1054 files changed, 60736 insertions, 21076 deletions

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 8b05636334..43e89b1537 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -134,8 +134,6 @@ dvb/
         - info on Linux Digital Video Broadcast (DVB) subsystem.
 early-userspace/
         - info about initramfs, klibc, and userspace early during boot.
-ecryptfs.txt
-        - docs on eCryptfs: stacked cryptographic filesystem for Linux.
 eisa.txt
         - info on EISA bus support.
 exception.txt
diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl
index 90ed23df1f..c917de681c 100644
--- a/Documentation/DocBook/deviceiobook.tmpl
+++ b/Documentation/DocBook/deviceiobook.tmpl
@@ -316,7 +316,8 @@ CPU B:  spin_unlock_irqrestore(&dev_lock, flags)
 
   <chapter id="pubfunctions">
      <title>Public Functions Provided</title>
-!Einclude/asm-i386/io.h
+!Iinclude/asm-i386/io.h
+!Elib/iomap.c
   </chapter>
 
 </book>
diff --git a/Documentation/HOWTO b/Documentation/HOWTO
index f8cc3f8ed1..c64e969dc3 100644
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
@@ -208,7 +208,7 @@ tools.  One such tool that is particularly recommended is the Linux
 Cross-Reference project, which is able to present source code in a
 self-referential, indexed webpage format. An excellent up-to-date
 repository of the kernel code may be found at:
-        http://sosdg.org/~coywolf/lxr/
+        http://users.sosdg.org/~qiyong/lxr/
 
 
 The development process
@@ -384,7 +384,7 @@ One of the best ways to put into practice your hacking skills is by fixing
 bugs reported by other people. Not only you will help to make the kernel
 more stable, you'll learn to fix real world problems and you will improve
 your skills, and other developers will be aware of your presence. Fixing
-bugs is one of the best ways to earn merit amongst the developers, because
+bugs is one of the best ways to get merits among other developers, because
 not many people like wasting time fixing other people's bugs.
 
 To work in the already reported bug reports, go to http://bugzilla.kernel.org.
diff --git a/Documentation/ManagementStyle b/Documentation/ManagementStyle
index cbbebfb51f..49a8efa5af 100644
--- a/Documentation/ManagementStyle
+++ b/Documentation/ManagementStyle
@@ -166,7 +166,7 @@ To solve this problem, you really only have two options:
 The option of being unfailingly polite really doesn't exist. Nobody will
 trust somebody who is so clearly hiding his true character.
 
-(*) Paul Simon sang "Fifty Ways to Lose Your Lover", because quite
+(*) Paul Simon sang "Fifty Ways to Leave Your Lover", because quite
 frankly, "A Million Ways to Tell a Developer He Is a D*ckhead" doesn't
 scan nearly as well.  But I'm sure he thought about it. 
 
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index d6b45a9b29..a30dd4480a 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -126,7 +126,7 @@ the reviewers time and will get your patch rejected, probably
 without even being read.
 
 At a minimum you should check your patches with the patch style
-checker prior to submission (scripts/patchcheck.pl).  You should
+checker prior to submission (scripts/checkpatch.pl).  You should
 be able to justify all violations that remain in your patch.
 
 
@@ -560,7 +560,7 @@ NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
   <http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>
 
 Kernel Documentation/CodingStyle:
-  <http://sosdg.org/~coywolf/lxr/source/Documentation/CodingStyle>
+  <http://users.sosdg.org/~qiyong/lxr/source/Documentation/CodingStyle>
 
 Linus Torvalds's mail on the canonical patch format:
   <http://lkml.org/lkml/2005/4/7/183>
diff --git a/Documentation/crypto/async-tx-api.txt b/Documentation/crypto/async-tx-api.txt
new file mode 100644
index 0000000000..c1e9545c59
--- /dev/null
+++ b/Documentation/crypto/async-tx-api.txt
@@ -0,0 +1,219 @@
+                 Asynchronous Transfers/Transforms API
+
+1 INTRODUCTION
+
+2 GENEALOGY
+
+3 USAGE
+3.1 General format of the API
+3.2 Supported operations
+3.3 Descriptor management
+3.4 When does the operation execute?
+3.5 When does the operation complete?
+3.6 Constraints
+3.7 Example
+
+4 DRIVER DEVELOPER NOTES
+4.1 Conformance points
+4.2 "My application needs finer control of hardware channels"
+
+5 SOURCE
+
+---
+
+1 INTRODUCTION
+
+The async_tx API provides methods for describing a chain of asynchronous
+bulk memory transfers/transforms with support for inter-transactional
+dependencies.  It is implemented as a dmaengine client that smooths over
+the details of different hardware offload engine implementations.  Code
+that is written to the API can optimize for asynchronous operation and
+the API will fit the chain of operations to the available offload
+resources.
+
+2 GENEALOGY
+
+The API was initially designed to offload the memory copy and
+xor-parity-calculations of the md-raid5 driver using the offload engines
+present in the Intel(R) Xscale series of I/O processors.  It also built
+on the 'dmaengine' layer developed for offloading memory copies in the
+network stack using Intel(R) I/OAT engines.  The following design
+features surfaced as a result:
+1/ implicit synchronous path: users of the API do not need to know if
+   the platform they are running on has offload capabilities.  The
+   operation will be offloaded when an engine is available and carried out
+   in software otherwise.
+2/ cross channel dependency chains: the API allows a chain of dependent
+   operations to be submitted, like xor->copy->xor in the raid5 case.  The
+   API automatically handles cases where the transition from one operation
+   to another implies a hardware channel switch.
+3/ dmaengine extensions to support multiple clients and operation types
+   beyond 'memcpy'
+
+3 USAGE
+
+3.1 General format of the API:
+struct dma_async_tx_descriptor *
+async_<operation>(<op specific parameters>,
+                  enum async_tx_flags flags,
+                  struct dma_async_tx_descriptor *dependency,
+                  dma_async_tx_callback callback_routine,
+                  void *callback_parameter);
+
+3.2 Supported operations:
+memcpy       - memory copy between a source and a destination buffer
+memset       - fill a destination buffer with a byte value
+xor          - xor a series of source buffers and write the result to a
+               destination buffer
+xor_zero_sum - xor a series of source buffers and set a flag if the
+               result is zero.  The implementation attempts to prevent
+               writes to memory
+
+3.3 Descriptor management:
+The return value is non-NULL and points to a 'descriptor' when the operation
+has been queued to execute asynchronously.  Descriptors are recycled
+resources, under control of the offload engine driver, to be reused as
+operations complete.  When an application needs to submit a chain of
+operations it must guarantee that the descriptor is not automatically recycled
+before the dependency is submitted.  This requires that all descriptors be
+acknowledged by the application before the offload engine driver is allowed to
+recycle (or free) the descriptor.  A descriptor can be acked by one of the
+following methods:
+1/ setting the ASYNC_TX_ACK flag if no child operations are to be submitted
+2/ setting the ASYNC_TX_DEP_ACK flag to acknowledge the parent
+   descriptor of a new operation.
+3/ calling async_tx_ack() on the descriptor.
+
+3.4 When does the operation execute?
+Operations do not immediately issue after return from the
+async_<operation> call.  Offload engine drivers batch operations to
+improve performance by reducing the number of mmio cycles needed to
+manage the channel.  Once a driver-specific threshold is met the driver
+automatically issues pending operations.  An application can force this
+event by calling async_tx_issue_pending_all().  This operates on all
+channels since the application has no knowledge of channel to operation
+mapping.
+
+3.5 When does the operation complete?
+There are two methods for an application to learn about the completion
+of an operation.
+1/ Call dma_wait_for_async_tx().  This call causes the CPU to spin while
+   it polls for the completion of the operation.  It handles dependency
+   chains and issuing pending operations.
+2/ Specify a completion callback.  The callback routine runs in tasklet
+   context if the offload engine driver supports interrupts, or it is
+   called in application context if the operation is carried out
+   synchronously in software.  The callback can be set in the call to
+   async_<operation>, or when the application needs to submit a chain of
+   unknown length it can use the async_trigger_callback() routine to set a
+   completion interrupt/callback at the end of the chain.
+
+3.6 Constraints:
+1/ Calls to async_<operation> are not permitted in IRQ context.  Other
+   contexts are permitted provided constraint #2 is not violated.
+2/ Completion callback routines cannot submit new operations.  This
+   results in recursion in the synchronous case and spin_locks being
+   acquired twice in the asynchronous case.
+
+3.7 Example:
+Perform a xor->copy->xor operation where each operation depends on the
+result from the previous operation:
+
+void complete_xor_copy_xor(void *param)
+{
+        printk("complete\n");
+}
+
+int run_xor_copy_xor(struct page **xor_srcs,
+                     int xor_src_cnt,
+                     struct page *xor_dest,
+                     size_t xor_len,
+                     struct page *copy_src,
+                     struct page *copy_dest,
+                     size_t copy_len)
+{
+        struct dma_async_tx_descriptor *tx;
+
+        tx = async_xor(xor_dest, xor_srcs, 0, xor_src_cnt, xor_len,
+                       ASYNC_TX_XOR_DROP_DST, NULL, NULL, NULL);
+        tx = async_memcpy(copy_dest, copy_src, 0, 0, copy_len,
+                          ASYNC_TX_DEP_ACK, tx, NULL, NULL);
+        tx = async_xor(xor_dest, xor_srcs, 0, xor_src_cnt, xor_len,
+                       ASYNC_TX_XOR_DROP_DST | ASYNC_TX_DEP_ACK | ASYNC_TX_ACK,
+                       tx, complete_xor_copy_xor, NULL);
+
+        async_tx_issue_pending_all();
+}
+
+See include/linux/async_tx.h for more information on the flags.  See the
+ops_run_* and ops_complete_* routines in drivers/md/raid5.c for more
+implementation examples.
+
+4 DRIVER DEVELOPMENT NOTES
+4.1 Conformance points:
+There are a few conformance points required in dmaengine drivers to
+accommodate assumptions made by applications using the async_tx API:
+1/ Completion callbacks are expected to happen in tasklet context
+2/ dma_async_tx_descriptor fields are never manipulated in IRQ context
+3/ Use async_tx_run_dependencies() in the descriptor clean up path to
+   handle submission of dependent operations
+
+4.2 "My application needs finer control of hardware channels"
+This requirement seems to arise from cases where a DMA engine driver is
+trying to support device-to-memory DMA.  The dmaengine and async_tx
+implementations were designed for offloading memory-to-memory
+operations; however, there are some capabilities of the dmaengine layer
+that can be used for platform-specific channel management.
+Platform-specific constraints can be handled by registering the
+application as a 'dma_client' and implementing a 'dma_event_callback' to
+apply a filter to the available channels in the system.  Before showing
+how to implement a custom dma_event callback some background of
+dmaengine's client support is required.
+
+The following routines in dmaengine support multiple clients requesting
+use of a channel:
+- dma_async_client_register(struct dma_client *client)
+- dma_async_client_chan_request(struct dma_client *client)
+
+dma_async_client_register takes a pointer to an initialized dma_client
+structure.  It expects that the 'event_callback' and 'cap_mask' fields
+are already initialized.
+
+dma_async_client_chan_request triggers dmaengine to notify the client of
+all channels that satisfy the capability mask.  It is up to the client's
+event_callback routine to track how many channels the client needs and
+how many it is currently using.  The dma_event_callback routine returns a
+dma_state_client code to let dmaengine know the status of the
+allocation.
+
+Below is the example of how to extend this functionality for
+platform-specific filtering of the available channels beyond the
+standard capability mask:
+
+static enum dma_state_client
+my_dma_client_callback(struct dma_client *client,
+                        struct dma_chan *chan, enum dma_state state)
+{
+        struct dma_device *dma_dev;
+        struct my_platform_specific_dma *plat_dma_dev;
+        
+        dma_dev = chan->device;
+        plat_dma_dev = container_of(dma_dev,
+                                    struct my_platform_specific_dma,
+                                    dma_dev);
+
+        if (!plat_dma_dev->platform_specific_capability)
+                return DMA_DUP;
+
+        . . .
+}
+
+5 SOURCE
+include/linux/dmaengine.h: core header file for DMA drivers and clients
+drivers/dma/dmaengine.c: offload engine channel management routines
+drivers/dma/: location for offload engine drivers
+include/linux/async_tx.h: core header file for the async_tx api
+crypto/async_tx/async_tx.c: async_tx interface to dmaengine and common code
+crypto/async_tx/async_memcpy.c: copy offload
+crypto/async_tx/async_memset.c: memory fill offload
+crypto/async_tx/async_xor.c: xor and xor zero sum offload
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 8de132a02b..6c46730c63 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -94,6 +94,8 @@ Your cooperation is appreciated.
                   9 = /dev/urandom      Faster, less secure random number gen.
                  10 = /dev/aio          Asynchronous I/O notification interface
                  11 = /dev/kmsg         Writes to this come out as printk's
+                 12 = /dev/oldmem       Used by crashdump kernels to access
+                                        the memory of the kernel that crashed.
 
   1 block       RAM disk
                   0 = /dev/ram0         First RAM disk
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index a43d2878a4..00928d2ecf 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -197,6 +197,14 @@ Who:	Len Brown <len.brown@intel.com>
 
 ---------------------------
 
+What:   /proc/acpi/event
+When:   February 2008
+Why:    /proc/acpi/event has been replaced by events via the input layer
+        and netlink since 2.6.23.
+Who:    Len Brown <len.brown@intel.com>
+
+---------------------------
+
 What:   Compaq touchscreen device emulation
 When:   Oct 2007
 Files:  drivers/input/tsdev.c
@@ -290,3 +298,11 @@ Why:	All mthca hardware also supports MSI-X, which provides
 Who:    Roland Dreier <rolandd@cisco.com>
 
 ---------------------------
+
+What:   sk98lin network driver
+When:   Feburary 2008
+Why:    In kernel tree version of driver is unmaintained. Sk98lin driver
+        replaced by the skge driver. 
+Who:    Stephen Hemminger <shemminger@linux-foundation.org>
+
+---------------------------
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 571785887a..59db1bca70 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -32,6 +32,8 @@ directory-locking
         - info about the locking scheme used for directory operations.
 dlmfs.txt
         - info on the userspace interface to the OCFS2 DLM.
+ecryptfs.txt
+        - docs on eCryptfs: stacked cryptographic filesystem for Linux.
 ext2.txt
         - info, mount options and specifications for the Ext2 filesystem.
 ext3.txt
diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt
index bbd8b28c13..cda6905cbe 100644
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
@@ -6,12 +6,26 @@ ABOUT
 
 v9fs is a Unix implementation of the Plan 9 9p remote filesystem protocol.
 
-This software was originally developed by Ron Minnich <rminnich@lanl.gov>
-and Maya Gokhale <maya@lanl.gov>.  Additional development by Greg Watson
+This software was originally developed by Ron Minnich <rminnich@sandia.gov>
+and Maya Gokhale.  Additional development by Greg Watson
 <gwatson@lanl.gov> and most recently Eric Van Hensbergen
 <ericvh@gmail.com>, Latchesar Ionkov <lucho@ionkov.net> and Russ Cox
 <rsc@swtch.com>.
 
+The best detailed explanation of the Linux implementation and applications of
+the 9p client is available in the form of a USENIX paper:
+   http://www.usenix.org/events/usenix05/tech/freenix/hensbergen.html
+
+Other applications are described in the following papers:
+        * XCPU & Clustering
+                http://www.xcpu.org/xcpu-talk.pdf
+        * KVMFS: control file system for KVM
+                http://www.xcpu.org/kvmfs.pdf
+        * CellFS: A New ProgrammingModel for the Cell BE
+                http://www.xcpu.org/cellfs-talk.pdf
+        * PROSE I/O: Using 9p to enable Application Partitions
+                http://plan9.escet.urjc.es/iwp9/cready/PROSE_iwp9_2006.pdf
+
 USAGE
 =====
 
@@ -90,9 +104,9 @@ subset of the namespace by extending the path: '#U*'/tmp would just export
 and export.
 
 A Linux version of the 9p server is now maintained under the npfs project
-on sourceforge (http://sourceforge.net/projects/npfs).  There is also a
-more stable single-threaded version of the server (named spfs) available from
-the same CVS repository.
+on sourceforge (http://sourceforge.net/projects/npfs).  The currently
+maintained version is the single-threaded version of the server (named spfs)
+available from the same CVS repository.
 
 There are user and developer mailing lists available through the v9fs project
 on sourceforge (http://sourceforge.net/projects/v9fs).
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt
index 8ccf0c1b58..ed55238023 100644
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
@@ -28,11 +28,7 @@ Manish Singh  <manish.singh@oracle.com>
 Caveats
 =======
 Features which OCFS2 does not support yet:
-        - sparse files
         - extended attributes
-        - shared writable mmap
-        - loopback is supported, but data written will not
-          be cluster coherent.
         - quotas
         - cluster aware flock
         - cluster aware lockf
@@ -57,3 +53,12 @@ nointr			Do not allow signals to interrupt cluster
 atime_quantum=60(*)     OCFS2 will not update atime unless this number
                         of seconds has passed since the last update.
                         Set to zero to always update atime.
+data=ordered    (*)     All data are forced directly out to the main file
+                        system prior to its metadata being committed to the
+                        journal.
+data=writeback          Data ordering is not preserved, data may be written
+                        into the main file system after its metadata has been
+                        committed to the journal.
+preferred_slot=0(*)     During mount, try to use this filesystem slot first. If
+                        it is in use by another node, the first empty one found
+                        will be chosen. Invalid values will be ignored.
diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4
index fa0c786a8b..cf6b6cb02a 100644
--- a/Documentation/i2c/busses/i2c-piix4
+++ b/Documentation/i2c/busses/i2c-piix4
@@ -6,7 +6,7 @@ Supported adapters:
     Datasheet: Publicly available at the Intel website
   * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges
     Datasheet: Only available via NDA from ServerWorks
-  * ATI IXP200, IXP300, IXP400, SB600 and SB700 southbridges
+  * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges
     Datasheet: Not publicly available
   * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
     Datasheet: Publicly available at the SMSC website http://www.smsc.com
diff --git a/Documentation/input/iforce-protocol.txt b/Documentation/input/iforce-protocol.txt
index 95df4ca70e..8777d2d321 100644
--- a/Documentation/input/iforce-protocol.txt
+++ b/Documentation/input/iforce-protocol.txt
@@ -1,254 +1,254 @@
-** Introduction

-This document describes what I managed to discover about the protocol used to

-specify force effects to I-Force 2.0 devices.  None of this information comes

-from Immerse. That's why you should not trust what is written in this

-document. This document is intended to help understanding the protocol.

-This is not a reference. Comments and corrections are welcome.  To contact me,

-send an email to: deneux@ifrance.com

-

-** WARNING **

-I may not be held responsible for any dammage or harm caused if you try to

-send data to your I-Force device based on what you read in this document.

-

-** Preliminary Notes:

-All values are hexadecimal with big-endian encoding (msb on the left). Beware,

-values inside packets are encoded using little-endian.  Bytes whose roles are

-unknown are marked ???  Information that needs deeper inspection is marked (?)

-

-** General form of a packet **

-This is how packets look when the device uses the rs232 to communicate.

-2B OP LEN DATA CS

-CS is the checksum. It is equal to the exclusive or of all bytes.

-

-When using USB:

-OP DATA

-The 2B, LEN and CS fields have disappeared, probably because USB handles frames and

-data corruption is handled or unsignificant.

-

-First, I describe effects that are sent by the device to the computer

-

-** Device input state

-This packet is used to indicate the state of each button and the value of each

-axis

-OP= 01 for a joystick, 03 for a wheel

-LEN= Varies from device to device

-00 X-Axis lsb

-01 X-Axis msb

-02 Y-Axis lsb, or gas pedal for a wheel

-03 Y-Axis msb, or brake pedal for a wheel

-04 Throttle

-05 Buttons

-06 Lower 4 bits: Buttons

-   Upper 4 bits: Hat

-07 Rudder

-

-** Device effects states

-OP= 02

-LEN= Varies

-00 ? Bit 1 (Value 2) is the value of the deadman switch

-01 Bit 8 is set if the effect is playing. Bits 0 to 7 are the effect id.

-02 ??

-03 Address of parameter block changed (lsb)

-04 Address of parameter block changed (msb)

-05 Address of second parameter block changed (lsb)

-... depending on the number of parameter blocks updated

-

-** Force effect **

-OP=  01

-LEN= 0e

-00 Channel (when playing several effects at the same time, each must be assigned a channel)

-01 Wave form

-        Val 00 Constant

-        Val 20 Square

-        Val 21 Triangle

-        Val 22 Sine

-        Val 23 Sawtooth up

-        Val 24 Sawtooth down

-        Val 40 Spring (Force = f(pos))

-        Val 41 Friction (Force = f(velocity)) and Inertia (Force = f(acceleration))

-

-        

-02 Axes affected and trigger

-        Bits 4-7: Val 2 = effect along one axis. Byte 05 indicates direction

-                  Val 4 = X axis only. Byte 05 must contain 5a

-                  Val 8 = Y axis only. Byte 05 must contain b4

-                  Val c = X and Y axes. Bytes 05 must contain 60

-        Bits 0-3: Val 0 = No trigger

-                  Val x+1 = Button x triggers the effect

-        When the whole byte is 0, cancel the previously set trigger

-

-03-04 Duration of effect (little endian encoding, in ms)

-

-05 Direction of effect, if applicable. Else, see 02 for value to assign.

-

-06-07 Minimum time between triggering.

-

-08-09 Address of periodicity or magnitude parameters

-0a-0b Address of attack and fade parameters, or ffff if none.

-*or*

-08-09 Address of interactive parameters for X-axis, or ffff if not applicable

-0a-0b Address of interactive parameters for Y-axis, or ffff if not applicable

-

-0c-0d Delay before execution of effect (little endian encoding, in ms)

-

-

-** Time based parameters **

-

-*** Attack and fade ***

-OP=  02

-LEN= 08

-00-01 Address where to store the parameteres

-02-03 Duration of attack (little endian encoding, in ms)

-04 Level at end of attack. Signed byte.

-05-06 Duration of fade.

-07 Level at end of fade.

-

-*** Magnitude ***

-OP=  03

-LEN= 03

-00-01 Address

-02 Level. Signed byte.

-

-*** Periodicity ***

-OP=  04

-LEN= 07

-00-01 Address

-02 Magnitude. Signed byte.

-03 Offset. Signed byte.

-04 Phase. Val 00 = 0 deg, Val 40 = 90 degs.

-05-06 Period (little endian encoding, in ms)

-

-** Interactive parameters **

-OP=  05

-LEN= 0a

-00-01 Address

-02 Positive Coeff

-03 Negative Coeff

-04+05 Offset (center)

-06+07 Dead band (Val 01F4 = 5000 (decimal))

-08 Positive saturation (Val 0a = 1000 (decimal) Val 64 = 10000 (decimal))

-09 Negative saturation

-

-The encoding is a bit funny here: For coeffs, these are signed values. The

-maximum value is 64 (100 decimal), the min is 9c.

-For the offset, the minimum value is FE0C, the maximum value is 01F4.

-For the deadband, the minimum value is 0, the max is 03E8.

-

-** Controls **

-OP=  41

-LEN= 03

-00 Channel

-01 Start/Stop

-        Val 00: Stop

-        Val 01: Start and play once.

-        Val 41: Start and play n times (See byte 02 below)

-02 Number of iterations n.

-

-** Init **

-

-*** Querying features ***

-OP=  ff

-Query command. Length varies according to the query type.

-The general format of this packet is:

-ff 01 QUERY [INDEX] CHECKSUM

-reponses are of the same form:

-FF LEN QUERY VALUE_QUERIED CHECKSUM2

-where LEN = 1 + length(VALUE_QUERIED)

-

-**** Query ram size ****

-QUERY = 42 ('B'uffer size)

-The device should reply with the same packet plus two additionnal bytes

-containing the size of the memory:

-ff 03 42 03 e8 CS would mean that the device has 1000 bytes of ram available.

-

-**** Query number of effects ****

-QUERY = 4e ('N'umber of effects)

-The device should respond by sending the number of effects that can be played

-at the same time (one byte)

-ff 02 4e 14 CS would stand for 20 effects.

-

-**** Vendor's id ****

-QUERY = 4d ('M'anufacturer)

-Query the vendors'id (2 bytes)

-

-**** Product id *****

-QUERY = 50 ('P'roduct)

-Query the product id (2 bytes)

-

-**** Open device ****

-QUERY = 4f ('O'pen) 

-No data returned.

-

-**** Close device *****

-QUERY = 43 ('C')lose

-No data returned.

-

-**** Query effect ****

-QUERY = 45 ('E') 

-Send effect type.

-Returns nonzero if supported (2 bytes)

-

-**** Firmware Version ****

-QUERY = 56 ('V'ersion)

-Sends back 3 bytes - major, minor, subminor

-

-*** Initialisation of the device ***

-

-**** Set Control ****

-!!! Device dependent, can be different on different models !!!

-OP=  40 <idx> <val> [<val>]

-LEN= 2 or 3

-00 Idx

-   Idx 00 Set dead zone (0..2048) 

-   Idx 01 Ignore Deadman sensor (0..1)     

-   Idx 02 Enable comm watchdog (0..1)     

-   Idx 03 Set the strength of the spring (0..100)   

-   Idx 04 Enable or disable the spring (0/1)

-   Idx 05 Set axis saturation threshold (0..2048) 

-

-**** Set Effect State ****

-OP=  42 <val>

-LEN= 1

-00 State

-   Bit 3 Pause force feedback

-   Bit 2 Enable force feedback

-   Bit 0 Stop all effects

-

-**** Set overall gain ****

-OP=  43 <val>

-LEN= 1

-00 Gain

-   Val 00 = 0%

-   Val 40 = 50%

-   Val 80 = 100%

-

-** Parameter memory **

-

-Each device has a certain amount of memory to store parameters of effects.

-The amount of RAM may vary, I encountered values from 200 to 1000 bytes. Below

-is the amount of memory apparently needed for every set of parameters:

- - period : 0c

- - magnitude : 02

- - attack and fade : 0e

- - interactive : 08

-

-** Appendix: How to study the protocol ? **

-

-1. Generate effects using the force editor provided with the DirectX SDK, or use Immersion Studio (freely available at their web site in the developer section: www.immersion.com)

-2. Start a soft spying RS232 or USB (depending on where you connected your joystick/wheel). I used ComPortSpy from fCoder (alpha version!)

-3. Play the effect, and watch what happens on the spy screen.

-

-A few words about ComPortSpy:

-At first glance, this soft seems, hum, well... buggy. In fact, data appear with a few seconds latency. Personnaly, I restart it every time I play an effect.

-Remember it's free (as in free beer) and alpha!

-

-** URLS **

-Check www.immerse.com for Immersion Studio, and www.fcoder.com for ComPortSpy.

-

-** Author of this document **

-Johann Deneux <deneux@ifrance.com>

-Home page at http://www.esil.univ-mrs.fr/~jdeneux/projects/ff/

-

-Additions by Vojtech Pavlik.

-

-I-Force is trademark of Immersion Corp.

+** Introduction
+This document describes what I managed to discover about the protocol used to
+specify force effects to I-Force 2.0 devices.  None of this information comes
+from Immerse. That's why you should not trust what is written in this
+document. This document is intended to help understanding the protocol.
+This is not a reference. Comments and corrections are welcome.  To contact me,
+send an email to: deneux@ifrance.com
+
+** WARNING **
+I may not be held responsible for any dammage or harm caused if you try to
+send data to your I-Force device based on what you read in this document.
+
+** Preliminary Notes:
+All values are hexadecimal with big-endian encoding (msb on the left). Beware,
+values inside packets are encoded using little-endian.  Bytes whose roles are
+unknown are marked ???  Information that needs deeper inspection is marked (?)
+
+** General form of a packet **
+This is how packets look when the device uses the rs232 to communicate.
+2B OP LEN DATA CS
+CS is the checksum. It is equal to the exclusive or of all bytes.
+
+When using USB:
+OP DATA
+The 2B, LEN and CS fields have disappeared, probably because USB handles frames and
+data corruption is handled or unsignificant.
+
+First, I describe effects that are sent by the device to the computer
+
+** Device input state
+This packet is used to indicate the state of each button and the value of each
+axis
+OP= 01 for a joystick, 03 for a wheel
+LEN= Varies from device to device
+00 X-Axis lsb
+01 X-Axis msb
+02 Y-Axis lsb, or gas pedal for a wheel
+03 Y-Axis msb, or brake pedal for a wheel
+04 Throttle
+05 Buttons
+06 Lower 4 bits: Buttons
+   Upper 4 bits: Hat
+07 Rudder
+
+** Device effects states
+OP= 02
+LEN= Varies
+00 ? Bit 1 (Value 2) is the value of the deadman switch
+01 Bit 8 is set if the effect is playing. Bits 0 to 7 are the effect id.
+02 ??
+03 Address of parameter block changed (lsb)
+04 Address of parameter block changed (msb)
+05 Address of second parameter block changed (lsb)
+... depending on the number of parameter blocks updated
+
+** Force effect **
+OP=  01
+LEN= 0e
+00 Channel (when playing several effects at the same time, each must be assigned a channel)
+01 Wave form
+        Val 00 Constant
+        Val 20 Square
+        Val 21 Triangle
+        Val 22 Sine
+        Val 23 Sawtooth up
+        Val 24 Sawtooth down
+        Val 40 Spring (Force = f(pos))
+        Val 41 Friction (Force = f(velocity)) and Inertia (Force = f(acceleration))
+
+
+02 Axes affected and trigger
+        Bits 4-7: Val 2 = effect along one axis. Byte 05 indicates direction
+                  Val 4 = X axis only. Byte 05 must contain 5a
+                  Val 8 = Y axis only. Byte 05 must contain b4
+                  Val c = X and Y axes. Bytes 05 must contain 60
+        Bits 0-3: Val 0 = No trigger
+                  Val x+1 = Button x triggers the effect
+        When the whole byte is 0, cancel the previously set trigger
+
+03-04 Duration of effect (little endian encoding, in ms)
+
+05 Direction of effect, if applicable. Else, see 02 for value to assign.
+
+06-07 Minimum time between triggering.
+
+08-09 Address of periodicity or magnitude parameters
+0a-0b Address of attack and fade parameters, or ffff if none.
+*or*
+08-09 Address of interactive parameters for X-axis, or ffff if not applicable
+0a-0b Address of interactive parameters for Y-axis, or ffff if not applicable
+
+0c-0d Delay before execution of effect (little endian encoding, in ms)
+
+
+** Time based parameters **
+
+*** Attack and fade ***
+OP=  02
+LEN= 08
+00-01 Address where to store the parameteres
+02-03 Duration of attack (little endian encoding, in ms)
+04 Level at end of attack. Signed byte.
+05-06 Duration of fade.
+07 Level at end of fade.
+
+*** Magnitude ***
+OP=  03
+LEN= 03
+00-01 Address
+02 Level. Signed byte.
+
+*** Periodicity ***
+OP=  04
+LEN= 07
+00-01 Address
+02 Magnitude. Signed byte.
+03 Offset. Signed byte.
+04 Phase. Val 00 = 0 deg, Val 40 = 90 degs.
+05-06 Period (little endian encoding, in ms)
+
+** Interactive parameters **
+OP=  05
+LEN= 0a
+00-01 Address
+02 Positive Coeff
+03 Negative Coeff
+04+05 Offset (center)
+06+07 Dead band (Val 01F4 = 5000 (decimal))
+08 Positive saturation (Val 0a = 1000 (decimal) Val 64 = 10000 (decimal))
+09 Negative saturation
+
+The encoding is a bit funny here: For coeffs, these are signed values. The
+maximum value is 64 (100 decimal), the min is 9c.
+For the offset, the minimum value is FE0C, the maximum value is 01F4.
+For the deadband, the minimum value is 0, the max is 03E8.
+
+** Controls **
+OP=  41
+LEN= 03
+00 Channel
+01 Start/Stop
+        Val 00: Stop
+        Val 01: Start and play once.
+        Val 41: Start and play n times (See byte 02 below)
+02 Number of iterations n.
+
+** Init **
+
+*** Querying features ***
+OP=  ff
+Query command. Length varies according to the query type.
+The general format of this packet is:
+ff 01 QUERY [INDEX] CHECKSUM
+reponses are of the same form:
+FF LEN QUERY VALUE_QUERIED CHECKSUM2
+where LEN = 1 + length(VALUE_QUERIED)
+
+**** Query ram size ****
+QUERY = 42 ('B'uffer size)
+The device should reply with the same packet plus two additionnal bytes
+containing the size of the memory:
+ff 03 42 03 e8 CS would mean that the device has 1000 bytes of ram available.
+
+**** Query number of effects ****
+QUERY = 4e ('N'umber of effects)
+The device should respond by sending the number of effects that can be played
+at the same time (one byte)
+ff 02 4e 14 CS would stand for 20 effects.
+
+**** Vendor's id ****
+QUERY = 4d ('M'anufacturer)
+Query the vendors'id (2 bytes)
+
+**** Product id *****
+QUERY = 50 ('P'roduct)
+Query the product id (2 bytes)
+
+**** Open device ****
+QUERY = 4f ('O'pen)
+No data returned.
+
+**** Close device *****
+QUERY = 43 ('C')lose
+No data returned.
+
+**** Query effect ****
+QUERY = 45 ('E')
+Send effect type.
+Returns nonzero if supported (2 bytes)
+
+**** Firmware Version ****
+QUERY = 56 ('V'ersion)
+Sends back 3 bytes - major, minor, subminor
+
+*** Initialisation of the device ***
+
+**** Set Control ****
+!!! Device dependent, can be different on different models !!!
+OP=  40 <idx> <val> [<val>]
+LEN= 2 or 3
+00 Idx
+   Idx 00 Set dead zone (0..2048)
+   Idx 01 Ignore Deadman sensor (0..1)
+   Idx 02 Enable comm watchdog (0..1)
+   Idx 03 Set the strength of the spring (0..100)
+   Idx 04 Enable or disable the spring (0/1)
+   Idx 05 Set axis saturation threshold (0..2048)
+
+**** Set Effect State ****
+OP=  42 <val>
+LEN= 1
+00 State
+   Bit 3 Pause force feedback
+   Bit 2 Enable force feedback
+   Bit 0 Stop all effects
+
+**** Set overall gain ****
+OP=  43 <val>
+LEN= 1
+00 Gain
+   Val 00 = 0%
+   Val 40 = 50%
+   Val 80 = 100%
+
+** Parameter memory **
+
+Each device has a certain amount of memory to store parameters of effects.
+The amount of RAM may vary, I encountered values from 200 to 1000 bytes. Below
+is the amount of memory apparently needed for every set of parameters:
+ - period : 0c
+ - magnitude : 02
+ - attack and fade : 0e
+ - interactive : 08
+
+** Appendix: How to study the protocol ? **
+
+1. Generate effects using the force editor provided with the DirectX SDK, or use Immersion Studio (freely available at their web site in the developer section: www.immersion.com)
+2. Start a soft spying RS232 or USB (depending on where you connected your joystick/wheel). I used ComPortSpy from fCoder (alpha version!)
+3. Play the effect, and watch what happens on the spy screen.
+
+A few words about ComPortSpy:
+At first glance, this soft seems, hum, well... buggy. In fact, data appear with a few seconds latency. Personnaly, I restart it every time I play an effect.
+Remember it's free (as in free beer) and alpha!
+
+** URLS **
+Check www.immerse.com for Immersion Studio, and www.fcoder.com for ComPortSpy.
+
+** Author of this document **
+Johann Deneux <deneux@ifrance.com>
+Home page at http://www.esil.univ-mrs.fr/~jdeneux/projects/ff/
+
+Additions by Vojtech Pavlik.
+
+I-Force is trademark of Immersion Corp.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 975f029be2..4d175c7512 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -468,9 +468,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format:
                         <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
 
-        cpia_pp=        [HW,PPT]
-                        Format: { parport<nr> | auto | none }
-
         crashkernel=nn[KMG]@ss[KMG]
                         [KNL] Reserve a chunk of physical memory to
                         hold a kernel to switch to with kexec on panic.
@@ -952,14 +949,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format: <1-256>
 
         maxcpus=        [SMP] Maximum number of processors that an SMP kernel
-                        should make use of.
-                        Using "nosmp" or "maxcpus=0" will disable SMP
-                        entirely (the MPS table probe still happens, though).
-                        A command-line option of "maxcpus=<NUM>", where <NUM>
-                        is an integer greater than 0, limits the maximum number
-                        of CPUs activated in SMP mode to <NUM>.
-                        Using "maxcpus=1" on an SMP kernel is the trivial
-                        case of an SMP kernel with only one CPU.
+                        should make use of.  maxcpus=n : n >= 0 limits the
+                        kernel to using 'n' processors.  n=0 is a special case,
+                        it is equivalent to "nosmp", which also disables
+                        the IO APIC.
 
         max_addr=[KMG]  [KNL,BOOT,ia64] All physical memory greater than or
                         equal to this physical address is ignored.
@@ -1184,7 +1177,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nosep           [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support.
 
-        nosmp           [SMP] Tells an SMP kernel to act as a UP kernel.
+        nosmp           [SMP] Tells an SMP kernel to act as a UP kernel,
+                        and disable the IO APIC.  legacy for "maxcpus=0".
 
         nosoftlockup    [KNL] Disable the soft-lockup detector.
 
@@ -1826,6 +1820,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         -1: disable all active trip points in all thermal zones
                         <degrees C>: override all lowest active trip points
 
+        thermal.crt=    [HW,ACPI]
+                        -1: disable all critical trip points in all thermal zones
+                        <degrees C>: lower all critical trip points
+
         thermal.nocrt=  [HW,ACPI]
                         Set to disable actions on ACPI thermal zone
                         critical and hot trip points.
diff --git a/Documentation/ko_KR/HOWTO b/Documentation/ko_KR/HOWTO
new file mode 100644
index 0000000000..b51d7ca842
--- /dev/null
+++ b/Documentation/ko_KR/HOWTO
@@ -0,0 +1,623 @@
+NOTE:
+This is a version of Documentation/HOWTO translated into korean
+This document is maintained by minchan Kim < minchan.kim@gmail.com>
+If you find any difference between this document and the original file or
+a problem with the translation, please contact the maintainer of this file.
+
+Please also note that the purpose of this file is to be easier to
+read for non English (read: korean) speakers and is not intended as
+a fork. So if you have any comments or updates for this file please
+try to update the original English file first.
+
+==================================
+이 문서는
+Documentation/HOWTO
+의 한글 번역입니다.
+
+역자： 김민찬 <minchan.kim@gmail.com >
+감수： 이제이미 <jamee.lee@samsung.com>
+==================================
+
+어떻게 리눅스 커널 개발을 하는가
+---------------------------------
+
+이 문서는 커널 개발에 있어 가장 중요한 문서이다. 이 문서는
+리눅스 커널 개발자가 되는 법과 리눅스 커널 개발 커뮤니티와 일하는
+법을 담고있다. 커널 프로그래밍의기술적인 측면과 관련된 내용들은
+포함하지 않으려고 하였지만 올바으로 여러분을 안내하는 데 도움이
+될 것이다.
+
+이 문서에서 오래된 것을 발견하면 문서의 아래쪽에 나열된 메인트너에게
+패치를 보내달라.
+
+
+소개
+----
+
+자, 여러분은 리눅스 커널 개발자가 되는 법을 배우고 싶은가? 아니면
+상사로부터"이 장치를 위한 리눅스 드라이버를 작성하시오"라는 말을
+들었는가? 이 문서는 여러분이 겪게 될 과정과 커뮤니티와 일하는 법을
+조언하여 여러분의 목적을 달성하기 위해 필요한 것 모두를 알려주는
+것이다.
+
+커널은 대부분은 C로 작성되었어고 몇몇 아키텍쳐의 의존적인 부분은
+어셈블리로 작성되었다. 커널 개발을 위해 C를 잘 이해하고 있어야 한다.
+여러분이 특정 아키텍쳐의 low-level 개발을 할 것이 아니라면
+어셈블리(특정 아키텍쳐)는 잘 알아야 할 필요는 없다.
+다음의 참고서적들은 기본에 충실한 C 교육이나 수년간의 경험에 견주지는
+못하지만 적어도 참고 용도로는 좋을 것이다
+ - "The C Programming Language" by Kernighan and Ritchie [Prentice Hall]
+ - "Practical C Programming" by Steve Oualline [O'Reilly]
+ - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]
+
+커널은 GNU C와 GNU 툴체인을 사용하여 작성되었다. 이 툴들은 ISO C89 표준을
+따르는 반면 표준에 있지 않은 많은 확장기능도 가지고 있다. 커널은 표준 C
+라이브러리와는 관계없이 freestanding C 환경이어서 C 표준의 일부는
+지원되지 않는다. 임의의 long long 나누기나 floating point는 지원되지 않는다.
+때론 이런 이유로 커널이 그런 확장 기능을 가진 툴체인을 가지고 만들어졌다는
+것이 이해하기 어려울 수도 있고 게다가 불행하게도 그런 것을 정확하게 설명하는
+어떤 참고문서도 있지 않다. 정보를 얻기 위해서는 gcc info (`info gcc`)페이지를
+살펴보라.
+
+여러분은 기존의 개발 커뮤니티와 일하는 법을 배우려고 하고 있다는 것을
+기억하라. 코딩, 스타일, 절차에 관한 훌륭한 표준을 가진 사람들이 모인
+다양한 그룹이 있다. 이 표준들은 오랜동안 크고 지역적으로 분산된 팀들에
+의해 가장 좋은 방법으로 일하기위하여 찾은 것을 기초로 만들어져왔다.
+그 표준들은 문서화가 잘 되어 있기 때문에 가능한한 미리 많은 표준들에
+관하여 배우려고 시도하라. 다른 사람들은 여러분이나 여러분의 회사가
+일하는 방식에 적응하는 것을 원하지는 않는다.
+
+
+법적 문제
+---------
+
+리눅스 커널 소스 코드는 GPL로 배포(release)되었다. 소스트리의 메인
+디렉토리에 있는 라이센스에 관하여 상세하게 쓰여 있는 COPYING이라는
+파일을 봐라.여러분이 라이센스에 관한 더 깊은 문제를 가지고 있다면
+리눅스 커널 메일링 리스트에 묻지말고 변호사와 연락하라. 메일링
+리스트들에 있는 사람들은 변호사가 아니기 때문에 법적 문제에 관하여
+그들의 말에 의지해서는 안된다.
+
+GPL에 관한 잦은 질문들과 답변들은 다음을 참조하라.
+    http://www.gnu.org/licenses/gpl-faq.html
+
+
+문서
+----
+
+리눅스 커널 소스 트리는 커널 커뮤니티와 일하는 법을 배우기 위한 많은
+귀중한 문서들을 가지고 있다. 새로운 기능들이 커널에 들어가게 될 때,
+그 기능을 어떻게 사용하는지에 관한 설명을 위하여 새로운 문서 파일을
+추가하는 것을 권장한다. 커널이 유저스페이스로 노출하는 인터페이스를
+변경하게 되면 변경을 설명하는 메뉴얼 페이지들에 대한 패치나 정보를
+mtk-manpages@gmx.net의 메인트너에게 보낼 것을 권장한다.
+
+다음은 커널 소스 트리에 있는 읽어야 할 파일들의 리스트이다.
+  README
+    이 파일은 리눅스 커널에 관하여 간단한 배경 설명과 커널을 설정하고
+    빌드하기 위해 필요한 것을 설명한다. 커널에 입문하는 사람들은 여기서
+    시작해야 한다.
+
+  Documentation/Changes
+    이 파일은 커널을 성공적으로 빌드하고 실행시키기 위해 필요한 다양한
+    소프트웨어 패키지들의 최소 버젼을 나열한다.
+
+  Documentation/CodingStyle
+    이 문서는 리눅스 커널 코딩 스타일과 그렇게 한 몇몇 이유를 설명한다.
+    모든 새로운 코드는 이 문서에 가이드라인들을 따라야 한다. 대부분의
+    메인트너들은 이 규칙을 따르는 패치들만을 받아들일 것이고 많은 사람들이
+    그 패치가 올바른 스타일일 경우만 코드를 검토할 것이다.
+
+  Documentation/SubmittingPatches
+  Documentation/SubmittingDrivers
+    이 파일들은 성공적으로 패치를 만들고 보내는 법을 다음의 내용들로
+    굉장히 상세히 설명하고 있다(그러나 다음으로 한정되진 않는다).
+       - Email 내용들
+       - Email 양식
+       - 그것을 누구에게 보낼지
+    이러한 규칙들을 따르는 것이 성공을 보장하진 않는다(왜냐하면 모든
+    패치들은 내용과 스타일에 관하여 면밀히 검토되기 때문이다).
+    그러나 규칙을 따르지 않는다면 거의 성공하지도 못할 것이다.
+
+    올바른 패치들을 만드는 법에 관한 훌륭한 다른 문서들이 있다.
+    "The Perfect Patch"
+        http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
+    "Linux kernel patch submission format"
+        http://linux.yyz.us/patch-format.html
+
+   Documentation/stable_api_nonsense.txt
+    이 문서는 의도적으로 커널이 변하지 않는 API를 갖지 않도록 결정한
+    이유를 설명하며 다음과 같은 것들을 포함한다.
+       - 서브시스템 shim-layer(호환성을 위해?)
+       - 운영 체제들 간의 드라이버 이식성
+       - 커널 소스 트리내에 빠른 변화를 늦추는 것(또는 빠른 변화를 막는 것)
+    이 문서는 리눅스 개발 철학을 이해하는데 필수적이며 다른 운영체제에서
+    리눅스로 옮겨오는 사람들에게는 매우 중요하다.
+
+
+  Documentation/SecurityBugs
+    여러분들이 리눅스 커널의 보안 문제를 발견했다고 생각한다면 이 문서에
+    나온 단계에 따라서 커널 개발자들에게 알리고 그 문제를 해결할 수 있도록
+    도와 달라.
+
+  Documentation/ManagementStyle
+    이 문서는 리눅스 커널 메인트너들이 어떻게 그들의 방법론의 정신을
+    어떻게 공유하고 운영하는지를 설명한다. 이것은 커널 개발에 입문하는
+    모든 사람들(또는 커널 개발에 작은 호기심이라도 있는 사람들)이
+    읽어야 할 중요한 문서이다. 왜냐하면 이 문서는 커널 메인트너들의
+    독특한 행동에 관하여 흔히 있는 오해들과 혼란들을 해소하고 있기
+    때문이다.
+
+  Documentation/stable_kernel_rules.txt
+    이 문서는 안정적인 커널 배포가 이루어지는 규칙을 설명하고 있으며
+    여러분들이 이러한 배포들 중 하나에 변경을 하길 원한다면
+    무엇을 해야 하는지를 설명한다.
+
+  Documentation/kernel-docs.txt
+    커널 개발에 관계된 외부 문서의 리스트이다. 커널 내의 포함된 문서들
+    중에 여러분이 찾고 싶은 문서를 발견하지 못할 경우 이 리스트를
+    살펴보라.
+
+  Documentation/applying-patches.txt
+    패치가 무엇이며 그것을 커널의 다른 개발 브랜치들에 어떻게
+    적용하는지에 관하여 자세히 설명 하고 있는 좋은 입문서이다.
+
+커널은 소스 코드 그 자체에서 자동적으로 만들어질 수 있는 많은 문서들을
+가지고 있다. 이것은 커널 내의 API에 대한 모든 설명, 그리고 락킹을
+올바르게 처리하는 법에 관한 규칙을 포함하고 있다. 이 문서는
+Documentation/DocBook/ 디렉토리 내에서 만들어지며 PDF, Postscript, HTML,
+그리고 man 페이지들로 다음과 같이 실행하여 만들어 진다.
+         make pdfdocs
+         make psdocs
+         make htmldocs
+         make mandocs
+각각의 명령을 메인 커널 소스 디렉토리로부터 실행한다.
+
+
+커널 개발자가 되는 것
+---------------------
+
+여러분이 리눅스 커널 개발에 관하여 아무것도 모른다면 Linux KernelNewbies
+프로젝트를 봐야 한다.
+    http://kernelnewbies.org
+그곳은 거의 모든 종류의 기본적인 커널 개발 질문들(질문하기 전에 먼저
+아카이브를 찾아봐라. 과거에 이미 답변되었을 수도 있다)을 할수있는 도움이
+될만한 메일링 리스트가 있다. 또한 실시간으로 질문 할수 있는 IRC 채널도
+가지고 있으며 리눅스 커널 개발을 배우는 데 유용한 문서들을 보유하고 있다.
+
+웹사이트는 코드구성, 서브시스템들, 그리고 현재 프로젝트들
+(트리 내, 외부에 존재하는)에 관한 기본적인 정보들을 가지고 있다. 또한
+그곳은 커널 컴파일이나 패치를 하는 법과 같은 기본적인 것들을  설명한다.
+
+여러분이 어디서 시작해야 할진 모르지만 커널 개발 커뮤니티에 참여할 수
+있는 일들을 찾길 원한다면 리눅스 커널 Janitor 프로젝트를 살펴봐라.
+         http://janitor.kernelnewbies.org/
+그곳은 시작하기에 아주 딱 좋은 곳이다. 그곳은 리눅스 커널 소스 트리내에
+간단히 정리되고 수정될 수 있는 문제들에 관하여 설명한다. 여러분은 이
+프로젝트를 대표하는 개발자들과 일하면서 자신의 패치를 리눅스 커널 트리에
+반영하기 위한 기본적인 것들을 배우게 될것이며 여러분이 아직 아이디어를
+가지고 있지 않다면 다음에 무엇을 해야할지에 관한 방향을 배울 수 있을
+것이다.
+
+여러분들이 이미 커널 트리에 반영하길 원하는 코드 묶음을 가지고 있지만
+올바른 포맷으로 포장하는데 도움이 필요하다면 그러한 문제를 돕기 위해
+만들어진 kernel-mentors 프로젝트가 있다. 그곳은 메일링 리스트이며
+다음에서 참조할 수 있다.
+         http://selenic.com/mailman/listinfo/kernel-mentors
+
+리눅스 커널 코드에 실제 변경을 하기 전에 반드시 그 코드가 어떻게
+동작하는지 이해하고 있어야 한다. 코드를 분석하기 위하여 특정한 툴의
+도움을 빌려서라도 코드를 직접 읽는 것보다 좋은 것은 없다(대부분의
+자잘한 부분들은 잘 코멘트되어 있다). 그런 툴들 중에 특히 추천할만한
+것은 Linux Cross-Reference project이며 그것은 자기 참조 방식이며
+소스코드를 인덱스된 웹 페이지들의 형태로 보여준다. 최신의 멋진 커널
+코드 저장소는 다음을 통하여 참조할 수 있다.
+      http://sosdg.org/~coywolf/lxr/
+
+
+개발 프로세스
+-------------
+
+리눅스 커널 개발 프로세스는 현재 몇몇 다른 메인 커널 "브랜치들"과
+서브시스템에 특화된 커널 브랜치들로 구성된다. 몇몇 다른 메인
+브랜치들은 다음과 같다.
+  - main 2.6.x 커널 트리
+  - 2.6.x.y - 안정된 커널 트리
+  - 2.6.x -git 커널 패치들
+  - 2.6.x -mm 커널 패치들
+  - 서브시스템을 위한 커널 트리들과 패치들
+
+2.6.x 커널 트리
+---------------
+
+2.6.x 커널들은 Linux Torvalds가 관리하며 kernel.org의 pub/linux/kernel/v2.6/
+디렉토리에서 참조될 수 있다.개발 프로세스는 다음과 같다.
+  - 새로운 커널이 배포되자마자 2주의 시간이 주어진다. 이 기간동은
+    메인트너들은 큰 diff들을 Linus에게 제출할 수 있다. 대개 이 패치들은
+    몇 주 동안 -mm 커널내에 이미 있었던 것들이다. 큰 변경들을 제출하는 데
+    선호되는 방법은  git(커널의 소스 관리 툴, 더 많은 정보들은 http://git.or.cz/
+    에서 참조할 수 있다)를 사용하는 것이지만 순수한 패치파일의 형식으로 보내도
+    것도 무관하다.
+  - 2주 후에 -rc1 커널이 배포되며 지금부터는 전체 커널의 안정성에 영향을
+    미칠수 있는 새로운 기능들을 포함하지 않는 패치들만을 추가될 수 있다.
+    완전히 새로운 드라이버(혹은 파일시스템)는 -rc1 이후에만 받아들여진다는
+    것을 기억해라. 왜냐하면 변경이 자체내에서만 발생하고 추가된 코드가
+    드라이버 외부의 다른 부분에는 영향을 주지 않으므로 그런 변경은
+    퇴보(regression)를 일으킬 만한 위험을 가지고 있지 않기 때문이다. -rc1이
+    배포된 이후에 git를 사용하여 패치들을 Linus에게 보낼수 있지만 패치들은
+    공식적인 메일링 리스트로 보내서 검토를 받을 필요가 있다.
+  - 새로운 -rc는 Linus는 현재 git tree가 테스트 하기에 충분히 안정된 상태에
+    있다고 판단될 때마다 배포된다. 목표는 새로운 -rc 커널을 매주 배포하는
+    것이다.
+  - 이러한 프로세스는 커널이 "준비"되었다고 여겨질때까지 계속된다.
+    프로세스는 대체로 6주간 지속된다.
+    - 각 -rc 배포에 있는 알려진 퇴보의 목록들은 다음 URI에 남겨진다.
+    http://kernelnewbies.org/known_regressions
+
+커널 배포에 있어서 언급할만한 가치가 있는 리눅스 커널 메일링 리스트의
+Andrew Morton의 글이 있다.
+        "커널이 언제 배포될지는 아무로 모른다. 왜냐하면 배포는 알려진
+         버그의 상황에 따라 배포되는 것이지 미리정해 놓은 시간에 따라
+          배포되는 것은 아니기 때문이다."
+
+2.6.x.y - 안정 커널 트리
+------------------------
+
+4 자리 숫자로 이루어진 버젼의 커널들은 -stable 커널들이다. 그것들은 2.6.x
+커널에서 발견된 큰 퇴보들이나 보안 문제들 중 비교적 작고 중요한 수정들을
+포함한다.
+
+이것은 가장 최근의 안정적인 커널을 원하는 사용자에게 추천되는 브랜치이며,
+개발/실험적 버젼을 테스트하는 것을 돕는데는 별로 관심이 없다.
+
+어떤 2.6.x.y 커널도 사용가능하지 않다면 그때는 가장 높은 숫자의 2.6.x
+커널이 현재의 안정 커널이다.
+
+2.6.x.y는 "stable" 팀<stable@kernel.org>에 의해 관리되며 거의 매번 격주로
+배포된다.
+
+커널 트리 문서들 내에 Documentation/stable_kernel_rules.txt 파일은 어떤
+종류의 변경들이 -stable 트리로 들어왔는지와 배포 프로세스가 어떻게
+진행되는지를 설명한다.
+
+
+2.6.x -git 패치들
+------------------
+git 저장소(그러므로 -git이라는 이름이 붙음)에는 날마다 관리되는 Linus의
+커널 트리의 snapshot 들이 있다. 이 패치들은 일반적으로 날마다 배포되며
+Linus의 트리의 현재 상태를 나타낸다. 이 패치들은 정상적인지 조금도
+살펴보지 않고 자동적으로 생성된 것이므로 -rc 커널들 보다도 더 실험적이다.
+
+2.6.x -mm 커널 패치들
+---------------------
+Andrew Morton에 의해 배포된 실험적인 커널 패치들이다. Andrew는 모든 다른
+서브시스템 커널 트리와 패치들을 가져와서 리눅스 커널 메일링 리스트로
+온 많은 패치들과 한데 묶는다. 이 트리는 새로운 기능들과 패치들을 위한
+장소를 제공하는 역할을 한다. 하나의 패치가 -mm에 한동안 있으면서 그 가치가
+증명되게 되면 Andrew나 서브시스템 메인트너는 그것을 메인라인에 포함시키기
+위하여 Linus에게 보낸다.
+
+커널 트리에 포함하고 싶은 모든 새로운 패치들은 Linus에게 보내지기 전에
+-mm 트리에서 테스트를 하는 것을 적극 추천한다.
+
+이 커널들은 안정되게 사용할 시스템에서에 실행하는 것은 적합하지 않으며
+다른 브랜치들의 어떤 것들보다 위험하다.
+
+여러분이 커널 개발 프로세스를 돕길 원한다면 이 커널 배포들을 사용하고
+테스트한 후 어떤 문제를 발견하거나 또는 모든 것이 잘 동작한다면 리눅스
+커널 메일링 리스트로 피드백을 해달라.
+
+이 커널들은 일반적으로 모든 다른 실험적인 패치들과 배포될 당시의
+사용가능한 메인라인 -git 커널들의 몇몇 변경을 포함한다.
+
+-mm 커널들은 정해진 일정대로 배포되지 않는다. 하지만 대개 몇몇 -mm 커널들은
+각 -rc 커널(1부터 3이 흔함) 사이에서 배포된다.
+
+서브시스템 커널 트리들과 패치들
+-------------------------------
+많은 다른 커널 서브시스템 개발자들은 커널의 다른 부분들에서 무슨 일이
+일어나고 있는지를 볼수 있도록 그들의 개발 트리를 공개한다. 이 트리들은
+위에서 설명하였던 것 처럼 -mm 커널 배포들로 합쳐진다.
+
+다음은  활용가능한 커널 트리들을 나열한다.
+  git trees:
+    - Kbuild development tree, Sam Ravnborg < sam@ravnborg.org>
+    git.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
+
+    - ACPI development tree, Len Brown <len.brown@intel.com >
+    git.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
+
+    - Block development tree, Jens Axboe <axboe@suse.de>
+    git.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
+
+    - DRM development tree, Dave Airlie <airlied@linux.ie>
+    git.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
+
+    - ia64 development tree, Tony Luck < tony.luck@intel.com>
+    git.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
+
+    - infiniband, Roland Dreier <rolandd@cisco.com >
+    git.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
+
+    - libata, Jeff Garzik <jgarzik@pobox.com>
+    git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
+
+    - network drivers, Jeff Garzik <jgarzik@pobox.com>
+    git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
+
+    - pcmcia, Dominik Brodowski < linux@dominikbrodowski.net>
+    git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
+
+    - SCSI, James Bottomley < James.Bottomley@SteelEye.com>
+    git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
+
+  quilt trees:
+    - USB, PCI, Driver Core, and I2C, Greg Kroah-Hartman < gregkh@suse.de>
+    kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+    - x86-64, partly i386, Andi Kleen < ak@suse.de>
+        ftp.firstfloor.org:/pub/ak/x86_64/quilt/
+
+  다른 커널 트리들은 http://kernel.org/git와 MAINTAINERS 파일에서 참조할 수
+  있다.
+
+버그 보고
+---------
+bugzilla.kernel.org는 리눅스 커널 개발자들이 커널의 버그를 추적하는 곳이다.
+사용자들은 발견한 모든 버그들을 보고하기 위하여 이 툴을 사용할 것을 권장한다.
+kernel bugzilla를 사용하는 자세한 방법은 다음을 참조하라.
+    http://test.kernel.org/bugzilla/faq.html
+
+메인 커널 소스 디렉토리에 있는 REPORTING-BUGS 파일은 커널 버그일 것 같은
+것을 보고하는는 법에 관한 좋은 템플릿이고 문제를 추적하기 위해서 커널
+개발자들이 필요로 하는 정보가 무엇들인지를 상세히 설명하고 있다.
+
+
+버그 리포트들의 관리
+--------------------
+
+여러분의 해킹 기술을 연습하는 가장 좋은 방법 중의 하는 다른 사람들이
+보고한 버그들을 수정하는 것이다. 여러분은 커널을 더욱 안정화시키는데
+도움을 줄 뿐만이 아니라 실제있는 문제들을 수정하는 법을 배우게 되고
+그와 함께 여러분들의 기술은 향상될 것이며 다른 개발자들이 여러분의
+존재에 대해 알게 될 것이다. 버그를 수정하는 것은 개발자들  사이에서
+점수를 얻을 수 있는 가장 좋은 방법중의 하나이다. 왜냐하면 많은 사람들은
+다른 사람들의 버그들을 수정하기 위하여 시간을 낭비하지 않기 때문이다.
+
+이미 보고된 버그 리포트들을 가지고 작업하기 위해서 http://bugzilla.kernelorg를
+참조하라. 여러분이 앞으로 생겨날 버그 리포트들의 조언자가 되길 원한다면
+bugme-new 메일링 리스트나(새로운 버그 리포트들만이 이곳에서 메일로 전해진다)
+bugme-janitor 메일링 리스트(bugzilla에 모든 변화들이 여기서 메일로 전해진다)
+에 등록하면 된다.
+
+      http://lists.osdl.org/mailman/listinfo/bugme-new
+      http://lists.osdl.org/mailman/listinfo/bugme-janitors
+
+
+
+메일링 리스트들
+---------------
+
+위의 몇몇 문서들이 설명하였지만 핵심 커널 개발자들의 대다수는
+리눅스 커널 메일링 리스트에 참여하고 있다. 리스트에 등록하고 해지하는
+방법에 관한 자세한 사항은 다음에서 참조할 수 있다.
+    http://vger.kernel.org/vger-lists.html#linux-kernel
+웹상의 많은 다른 곳에도 메일링 리스트의 아카이브들이 있다.
+이러한 아카이브들을 찾으려면 검색 엔진을 사용하라. 예를 들어:
+      http://dir.gmane.org/gmane.linux.kernel
+여러분이 새로운 문제에 관해 리스트에 올리기 전에 말하고 싶은 주제에 대한
+것을 아카이브에서 먼저 찾기를 강력히 권장한다. 이미 상세하게 토론된 많은
+것들이 메일링 리스트의 아카이브에 기록되어 있다.
+
+각각의 커널 서브시스템들의 대부분은 자신들의 개발에 관한 노력들로 이루어진
+분리된 메일링 리스트를 따로 가지고 있다. 다른 그룹들이 무슨 리스트를 가지고
+있는지는 MAINTAINERS 파일을 참조하라.
+
+많은 리스트들은 kernel.org에서 호스트되고 있다. 그 정보들은 다음에서 참조될 수 있다.
+         http://vger.kernel.org/vger-lists.html
+
+리스트들을 사용할 때는 올바른 예절을 따를 것을 유념해라.
+대단하진 않지만 다음 URL은 리스트(혹은 모든 리스트)와 대화하는 몇몇 간단한
+가이드라인을 가지고 있다.
+         http://www.albion.com/netiquette/
+
+여러 사람들이 여러분의 메일에 응답한다면 CC: 즉 수신 리스트는 꽤 커지게
+될 것이다. 아무 이유없이 CC에서 어떤 사람도 제거하거나 리스트 주소로만
+회신하지 마라. 메일을 보낸 사람으로서 하나를 받고 리스트로부터 또
+하나를 받아 두번 받는 것에 익숙하여 있으니 mail-header를 조작하려고 하지
+말아라. 사람들은 그런 것을 좋아하지 않을 것이다.
+
+여러분의 회신의 문맥을 원래대로 유지해야 한다. 여러분들의 회신의 윗부분에
+"John 커널해커는 작성했다...."를 유지하며 여러분들의 의견을 그 메일의 윗부분에
+작성하지 말고 각 인용한 단락들 사이에 넣어라.
+
+여러분들이 패치들을 메일에 넣는다면 그것들은 Documentation/SubmittingPatches에
+나와있는데로 명백히(plain) 읽을 수 있는 텍스트여야 한다. 커널 개발자들은
+첨부파일이나 압축된 패치들을 원하지 않는다. 그들은 여러분들의 패치의
+각 라인 단위로 코멘트를 하길 원하며 압축하거나 첨부하지 않고 보내는 것이
+그렇게 할 수 있는 유일한 방법이다. 여러분들이 사용하는 메일 프로그램이
+스페이스나 탭 문자들을 조작하지 않는지 확인하라. 가장 좋은 첫 테스트는
+메일을 자신에게 보내보고 스스로 그 패치를 적용해보라. 그것이 동작하지
+않는다면 여러분의 메일 프로그램을 고치던가 제대로 동작하는 프로그램으로
+바꾸어라.
+
+무엇보다도 메일링 리스트의 다른 구독자들에게 보여주려 한다는 것을 기억하라.
+
+
+커뮤니티와 일하는 법
+--------------------
+
+커널 커뮤니티의 목적은 가능한한 가장 좋은 커널을 제공하는 것이다. 여러분이
+받아들여질 패치를 제출하게 되면 그 패치의 기술적인 이점으로 검토될 것이다.
+그럼 여러분들은 무엇을 기대하고 있어야 하는가?
+ - 비판
+ - 의견
+ - 변경을 위한 요구
+ - 당위성을 위한 요구
+ - 고요
+
+기억하라. 이것들은 여러분의 패치가 커널로 들어가기 위한 과정이다. 여러분의
+패치들은 비판과 다른 의견을 받을 수 있고 그것들을 기술적인 레벨로 평가하고
+재작업하거나 또는 왜 수정하면 안되는지에 관하여 명료하고 간결한 이유를
+말할 수 있어야 한다. 여러분이 제출한 것에 어떤 응답도 있지 않다면 몇 일을
+기다려보고 다시 시도해라. 때론 너무 많은 메일들 속에 묻혀버리기도 한다.
+
+여러분은 무엇을 해서는 안되는가?
+ - 여러분의 패치가 아무 질문 없이 받아들여지기를 기대하는 것
+ - 방어적이 되는 것
+ - 의견을 무시하는 것
+ - 요청된 변경을 하지 않고 패치를 다시 제출하는 것
+
+가능한한 가장 좋은 기술적인 해답을 찾고 있는 커뮤니티에서는 항상
+어떤 패치가 얼마나 좋은지에 관하여 다른 의견들이 있을 수 있다. 여러분은
+협조적이어야 하고 기꺼이 여러분의 생각을 커널 내에 맞추어야 한다. 아니면
+적어도 여러분의 것이 가치있다는 것을 중명하여야 한다. 잘못된 것도 여러분이
+올바른 방향의 해결책으로 이끌어갈 의지가 있다면 받아들여질 것이라는 점을
+기억하라.
+
+여러분의 첫 패치에  여러분이 수정해야하는 십여개 정도의 회신이 오는
+경우도 흔하다. 이것은 여러분의 패치가 받아들여지지 않을 것이라는 것을
+의미하는 것이 아니고 개인적으로 여러분에게 감정이 있어서 그러는 것도
+아니다. 간단히 여러분의 패치에 제기된 문제들을 수정하고 그것을 다시
+보내라.
+
+
+커널 커뮤니티와 기업 조직간의 차이점
+-----------------------------------------------------------------
+커널 커뮤니티는 가장 전통적인 회사의 개발 환경과는 다르다. 여기에 여러분들의
+문제를 피하기 위한 목록이 있다.
+  여러분들이 제안한 변경들에 관하여 말할 때 좋은 것들 :
+    - " 이것은 여러 문제들을 해겹합니다."
+    - "이것은 2000 라인의 코드를 제거합니다."
+    - "이것은 내가 말하려는 것에 관해 설명하는 패치입니다."
+    - "나는 5개의 다른 아키텍쳐에서 그것을 테스트했슴으로..."
+    - "여기에 일련의 작은 패치들이 있습음로..."
+    - "이것은 일반적인 머신에서 성능을 향상시키므로..."
+
+  여러분들이 말할 때 피해야 할 좋지 않은 것들 :
+    - "우리를 그것을 AIT/ptx/Solaris에서 이러한 방법으로 했다. 그러므로 그것은 좋은 것임에 틀립없다..."
+    - "나는 20년동안 이것을 해왔다. 그러므로..."
+    - "이것은 돈을 벌기위해 나의 회사가 필요로 하는 것이다."
+    - "이것은 우리의 엔터프라이즈 상품 라인을 위한 것이다."
+    - "여기에 나의 생각을 말하고 있는 1000 페이지 설계 문서가 있다."
+    - "나는 6달동안 이것을 했으니..."
+    - "여기세 5000라인 짜리 패치가 있으니..."
+    - "나는 현재 뒤죽박죽인 것을 재작성했다. 그리고 여기에..."
+    - "나는 마감시한을 가지고 있으므로 이 패치는 지금 적용될 필요가 있다."
+
+커널 커뮤니티가 전통적인 소프트웨어 엔지니어링 개발 환경들과
+또 다른 점은 얼굴을 보지 않고 일한다는 점이다. 이메일과 irc를 대화의
+주요수단으로 사용하는 것의 한가지 장점은 성별이나 인종의 차별이
+없다는 것이다. 리눅스 커널의 작업 환경에서는 단지 이메일 주소만
+알수 있기 때문에 여성과 소수 민족들도 모두 받아들여진다. 국제적으로
+일하게 되는 측면은 사람의 이름에 근거하여 성별을 추측할 수 없게
+하기때문에  차별을 없애는 데 도움을 준다. Andrea라는 이름을 가진 남자와
+Pat이라는 이름을 가진 여자가 있을 수도 있는 것이다. 리눅스 커널에서
+작업하며 생각을 표현해왔던 대부분의 여성들은 긍정적인 경험을 가지고
+있다.
+
+언어 장벽은 영어에 익숙하지 않은 몇몇 사람들에게 문제가 될 수도 있다.
+ 언어의 훌륭한 구사는 메일링 리스트에서 올바르게 자신의 생각을
+표현하기 위하여 필요하다. 그래서 여러분은 이메일을 보내기 전에
+영어를 올바르게 사용하고 있는지를 체크하는 것이 바람직하다.
+
+
+여러분의 변경을 나누어라
+------------------------
+
+리눅스 커널 커뮤니티는 한꺼번에 굉장히 큰 코드의 묶음을 쉽게
+받아들이지 않는다. 변경은 적절하게 소개되고, 검토되고, 각각의
+부분으로 작게 나누어져야 한다. 이것은 회사에서 하는 것과는 정확히
+반대되는 것이다. 여러분들의 제안은 개발 초기에 일찍이 소개되야 한다.
+그래서 여러분들은 자신이 하고 있는 것에 관하여 피드백을 받을 수 있게
+된다. 커뮤니티가 여러분들이 커뮤니티와 함께 일하고 있다는 것을
+느끼도록 만들고 커뮤니티가 여러분의 기능을 위한 쓰레기 장으로서
+사용되지 않고 있다는 것을 느끼게 하자. 그러나 메일링 리스트에 한번에
+50개의 이메일을 보내지는 말아라. 여러분들의 일련의 패치들은 항상
+더 작아야 한다.
+
+패치를 나누는 이유는 다음과 같다.
+
+1) 작은 패치들은 여러분의 패치들이 적용될 수 있는 확률을 높여준다.
+   왜냐하면 다른 사람들은 정확성을 검증하기 위하여 많은 시간과 노력을
+   들이기를 원하지 않는다. 5줄의 패치는 메인트너가 거의 몇 초간 힐끗
+   보면 적용될 수 있다. 그러나 500 줄의 패치는 정확성을 검토하기 위하여
+   몇시간이 걸릴 수도 있다(걸리는 시간은 패치의 크기 혹은 다른 것에
+   비례하여 기하급수적으로 늘어난다).
+
+   패치를 작게 만드는 것은 무엇인가 잘못되었을 때 디버그하는 것을
+   쉽게 만든다. 즉, 그렇게 만드는 것은 매우 큰 패치를 적용한 후에
+   조사하는 것 보다 작은 패치를 적용한 후에 (그리고 몇몇의 것이
+   깨졌을 때) 하나씩 패치들을 제거해가며 디버그 하기 쉽도록 만들어 준다.
+
+2) 작은 패치들을 보내는 것뿐만 아니라 패치들을 제출하기전에 재작성하고
+   간단하게(혹은 간단한게 재배치하여) 하는 것도 중요하다.
+
+여기에 커널 개발자 Al Viro의 이야기가 있다.
+    "학생의 수학 숙제를 채점하는 선생님을 생각해보라. 선생님은 학생들이
+    답을 얻을때까지 겪은 시행착오를 보길 원하지 않는다. 선생님들은
+    간결하고 가장 뛰어난 답을 보길 원한다. 훌륭한 학생은 이것을 알고
+    마지막으로 답을 얻기 전 중간 과정들을 제출하진 않는다.
+
+    커널 개발도 마찬가지이다. 메인트너들과 검토하는 사람들은 문제를
+    풀어나가는 과정속에 숨겨진 과정을 보길 원하진 않는다. 그들은
+    간결하고 멋진 답을 보길 원한다."
+
+커뮤니티와 함께 일하며 뛰어난 답을 찾고 여러분들의 완성되지 않은 일들
+사이에 균형을 유지해야 하는 어려움이 있을 수 있다. 그러므로 프로세스의
+초반에 여러분의 일을 향상시키기위한 피드백을 얻는 것 뿐만 아니라
+여러분들의 변경들을 작은 묶음으로 유지해서 심지어는 여러분의 작업의
+모든 부분이 지금은 포함될 준비가 되어있지 않지만 작은 부분은 이미
+받아들여질 수 있도록 유지하는 것이 바람직하다.
+
+또한 완성되지 않았고 "나중에 수정될 것이다." 와 같은 것들은 포함하는
+패치들은 받아들여지지 않을 것이라는 점을 유념하라.
+
+변경을 정당화해라
+-----------------
+
+여러분들의 나누어진 패치들을 리눅스 커뮤니티가 왜 반영해야 하는지를
+알도록 하는 것은 매우 중요하다. 새로운 기능들이 필요하고 유용하다는
+것은 반드시 그에 맞는 이유가 있어야 한다.
+
+
+변경을 문서화해라
+-----------------
+
+여러분이 패치를 보내려 할때는 여러분이 무엇을 말하려고 하는지를 충분히
+생각하여 이메일을 작성해야 한다. 이 정보는 패치를 위한 ChangeLog가 될
+것이다. 그리고 항상 그 내용을 보길 원하는 모든 사람들을 위해 보존될
+것이다. 패치는 완벽하게 다음과 같은 내용들을 포함하여 설명해야 한다.
+  - 변경이 왜 필요한지
+  - 패치에 관한 전체 설계 어프로치
+  - 구현 상세들
+  - 테스트 결과들
+
+이것이 무엇인지 더 자세한 것을 알고 싶다면 다음 문서의 ChageLog 항을 봐라.
+   "The Perfect Patch"
+    http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
+
+
+
+
+이 모든 것을 하는 것은 매우 어려운 일이다. 완벽히 소화하는 데는 적어도 몇년이
+걸릴 수도 있다. 많은 인내와 결의가 필요한 계속되는 개선의 과정이다. 그러나
+가능한한 포기하지 말라. 많은 사람들은 이전부터 해왔던 것이고 그 사람들도
+정확하게 여러분들이 지금 서 있는 그 곳부터  시작했었다.
+
+
+
+
+----------
+"개발 프로세스"(http://linux.tar.gz/articles/2.6-development_process) 섹션을
+작성하는데 있어 참고할 문서를 사용하도록 허락해준 Paolo Ciarrocchi에게
+감사한다. 여러분들이 말해야 할 것과 말해서는 안되는 것의 목록 중 일부를 제공해준
+Randy Dunlap과 Gerrit Huizenga에게 감사한다. 또한 검토와 의견 그리고
+공헌을 아끼지 않은 Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,
+Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi Kleen,
+Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop,
+David A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard에게도 감사를 전한다.
+그들의 도움이 없었다면 이 문서는 존재하지 않았을 것이다.
+
+
+
+메인트너: Greg Kroah-Hartman <greg@kroah.com>
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c
index f7918401a0..73c5f1f3d5 100644
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
@@ -882,7 +882,7 @@ static u32 handle_block_output(int fd, const struct iovec *iov,
                  * of the block file (possibly extending it). */
                 if (off + len > device_len) {
                         /* Trim it back to the correct length */
-                        ftruncate(dev->fd, device_len);
+                        ftruncate64(dev->fd, device_len);
                         /* Die, bad Guest, die. */
                         errx(1, "Write past end %llu+%u", off, len);
                 }
diff --git a/Documentation/lockstat.txt b/Documentation/lockstat.txt
new file mode 100644
index 0000000000..4ba4664ce5
--- /dev/null
+++ b/Documentation/lockstat.txt
@@ -0,0 +1,120 @@
+
+LOCK STATISTICS
+
+- WHAT
+
+As the name suggests, it provides statistics on locks.
+
+- WHY
+
+Because things like lock contention can severely impact performance.
+
+- HOW
+
+Lockdep already has hooks in the lock functions and maps lock instances to
+lock classes. We build on that. The graph below shows the relation between
+the lock functions and the various hooks therein.
+
+        __acquire
+            |
+           lock _____
+            |        \
+            |    __contended
+            |         |
+            |       <wait>
+            | _______/
+            |/
+            |
+       __acquired
+            |
+            .
+          <hold>
+            .
+            |
+       __release
+            |
+         unlock
+
+lock, unlock    - the regular lock functions
+__*             - the hooks
+<>              - states
+
+With these hooks we provide the following statistics:
+
+ con-bounces       - number of lock contention that involved x-cpu data
+ contentions       - number of lock acquisitions that had to wait
+ wait time min     - shortest (non-0) time we ever had to wait for a lock
+           max     - longest time we ever had to wait for a lock
+           total   - total time we spend waiting on this lock
+ acq-bounces       - number of lock acquisitions that involved x-cpu data
+ acquisitions      - number of times we took the lock
+ hold time min     - shortest (non-0) time we ever held the lock
+           max     - longest time we ever held the lock
+           total   - total time this lock was held
+
+From these number various other statistics can be derived, such as:
+
+ hold time average = hold time total / acquisitions
+
+These numbers are gathered per lock class, per read/write state (when
+applicable).
+
+It also tracks 4 contention points per class. A contention point is a call site
+that had to wait on lock acquisition.
+
+ - USAGE
+
+Look at the current lock statistics:
+
+( line numbers not part of actual output, done for clarity in the explanation
+  below )
+
+# less /proc/lock_stat
+
+01 lock_stat version 0.2
+02 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+03                               class name    con-bounces    contentions   waittime-min   waittime-max waittime-total    acq-bounces   acquisitions   holdtime-min   holdtime-max holdtime-total
+04 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+05
+06               &inode->i_data.tree_lock-W:            15          21657           0.18     1093295.30 11547131054.85             58          10415           0.16          87.51        6387.60
+07               &inode->i_data.tree_lock-R:             0              0           0.00           0.00           0.00          23302         231198           0.25           8.45       98023.38
+08               --------------------------
+09                 &inode->i_data.tree_lock              0          [<ffffffff8027c08f>] add_to_page_cache+0x5f/0x190
+10
+11 ...............................................................................................................................................................................................
+12
+13                              dcache_lock:          1037           1161           0.38          45.32         774.51           6611         243371           0.15         306.48       77387.24
+14                              -----------
+15                              dcache_lock            180          [<ffffffff802c0d7e>] sys_getcwd+0x11e/0x230
+16                              dcache_lock            165          [<ffffffff802c002a>] d_alloc+0x15a/0x210
+17                              dcache_lock             33          [<ffffffff8035818d>] _atomic_dec_and_lock+0x4d/0x70
+18                              dcache_lock              1          [<ffffffff802beef8>] shrink_dcache_parent+0x18/0x130
+
+This excerpt shows the first two lock class statistics. Line 01 shows the
+output version - each time the format changes this will be updated. Line 02-04
+show the header with column descriptions. Lines 05-10 and 13-18 show the actual
+statistics. These statistics come in two parts; the actual stats separated by a
+short separator (line 08, 14) from the contention points.
+
+The first lock (05-10) is a read/write lock, and shows two lines above the
+short separator. The contention points don't match the column descriptors,
+they have two: contentions and [<IP>] symbol.
+
+
+View the top contending locks:
+
+# grep : /proc/lock_stat | head
+              &inode->i_data.tree_lock-W:            15          21657           0.18     1093295.30 11547131054.85             58          10415           0.16          87.51        6387.60
+              &inode->i_data.tree_lock-R:             0              0           0.00           0.00           0.00          23302         231198           0.25           8.45       98023.38
+                             dcache_lock:          1037           1161           0.38          45.32         774.51           6611         243371           0.15         306.48       77387.24
+                         &inode->i_mutex:           161            286 18446744073709       62882.54     1244614.55           3653          20598 18446744073709       62318.60     1693822.74
+                         &zone->lru_lock:            94             94           0.53           7.33          92.10           4366          32690           0.29          59.81       16350.06
+              &inode->i_data.i_mmap_lock:            79             79           0.40           3.77          53.03          11779          87755           0.28         116.93       29898.44
+                        &q->__queue_lock:            48             50           0.52          31.62          86.31            774          13131           0.17         113.08       12277.52
+                        &rq->rq_lock_key:            43             47           0.74          68.50         170.63           3706          33929           0.22         107.99       17460.62
+                      &rq->rq_lock_key#2:            39             46           0.75           6.68          49.03           2979          32292           0.17         125.17       17137.63
+                         tasklist_lock-W:            15             15           1.45          10.87          32.70           1201           7390           0.58          62.55       13648.47
+
+Clear the statistics:
+
+# echo 0 > /proc/lock_stat
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index d63f480afb..153d84d281 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -96,6 +96,9 @@ routing.txt
         - the new routing mechanism
 shaper.txt
         - info on the module that can shape/limit transmitted traffic.
+sk98lin.txt
+        - Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit
+          Ethernet Adapter family driver info
 skfp.txt
         - SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.
 smc9.txt
diff --git a/Documentation/networking/multiqueue.txt b/Documentation/networking/multiqueue.txt
index 00b60cce22..ea5a42e8f7 100644
--- a/Documentation/networking/multiqueue.txt
+++ b/Documentation/networking/multiqueue.txt
@@ -58,9 +58,13 @@ software, so it's a straight round-robin qdisc.  It uses the same syntax and
 classification priomap that sch_prio uses, so it should be intuitive to
 configure for people who've used sch_prio.
 
-The PRIO qdisc naturally plugs into a multiqueue device.  If PRIO has been
-built with NET_SCH_PRIO_MQ, then upon load, it will make sure the number of
-bands requested is equal to the number of queues on the hardware.  If they
+In order to utilitize the multiqueue features of the qdiscs, the network
+device layer needs to enable multiple queue support.  This can be done by
+selecting NETDEVICES_MULTIQUEUE under Drivers.
+
+The PRIO qdisc naturally plugs into a multiqueue device.  If
+NETDEVICES_MULTIQUEUE is selected, then on qdisc load, the number of
+bands requested is compared to the number of queues on the hardware.  If they
 are equal, it sets a one-to-one mapping up between the queues and bands.  If
 they're not equal, it will not load the qdisc.  This is the same behavior
 for RR.  Once the association is made, any skb that is classified will have
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt
new file mode 100644
index 0000000000..8590a954df
--- /dev/null
+++ b/Documentation/networking/sk98lin.txt
@@ -0,0 +1,568 @@
+(C)Copyright 1999-2004 Marvell(R).
+All rights reserved
+===========================================================================
+
+sk98lin.txt created 13-Feb-2004
+
+Readme File for sk98lin v6.23
+Marvell Yukon/SysKonnect SK-98xx Gigabit Ethernet Adapter family driver for LINUX
+
+This file contains
+ 1  Overview
+ 2  Required Files
+ 3  Installation
+    3.1  Driver Installation
+    3.2  Inclusion of adapter at system start
+ 4  Driver Parameters
+    4.1  Per-Port Parameters
+    4.2  Adapter Parameters
+ 5  Large Frame Support
+ 6  VLAN and Link Aggregation Support (IEEE 802.1, 802.1q, 802.3ad)
+ 7  Troubleshooting
+
+===========================================================================
+
+
+1  Overview
+===========
+
+The sk98lin driver supports the Marvell Yukon and SysKonnect 
+SK-98xx/SK-95xx compliant Gigabit Ethernet Adapter on Linux. It has 
+been tested with Linux on Intel/x86 machines.
+***
+
+
+2  Required Files
+=================
+
+The linux kernel source.
+No additional files required.
+***
+
+
+3  Installation
+===============
+
+It is recommended to download the latest version of the driver from the 
+SysKonnect web site www.syskonnect.com. If you have downloaded the latest
+driver, the Linux kernel has to be patched before the driver can be 
+installed. For details on how to patch a Linux kernel, refer to the 
+patch.txt file.
+
+3.1  Driver Installation
+------------------------
+
+The following steps describe the actions that are required to install
+the driver and to start it manually. These steps should be carried
+out for the initial driver setup. Once confirmed to be ok, they can
+be included in the system start.
+
+NOTE 1: To perform the following tasks you need 'root' access.
+
+NOTE 2: In case of problems, please read the section "Troubleshooting" 
+        below.
+
+The driver can either be integrated into the kernel or it can be compiled 
+as a module. Select the appropriate option during the kernel 
+configuration.
+
+Compile/use the driver as a module
+----------------------------------
+To compile the driver, go to the directory /usr/src/linux and
+execute the command "make menuconfig" or "make xconfig" and proceed as 
+follows:
+
+To integrate the driver permanently into the kernel, proceed as follows:
+
+1. Select the menu "Network device support" and then "Ethernet(1000Mbit)"
+2. Mark "Marvell Yukon Chipset / SysKonnect SK-98xx family support" 
+   with (*) 
+3. Build a new kernel when the configuration of the above options is 
+   finished.
+4. Install the new kernel.
+5. Reboot your system.
+
+To use the driver as a module, proceed as follows:
+
+1. Enable 'loadable module support' in the kernel.
+2. For automatic driver start, enable the 'Kernel module loader'.
+3. Select the menu "Network device support" and then "Ethernet(1000Mbit)"
+4. Mark "Marvell Yukon Chipset / SysKonnect SK-98xx family support" 
+   with (M)
+5. Execute the command "make modules".
+6. Execute the command "make modules_install".
+   The appropriate modules will be installed.
+7. Reboot your system.
+
+
+Load the module manually
+------------------------
+To load the module manually, proceed as follows:
+
+1. Enter "modprobe sk98lin".
+2. If a Marvell Yukon or SysKonnect SK-98xx adapter is installed in 
+   your computer and you have a /proc file system, execute the command:
+   "ls /proc/net/sk98lin/" 
+   This should produce an output containing a line with the following 
+   format:
+   eth0   eth1  ...
+   which indicates that your adapter has been found and initialized.
+   
+   NOTE 1: If you have more than one Marvell Yukon or SysKonnect SK-98xx 
+           adapter installed, the adapters will be listed as 'eth0', 
+                   'eth1', 'eth2', etc.
+                   For each adapter, repeat steps 3 and 4 below.
+
+   NOTE 2: If you have other Ethernet adapters installed, your Marvell
+           Yukon or SysKonnect SK-98xx adapter will be mapped to the 
+                   next available number, e.g. 'eth1'. The mapping is executed 
+                   automatically.
+           The module installation message (displayed either in a system
+           log file or on the console) prints a line for each adapter 
+           found containing the corresponding 'ethX'.
+
+3. Select an IP address and assign it to the respective adapter by 
+   entering:
+   ifconfig eth0 <ip-address>
+   With this command, the adapter is connected to the Ethernet. 
+   
+   SK-98xx Gigabit Ethernet Server Adapters: The yellow LED on the adapter 
+   is now active, the link status LED of the primary port is active and 
+   the link status LED of the secondary port (on dual port adapters) is 
+   blinking (if the ports are connected to a switch or hub).
+   SK-98xx V2.0 Gigabit Ethernet Adapters: The link status LED is active.
+   In addition, you will receive a status message on the console stating
+   "ethX: network connection up using port Y" and showing the selected 
+   connection parameters (x stands for the ethernet device number 
+   (0,1,2, etc), y stands for the port name (A or B)).
+
+   NOTE: If you are in doubt about IP addresses, ask your network
+         administrator for assistance.
+  
+4. Your adapter should now be fully operational.
+   Use 'ping <otherstation>' to verify the connection to other computers 
+   on your network.
+5. To check the adapter configuration view /proc/net/sk98lin/[devicename].
+   For example by executing:    
+   "cat /proc/net/sk98lin/eth0" 
+
+Unload the module
+-----------------
+To stop and unload the driver modules, proceed as follows:
+
+1. Execute the command "ifconfig eth0 down".
+2. Execute the command "rmmod sk98lin".
+
+3.2  Inclusion of adapter at system start
+-----------------------------------------
+
+Since a large number of different Linux distributions are 
+available, we are unable to describe a general installation procedure
+for the driver module.
+Because the driver is now integrated in the kernel, installation should
+be easy, using the standard mechanism of your distribution.
+Refer to the distribution's manual for installation of ethernet adapters.
+
+***
+
+4  Driver Parameters
+====================
+
+Parameters can be set at the command line after the module has been 
+loaded with the command 'modprobe'.
+In some distributions, the configuration tools are able to pass parameters
+to the driver module.
+
+If you use the kernel module loader, you can set driver parameters
+in the file /etc/modprobe.conf (or /etc/modules.conf in 2.4 or earlier).
+To set the driver parameters in this file, proceed as follows:
+
+1. Insert a line of the form :
+   options sk98lin ...
+   For "...", the same syntax is required as described for the command
+   line parameters of modprobe below.
+2. To activate the new parameters, either reboot your computer
+   or 
+   unload and reload the driver.
+   The syntax of the driver parameters is:
+
+        modprobe sk98lin parameter=value1[,value2[,value3...]]
+
+   where value1 refers to the first adapter, value2 to the second etc.
+
+NOTE: All parameters are case sensitive. Write them exactly as shown 
+      below.
+
+Example:
+Suppose you have two adapters. You want to set auto-negotiation
+on the first adapter to ON and on the second adapter to OFF.
+You also want to set DuplexCapabilities on the first adapter
+to FULL, and on the second adapter to HALF.
+Then, you must enter:
+
+        modprobe sk98lin AutoNeg_A=On,Off DupCap_A=Full,Half
+
+NOTE: The number of adapters that can be configured this way is
+      limited in the driver (file skge.c, constant SK_MAX_CARD_PARAM).
+      The current limit is 16. If you happen to install
+      more adapters, adjust this and recompile.
+
+
+4.1  Per-Port Parameters
+------------------------
+
+These settings are available for each port on the adapter.
+In the following description, '?' stands for the port for
+which you set the parameter (A or B).
+
+Speed
+-----
+Parameter:    Speed_?
+Values:       10, 100, 1000, Auto
+Default:      Auto
+
+This parameter is used to set the speed capabilities. It is only valid 
+for the SK-98xx V2.0 copper adapters.
+Usually, the speed is negotiated between the two ports during link 
+establishment. If this fails, a port can be forced to a specific setting
+with this parameter.
+
+Auto-Negotiation
+----------------
+Parameter:    AutoNeg_?
+Values:       On, Off, Sense
+Default:      On
+  
+The "Sense"-mode automatically detects whether the link partner supports
+auto-negotiation or not.
+
+Duplex Capabilities
+-------------------
+Parameter:    DupCap_?
+Values:       Half, Full, Both
+Default:      Both
+
+This parameters is only relevant if auto-negotiation for this port is 
+not set to "Sense". If auto-negotiation is set to "On", all three values
+are possible. If it is set to "Off", only "Full" and "Half" are allowed.
+This parameter is useful if your link partner does not support all
+possible combinations.
+
+Flow Control
+------------
+Parameter:    FlowCtrl_?
+Values:       Sym, SymOrRem, LocSend, None
+Default:      SymOrRem
+
+This parameter can be used to set the flow control capabilities the 
+port reports during auto-negotiation. It can be set for each port 
+individually.
+Possible modes:
+   -- Sym      = Symmetric: both link partners are allowed to send 
+                  PAUSE frames
+   -- SymOrRem = SymmetricOrRemote: both or only remote partner 
+                  are allowed to send PAUSE frames
+   -- LocSend  = LocalSend: only local link partner is allowed 
+                  to send PAUSE frames
+   -- None     = no link partner is allowed to send PAUSE frames
+  
+NOTE: This parameter is ignored if auto-negotiation is set to "Off".
+
+Role in Master-Slave-Negotiation (1000Base-T only)
+--------------------------------------------------
+Parameter:    Role_?
+Values:       Auto, Master, Slave
+Default:      Auto
+
+This parameter is only valid for the SK-9821 and SK-9822 adapters.
+For two 1000Base-T ports to communicate, one must take the role of the
+master (providing timing information), while the other must be the 
+slave. Usually, this is negotiated between the two ports during link 
+establishment. If this fails, a port can be forced to a specific setting
+with this parameter.
+
+
+4.2  Adapter Parameters
+-----------------------
+
+Connection Type (SK-98xx V2.0 copper adapters only)
+---------------
+Parameter:    ConType
+Values:       Auto, 100FD, 100HD, 10FD, 10HD
+Default:      Auto
+
+The parameter 'ConType' is a combination of all five per-port parameters
+within one single parameter. This simplifies the configuration of both ports
+of an adapter card! The different values of this variable reflect the most 
+meaningful combinations of port parameters.
+
+The following table shows the values of 'ConType' and the corresponding
+combinations of the per-port parameters:
+
+    ConType   |  DupCap   AutoNeg   FlowCtrl   Role             Speed
+    ----------+------------------------------------------------------
+    Auto      |  Both     On        SymOrRem   Auto             Auto
+    100FD     |  Full     Off       None       Auto (ignored)   100
+    100HD     |  Half     Off       None       Auto (ignored)   100
+    10FD      |  Full     Off       None       Auto (ignored)   10
+    10HD      |  Half     Off       None       Auto (ignored)   10
+
+Stating any other port parameter together with this 'ConType' variable
+will result in a merged configuration of those settings. This due to 
+the fact, that the per-port parameters (e.g. Speed_? ) have a higher
+priority than the combined variable 'ConType'.
+
+NOTE: This parameter is always used on both ports of the adapter card.
+
+Interrupt Moderation
+--------------------
+Parameter:    Moderation
+Values:       None, Static, Dynamic
+Default:      None
+
+Interrupt moderation is employed to limit the maximum number of interrupts
+the driver has to serve. That is, one or more interrupts (which indicate any
+transmit or receive packet to be processed) are queued until the driver 
+processes them. When queued interrupts are to be served, is determined by the
+'IntsPerSec' parameter, which is explained later below.
+
+Possible modes:
+
+   -- None - No interrupt moderation is applied on the adapter card. 
+      Therefore, each transmit or receive interrupt is served immediately
+      as soon as it appears on the interrupt line of the adapter card.
+
+   -- Static - Interrupt moderation is applied on the adapter card. 
+      All transmit and receive interrupts are queued until a complete
+      moderation interval ends. If such a moderation interval ends, all
+      queued interrupts are processed in one big bunch without any delay.
+      The term 'static' reflects the fact, that interrupt moderation is
+      always enabled, regardless how much network load is currently 
+      passing via a particular interface. In addition, the duration of
+      the moderation interval has a fixed length that never changes while
+      the driver is operational.
+
+   -- Dynamic - Interrupt moderation might be applied on the adapter card,
+      depending on the load of the system. If the driver detects that the
+      system load is too high, the driver tries to shield the system against 
+      too much network load by enabling interrupt moderation. If - at a later
+      time - the CPU utilization decreases again (or if the network load is 
+      negligible) the interrupt moderation will automatically be disabled.
+
+Interrupt moderation should be used when the driver has to handle one or more
+interfaces with a high network load, which - as a consequence - leads also to a
+high CPU utilization. When moderation is applied in such high network load 
+situations, CPU load might be reduced by 20-30%.
+
+NOTE: The drawback of using interrupt moderation is an increase of the round-
+trip-time (RTT), due to the queueing and serving of interrupts at dedicated
+moderation times.
+
+Interrupts per second
+---------------------
+Parameter:    IntsPerSec
+Values:       30...40000 (interrupts per second)
+Default:      2000
+
+This parameter is only used if either static or dynamic interrupt moderation
+is used on a network adapter card. Using this parameter if no moderation is
+applied will lead to no action performed.
+
+This parameter determines the length of any interrupt moderation interval. 
+Assuming that static interrupt moderation is to be used, an 'IntsPerSec' 
+parameter value of 2000 will lead to an interrupt moderation interval of
+500 microseconds. 
+
+NOTE: The duration of the moderation interval is to be chosen with care.
+At first glance, selecting a very long duration (e.g. only 100 interrupts per 
+second) seems to be meaningful, but the increase of packet-processing delay 
+is tremendous. On the other hand, selecting a very short moderation time might
+compensate the use of any moderation being applied.
+
+
+Preferred Port
+--------------
+Parameter:    PrefPort
+Values:       A, B
+Default:      A
+
+This is used to force the preferred port to A or B (on dual-port network 
+adapters). The preferred port is the one that is used if both are detected
+as fully functional.
+
+RLMT Mode (Redundant Link Management Technology)
+------------------------------------------------
+Parameter:    RlmtMode
+Values:       CheckLinkState,CheckLocalPort, CheckSeg, DualNet
+Default:      CheckLinkState
+
+RLMT monitors the status of the port. If the link of the active port 
+fails, RLMT switches immediately to the standby link. The virtual link is 
+maintained as long as at least one 'physical' link is up. 
+
+Possible modes:
+
+   -- CheckLinkState - Check link state only: RLMT uses the link state
+      reported by the adapter hardware for each individual port to 
+      determine whether a port can be used for all network traffic or 
+      not.
+
+   -- CheckLocalPort - In this mode, RLMT monitors the network path 
+      between the two ports of an adapter by regularly exchanging packets
+      between them. This mode requires a network configuration in which 
+      the two ports are able to "see" each other (i.e. there must not be 
+      any router between the ports).
+
+   -- CheckSeg - Check local port and segmentation: This mode supports the
+      same functions as the CheckLocalPort mode and additionally checks 
+      network segmentation between the ports. Therefore, this mode is only
+      to be used if Gigabit Ethernet switches are installed on the network
+      that have been configured to use the Spanning Tree protocol. 
+
+   -- DualNet - In this mode, ports A and B are used as separate devices. 
+      If you have a dual port adapter, port A will be configured as eth0 
+      and port B as eth1. Both ports can be used independently with 
+      distinct IP addresses. The preferred port setting is not used. 
+      RLMT is turned off.
+   
+NOTE: RLMT modes CLP and CLPSS are designed to operate in configurations 
+      where a network path between the ports on one adapter exists. 
+      Moreover, they are not designed to work where adapters are connected
+      back-to-back.
+***
+
+
+5  Large Frame Support
+======================
+
+The driver supports large frames (also called jumbo frames). Using large 
+frames can result in an improved throughput if transferring large amounts 
+of data.
+To enable large frames, set the MTU (maximum transfer unit) of the 
+interface to the desired value (up to 9000), execute the following 
+command:
+      ifconfig eth0 mtu 9000
+This will only work if you have two adapters connected back-to-back
+or if you use a switch that supports large frames. When using a switch, 
+it should be configured to allow large frames and auto-negotiation should  
+be set to OFF. The setting must be configured on all adapters that can be 
+reached by the large frames. If one adapter is not set to receive large 
+frames, it will simply drop them.
+
+You can switch back to the standard ethernet frame size by executing the 
+following command:
+      ifconfig eth0 mtu 1500
+
+To permanently configure this setting, add a script with the 'ifconfig' 
+line to the system startup sequence (named something like "S99sk98lin" 
+in /etc/rc.d/rc2.d).
+***
+
+
+6  VLAN and Link Aggregation Support (IEEE 802.1, 802.1q, 802.3ad)
+==================================================================
+
+The Marvell Yukon/SysKonnect Linux drivers are able to support VLAN and 
+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://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 
+      modules and does not take the responsibility for any kind of 
+      failures or problems arising in connection with these modules.
+
+NOTE: Configuring Link Aggregation on a SysKonnect dual link adapter may 
+      cause problems when unloading the driver.
+
+
+7  Troubleshooting
+==================
+
+If any problems occur during the installation process, check the 
+following list:
+
+
+Problem:  The SK-98xx adapter cannot be found by the driver.
+Solution: In /proc/pci search for the following entry:
+             'Ethernet controller: SysKonnect SK-98xx ...'
+          If this entry exists, the SK-98xx or SK-98xx V2.0 adapter has 
+          been found by the system and should be operational.
+          If this entry does not exist or if the file '/proc/pci' is not 
+          found, there may be a hardware problem or the PCI support may 
+          not be enabled in your kernel.
+          The adapter can be checked using the diagnostics program which 
+          is available on the SysKonnect web site:
+          www.syskonnect.com
+          
+          Some COMPAQ machines have problems dealing with PCI under Linux.
+          This problem is described in the 'PCI howto' document
+          (included in some distributions or available from the
+          web, e.g. at 'www.linux.org'). 
+
+
+Problem:  Programs such as 'ifconfig' or 'route' cannot be found or the 
+          error message 'Operation not permitted' is displayed.
+Reason:   You are not logged in as user 'root'.
+Solution: Logout and login as 'root' or change to 'root' via 'su'.
+
+
+Problem:  Upon use of the command 'ping <address>' the message
+          "ping: sendto: Network is unreachable" is displayed.
+Reason:   Your route is not set correctly.
+Solution: If you are using RedHat, you probably forgot to set up the 
+          route in the 'network configuration'.
+          Check the existing routes with the 'route' command and check 
+          if an entry for 'eth0' exists, and if so, if it is set correctly.
+
+
+Problem:  The driver can be started, the adapter is connected to the 
+          network, but you cannot receive or transmit any packets; 
+          e.g. 'ping' does not work.
+Reason:   There is an incorrect route in your routing table.
+Solution: Check the routing table with the command 'route' and read the 
+          manual help pages dealing with routes (enter 'man route').
+
+NOTE: Although the 2.2.x kernel versions generate the routing entry 
+      automatically, problems of this kind may occur here as well. We've 
+      come across a situation in which the driver started correctly at 
+      system start, but after the driver has been removed and reloaded,
+      the route of the adapter's network pointed to the 'dummy0'device 
+      and had to be corrected manually.
+
+
+Problem:  Your computer should act as a router between multiple 
+          IP subnetworks (using multiple adapters), but computers in 
+          other subnetworks cannot be reached.
+Reason:   Either the router's kernel is not configured for IP forwarding 
+          or the routing table and gateway configuration of at least one 
+          computer is not working.
+
+Problem:  Upon driver start, the following error message is displayed:
+          "eth0: -- ERROR --
+          Class: internal Software error
+          Nr:    0xcc
+          Msg:   SkGeInitPort() cannot init running ports"
+Reason:   You are using a driver compiled for single processor machines 
+          on a multiprocessor machine with SMP (Symmetric MultiProcessor) 
+          kernel.
+Solution: Configure your kernel appropriately and recompile the kernel or
+          the modules.
+
+
+
+If your problem is not listed here, please contact SysKonnect's technical
+support for help (linux@syskonnect.de).
+When contacting our technical support, please ensure that the following 
+information is available:
+- System Manufacturer and HW Informations (CPU, Memory... )
+- PCI-Boards in your system
+- Distribution
+- Kernel version
+- Driver version
+***
+
+
+
+***End of Readme File***
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index ef19142896..10c8f6922e 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -43,7 +43,7 @@ On x86   - You press the key combo 'ALT-SysRq-<command key>'. Note - Some
            keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is
            also known as the 'Print Screen' key. Also some keyboards cannot
            handle so many keys being pressed at the same time, so you might
-           have better luck with "press Alt", "press SysRq", "release Alt",
+           have better luck with "press Alt", "press SysRq", "release SysRq",
            "press <command key>", release everything.
 
 On SPARC - You press 'ALT-STOP-<command key>', I believe.
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt
index eb2f5986e1..60953d6c91 100644
--- a/Documentation/thinkpad-acpi.txt
+++ b/Documentation/thinkpad-acpi.txt
@@ -1,7 +1,7 @@
                      ThinkPad ACPI Extras Driver
 
-                            Version 0.15
-                           July 1st, 2007
+                            Version 0.16
+                          August 2nd, 2007
 
                Borislav Deianov <borislav@users.sf.net>
              Henrique de Moraes Holschuh <hmh@hmh.eng.br>
@@ -161,20 +161,22 @@ system.  Enabling the hotkey functionality of thinkpad-acpi signals the
 firmware that such a driver is present, and modifies how the ThinkPad
 firmware will behave in many situations.
 
+The driver enables the hot key feature automatically when loaded.  The
+feature can later be disabled and enabled back at runtime.  The driver
+will also restore the hot key feature to its previous state and mask
+when it is unloaded.
+
 When the hotkey feature is enabled and the hot key mask is set (see
-below), the various hot keys either generate ACPI events in the
-following format:
+below), the driver will report HKEY events in the following format:
 
         ibm/hotkey HKEY 00000080 0000xxxx
 
-or events over the input layer.  The input layer support accepts the
-standard IOCTLs to remap the keycodes assigned to each hotkey.
+Some of these events refer to hot key presses, but not all.
 
-When the input device is open, the driver will suppress any ACPI hot key
-events that get translated into a meaningful input layer event, in order
-to avoid sending duplicate events to userspace.  Hot keys that are
-mapped to KEY_RESERVED in the keymap are not translated, and will always
-generate an ACPI ibm/hotkey HKEY event, and no input layer events.
+The driver will generate events over the input layer for hot keys and
+radio switches, and over the ACPI netlink layer for other events.  The
+input layer support accepts the standard IOCTLs to remap the keycodes
+assigned to each hot key.
 
 The hot key bit mask allows some control over which hot keys generate
 events.  If a key is "masked" (bit set to 0 in the mask), the firmware
@@ -256,6 +258,20 @@ sysfs notes:
                 disabled" postition, and 1 if the switch is in the
                 "radios enabled" position.
 
+        hotkey_report_mode:
+                Returns the state of the procfs ACPI event report mode
+                filter for hot keys.  If it is set to 1 (the default),
+                all hot key presses are reported both through the input
+                layer and also as ACPI events through procfs (but not
+                through netlink).  If it is set to 2, hot key presses
+                are reported only through the input layer.
+
+                This attribute is read-only in kernels 2.6.23 or later,
+                and read-write on earlier kernels.
+
+                May return -EPERM (write access locked out by module
+                parameter) or -EACCES (read-only).
+
 input layer notes:
 
 A Hot key is mapped to a single input layer EV_KEY event, possibly
@@ -393,21 +409,63 @@ unknown by the driver if the ThinkPad firmware triggered these events on
 hot key press or release, but the firmware will do it for either one, not
 both.
 
-If a key is mapped to KEY_RESERVED, it generates no input events at all,
-and it may generate a legacy thinkpad-acpi ACPI hotkey event.
-
+If a key is mapped to KEY_RESERVED, it generates no input events at all.
 If a key is mapped to KEY_UNKNOWN, it generates an input event that
-includes an scan code, and it may also generate a legacy thinkpad-acpi
-ACPI hotkey event.
-
-If a key is mapped to anything else, it will only generate legacy
-thinkpad-acpi ACPI hotkey events if nobody has opened the input device.
+includes an scan code.  If a key is mapped to anything else, it will
+generate input device EV_KEY events.
 
 Non hot-key ACPI HKEY event map:
 0x5001          Lid closed
 0x5002          Lid opened
 0x7000          Radio Switch may have changed state
 
+The above events are not propagated by the driver, except for legacy
+compatibility purposes when hotkey_report_mode is set to 1.
+
+Compatibility notes:
+
+ibm-acpi and thinkpad-acpi 0.15 (mainline kernels before 2.6.23) never
+supported the input layer, and sent events over the procfs ACPI event
+interface.
+
+To avoid sending duplicate events over the input layer and the ACPI
+event interface, thinkpad-acpi 0.16 implements a module parameter
+(hotkey_report_mode), and also a sysfs device attribute with the same
+name.
+
+Make no mistake here: userspace is expected to switch to using the input
+layer interface of thinkpad-acpi, together with the ACPI netlink event
+interface in kernels 2.6.23 and later, or with the ACPI procfs event
+interface in kernels 2.6.22 and earlier.
+
+If no hotkey_report_mode module parameter is specified (or it is set to
+zero), the driver defaults to mode 1 (see below), and on kernels 2.6.22
+and earlier, also allows one to change the hotkey_report_mode through
+sysfs.  In kernels 2.6.23 and later, where the netlink ACPI event
+interface is available, hotkey_report_mode cannot be changed through
+sysfs (it is read-only).
+
+If the hotkey_report_mode module parameter is set to 1 or 2, it cannot
+be changed later through sysfs (any writes will return -EPERM to signal
+that hotkey_report_mode was locked.  On 2.6.23 and later, where
+hotkey_report_mode cannot be changed at all, writes will return -EACES).
+
+hotkey_report_mode set to 1 makes the driver export through the procfs
+ACPI event interface all hot key presses (which are *also* sent to the
+input layer).  This is a legacy compatibility behaviour, and it is also
+the default mode of operation for the driver.
+
+hotkey_report_mode set to 2 makes the driver filter out the hot key
+presses from the procfs ACPI event interface, so these events will only
+be sent through the input layer.  Userspace that has been updated to use
+the thinkpad-acpi input layer interface should set hotkey_report_mode to
+2.
+
+Hot key press events are never sent to the ACPI netlink event interface.
+Really up-to-date userspace under kernel 2.6.23 and later is to use the
+netlink interface and the input layer interface, and don't bother at all
+with hotkey_report_mode.
+
 
 Bluetooth
 ---------
diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
index 5dd3109a8b..5a27af2ee1 100644
--- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -407,8 +407,10 @@ Description
                 u32 length;             // Length of this frame
                 u32 offset_low;         // Offset in the file of the
                 u32 offset_high;        // start of this frame
-                u32 mask1;              // Bits 0-1 are the type mask:
+                u32 mask1;              // Bits 0-2 are the type mask:
                                         // 1=I, 2=P, 4=B
+                                        // 0=End of Program Index, other fields
+                                        //   are invalid.
                 u32 pts;                // The PTS of the frame
                 u32 mask2;              // Bit 0 is bit 32 of the pts.
         };
diff --git a/MAINTAINERS b/MAINTAINERS
index abe5fa7f9c..9a91d9e3f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -44,9 +44,10 @@ trivial patch so apply some common sense.
         or does something very odd once a month document it.
 
         PLEASE remember that submissions must be made under the terms
-        of the OSDL certificate of contribution
-        (http://www.osdl.org/newsroom/press_releases/2004/2004_05_24_dco.html)
-        and should include a Signed-off-by: line.
+        of the OSDL certificate of contribution and should include a
+        Signed-off-by: line.  The current version of this "Developer's
+        Certificate of Origin" (DCO) is listed in the file
+        Documentation/SubmittingPatches.
 
 6.      Make sure you have the right to send any changes you make. If you
         do changes at work you may find your employer owns the patch
@@ -167,11 +168,11 @@ S:	Maintained
 P:      Eric Van Hensbergen
 M:      ericvh@gmail.com
 P:      Ron Minnich
-M:      rminnich@lanl.gov
+M:      rminnich@sandia.gov
 P:      Latchesar Ionkov
 M:      lucho@ionkov.net
 L:      v9fs-developer@lists.sourceforge.net
-W:      http://v9fs.sf.net
+W:      http://swik.net/v9fs
 T:      git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git
 S:      Maintained
 
@@ -2057,12 +2058,18 @@ L:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2200.sourceforge.net
 S:      Supported
 
-IOC3 DRIVER
+IOC3 ETHERNET DRIVER
 P:      Ralf Baechle
 M:      ralf@linux-mips.org
 L:      linux-mips@linux-mips.org
 S:      Maintained
 
+IOC3 SERIAL DRIVER
+P:      Pat Gefre
+M:      pfg@sgi.com
+L:      linux-kernel@linux-mips.org
+S:      Maintained
+
 IP MASQUERADING:
 P:      Juanjo Ciarlante
 M:      jjciarla@raiz.uncu.edu.ar
@@ -2594,6 +2601,19 @@ M:	shemminger@linux-foundation.org
 L:      netem@lists.linux-foundation.org
 S:      Maintained
 
+NETERION (S2IO) Xframe 10GbE DRIVER
+P:      Ramkrishna Vepa
+M:      ram.vepa@neterion.com
+P:      Rastapur Santosh
+M:      santosh.rastapur@neterion.com
+P:      Sivakumar Subramani
+M:      sivakumar.subramani@neterion.com
+P:      Sreenivasa Honnur
+M:      sreenivasa.honnur@neterion.com
+L:      netdev@vger.kernel.org
+W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
+S:      Supported
+
 NETFILTER/IPTABLES/IPCHAINS
 P:      Rusty Russell
 P:      Marc Boucher
@@ -2602,8 +2622,8 @@ P:	Harald Welte
 P:      Jozsef Kadlecsik
 P:      Patrick McHardy
 M:      kaber@trash.net
-L:      netfilter-devel@lists.netfilter.org
-L:      netfilter@lists.netfilter.org (subscribers-only)
+L:      netfilter-devel@vger.kernel.org
+L:      netfilter@vger.kernel.org
 L:      coreteam@netfilter.org
 W:      http://www.netfilter.org/
 W:      http://www.iptables.org/
@@ -2656,11 +2676,17 @@ M:	jmorris@namei.org
 P:      Hideaki YOSHIFUJI
 M:      yoshfuji@linux-ipv6.org
 P:      Patrick McHardy
-M:      kaber@coreworks.de
+M:      kaber@trash.net
 L:      netdev@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:      Maintained
 
+NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
+P:      Paul Moore
+M:      paul.moore@hp.com
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 NETWORKING [WIRELESS]
 P:      John W. Linville
 M:      linville@tuxdriver.com
@@ -2728,19 +2754,6 @@ M:	adaplas@gmail.com
 L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
-NETERION (S2IO) Xframe 10GbE DRIVER
-P:      Ramkrishna Vepa
-M:      ram.vepa@neterion.com
-P:      Rastapur Santosh
-M:      santosh.rastapur@neterion.com
-P:      Sivakumar Subramani
-M:      sivakumar.subramani@neterion.com
-P:      Sreenivasa Honnur
-M:      sreenivasa.honnur@neterion.com
-L:      netdev@vger.kernel.org
-W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
-S:      Supported
-
 OPENCORES I2C BUS DRIVER
 P:      Peter Korsgaard
 M:      jacmet@sunsite.dk
diff --git a/Makefile b/Makefile
index f3229a4945..4635a64da3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION =-rc3
-NAME = Holy Dancing Manatees, Batman!
+EXTRAVERSION =
+NAME = Arr Matey! A Hairy Bilge Rat!
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d6145298a3..691aae309c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -721,7 +721,8 @@ config LEDS
 
 config LEDS_TIMER
         bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
-                            MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
+                            OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
+                            || MACH_OMAP_PERSEUS2
         depends on LEDS
         depends on !GENERIC_CLOCKEVENTS
         default y if ARCH_EBSA110
@@ -738,7 +739,9 @@ config LEDS_TIMER
 
 config LEDS_CPU
         bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
-                        !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
+                        !ARCH_OMAP) \
+                        || OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
+                        || MACH_OMAP_PERSEUS2
         depends on LEDS
         help
           If you say Y here, the red LED will be used to give a good real
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 240c448ec3..a2dd930d11 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -338,7 +338,7 @@ pbus_assign_bus_resources(struct pci_bus *bus, struct pci_sys_data *root)
  * pcibios_fixup_bus - Called after each bus is probed,
  * but before its children are examined.
  */
-void __devinit pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
 {
         struct pci_sys_data *root = bus->sysdata;
         struct pci_dev *dev;
@@ -419,7 +419,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 /*
  * Convert from Linux-centric to bus-centric addresses for bridge devices.
  */
-void __devinit
+void
 pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
                          struct resource *res)
 {
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 851cc7158c..70b2c78011 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -336,7 +336,7 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type)
         if (line >= 0 && line < 16) {
                 gpio_line_config(line, GPIO_IN);
         } else {
-                gpio_line_config(EP93XX_GPIO_LINE_F(line), GPIO_IN);
+                gpio_line_config(EP93XX_GPIO_LINE_F(line-16), GPIO_IN);
         }
 
         port = line >> 3;
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c
index a58b678006..4cfc9d3af2 100644
--- a/arch/arm/mach-imx/generic.c
+++ b/arch/arm/mach-imx/generic.c
@@ -101,10 +101,11 @@ EXPORT_SYMBOL(imx_gpio_mode);
 
 int imx_gpio_request(unsigned gpio, const char *label)
 {
-        if(gpio >= (GPIO_PORT_MAX + 1) * 32)
+        if(gpio >= (GPIO_PORT_MAX + 1) * 32) {
                 printk(KERN_ERR "imx_gpio: Attempt to request nonexistent GPIO %d for \"%s\"\n",
                         gpio, label ? label : "?");
                 return -EINVAL;
+        }
 
         if(test_and_set_bit(gpio, imx_gpio_alloc_map)) {
                 printk(KERN_ERR "imx_gpio: GPIO %d already used. Allocation for \"%s\" failed\n",
@@ -129,7 +130,7 @@ EXPORT_SYMBOL(imx_gpio_free);
 
 int imx_gpio_direction_input(unsigned gpio)
 {
-        imx_gpio_mode(gpio| GPIO_IN);
+        imx_gpio_mode(gpio | GPIO_IN | GPIO_GIUS | GPIO_DR);
         return 0;
 }
 
@@ -138,7 +139,7 @@ EXPORT_SYMBOL(imx_gpio_direction_input);
 int imx_gpio_direction_output(unsigned gpio, int value)
 {
         imx_gpio_set_value(gpio, value);
-        imx_gpio_mode(gpio| GPIO_OUT);
+        imx_gpio_mode(gpio | GPIO_OUT | GPIO_GIUS | GPIO_DR);
         return 0;
 }
 
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 7b260b7c53..79d4ef4c54 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -294,9 +294,11 @@ static int h3_select_irda(struct device *dev, int state)
         return err;
 }
 
-static void set_trans_mode(void *data)
+static void set_trans_mode(struct work_struct *work)
 {
-        int *mode = data;
+        struct omap_irda_config *irda_config =
+                container_of(work, struct omap_irda_config, gpio_expa.work);
+        int mode = irda_config->mode;
         unsigned char expa;
         int err = 0;
 
@@ -306,7 +308,7 @@ static void set_trans_mode(void *data)
 
         expa &= ~0x03;
 
-        if (*mode & IR_SIRMODE) {
+        if (mode & IR_SIRMODE) {
                 expa |= 0x01;
         } else { /* MIR/FIR */
                 expa |= 0x03;
@@ -321,9 +323,9 @@ static int h3_transceiver_mode(struct device *dev, int mode)
 {
         struct omap_irda_config *irda_config = dev->platform_data;
 
+        irda_config->mode = mode;
         cancel_delayed_work(&irda_config->gpio_expa);
-        PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);
-#error this is not permitted - mode is an argument variable
+        PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode);
         schedule_delayed_work(&irda_config->gpio_expa, 0);
 
         return 0;
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index 0cbf1b0071..86de303eca 100644
--- a/arch/arm/mach-omap1/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -133,13 +133,13 @@ void osk_leds_event(led_event_t evt)
                 mistral_setled();
                 break;
 
-        case led_idle_start:
-                hw_led_state |= IDLE_LED;
+        case led_idle_start:    /* idle == off */
+                hw_led_state &= ~IDLE_LED;
                 mistral_setled();
                 break;
 
         case led_idle_end:
-                hw_led_state &= ~IDLE_LED;
+                hw_led_state |= IDLE_LED;
                 mistral_setled();
                 break;
 
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 5bb348e2e3..2e68be6072 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -57,7 +57,6 @@
 #include <asm/arch/tc.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/tps65010.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/dsp_common.h>
 #include <asm/arch/dmtimer.h>
@@ -250,11 +249,6 @@ void omap_pm_suspend(void)
 
         omap_serial_wake_trigger(1);
 
-        if (machine_is_omap_osk()) {
-                /* Stop LED1 (D9) blink */
-                tps65010_set_led(LED1, OFF);
-        }
-
         if (!cpu_is_omap15xx())
                 omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
 
@@ -447,11 +441,6 @@ void omap_pm_suspend(void)
         omap_serial_wake_trigger(0);
 
         printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev);
-
-        if (machine_is_omap_osk()) {
-                /* Let LED1 (D9) blink again */
-                tps65010_set_led(LED1, BLINK);
-        }
 }
 
 #if defined(DEBUG) && defined(CONFIG_PROC_FS)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 588adb5ab4..d9af4367f8 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -1160,8 +1160,8 @@ int __init omap2_clk_init(void)
         clk_enable(&sync_32k_ick);
         clk_enable(&omapctrl_ick);
 
-        /* Force the APLLs active during bootup to avoid disabling and
-         * enabling them unnecessarily. */
+        /* Force the APLLs always active. The clocks are idled
+         * automatically by hardware. */
         clk_enable(&apll96_ck);
         clk_enable(&apll54_ck);
 
@@ -1174,12 +1174,3 @@ int __init omap2_clk_init(void)
 
         return 0;
 }
-
-static int __init omap2_disable_aplls(void)
-{
-        clk_disable(&apll96_ck);
-        clk_disable(&apll54_ck);
-
-        return 0;
-}
-late_initcall(omap2_disable_aplls);
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index aaa5589e81..e9c367fc9f 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -84,7 +84,7 @@ static inline void __init omap_serial_reset(struct plat_serial8250_port *p)
         serial_write_reg(p, UART_OMAP_MDR1, 0x07);
         serial_write_reg(p, UART_OMAP_SCR, 0x08);
         serial_write_reg(p, UART_OMAP_MDR1, 0x00);
-        serial_write_reg(p, UART_OMAP_SYSC, 0x01);
+        serial_write_reg(p, UART_OMAP_SYSC, (0x02 << 3) | (1 << 2) | (1 << 0));
 }
 
 void __init omap_serial_init()
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 4b867b0789..ae2ae08032 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -365,7 +365,7 @@ void __init pxa_init_irq_gpio(int gpio_nr)
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
-        for (irq = IRQ_GPIO(2); irq <= IRQ_GPIO(gpio_nr); irq++) {
+        for (irq = IRQ_GPIO(2); irq < IRQ_GPIO(gpio_nr); irq++) {
                 set_irq_chip(irq, &pxa_muxed_gpio_chip);
                 set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 3dba666151..ecec2f85c4 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -165,7 +165,7 @@ static void __init gic_init_irq(void)
 #endif
         gic_dist_init(0, __io_address(REALVIEW_GIC_DIST_BASE), 29);
         gic_cpu_init(0, __io_address(REALVIEW_GIC_CPU_BASE));
-#ifdef CONFIG_REALVIEW_MPCORE
+#if defined(CONFIG_REALVIEW_MPCORE) && !defined(CONFIG_REALVIEW_MPCORE_REVB)
         gic_dist_init(1, __io_address(REALVIEW_GIC1_DIST_BASE), 64);
         gic_cpu_init(1, __io_address(REALVIEW_GIC1_CPU_BASE));
         gic_cascade_irq(1, IRQ_EB_IRQ1);
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 0ba7e9060c..c326983f4a 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -276,7 +276,21 @@ static unsigned char pm_osiris_ctrl0;
 
 static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
 {
+        unsigned int tmp;
+
         pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);
+        tmp = pm_osiris_ctrl0 & ~OSIRIS_CTRL0_NANDSEL;
+
+        /* ensure correct NAND slot is selected on resume */
+        if ((pm_osiris_ctrl0 & OSIRIS_CTRL0_BOOT_INT) == 0)
+                tmp |= 2;
+
+        __raw_writeb(tmp, OSIRIS_VA_CTRL0);
+
+        /* ensure that an nRESET is not generated on resume. */
+        s3c2410_gpio_setpin(S3C2410_GPA21, 1);
+        s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT);
+
         return 0;
 }
 
@@ -285,6 +299,10 @@ static int osiris_pm_resume(struct sys_device *sd)
         if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)
                 __raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);
 
+        __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0);
+
+        s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT);
+
         return 0;
 }
 
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index b4e9b734e0..76b800a951 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -57,7 +57,17 @@ static void l2x0_inv_range(unsigned long start, unsigned long end)
 {
         unsigned long addr;
 
-        start &= ~(CACHE_LINE_SIZE - 1);
+        if (start & (CACHE_LINE_SIZE - 1)) {
+                start &= ~(CACHE_LINE_SIZE - 1);
+                sync_writel(start, L2X0_CLEAN_INV_LINE_PA, 1);
+                start += CACHE_LINE_SIZE;
+        }
+
+        if (end & (CACHE_LINE_SIZE - 1)) {
+                end &= ~(CACHE_LINE_SIZE - 1);
+                sync_writel(end, L2X0_CLEAN_INV_LINE_PA, 1);
+        }
+
         for (addr = start; addr < end; addr += CACHE_LINE_SIZE)
                 sync_writel(addr, L2X0_INV_LINE_PA, 1);
         cache_sync();
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 7987aa6e95..4f0f9c4e93 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -172,7 +172,7 @@ console_initcall(omap_add_serial_console);
 #if defined(CONFIG_ARCH_OMAP16XX)
 #define TIMER_32K_SYNCHRONIZED          0xfffbc410
 #elif defined(CONFIG_ARCH_OMAP24XX)
-#define TIMER_32K_SYNCHRONIZED          0x48004010
+#define TIMER_32K_SYNCHRONIZED          (OMAP24XX_32KSYNCT_BASE + 0x10)
 #endif
 
 #ifdef  TIMER_32K_SYNCHRONIZED
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 36073dfaa4..3856f5aedf 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -271,11 +271,6 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
 
 #if defined(CONFIG_ARCH_OMAP1)
 
-struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
-{
-        BUG();
-}
-
 /**
  * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR
  * @inputmask: current value of idlect mask
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c
index b0af014b0e..ea76f1979a 100644
--- a/arch/arm/plat-omap/timer32k.c
+++ b/arch/arm/plat-omap/timer32k.c
@@ -71,7 +71,7 @@ struct sys_timer omap_timer;
 #if defined(CONFIG_ARCH_OMAP16XX)
 #define TIMER_32K_SYNCHRONIZED          0xfffbc410
 #elif defined(CONFIG_ARCH_OMAP24XX)
-#define TIMER_32K_SYNCHRONIZED          0x48004010
+#define TIMER_32K_SYNCHRONIZED          (OMAP24XX_32KSYNCT_BASE + 0x10)
 #else
 #error OMAP 32KHz timer does not currently work on 15XX!
 #endif
@@ -147,14 +147,15 @@ static inline void omap_32k_timer_ack_irq(void)
 static void omap_32k_timer_set_mode(enum clock_event_mode mode,
                                     struct clock_event_device *evt)
 {
+        omap_32k_timer_stop();
+
         switch (mode) {
-        case CLOCK_EVT_MODE_ONESHOT:
         case CLOCK_EVT_MODE_PERIODIC:
                 omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);
                 break;
+        case CLOCK_EVT_MODE_ONESHOT:
         case CLOCK_EVT_MODE_UNUSED:
         case CLOCK_EVT_MODE_SHUTDOWN:
-                omap_32k_timer_stop();
                 break;
         case CLOCK_EVT_MODE_RESUME:
                 break;
@@ -194,8 +195,6 @@ omap_32k_ticks_to_nsecs(unsigned long ticks_32k)
         return (unsigned long long) ticks_32k * 1000 * 5*5*5*5*5*5 >> 9;
 }
 
-static unsigned long omap_32k_last_tick = 0;
-
 /*
  * Returns current time from boot in nsecs. It's OK for this to wrap
  * around for now, as it's just a relative time stamp.
@@ -225,7 +224,6 @@ static __init void omap_init_32k_timer(void)
 {
         if (cpu_class_is_omap1())
                 setup_irq(INT_OS_TIMER, &omap_32k_timer_irq);
-        omap_32k_last_tick = omap_32k_sync_timer_read();
 
 #ifdef CONFIG_ARCH_OMAP2
         /* REVISIT: Check 24xx TIOCP_CFG settings after idle works */
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 04ddab2bd8..eea3f50743 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -323,6 +323,7 @@ static int __init vfp_init(void)
          * we just need to read the VFPSID register.
          */
         vfp_vector = vfp_testing_entry;
+        barrier();
         vfpsid = fmrx(FPSID);
         barrier();
         vfp_vector = vfp_null_entry;
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index bafcfa5214..5d488ef965 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -84,6 +84,7 @@
 #include <linux/err.h>
 #include <asm/blackfin.h>
 #include <asm/gpio.h>
+#include <asm/portmux.h>
 #include <linux/irq.h>
 
 #ifdef BF533_FAMILY
@@ -115,7 +116,11 @@ static struct gpio_port_t *gpio_bankb[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
 };
 #endif
 
-static unsigned short reserved_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
+static unsigned short reserved_gpio_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
+static unsigned short reserved_peri_map[gpio_bank(MAX_BLACKFIN_GPIOS + 16)];
+char *str_ident = NULL;
+
+#define RESOURCE_LABEL_SIZE 16
 
 #ifdef CONFIG_PM
 static unsigned short wakeup_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
@@ -143,22 +148,100 @@ inline int check_gpio(unsigned short gpio)
         return 0;
 }
 
+static void set_label(unsigned short ident, const char *label)
+{
+
+        if (label && str_ident) {
+                strncpy(str_ident + ident * RESOURCE_LABEL_SIZE, label,
+                         RESOURCE_LABEL_SIZE);
+                str_ident[ident * RESOURCE_LABEL_SIZE +
+                         RESOURCE_LABEL_SIZE - 1] = 0;
+        }
+}
+
+static char *get_label(unsigned short ident)
+{
+        if (!str_ident)
+                return "UNKNOWN";
+
+        return (str_ident[ident * RESOURCE_LABEL_SIZE] ?
+                (str_ident + ident * RESOURCE_LABEL_SIZE) : "UNKNOWN");
+}
+
+static int cmp_label(unsigned short ident, const char *label)
+{
+        if (label && str_ident)
+                return strncmp(str_ident + ident * RESOURCE_LABEL_SIZE,
+                                 label, strlen(label));
+        else
+                return -EINVAL;
+}
+
 #ifdef BF537_FAMILY
 static void port_setup(unsigned short gpio, unsigned short usage)
 {
-        if (usage == GPIO_USAGE) {
-                if (*port_fer[gpio_bank(gpio)] & gpio_bit(gpio))
-                        printk(KERN_WARNING "bfin-gpio: Possible Conflict with Peripheral "
-                               "usage and GPIO %d detected!\n", gpio);
-                *port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio);
-        } else
-                *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio);
-        SSYNC();
+        if (!check_gpio(gpio)) {
+                if (usage == GPIO_USAGE) {
+                        *port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio);
+                } else
+                        *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio);
+                SSYNC();
+        }
 }
 #else
 # define port_setup(...)  do { } while (0)
 #endif
 
+#ifdef BF537_FAMILY
+
+#define PMUX_LUT_RES            0
+#define PMUX_LUT_OFFSET         1
+#define PMUX_LUT_ENTRIES        41
+#define PMUX_LUT_SIZE           2
+
+static unsigned short port_mux_lut[PMUX_LUT_ENTRIES][PMUX_LUT_SIZE] = {
+        {P_PPI0_D13, 11}, {P_PPI0_D14, 11}, {P_PPI0_D15, 11},
+        {P_SPORT1_TFS, 11}, {P_SPORT1_TSCLK, 11}, {P_SPORT1_DTPRI, 11},
+        {P_PPI0_D10, 10}, {P_PPI0_D11, 10}, {P_PPI0_D12, 10},
+        {P_SPORT1_RSCLK, 10}, {P_SPORT1_RFS, 10}, {P_SPORT1_DRPRI, 10},
+        {P_PPI0_D8, 9}, {P_PPI0_D9, 9}, {P_SPORT1_DRSEC, 9},
+        {P_SPORT1_DTSEC, 9}, {P_TMR2, 8}, {P_PPI0_FS3, 8}, {P_TMR3, 7},
+        {P_SPI0_SSEL4, 7}, {P_TMR4, 6}, {P_SPI0_SSEL5, 6}, {P_TMR5, 5},
+        {P_SPI0_SSEL6, 5}, {P_UART1_RX, 4}, {P_UART1_TX, 4}, {P_TMR6, 4},
+        {P_TMR7, 4}, {P_UART0_RX, 3}, {P_UART0_TX, 3}, {P_DMAR0, 3},
+        {P_DMAR1, 3}, {P_SPORT0_DTSEC, 1}, {P_SPORT0_DRSEC, 1},
+        {P_CAN0_RX, 1}, {P_CAN0_TX, 1}, {P_SPI0_SSEL7, 1},
+        {P_SPORT0_TFS, 0}, {P_SPORT0_DTPRI, 0}, {P_SPI0_SSEL2, 0},
+        {P_SPI0_SSEL3, 0}
+};
+
+static void portmux_setup(unsigned short per, unsigned short function)
+{
+        u16 y, muxreg, offset;
+
+        for (y = 0; y < PMUX_LUT_ENTRIES; y++) {
+                if (port_mux_lut[y][PMUX_LUT_RES] == per) {
+
+                        /* SET PORTMUX REG */
+
+                        offset = port_mux_lut[y][PMUX_LUT_OFFSET];
+                        muxreg = bfin_read_PORT_MUX();
+
+                        if (offset != 1) {
+                                muxreg &= ~(1 << offset);
+                        } else {
+                                muxreg &= ~(3 << 1);
+                        }
+
+                        muxreg |= (function << offset);
+                        bfin_write_PORT_MUX(muxreg);
+                }
+        }
+}
+
+#else
+# define portmux_setup(...)  do { } while (0)
+#endif
 
 static void default_gpio(unsigned short gpio)
 {
@@ -179,22 +262,15 @@ static void default_gpio(unsigned short gpio)
 
 static int __init bfin_gpio_init(void)
 {
-        int i;
-
-        printk(KERN_INFO "Blackfin GPIO Controller\n");
 
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE)
-                reserved_map[gpio_bank(i)] = 0;
+        str_ident = kzalloc(RESOURCE_LABEL_SIZE * 256, GFP_KERNEL);
+        if (!str_ident)
+                return -ENOMEM;
 
-#if defined(BF537_FAMILY) && (defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE))
-# if defined(CONFIG_BFIN_MAC_RMII)
-        reserved_map[gpio_bank(PORT_H)] = 0xC373;
-# else
-        reserved_map[gpio_bank(PORT_H)] = 0xFFFF;
-# endif
-#endif
+        printk(KERN_INFO "Blackfin GPIO Controller\n");
 
         return 0;
+
 }
 
 arch_initcall(bfin_gpio_init);
@@ -223,7 +299,7 @@ arch_initcall(bfin_gpio_init);
 void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
 { \
         unsigned long flags; \
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
         local_irq_save(flags); \
         if (arg) \
                 gpio_bankb[gpio_bank(gpio)]->name |= gpio_bit(gpio); \
@@ -243,7 +319,7 @@ SET_GPIO(both)
 #define SET_GPIO_SC(name) \
 void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
 { \
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
         if (arg) \
                 gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \
         else \
@@ -258,7 +334,7 @@ SET_GPIO_SC(maskb)
 void set_gpio_data(unsigned short gpio, unsigned short arg)
 {
         unsigned long flags;
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
         local_irq_save(flags);
         if (arg)
                 gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio);
@@ -277,7 +353,7 @@ SET_GPIO_SC(data)
 void set_gpio_toggle(unsigned short gpio)
 {
         unsigned long flags;
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
         local_irq_save(flags);
         gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio);
         bfin_read_CHIPID();
@@ -286,7 +362,7 @@ void set_gpio_toggle(unsigned short gpio)
 #else
 void set_gpio_toggle(unsigned short gpio)
 {
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
         gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio);
 }
 #endif
@@ -350,7 +426,7 @@ unsigned short get_gpio_data(unsigned short gpio)
 {
         unsigned long flags;
         unsigned short ret;
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
         local_irq_save(flags);
         ret = 0x01 & (gpio_bankb[gpio_bank(gpio)]->data >> gpio_sub_n(gpio));
         bfin_read_CHIPID();
@@ -494,13 +570,14 @@ u32 gpio_pm_setup(void)
                         gpio_bank_saved[bank].dir   = gpio_bankb[bank]->dir;
                         gpio_bank_saved[bank].edge  = gpio_bankb[bank]->edge;
                         gpio_bank_saved[bank].both  = gpio_bankb[bank]->both;
-                        gpio_bank_saved[bank].reserved = reserved_map[bank];
+                        gpio_bank_saved[bank].reserved =
+                                                reserved_gpio_map[bank];
 
                         gpio = i;
 
                         while (mask) {
                                 if (mask & 1) {
-                                        reserved_map[gpio_bank(gpio)] |=
+                                        reserved_gpio_map[gpio_bank(gpio)] |=
                                                         gpio_bit(gpio);
                                         bfin_gpio_wakeup_type(gpio,
                                                 wakeup_flags_map[gpio]);
@@ -540,7 +617,8 @@ void gpio_pm_restore(void)
                         gpio_bankb[bank]->edge  = gpio_bank_saved[bank].edge;
                         gpio_bankb[bank]->both  = gpio_bank_saved[bank].both;
 
-                        reserved_map[bank] = gpio_bank_saved[bank].reserved;
+                        reserved_gpio_map[bank] =
+                                        gpio_bank_saved[bank].reserved;
 
                 }
 
@@ -550,6 +628,141 @@ void gpio_pm_restore(void)
 
 #endif
 
+
+
+
+int peripheral_request(unsigned short per, const char *label)
+{
+        unsigned long flags;
+        unsigned short ident = P_IDENT(per);
+
+        /*
+         * Don't cares are pins with only one dedicated function
+         */
+
+        if (per & P_DONTCARE)
+                return 0;
+
+        if (!(per & P_DEFINED))
+                return -ENODEV;
+
+        local_irq_save(flags);
+
+        if (!check_gpio(ident)) {
+
+        if (unlikely(reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
+                printk(KERN_ERR
+                       "%s: Peripheral %d is already reserved as GPIO by %s !\n",
+                       __FUNCTION__, ident, get_label(ident));
+                dump_stack();
+                local_irq_restore(flags);
+                return -EBUSY;
+        }
+
+        }
+
+        if (unlikely(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident))) {
+
+        /*
+         * Pin functions like AMC address strobes my
+         * be requested and used by several drivers
+         */
+
+        if (!(per & P_MAYSHARE)) {
+
+        /*
+         * Allow that the identical pin function can
+         * be requested from the same driver twice
+         */
+
+                if (cmp_label(ident, label) == 0)
+                        goto anyway;
+
+                        printk(KERN_ERR
+                               "%s: Peripheral %d function %d is already"
+                               "reserved by %s !\n",
+                               __FUNCTION__, ident, P_FUNCT2MUX(per),
+                                get_label(ident));
+                        dump_stack();
+                        local_irq_restore(flags);
+                        return -EBUSY;
+                }
+
+        }
+
+anyway:
+
+
+        portmux_setup(per, P_FUNCT2MUX(per));
+
+        port_setup(ident, PERIPHERAL_USAGE);
+
+        reserved_peri_map[gpio_bank(ident)] |= gpio_bit(ident);
+        local_irq_restore(flags);
+        set_label(ident, label);
+
+        return 0;
+}
+EXPORT_SYMBOL(peripheral_request);
+
+int peripheral_request_list(unsigned short per[], const char *label)
+{
+        u16 cnt;
+        int ret;
+
+        for (cnt = 0; per[cnt] != 0; cnt++) {
+                ret = peripheral_request(per[cnt], label);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(peripheral_request_list);
+
+void peripheral_free(unsigned short per)
+{
+        unsigned long flags;
+        unsigned short ident = P_IDENT(per);
+
+        if (per & P_DONTCARE)
+                return;
+
+        if (!(per & P_DEFINED))
+                return;
+
+        if (check_gpio(ident) < 0)
+                return;
+
+        local_irq_save(flags);
+
+        if (unlikely(!(reserved_peri_map[gpio_bank(ident)]
+                         & gpio_bit(ident)))) {
+                local_irq_restore(flags);
+                return;
+        }
+
+        if (!(per & P_MAYSHARE)) {
+                port_setup(ident, GPIO_USAGE);
+        }
+
+        reserved_peri_map[gpio_bank(ident)] &= ~gpio_bit(ident);
+
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(peripheral_free);
+
+void peripheral_free_list(unsigned short per[])
+{
+        u16 cnt;
+
+        for (cnt = 0; per[cnt] != 0; cnt++) {
+                peripheral_free(per[cnt]);
+        }
+
+}
+EXPORT_SYMBOL(peripheral_free_list);
+
 /***********************************************************
 *
 * FUNCTIONS: Blackfin GPIO Driver
@@ -574,13 +787,13 @@ int gpio_request(unsigned short gpio, const char *label)
 
         local_irq_save(flags);
 
-        if (unlikely(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
+        if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
                 printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved!\n", gpio);
                 dump_stack();
                 local_irq_restore(flags);
                 return -EBUSY;
         }
-        reserved_map[gpio_bank(gpio)] |= gpio_bit(gpio);
+        reserved_gpio_map[gpio_bank(gpio)] |= gpio_bit(gpio);
 
         local_irq_restore(flags);
 
@@ -599,7 +812,7 @@ void gpio_free(unsigned short gpio)
 
         local_irq_save(flags);
 
-        if (unlikely(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
+        if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
                 printk(KERN_ERR "bfin-gpio: GPIO %d wasn't reserved!\n", gpio);
                 dump_stack();
                 local_irq_restore(flags);
@@ -608,7 +821,7 @@ void gpio_free(unsigned short gpio)
 
         default_gpio(gpio);
 
-        reserved_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
+        reserved_gpio_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
 
         local_irq_restore(flags);
 }
@@ -618,7 +831,7 @@ void gpio_direction_input(unsigned short gpio)
 {
         unsigned long flags;
 
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
 
         local_irq_save(flags);
         gpio_bankb[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio);
@@ -631,7 +844,7 @@ void gpio_direction_output(unsigned short gpio)
 {
         unsigned long flags;
 
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
 
         local_irq_save(flags);
         gpio_bankb[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index d61bba98fb..9604588083 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -815,7 +815,7 @@ _extable:
 
 ALIGN
 ENTRY(_sys_call_table)
-        .long _sys_ni_syscall   /* 0  -  old "setup()" system call*/
+        .long _sys_restart_syscall      /* 0 */
         .long _sys_exit
         .long _sys_fork
         .long _sys_read
@@ -978,13 +978,13 @@ ENTRY(_sys_call_table)
         .long _sys_sched_get_priority_min  /* 160 */
         .long _sys_sched_rr_get_interval
         .long _sys_nanosleep
-        .long _sys_ni_syscall   /* sys_mremap */
+        .long _sys_mremap
         .long _sys_setresuid    /* setresuid16 */
         .long _sys_getresuid    /* getresuid16 */       /* 165 */
         .long _sys_ni_syscall   /* for vm86 */
         .long _sys_ni_syscall   /* old "query_module" */
         .long _sys_ni_syscall   /* sys_poll */
-        .long _sys_ni_syscall   /* sys_nfsservctl */
+        .long _sys_nfsservctl
         .long _sys_setresgid    /* setresgid16 */       /* 170 */
         .long _sys_getresgid    /* getresgid16 */
         .long _sys_prctl
@@ -1040,7 +1040,7 @@ ENTRY(_sys_call_table)
         .long _sys_ni_syscall   /* reserved for TUX */
         .long _sys_ni_syscall
         .long _sys_gettid
-        .long _sys_ni_syscall   /* 225 */ /* sys_readahead */
+        .long _sys_readahead    /* 225 */
         .long _sys_setxattr
         .long _sys_lsetxattr
         .long _sys_fsetxattr
@@ -1157,6 +1157,21 @@ ENTRY(_sys_call_table)
         .long _sys_shmctl
         .long _sys_shmdt        /* 340 */
         .long _sys_shmget
+        .long _sys_splice
+        .long _sys_sync_file_range
+        .long _sys_tee
+        .long _sys_vmsplice     /* 345 */
+        .long _sys_epoll_pwait
+        .long _sys_utimensat
+        .long _sys_signalfd
+        .long _sys_timerfd
+        .long _sys_eventfd      /* 350 */
+        .long _sys_pread64
+        .long _sys_pwrite64
+        .long _sys_fadvise64
+        .long _sys_set_robust_list
+        .long _sys_get_robust_list      /* 355 */
+        .long _sys_fallocate
         .rept NR_syscalls-(.-_sys_call_table)/4
         .long _sys_ni_syscall
         .endr
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index 1772d8d2c1..b103027222 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -158,10 +158,16 @@ static int bfin_pm_finish(suspend_state_t state)
         return 0;
 }
 
+static int bfin_pm_valid(suspend_state_t state)
+{
+        return (state == PM_SUSPEND_STANDBY);
+}
+
 struct pm_ops bfin_pm_ops = {
         .prepare = bfin_pm_prepare,
         .enter = bfin_pm_enter,
         .finish = bfin_pm_finish,
+        .valid  = bfin_pm_valid,
 };
 
 static int __init bfin_pm_init(void)
diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug
index 554efe604a..996d97e953 100644
--- a/arch/h8300/Kconfig.debug
+++ b/arch/h8300/Kconfig.debug
@@ -59,7 +59,7 @@ config BLKDEV_RESERVE
         help
           Reserved BLKDEV area.
 
-config CONFIG_BLKDEV_RESERVE_ADDRESS
+config BLKDEV_RESERVE_ADDRESS
         hex 'start address'
         depends on BLKDEV_RESERVE
         help
diff --git a/arch/i386/boot/boot.h b/arch/i386/boot/boot.h
index dec70c9b60..20bab9431a 100644
--- a/arch/i386/boot/boot.h
+++ b/arch/i386/boot/boot.h
@@ -87,7 +87,7 @@ static inline void set_fs(u16 seg)
 static inline u16 fs(void)
 {
         u16 seg;
-        asm("movw %%fs,%0" : "=rm" (seg));
+        asm volatile("movw %%fs,%0" : "=rm" (seg));
         return seg;
 }
 
@@ -98,7 +98,7 @@ static inline void set_gs(u16 seg)
 static inline u16 gs(void)
 {
         u16 seg;
-        asm("movw %%gs,%0" : "=rm" (seg));
+        asm volatile("movw %%gs,%0" : "=rm" (seg));
         return seg;
 }
 
@@ -107,19 +107,19 @@ typedef unsigned int addr_t;
 static inline u8 rdfs8(addr_t addr)
 {
         u8 v;
-        asm("movb %%fs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr));
+        asm volatile("movb %%fs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr));
         return v;
 }
 static inline u16 rdfs16(addr_t addr)
 {
         u16 v;
-        asm("movw %%fs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr));
+        asm volatile("movw %%fs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr));
         return v;
 }
 static inline u32 rdfs32(addr_t addr)
 {
         u32 v;
-        asm("movl %%fs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr));
+        asm volatile("movl %%fs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr));
         return v;
 }
 
@@ -139,19 +139,19 @@ static inline void wrfs32(u32 v, addr_t addr)
 static inline u8 rdgs8(addr_t addr)
 {
         u8 v;
-        asm("movb %%gs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr));
+        asm volatile("movb %%gs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr));
         return v;
 }
 static inline u16 rdgs16(addr_t addr)
 {
         u16 v;
-        asm("movw %%gs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr));
+        asm volatile("movw %%gs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr));
         return v;
 }
 static inline u32 rdgs32(addr_t addr)
 {
         u32 v;
-        asm("movl %%gs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr));
+        asm volatile("movl %%gs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr));
         return v;
 }
 
@@ -180,15 +180,15 @@ static inline int memcmp(const void *s1, const void *s2, size_t len)
 static inline int memcmp_fs(const void *s1, addr_t s2, size_t len)
 {
         u8 diff;
-        asm("fs; repe; cmpsb; setnz %0"
-            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
+        asm volatile("fs; repe; cmpsb; setnz %0"
+                     : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
         return diff;
 }
 static inline int memcmp_gs(const void *s1, addr_t s2, size_t len)
 {
         u8 diff;
-        asm("gs; repe; cmpsb; setnz %0"
-            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
+        asm volatile("gs; repe; cmpsb; setnz %0"
+                     : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
         return diff;
 }
 
diff --git a/arch/i386/boot/cpucheck.c b/arch/i386/boot/cpucheck.c
index 991e8ceae1..e655a89c55 100644
--- a/arch/i386/boot/cpucheck.c
+++ b/arch/i386/boot/cpucheck.c
@@ -96,7 +96,8 @@ static int has_fpu(void)
                 asm volatile("movl %0,%%cr0" : : "r" (cr0));
         }
 
-        asm("fninit ; fnstsw %0 ; fnstcw %1" : "+m" (fsw), "+m" (fcw));
+        asm volatile("fninit ; fnstsw %0 ; fnstcw %1"
+                     : "+m" (fsw), "+m" (fcw));
 
         return fsw == 0 && (fcw & 0x103f) == 0x003f;
 }
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c
index 82b5c846a1..bd138e442e 100644
--- a/arch/i386/boot/edd.c
+++ b/arch/i386/boot/edd.c
@@ -30,9 +30,9 @@ static int read_mbr(u8 devno, void *buf)
         cx = 0x0001;            /* Sector 0-0-1 */
         dx = devno;
         bx = (size_t)buf;
-        asm("pushfl; stc; int $0x13; setc %%al; popfl"
-            : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx)
-            : : "esi", "edi", "memory");
+        asm volatile("pushfl; stc; int $0x13; setc %%al; popfl"
+                     : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx)
+                     : : "esi", "edi", "memory");
 
         return -(u8)ax;         /* 0 or -1 */
 }
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
index 7f4a2c53bd..f3140e596d 100644
--- a/arch/i386/boot/header.S
+++ b/arch/i386/boot/header.S
@@ -275,7 +275,7 @@ die:
         hlt
         jmp     die
 
-        .size   die, .-due
+        .size   die, .-die
 
         .section ".initdata", "a"
 setup_corrupt:
diff --git a/arch/i386/boot/memory.c b/arch/i386/boot/memory.c
index 1a2e62db8b..378353956b 100644
--- a/arch/i386/boot/memory.c
+++ b/arch/i386/boot/memory.c
@@ -20,6 +20,7 @@
 
 static int detect_memory_e820(void)
 {
+        int count = 0;
         u32 next = 0;
         u32 size, id;
         u8 err;
@@ -27,20 +28,33 @@ static int detect_memory_e820(void)
 
         do {
                 size = sizeof(struct e820entry);
-                id = SMAP;
+
+                /* Important: %edx is clobbered by some BIOSes,
+                   so it must be either used for the error output
+                   or explicitly marked clobbered. */
                 asm("int $0x15; setc %0"
-                    : "=am" (err), "+b" (next), "+d" (id), "+c" (size),
+                    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
                       "=m" (*desc)
-                    : "D" (desc), "a" (0xe820));
+                    : "D" (desc), "d" (SMAP), "a" (0xe820));
+
+                /* Some BIOSes stop returning SMAP in the middle of
+                   the search loop.  We don't know exactly how the BIOS
+                   screwed up the map at that point, we might have a
+                   partial map, the full map, or complete garbage, so
+                   just return failure. */
+                if (id != SMAP) {
+                        count = 0;
+                        break;
+                }
 
-                if (err || id != SMAP)
+                if (err)
                         break;
 
-                boot_params.e820_entries++;
+                count++;
                 desc++;
-        } while (next && boot_params.e820_entries < E820MAX);
+        } while (next && count < E820MAX);
 
-        return boot_params.e820_entries;
+        return boot_params.e820_entries = count;
 }
 
 static int detect_memory_e801(void)
@@ -89,11 +103,16 @@ static int detect_memory_88(void)
 
 int detect_memory(void)
 {
+        int err = -1;
+
         if (detect_memory_e820() > 0)
-                return 0;
+                err = 0;
 
         if (!detect_memory_e801())
-                return 0;
+                err = 0;
+
+        if (!detect_memory_88())
+                err = 0;
 
-        return detect_memory_88();
+        return err;
 }
diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c
index 6be9ca811d..09fb342cc6 100644
--- a/arch/i386/boot/pm.c
+++ b/arch/i386/boot/pm.c
@@ -122,7 +122,11 @@ static void setup_gdt(void)
                 /* DS: data, read/write, 4 GB, base 0 */
                 [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
         };
-        struct gdt_ptr gdt;
+        /* Xen HVM incorrectly stores a pointer to the gdt_ptr, instead
+           of the gdt_ptr contents.  Thus, make it static so it will
+           stay in memory, at least long enough that we switch to the
+           proper kernel GDT. */
+        static struct gdt_ptr gdt;
 
         gdt.len = sizeof(boot_gdt)-1;
         gdt.ptr = (u32)&boot_gdt + (ds() << 4);
diff --git a/arch/i386/boot/tty.c b/arch/i386/boot/tty.c
index 9c668aad35..f3f14bd263 100644
--- a/arch/i386/boot/tty.c
+++ b/arch/i386/boot/tty.c
@@ -54,9 +54,9 @@ static u8 gettime(void)
         u16 ax = 0x0200;
         u16 cx, dx;
 
-        asm("int $0x1a"
-            : "+a" (ax), "=c" (cx), "=d" (dx)
-            : : "ebx", "esi", "edi");
+        asm volatile("int $0x1a"
+                     : "+a" (ax), "=c" (cx), "=d" (dx)
+                     : : "ebx", "esi", "edi");
 
         return dx >> 8;
 }
@@ -67,7 +67,7 @@ static u8 gettime(void)
 int getchar(void)
 {
         u16 ax = 0;
-        asm("int $0x16" : "+a" (ax));
+        asm volatile("int $0x16" : "+a" (ax));
 
         return ax & 0xff;
 }
@@ -75,9 +75,9 @@ int getchar(void)
 static int kbd_pending(void)
 {
         u8 pending;
-        asm("int $0x16; setnz %0"
-            : "=rm" (pending)
-            : "a" (0x0100));
+        asm volatile("int $0x16; setnz %0"
+                     : "=rm" (pending)
+                     : "a" (0x0100));
         return pending;
 }
 
diff --git a/arch/i386/boot/video-vesa.c b/arch/i386/boot/video-vesa.c
index f1bc71e948..1921907107 100644
--- a/arch/i386/boot/video-vesa.c
+++ b/arch/i386/boot/video-vesa.c
@@ -29,7 +29,7 @@ static void vesa_store_mode_params_graphics(void);
 static int vesa_probe(void)
 {
 #if defined(CONFIG_VIDEO_VESA) || defined(CONFIG_FIRMWARE_EDID)
-        u16 ax;
+        u16 ax, cx, di;
         u16 mode;
         addr_t mode_ptr;
         struct mode_info *mi;
@@ -39,9 +39,11 @@ static int vesa_probe(void)
 
         vginfo.signature = VBE2_MAGIC;
 
-        /* Optimistically assume a VESA BIOS is register-clean... */
         ax = 0x4f00;
-        asm("int $0x10" : "+a" (ax), "=m" (vginfo) : "D" (&vginfo));
+        di = (size_t)&vginfo;
+        asm(INT10
+            : "+a" (ax), "+D" (di), "=m" (vginfo)
+            : : "ebx", "ecx", "edx", "esi");
 
         if (ax != 0x004f ||
             vginfo.signature != VESA_MAGIC ||
@@ -64,9 +66,11 @@ static int vesa_probe(void)
                 memset(&vminfo, 0, sizeof vminfo); /* Just in case... */
 
                 ax = 0x4f01;
-                asm("int $0x10"
-                    : "+a" (ax), "=m" (vminfo)
-                    : "c" (mode), "D" (&vminfo));
+                cx = mode;
+                di = (size_t)&vminfo;
+                asm(INT10
+                    : "+a" (ax), "+c" (cx), "+D" (di), "=m" (vminfo)
+                    : : "ebx", "edx", "esi");
 
                 if (ax != 0x004f)
                         continue;
@@ -102,16 +106,18 @@ static int vesa_probe(void)
 
 static int vesa_set_mode(struct mode_info *mode)
 {
-        u16 ax;
+        u16 ax, bx, cx, di;
         int is_graphic;
         u16 vesa_mode = mode->mode - VIDEO_FIRST_VESA;
 
         memset(&vminfo, 0, sizeof vminfo); /* Just in case... */
 
         ax = 0x4f01;
-        asm("int $0x10"
-            : "+a" (ax), "=m" (vminfo)
-            : "c" (vesa_mode), "D" (&vminfo));
+        cx = vesa_mode;
+        di = (size_t)&vminfo;
+        asm(INT10
+            : "+a" (ax), "+c" (cx), "+D" (di), "=m" (vminfo)
+            : : "ebx", "edx", "esi");
 
         if (ax != 0x004f)
                 return -1;
@@ -129,9 +135,11 @@ static int vesa_set_mode(struct mode_info *mode)
 
 
         ax = 0x4f02;
-        asm volatile("int $0x10"
-                     : "+a" (ax)
-                     : "b" (vesa_mode), "D" (0));
+        bx = vesa_mode;
+        di = 0;
+        asm volatile(INT10
+                     : "+a" (ax), "+b" (bx), "+D" (di)
+                     : : "ecx", "edx", "esi");
 
         if (ax != 0x004f)
                 return -1;
diff --git a/arch/i386/boot/video-vga.c b/arch/i386/boot/video-vga.c
index 700d09a9c9..aef02f9ec0 100644
--- a/arch/i386/boot/video-vga.c
+++ b/arch/i386/boot/video-vga.c
@@ -47,16 +47,16 @@ static u8 vga_set_basic_mode(void)
 
 #ifdef CONFIG_VIDEO_400_HACK
         if (adapter >= ADAPTER_VGA) {
-                asm(INT10
-                    : : "a" (0x1202), "b" (0x0030)
-                    : "ecx", "edx", "esi", "edi");
+                asm volatile(INT10
+                             : : "a" (0x1202), "b" (0x0030)
+                             : "ecx", "edx", "esi", "edi");
         }
 #endif
 
         ax = 0x0f00;
-        asm(INT10
-            : "+a" (ax)
-            : : "ebx", "ecx", "edx", "esi", "edi");
+        asm volatile(INT10
+                     : "+a" (ax)
+                     : : "ebx", "ecx", "edx", "esi", "edi");
 
         mode = (u8)ax;
 
@@ -73,9 +73,10 @@ static u8 vga_set_basic_mode(void)
                 mode = 3;
 
         /* Set the mode */
+        ax = mode;
         asm volatile(INT10
-                     : : "a" (mode)
-                     : "ebx", "ecx", "edx", "esi", "edi");
+                     : "+a" (ax)
+                     : : "ebx", "ecx", "edx", "esi", "edi");
         do_restore = 1;
         return mode;
 }
diff --git a/arch/i386/boot/video.c b/arch/i386/boot/video.c
index 693f20d310..e4ba897bf9 100644
--- a/arch/i386/boot/video.c
+++ b/arch/i386/boot/video.c
@@ -147,7 +147,7 @@ int mode_defined(u16 mode)
 }
 
 /* Set mode (without recalc) */
-static int raw_set_mode(u16 mode)
+static int raw_set_mode(u16 mode, u16 *real_mode)
 {
         int nmode, i;
         struct card_info *card;
@@ -165,8 +165,10 @@ static int raw_set_mode(u16 mode)
 
                         if ((mode == nmode && visible) ||
                             mode == mi->mode ||
-                            mode == (mi->y << 8)+mi->x)
+                            mode == (mi->y << 8)+mi->x) {
+                                *real_mode = mi->mode;
                                 return card->set_mode(mi);
+                        }
 
                         if (visible)
                                 nmode++;
@@ -178,7 +180,7 @@ static int raw_set_mode(u16 mode)
                 if (mode >= card->xmode_first &&
                     mode < card->xmode_first+card->xmode_n) {
                         struct mode_info mix;
-                        mix.mode = mode;
+                        *real_mode = mix.mode = mode;
                         mix.x = mix.y = 0;
                         return card->set_mode(&mix);
                 }
@@ -223,6 +225,7 @@ static void vga_recalc_vertical(void)
 static int set_mode(u16 mode)
 {
         int rv;
+        u16 real_mode;
 
         /* Very special mode numbers... */
         if (mode == VIDEO_CURRENT_MODE)
@@ -232,13 +235,16 @@ static int set_mode(u16 mode)
         else if (mode == EXTENDED_VGA)
                 mode = VIDEO_8POINT;
 
-        rv = raw_set_mode(mode);
+        rv = raw_set_mode(mode, &real_mode);
         if (rv)
                 return rv;
 
         if (mode & VIDEO_RECALC)
                 vga_recalc_vertical();
 
+        /* Save the canonical mode number for the kernel, not
+           an alias, size specification or menu position */
+        boot_params.hdr.vid_mode = real_mode;
         return 0;
 }
 
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index ed0a0f2c15..f22ba8534d 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -151,51 +151,30 @@ bogus_real_magic:
 #define VIDEO_FIRST_V7 0x0900
 
 # Setting of user mode (AX=mode ID) => CF=success
+
+# For now, we only handle VESA modes (0x0200..0x03ff).  To handle other
+# modes, we should probably compile in the video code from the boot
+# directory.
 mode_set:
         movw    %ax, %bx
-#if 0
-        cmpb    $0xff, %ah
-        jz      setalias
-
-        testb   $VIDEO_RECALC>>8, %ah
-        jnz     _setrec
-
-        cmpb    $VIDEO_FIRST_RESOLUTION>>8, %ah
-        jnc     setres
-        
-        cmpb    $VIDEO_FIRST_SPECIAL>>8, %ah
-        jz      setspc
-
-        cmpb    $VIDEO_FIRST_V7>>8, %ah
-        jz      setv7
-#endif
-        
-        cmpb    $VIDEO_FIRST_VESA>>8, %ah
-        jnc     check_vesa
-#if 0   
-        orb     %ah, %ah
-        jz      setmenu
-#endif
-        
-        decb    %ah
-#       jz      setbios                           Add bios modes later
+        subb    $VIDEO_FIRST_VESA>>8, %bh
+        cmpb    $2, %bh
+        jb      check_vesa
 
-setbad: clc
+setbad:
+        clc
         ret
 
 check_vesa:
-        subb    $VIDEO_FIRST_VESA>>8, %bh
         orw     $0x4000, %bx                    # Use linear frame buffer
         movw    $0x4f02, %ax                    # VESA BIOS mode set call
         int     $0x10
         cmpw    $0x004f, %ax                    # AL=4f if implemented
-        jnz     _setbad                         # AH=0 if OK
+        jnz     setbad                          # AH=0 if OK
 
         stc
         ret
 
-_setbad: jmp setbad
-
         .code32
         ALIGN
 
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c
index 9f4ac8b02d..bd72d94e71 100644
--- a/arch/i386/kernel/alternative.c
+++ b/arch/i386/kernel/alternative.c
@@ -445,8 +445,6 @@ void __kprobes text_poke(void *addr, unsigned char *opcode, int len)
 {
         memcpy(addr, opcode, len);
         sync_core();
-        /* Not strictly needed, but can speed CPU recovery up. Ignore cross cacheline
-           case. */
-        if (cpu_has_clflush)
-                asm("clflush (%0) " :: "r" (addr) : "memory");
+        /* Could also do a CLFLUSH here to speed up CPU recovery; but
+           that causes hangs on some VIA CPUs. */
 }
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index ef8f0bc3fc..f0cce3c2dc 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -76,6 +76,7 @@ static unsigned int longhaul_index;
 /* Module parameters */
 static int scale_voltage;
 static int disable_acpi_c3;
+static int revid_errata;
 
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "longhaul", msg)
 
@@ -168,7 +169,10 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index,
 
         rdmsrl(MSR_VIA_LONGHAUL, longhaul.val);
         /* Setup new frequency */
-        longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
+        if (!revid_errata)
+                longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
+        else
+                longhaul.bits.RevisionKey = 0;
         longhaul.bits.SoftBusRatio = clock_ratio_index & 0xf;
         longhaul.bits.SoftBusRatio4 = (clock_ratio_index & 0x10) >> 4;
         /* Setup new voltage */
@@ -272,7 +276,7 @@ static void longhaul_setstate(unsigned int table_index)
 
         dprintk ("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n",
                         fsb, mult/10, mult%10, print_speed(speed/1000));
-
+retry_loop:
         preempt_disable();
         local_irq_save(flags);
 
@@ -344,6 +348,47 @@ static void longhaul_setstate(unsigned int table_index)
         preempt_enable();
 
         freqs.new = calc_speed(longhaul_get_cpu_mult());
+        /* Check if requested frequency is set. */
+        if (unlikely(freqs.new != speed)) {
+                printk(KERN_INFO PFX "Failed to set requested frequency!\n");
+                /* Revision ID = 1 but processor is expecting revision key
+                 * equal to 0. Jumpers at the bottom of processor will change
+                 * multiplier and FSB, but will not change bits in Longhaul
+                 * MSR nor enable voltage scaling. */
+                if (!revid_errata) {
+                        printk(KERN_INFO PFX "Enabling \"Ignore Revision ID\" "
+                                                "option.\n");
+                        revid_errata = 1;
+                        msleep(200);
+                        goto retry_loop;
+                }
+                /* Why ACPI C3 sometimes doesn't work is a mystery for me.
+                 * But it does happen. Processor is entering ACPI C3 state,
+                 * but it doesn't change frequency. I tried poking various
+                 * bits in northbridge registers, but without success. */
+                if (longhaul_flags & USE_ACPI_C3) {
+                        printk(KERN_INFO PFX "Disabling ACPI C3 support.\n");
+                        longhaul_flags &= ~USE_ACPI_C3;
+                        if (revid_errata) {
+                                printk(KERN_INFO PFX "Disabling \"Ignore "
+                                                "Revision ID\" option.\n");
+                                revid_errata = 0;
+                        }
+                        msleep(200);
+                        goto retry_loop;
+                }
+                /* This shouldn't happen. Longhaul ver. 2 was reported not
+                 * working on processors without voltage scaling, but with
+                 * RevID = 1. RevID errata will make things right. Just
+                 * to be 100% sure. */
+                if (longhaul_version == TYPE_LONGHAUL_V2) {
+                        printk(KERN_INFO PFX "Switching to Longhaul ver. 1\n");
+                        longhaul_version = TYPE_LONGHAUL_V1;
+                        msleep(200);
+                        goto retry_loop;
+                }
+        }
+        /* Report true CPU frequency */
         cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
 
         if (!bm_timeout)
@@ -956,11 +1001,20 @@ static void __exit longhaul_exit(void)
         kfree(longhaul_table);
 }
 
+/* Even if BIOS is exporting ACPI C3 state, and it is used
+ * with success when CPU is idle, this state doesn't
+ * trigger frequency transition in some cases. */
 module_param (disable_acpi_c3, int, 0644);
 MODULE_PARM_DESC(disable_acpi_c3, "Don't use ACPI C3 support");
-
+/* Change CPU voltage with frequency. Very usefull to save
+ * power, but most VIA C3 processors aren't supporting it. */
 module_param (scale_voltage, int, 0644);
 MODULE_PARM_DESC(scale_voltage, "Scale voltage of processor");
+/* Force revision key to 0 for processors which doesn't
+ * support voltage scaling, but are introducing itself as
+ * such. */
+module_param(revid_errata, int, 0644);
+MODULE_PARM_DESC(revid_errata, "Ignore CPU Revision ID");
 
 MODULE_AUTHOR ("Dave Jones <davej@codemonkey.org.uk>");
 MODULE_DESCRIPTION ("Longhaul driver for VIA Cyrix processors.");
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c
index d5a456d27d..db6c25aa57 100644
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -515,7 +515,7 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
 
         cpuid4_info[cpu] = kzalloc(
             sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL);
-        if (unlikely(cpuid4_info[cpu] == NULL))
+        if (cpuid4_info[cpu] == NULL)
                 return -ENOMEM;
 
         oldmask = current->cpus_allowed;
@@ -748,6 +748,8 @@ static void __cpuinit cache_remove_dev(struct sys_device * sys_dev)
         unsigned int cpu = sys_dev->id;
         unsigned long i;
 
+        if (cpuid4_info[cpu] == NULL)
+                return;
         for (i = 0; i < num_cache_leaves; i++) {
                 cache_remove_shared_cpu_map(cpu, i);
                 kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj));
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c
index 4be488e73b..93fecd4b03 100644
--- a/arch/i386/kernel/cpu/perfctr-watchdog.c
+++ b/arch/i386/kernel/cpu/perfctr-watchdog.c
@@ -263,8 +263,8 @@ static int setup_k7_watchdog(unsigned nmi_hz)
         unsigned int evntsel;
         struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
 
-        perfctr_msr = MSR_K7_PERFCTR0;
-        evntsel_msr = MSR_K7_EVNTSEL0;
+        perfctr_msr = wd_ops->perfctr;
+        evntsel_msr = wd_ops->evntsel;
 
         wrmsrl(perfctr_msr, 0UL);
 
@@ -343,8 +343,8 @@ static int setup_p6_watchdog(unsigned nmi_hz)
         unsigned int evntsel;
         struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
 
-        perfctr_msr = MSR_P6_PERFCTR0;
-        evntsel_msr = MSR_P6_EVNTSEL0;
+        perfctr_msr = wd_ops->perfctr;
+        evntsel_msr = wd_ops->evntsel;
 
         /* KVM doesn't implement this MSR */
         if (wrmsr_safe(perfctr_msr, 0, 0) < 0)
@@ -569,8 +569,8 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz)
             (ebx & ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT))
                 return 0;
 
-        perfctr_msr = MSR_ARCH_PERFMON_PERFCTR1;
-        evntsel_msr = MSR_ARCH_PERFMON_EVENTSEL1;
+        perfctr_msr = wd_ops->perfctr;
+        evntsel_msr = wd_ops->evntsel;
 
         wrmsrl(perfctr_msr, 0UL);
 
@@ -605,6 +605,16 @@ static struct wd_ops intel_arch_wd_ops = {
         .evntsel = MSR_ARCH_PERFMON_EVENTSEL1,
 };
 
+static struct wd_ops coreduo_wd_ops = {
+        .reserve = single_msr_reserve,
+        .unreserve = single_msr_unreserve,
+        .setup = setup_intel_arch_watchdog,
+        .rearm = p6_rearm,
+        .stop = single_msr_stop_watchdog,
+        .perfctr = MSR_ARCH_PERFMON_PERFCTR0,
+        .evntsel = MSR_ARCH_PERFMON_EVENTSEL0,
+};
+
 static void probe_nmi_watchdog(void)
 {
         switch (boot_cpu_data.x86_vendor) {
@@ -615,6 +625,12 @@ static void probe_nmi_watchdog(void)
                 wd_ops = &k7_wd_ops;
                 break;
         case X86_VENDOR_INTEL:
+                /* Work around Core Duo (Yonah) errata AE49 where perfctr1
+                   doesn't have a working enable bit. */
+                if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 14) {
+                        wd_ops = &coreduo_wd_ops;
+                        break;
+                }
                 if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {
                         wd_ops = &intel_arch_wd_ops;
                         break;
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 4b8a8da4b2..e2f4a1c685 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -754,14 +754,6 @@ static int pirq_entries [MAX_PIRQS];
 static int pirqs_enabled;
 int skip_ioapic_setup;
 
-static int __init ioapic_setup(char *str)
-{
-        skip_ioapic_setup = 1;
-        return 1;
-}
-
-__setup("noapic", ioapic_setup);
-
 static int __init ioapic_pirq_setup(char *str)
 {
         int i, max;
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 8c1c965eb2..c7227e2180 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -115,12 +115,12 @@ static int __init check_nmi_watchdog(void)
                         atomic_dec(&nmi_active);
                 }
         }
+        endflag = 1;
         if (!atomic_read(&nmi_active)) {
                 kfree(prev_nmi_count);
                 atomic_set(&nmi_active, -1);
                 return -1;
         }
-        endflag = 1;
         printk("OK.\n");
 
         /* now that we know it works we can reduce NMI frequency to
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index 0c8f00e69c..7c1b92522e 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -274,7 +274,6 @@ static void clear_singlestep(struct task_struct *child)
 void ptrace_disable(struct task_struct *child)
 { 
         clear_singlestep(child);
-        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
         clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
 }
 
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index cfffe3dd9e..47b0bef335 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -100,36 +100,45 @@ asmlinkage void machine_check(void);
 int kstack_depth_to_print = 24;
 static unsigned int code_bytes = 64;
 
-static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)
+static inline int valid_stack_ptr(struct thread_info *tinfo, void *p, unsigned size)
 {
         return  p > (void *)tinfo &&
-                p < (void *)tinfo + THREAD_SIZE - 3;
+                p <= (void *)tinfo + THREAD_SIZE - size;
 }
 
+/* The form of the top of the frame on the stack */
+struct stack_frame {
+        struct stack_frame *next_frame;
+        unsigned long return_address;
+};
+
 static inline unsigned long print_context_stack(struct thread_info *tinfo,
                                 unsigned long *stack, unsigned long ebp,
                                 struct stacktrace_ops *ops, void *data)
 {
-        unsigned long addr;
-
 #ifdef  CONFIG_FRAME_POINTER
-        while (valid_stack_ptr(tinfo, (void *)ebp)) {
-                unsigned long new_ebp;
-                addr = *(unsigned long *)(ebp + 4);
+        struct stack_frame *frame = (struct stack_frame *)ebp;
+        while (valid_stack_ptr(tinfo, frame, sizeof(*frame))) {
+                struct stack_frame *next;
+                unsigned long addr;
+
+                addr = frame->return_address;
                 ops->address(data, addr);
                 /*
                  * break out of recursive entries (such as
                  * end_of_stack_stop_unwind_function). Also,
                  * we can never allow a frame pointer to
                  * move downwards!
-                 */
-                new_ebp = *(unsigned long *)ebp;
-                if (new_ebp <= ebp)
+                 */
+                next = frame->next_frame;
+                if (next <= frame)
                         break;
-                ebp = new_ebp;
+                frame = next;
         }
 #else
-        while (valid_stack_ptr(tinfo, stack)) {
+        while (valid_stack_ptr(tinfo, stack, sizeof(*stack))) {
+                unsigned long addr;
+
                 addr = *stack++;
                 if (__kernel_text_address(addr))
                         ops->address(data, addr);
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index debd7dbb41..a39280b4dd 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -292,7 +292,6 @@ static struct clocksource clocksource_tsc = {
 
 void mark_tsc_unstable(char *reason)
 {
-        sched_clock_unstable_event();
         if (!tsc_unstable) {
                 tsc_unstable = 1;
                 tsc_enabled = 0;
diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile
index 77fbc9f64f..6914485c0d 100644
--- a/arch/i386/mach-generic/Makefile
+++ b/arch/i386/mach-generic/Makefile
@@ -2,6 +2,6 @@
 # Makefile for the generic architecture
 #
 
-EXTRA_CFLAGS    += -I../kernel
+EXTRA_CFLAGS    := -Iarch/i386/kernel
 
 obj-y                           := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/
diff --git a/arch/i386/mach-voyager/Makefile b/arch/i386/mach-voyager/Makefile
index f24d296513..33b74cf0dd 100644
--- a/arch/i386/mach-voyager/Makefile
+++ b/arch/i386/mach-voyager/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_CFLAGS    += -I../kernel
+EXTRA_CFLAGS    := -Iarch/i386/kernel
 obj-y                   := setup.o voyager_basic.o voyager_thread.o
 
 obj-$(CONFIG_SMP)       += voyager_smp.o voyager_cat.o
diff --git a/arch/i386/mm/highmem.c b/arch/i386/mm/highmem.c
index ad8d86cc68..1c3bf95f73 100644
--- a/arch/i386/mm/highmem.c
+++ b/arch/i386/mm/highmem.c
@@ -34,17 +34,16 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
         /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
         pagefault_disable();
 
-        idx = type + KM_TYPE_NR*smp_processor_id();
-        BUG_ON(!pte_none(*(kmap_pte-idx)));
-
         if (!PageHighMem(page))
                 return page_address(page);
 
+        idx = type + KM_TYPE_NR*smp_processor_id();
         vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+        BUG_ON(!pte_none(*(kmap_pte-idx)));
         set_pte(kmap_pte-idx, mk_pte(page, prot));
         arch_flush_lazy_mmu_mode();
 
-        return (void*) vaddr;
+        return (void *)vaddr;
 }
 
 void *kmap_atomic(struct page *page, enum km_type type)
diff --git a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c
index efdf95ac80..6c06d9c048 100644
--- a/arch/i386/mm/hugetlbpage.c
+++ b/arch/i386/mm/hugetlbpage.c
@@ -367,7 +367,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
                 return -ENOMEM;
 
         if (flags & MAP_FIXED) {
-                if (prepare_hugepage_range(addr, len, pgoff))
+                if (prepare_hugepage_range(addr, len))
                         return -EINVAL;
                 return addr;
         }
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 665db063a4..8434f2323b 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -550,6 +550,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
                 case PCI_DEVICE_ID_INTEL_ICH9_3:
                 case PCI_DEVICE_ID_INTEL_ICH9_4:
                 case PCI_DEVICE_ID_INTEL_ICH9_5:
+                case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
                         r->name = "PIIX/ICH";
                         r->get = pirq_piix_get;
                         r->set = pirq_piix_set;
diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
index 5f5193401b..10ac8c316c 100644
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
@@ -412,7 +412,7 @@ struct irq_routing_options {
         u16 segment;
 } __attribute__((packed));
 
-struct irq_routing_table * __devinit pcibios_get_irq_routing_table(void)
+struct irq_routing_table * pcibios_get_irq_routing_table(void)
 {
         struct irq_routing_options opt;
         struct irq_routing_table *rt = NULL;
diff --git a/arch/i386/xen/enlighten.c b/arch/i386/xen/enlighten.c
index f0c37511d8..f01bfcd4bd 100644
--- a/arch/i386/xen/enlighten.c
+++ b/arch/i386/xen/enlighten.c
@@ -623,8 +623,8 @@ static unsigned long xen_read_cr2_direct(void)
 
 static void xen_write_cr4(unsigned long cr4)
 {
-        /* never allow TSC to be disabled */
-        native_write_cr4(cr4 & ~X86_CR4_TSD);
+        /* Just ignore cr4 changes; Xen doesn't allow us to do
+           anything anyway. */
 }
 
 static unsigned long xen_read_cr3(void)
diff --git a/arch/i386/xen/mmu.c b/arch/i386/xen/mmu.c
index 4ae038aa6c..874db0cd1d 100644
--- a/arch/i386/xen/mmu.c
+++ b/arch/i386/xen/mmu.c
@@ -559,6 +559,9 @@ void xen_exit_mmap(struct mm_struct *mm)
         put_cpu();
 
         spin_lock(&mm->page_table_lock);
-        xen_pgd_unpin(mm->pgd);
+
+        /* pgd may not be pinned in the error exit path of execve */
+        if (PagePinned(virt_to_page(mm->pgd)))
+                xen_pgd_unpin(mm->pgd);
         spin_unlock(&mm->page_table_lock);
 }
diff --git a/arch/ia64/hp/sim/hpsim_console.c b/arch/ia64/hp/sim/hpsim_console.c
index 6e149c8ab8..01663bc42b 100644
--- a/arch/ia64/hp/sim/hpsim_console.c
+++ b/arch/ia64/hp/sim/hpsim_console.c
@@ -21,6 +21,7 @@
 #include <asm/machvec.h>
 #include <asm/pgtable.h>
 #include <asm/sal.h>
+#include <asm/hpsim.h>
 
 #include "hpsim_ssc.h"
 
@@ -28,7 +29,7 @@ static int simcons_init (struct console *, char *);
 static void simcons_write (struct console *, const char *, unsigned);
 static struct tty_driver *simcons_console_device (struct console *, int *);
 
-struct console hpsim_cons = {
+static struct console hpsim_cons = {
         .name =         "simcons",
         .write =        simcons_write,
         .device =       simcons_console_device,
@@ -58,7 +59,18 @@ simcons_write (struct console *cons, const char *buf, unsigned count)
 
 static struct tty_driver *simcons_console_device (struct console *c, int *index)
 {
-        extern struct tty_driver *hp_simserial_driver;
         *index = c->index;
         return hp_simserial_driver;
 }
+
+int simcons_register(void)
+{
+        if (!ia64_platform_is("hpsim"))
+                return 1;
+
+        if (hpsim_cons.flags & CON_ENABLED)
+                return 1;
+
+        register_console(&hpsim_cons);
+        return 0;
+}
diff --git a/arch/ia64/hp/sim/hpsim_setup.c b/arch/ia64/hp/sim/hpsim_setup.c
index f2297192a5..f629e903eb 100644
--- a/arch/ia64/hp/sim/hpsim_setup.c
+++ b/arch/ia64/hp/sim/hpsim_setup.c
@@ -21,6 +21,7 @@
 #include <asm/machvec.h>
 #include <asm/pgtable.h>
 #include <asm/sal.h>
+#include <asm/hpsim.h>
 
 #include "hpsim_ssc.h"
 
@@ -41,11 +42,5 @@ hpsim_setup (char **cmdline_p)
 {
         ROOT_DEV = Root_SDA1;           /* default to first SCSI drive */
 
-#ifdef CONFIG_HP_SIMSERIAL_CONSOLE
-        {
-                extern struct console hpsim_cons;
-                if (ia64_platform_is("hpsim"))
-                        register_console(&hpsim_cons);
-        }
-#endif
+        simcons_register();
 }
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index f26077a773..4017696ada 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -22,6 +22,9 @@
 #include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/irq.h>
+#include <asm/hpsim.h>
+
+#include "hpsim_ssc.h"
 
 #define SIMETH_RECV_MAX 10
 
@@ -35,12 +38,6 @@
 #define SIMETH_FRAME_SIZE       ETH_FRAME_LEN
 
 
-#define SSC_NETDEV_PROBE                100
-#define SSC_NETDEV_SEND                 101
-#define SSC_NETDEV_RECV                 102
-#define SSC_NETDEV_ATTACH               103
-#define SSC_NETDEV_DETACH               104
-
 #define NETWORK_INTR                    8
 
 struct simeth_local {
@@ -124,9 +121,6 @@ simeth_probe (void)
         return r;
 }
 
-extern long ia64_ssc (long, long, long, long, int);
-extern void ia64_ssc_connect_irq (long intr, long irq);
-
 static inline int
 netdev_probe(char *name, unsigned char *ether)
 {
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index e62694f8ef..4552a1cf5b 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <asm/irq.h>
+#include "hpsim_ssc.h"
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -59,8 +60,6 @@ struct disk_stat {
         unsigned count;
 };
 
-extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr);
-
 static int desc[16] = {
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index c47c8acc96..00a4599e5f 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -82,7 +82,7 @@ struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = {
 };
 
 DEFINE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq) = {
-        [0 ... IA64_NUM_VECTORS - 1] = IA64_SPURIOUS_INT_VECTOR
+        [0 ... IA64_NUM_VECTORS - 1] = -1
 };
 
 static cpumask_t vector_table[IA64_NUM_VECTORS] = {
@@ -179,7 +179,7 @@ static void __clear_irq_vector(int irq)
         domain = cfg->domain;
         cpus_and(mask, cfg->domain, cpu_online_map);
         for_each_cpu_mask(cpu, mask)
-                per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR;
+                per_cpu(vector_irq, cpu)[vector] = -1;
         cfg->vector = IRQ_VECTOR_UNASSIGNED;
         cfg->domain = CPU_MASK_NONE;
         irq_status[irq] = IRQ_UNUSED;
@@ -249,7 +249,7 @@ void __setup_vector_irq(int cpu)
 
         /* Clear vector_irq */
         for (vector = 0; vector < IA64_NUM_VECTORS; ++vector)
-                per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR;
+                per_cpu(vector_irq, cpu)[vector] = -1;
         /* Mark the inuse vectors */
         for (irq = 0; irq < NR_IRQS; ++irq) {
                 if (!cpu_isset(cpu, irq_cfg[irq].domain))
@@ -432,10 +432,18 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
                 } else if (unlikely(IS_RESCHEDULE(vector)))
                         kstat_this_cpu.irqs[vector]++;
                 else {
+                        int irq = local_vector_to_irq(vector);
+
                         ia64_setreg(_IA64_REG_CR_TPR, vector);
                         ia64_srlz_d();
 
-                        generic_handle_irq(local_vector_to_irq(vector));
+                        if (unlikely(irq < 0)) {
+                                printk(KERN_ERR "%s: Unexpected interrupt "
+                                       "vector %d on CPU %d is not mapped "
+                                       "to any IRQ!\n", __FUNCTION__, vector,
+                                       smp_processor_id());
+                        } else
+                                generic_handle_irq(irq);
 
                         /*
                          * Disable interrupts and send EOI:
@@ -483,6 +491,7 @@ void ia64_process_pending_intr(void)
                         kstat_this_cpu.irqs[vector]++;
                 else {
                         struct pt_regs *old_regs = set_irq_regs(NULL);
+                        int irq = local_vector_to_irq(vector);
 
                         ia64_setreg(_IA64_REG_CR_TPR, vector);
                         ia64_srlz_d();
@@ -493,8 +502,15 @@ void ia64_process_pending_intr(void)
                          * it will work. I hope it works!.
                          * Probably could shared code.
                          */
-                        vectors_in_migration[local_vector_to_irq(vector)]=0;
-                        generic_handle_irq(local_vector_to_irq(vector));
+                        if (unlikely(irq < 0)) {
+                                printk(KERN_ERR "%s: Unexpected interrupt "
+                                       "vector %d on CPU %d not being mapped "
+                                       "to any IRQ!!\n", __FUNCTION__, vector,
+                                       smp_processor_id());
+                        } else {
+                                vectors_in_migration[irq]=0;
+                                generic_handle_irq(irq);
+                        }
                         set_irq_regs(old_regs);
 
                         /*
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 122444a978..2e96f17b2f 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1577,7 +1577,6 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
 
               case PTRACE_DETACH:
                 /* detach a process that was attached. */
-                clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
                 ret = ptrace_detach(child, data);
                 goto out_tsk;
 
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 407efea04b..9e392a30d1 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -60,6 +60,7 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
+#include <asm/hpsim.h>
 
 #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
 # error "struct cpuinfo_ia64 too big!"
@@ -389,13 +390,8 @@ early_console_setup (char *cmdline)
         if (!efi_setup_pcdp_console(cmdline))
                 earlycons++;
 #endif
-#ifdef CONFIG_HP_SIMSERIAL_CONSOLE
-        {
-                extern struct console hpsim_cons;
-                register_console(&hpsim_cons);
+        if (!simcons_register())
                 earlycons++;
-        }
-#endif
 
         return (earlycons) ? 0 : -1;
 }
@@ -960,6 +956,11 @@ cpu_init (void)
 
         /* clear TPR & XTP to enable all interrupt classes: */
         ia64_setreg(_IA64_REG_CR_TPR, 0);
+
+        /* Clear any pending interrupts left by SAL/EFI */
+        while (ia64_get_ivr() != IA64_SPURIOUS_INT_VECTOR)
+                ia64_eoi();
+
 #ifdef CONFIG_SMP
         normal_xtp();
 #endif
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 62209dcf06..308772f7cd 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -58,6 +58,7 @@
 #include <asm/system.h>
 #include <asm/tlbflush.h>
 #include <asm/unistd.h>
+#include <asm/sn/arch.h>
 
 #define SMP_DEBUG 0
 
@@ -730,6 +731,11 @@ int __cpu_disable(void)
                 return (-EBUSY);
         }
 
+        if (ia64_platform_is("sn2")) {
+                if (!sn_cpu_disable_allowed(cpu))
+                        return -EBUSY;
+        }
+
         cpu_clear(cpu, cpu_online_map);
 
         if (migrate_platform_irqs(cpu)) {
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 7ac8592a35..d3c538be46 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -17,6 +17,7 @@
 #include <linux/bootmem.h>
 #include <linux/efi.h>
 #include <linux/mm.h>
+#include <linux/nmi.h>
 #include <linux/swap.h>
 
 #include <asm/meminit.h>
@@ -56,6 +57,8 @@ void show_mem(void)
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
                         struct page *page;
+                        if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
+                                touch_nmi_watchdog();
                         if (pfn_valid(pgdat->node_start_pfn + i))
                                 page = pfn_to_page(pgdat->node_start_pfn + i);
                         else {
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 0dbf0e81f8..0d34585058 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -16,6 +16,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/nmi.h>
 #include <linux/swap.h>
 #include <linux/bootmem.h>
 #include <linux/acpi.h>
@@ -533,6 +534,8 @@ void show_mem(void)
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
                         struct page *page;
+                        if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
+                                touch_nmi_watchdog();
                         if (pfn_valid(pgdat->node_start_pfn + i))
                                 page = pfn_to_page(pgdat->node_start_pfn + i);
                         else {
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index d22861c5b0..a9ff685aea 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -75,10 +75,8 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
  * Don't actually need to do any preparation, but need to make sure
  * the address is in the right region.
  */
-int prepare_hugepage_range(unsigned long addr, unsigned long len, pgoff_t pgoff)
+int prepare_hugepage_range(unsigned long addr, unsigned long len)
 {
-        if (pgoff & (~HPAGE_MASK >> PAGE_SHIFT))
-                return -EINVAL;
         if (len & ~HPAGE_MASK)
                 return -EINVAL;
         if (addr & ~HPAGE_MASK)
@@ -151,7 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
 
         /* Handle MAP_FIXED */
         if (flags & MAP_FIXED) {
-                if (prepare_hugepage_range(addr, len, pgoff))
+                if (prepare_hugepage_range(addr, len))
                         return -EINVAL;
                 return addr;
         }
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c
index 2c3f9dfca7..b663168da5 100644
--- a/arch/ia64/sn/kernel/huberror.c
+++ b/arch/ia64/sn/kernel/huberror.c
@@ -185,11 +185,14 @@ void hubiio_crb_error_handler(struct hubdev_info *hubdev_info)
  */
 void hub_error_init(struct hubdev_info *hubdev_info)
 {
+
         if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED,
-                        "SN_hub_error", (void *)hubdev_info))
+                        "SN_hub_error", (void *)hubdev_info)) {
                 printk("hub_error_init: Failed to request_irq for 0x%p\n",
                     hubdev_info);
-        return;
+                return;
+        }
+        sn_set_err_irq_affinity(SGI_II_ERROR);
 }
 
 
@@ -202,11 +205,14 @@ void hub_error_init(struct hubdev_info *hubdev_info)
  */
 void ice_error_init(struct hubdev_info *hubdev_info)
 {
+
         if (request_irq
             (SGI_TIO_ERROR, (void *)hub_eint_handler, IRQF_SHARED, "SN_TIO_error",
-             (void *)hubdev_info))
+             (void *)hubdev_info)) {
                 printk("ice_error_init: request_irq() error hubdev_info 0x%p\n",
                        hubdev_info);
-        return;
+                return;
+        }
+        sn_set_err_irq_affinity(SGI_TIO_ERROR);
 }
 
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 3600473894..0f9b12683b 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -19,6 +19,7 @@
 #include <asm/sn/pcidev.h>
 #include <asm/sn/shub_mmr.h>
 #include <asm/sn/sn_sal.h>
+#include <asm/sn/sn_feature_sets.h>
 
 static void force_interrupt(int irq);
 static void register_intr_pda(struct sn_irq_info *sn_irq_info);
@@ -233,6 +234,20 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)
                 (void)sn_retarget_vector(sn_irq_info, nasid, slice);
 }
 
+#ifdef CONFIG_SMP
+void sn_set_err_irq_affinity(unsigned int irq)
+{
+        /*
+         * On systems which support CPU disabling (SHub2), all error interrupts
+         * are targetted at the boot CPU.
+         */
+        if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT))
+                set_irq_affinity_info(irq, cpu_physical_id(0), 0);
+}
+#else
+void sn_set_err_irq_affinity(unsigned int irq) { }
+#endif
+
 static void
 sn_mask_irq(unsigned int irq)
 {
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 033c8a9f00..f3c69329e1 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -40,6 +40,7 @@
 #include <asm/sn/shub_mmr.h>
 #include <asm/sn/nodepda.h>
 #include <asm/sn/rw_mmr.h>
+#include <asm/sn/sn_feature_sets.h>
 
 DEFINE_PER_CPU(struct ptc_stats, ptcstats);
 DECLARE_PER_CPU(struct ptc_stats, ptcstats);
@@ -429,6 +430,31 @@ void sn2_send_IPI(int cpuid, int vector, int delivery_mode, int redirect)
         sn_send_IPI_phys(nasid, physid, vector, delivery_mode);
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
+/**
+ * sn_cpu_disable_allowed - Determine if a CPU can be disabled.
+ * @cpu - CPU that is requested to be disabled.
+ *
+ * CPU disable is only allowed on SHub2 systems running with a PROM
+ * that supports CPU disable. It is not permitted to disable the boot processor.
+ */
+bool sn_cpu_disable_allowed(int cpu)
+{
+        if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT)) {
+                if (cpu != 0)
+                        return true;
+                else
+                        printk(KERN_WARNING
+                              "Disabling the boot processor is not allowed.\n");
+
+        } else
+                printk(KERN_WARNING
+                       "CPU disable is not supported on this system.\n");
+
+        return false;
+}
+#endif /* CONFIG_HOTPLUG_CPU */
+
 #ifdef CONFIG_PROC_FS
 
 #define PTC_BASENAME    "sgi_sn/ptc_statistics"
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index df8d5bed61..1a8e49607f 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -66,7 +66,8 @@ static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret)
         }
 
         sz = sn_hwperf_obj_cnt * sizeof(struct sn_hwperf_object_info);
-        if ((objbuf = (struct sn_hwperf_object_info *) vmalloc(sz)) == NULL) {
+        objbuf = vmalloc(sz);
+        if (objbuf == NULL) {
                 printk("sn_hwperf_enum_objects: vmalloc(%d) failed\n", (int)sz);
                 e = -ENOMEM;
                 goto out;
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 42485ad50c..ab3eaf85fe 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -145,6 +145,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                 printk(KERN_WARNING
                        "pcibr cannot allocate interrupt for error handler\n");
         }
+        sn_set_err_irq_affinity(SGI_PCIASIC_ERROR);
 
         /* 
          * Update the Bridge with the "kernel" pagesize 
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index d798dd4d0d..ef048a6747 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -654,6 +654,8 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                        __FUNCTION__, SGI_TIOCA_ERROR,
                        (int)tioca_common->ca_common.bs_persist_busnum);
 
+        sn_set_err_irq_affinity(SGI_TIOCA_ERROR);
+
         /* Setup locality information */
         controller->node = tioca_kern->ca_closest_node;
         return tioca_common;
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c
index 84b72b27e2..cee9379d44 100644
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
@@ -1034,6 +1034,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                        tioce_common->ce_pcibus.bs_persist_segment,
                        tioce_common->ce_pcibus.bs_persist_busnum);
 
+        sn_set_err_irq_affinity(SGI_PCIASIC_ERROR);
         return tioce_common;
 }
 
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 8ccf3e47bf..bd5fe76401 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -57,9 +57,13 @@ config PLAT_MAPPI
 
 config PLAT_USRV
         bool "uServer"
+        select PLAT_HAS_INT1ICU
 
 config PLAT_M32700UT
         bool "M32700UT"
+        select PLAT_HAS_INT0ICU
+        select PLAT_HAS_INT1ICU
+        select PLAT_HAS_INT2ICU
         help
           The M3T-M32700UT is an evaluation board based on uT-Engine
           specification.  This board has an M32700 (Chaos) evaluation chip.
@@ -68,6 +72,9 @@ config PLAT_M32700UT
 
 config PLAT_OPSPUT
         bool "OPSPUT"
+        select PLAT_HAS_INT0ICU
+        select PLAT_HAS_INT1ICU
+        select PLAT_HAS_INT2ICU
         help
           The OPSPUT is an evaluation board based on uT-Engine
           specification.  This board has a OPSP-REP chip.
@@ -89,6 +96,7 @@ config PLAT_MAPPI3
 
 config PLAT_M32104UT
         bool "M32104UT"
+        select PLAT_HAS_INT1ICU
         help
           The M3T-M32104UT is an reference board based on uT-Engine
           specification.  This board has a M32104 chip.
@@ -149,6 +157,18 @@ config ISA_DUAL_ISSUE
         depends on CHIP_M32700 || CHIP_OPSP
         default y
 
+config PLAT_HAS_INT0ICU
+        bool
+        default n
+
+config PLAT_HAS_INT1ICU
+        bool
+        default n
+
+config PLAT_HAS_INT2ICU
+        bool
+        default n
+
 config BUS_CLOCK
         int "Bus Clock [Hz] (integer)"
         default "70000000" if PLAT_MAPPI
diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile
index cdf63b210c..60e12f3126 100644
--- a/arch/m32r/Makefile
+++ b/arch/m32r/Makefile
@@ -36,7 +36,8 @@ LIBGCC	:= $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 libs-y  += arch/m32r/lib/ $(LIBGCC)
 core-y  += arch/m32r/kernel/    \
            arch/m32r/mm/        \
-           arch/m32r/boot/
+           arch/m32r/boot/      \
+           arch/m32r/platforms/
 
 drivers-$(CONFIG_OPROFILE)      += arch/m32r/oprofile/
 
diff --git a/arch/m32r/m32104ut/defconfig.m32104ut b/arch/m32r/configs/m32104ut_defconfig
index 1f88f493a9..9b5af6cd2e 100644
--- a/arch/m32r/m32104ut/defconfig.m32104ut
+++ b/arch/m32r/configs/m32104ut_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Wed Dec 13 17:22:20 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:35 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -23,17 +26,18 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
@@ -46,29 +50,29 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
-CONFIG_SLAB=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -117,13 +121,18 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00700000
 CONFIG_IRAM_SIZE=0x00010000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 # CONFIG_SMP is not set
 CONFIG_NODES_SHIFT=1
@@ -131,6 +140,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ISA=y
 
 #
@@ -139,10 +149,6 @@ CONFIG_ISA=y
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 # CONFIG_BINFMT_FLAT is not set
@@ -156,13 +162,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -187,10 +193,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -206,12 +208,15 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 # CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
@@ -229,6 +234,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
@@ -248,7 +254,6 @@ CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -257,20 +262,8 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -297,7 +290,17 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -310,28 +313,12 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 CONFIG_PARPORT=m
 # CONFIG_PARPORT_GSC is not set
 # CONFIG_PARPORT_AX88796 is not set
 CONFIG_PARPORT_1284=y
-
-#
-# Plug and Play support
-#
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 
@@ -339,29 +326,19 @@ CONFIG_PNP=y
 # Protocols
 #
 CONFIG_ISAPNP=y
-
-#
-# Block devices
-#
+# CONFIG_PNPACPI is not set
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD_WCACHE=y
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -376,16 +353,17 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -393,6 +371,8 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -413,6 +393,8 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -420,12 +402,8 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
@@ -441,19 +419,6 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 # CONFIG_MD_LINEAR is not set
@@ -470,43 +435,17 @@ CONFIG_DM_SNAPSHOT=m
 # CONFIG_DM_MIRROR is not set
 # CONFIG_DM_ZERO is not set
 # CONFIG_DM_MULTIPATH is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
+# CONFIG_DM_DELAY is not set
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_NET_SB1000 is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_NET_VENDOR_3COM=y
@@ -536,28 +475,15 @@ CONFIG_NET_PCI=y
 # CONFIG_APRICOT is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_NET_POCKET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PLIP is not set
 # CONFIG_PPP is not set
@@ -566,15 +492,7 @@ CONFIG_NET_PCI=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -582,6 +500,7 @@ CONFIG_NET_PCI=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -607,12 +526,19 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -657,35 +583,17 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_PRINTER is not set
 # CONFIG_PPDEV is not set
 # CONFIG_TIPAR is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
 
 #
@@ -702,6 +610,8 @@ CONFIG_I2C_ELEKTOR=m
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_PCA_ISA is not set
 
@@ -710,11 +620,13 @@ CONFIG_I2C_ELEKTOR=m
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -725,21 +637,17 @@ CONFIG_I2C_ELEKTOR=m
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_AD7418 is not set
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 # CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
 CONFIG_SENSORS_ADM1031=m
 # CONFIG_SENSORS_ADM9240 is not set
 CONFIG_SENSORS_ASB100=m
@@ -761,8 +669,12 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_LM87 is not set
 CONFIG_SENSORS_LM90=m
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 CONFIG_SENSORS_MAX1619=m
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_DME1737 is not set
 CONFIG_SENSORS_SMSC47M1=m
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -770,29 +682,27 @@ CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_W83781D=m
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627HF=m
 # CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_PMS is not set
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
@@ -801,11 +711,9 @@ CONFIG_VIDEO_CQCAM=m
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
+# CONFIG_TUNER_TEA5761 is not set
 # CONFIG_VIDEO_M32R_AR is not set
-
-#
-# Radio Adapters
-#
+CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_CADET is not set
 # CONFIG_RADIO_RTRACK is not set
 # CONFIG_RADIO_RTRACK2 is not set
@@ -817,16 +725,20 @@ CONFIG_VIDEO_CQCAM=m
 # CONFIG_RADIO_TRUST is not set
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 
 #
@@ -836,16 +748,15 @@ CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+CONFIG_HID_DEBUG=y
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -858,50 +769,19 @@ CONFIG_DUMMY_CONSOLE=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
+# CONFIG_AUXDISPLAY is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -1000,6 +880,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1007,7 +888,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1060,6 +940,11 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 CONFIG_PROFILING=y
@@ -1072,29 +957,24 @@ CONFIG_OPROFILE=m
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
@@ -1103,9 +983,14 @@ CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_WP512=m
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1120,21 +1005,23 @@ CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.smp b/arch/m32r/configs/m32700ut.smp_defconfig
index 13579917af..af3b981791 100644
--- a/arch/m32r/m32700ut/defconfig.m32700ut.smp
+++ b/arch/m32r/configs/m32700ut.smp_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Tue Dec 12 17:52:38 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:35 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -23,19 +26,20 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -47,17 +51,18 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -65,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -123,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00080000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 CONFIG_SMP=y
 # CONFIG_CHIP_M32700_TS1 is not set
@@ -139,6 +149,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -147,10 +158,6 @@ CONFIG_NODES_SHIFT=1
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -164,13 +171,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -203,20 +210,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -242,7 +237,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -255,15 +260,7 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -278,6 +275,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # User Modules And Translation Layers
 #
 # CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -314,7 +312,6 @@ CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -337,29 +334,15 @@ CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -368,18 +351,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -395,14 +370,15 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -410,6 +386,8 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -430,6 +408,8 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -437,79 +417,31 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_NE2000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -517,15 +449,7 @@ CONFIG_SMC91X=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -533,6 +457,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -549,6 +474,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -587,35 +513,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
 CONFIG_DS1302=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -623,65 +528,76 @@ CONFIG_DS1302=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 CONFIG_VIDEO_M32R_AR=m
 CONFIG_VIDEO_M32R_AR_M64278=m
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Radio Adapters
-#
-
-#
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 CONFIG_FB_S1D13XXX=y
 # CONFIG_FB_VIRTUAL is not set
 
@@ -691,29 +607,25 @@ CONFIG_FB_S1D13XXX=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_M32R_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -726,35 +638,20 @@ CONFIG_LOGO_M32R_CLUT224=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 CONFIG_MMC=y
 CONFIG_MMC_DEBUG=y
-CONFIG_MMC_BLOCK=y
-# CONFIG_MMC_TIFM_SD is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
+# CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# LED Triggers
-#
-
-#
-# InfiniBand support
+# MMC/SD Card Drivers
 #
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# MMC/SD Host Controller Drivers
 #
+# CONFIG_NEW_LEDS is not set
 
 #
 # Real Time Clock
@@ -762,17 +659,9 @@ CONFIG_MMC_BLOCK=y
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -849,7 +738,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
@@ -872,6 +760,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -879,7 +768,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -932,6 +820,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 CONFIG_PROFILING=y
@@ -944,29 +837,27 @@ CONFIG_OPROFILE=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.up b/arch/m32r/configs/m32700ut.up_defconfig
index 190f961d33..a31823ffe2 100644
--- a/arch/m32r/m32700ut/defconfig.m32700ut.up
+++ b/arch/m32r/configs/m32700ut.up_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Tue Dec 12 12:07:08 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:35 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -24,18 +27,19 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -47,29 +51,29 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -122,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00080000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 # CONFIG_SMP is not set
 CONFIG_NODES_SHIFT=1
@@ -136,6 +146,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -144,10 +155,6 @@ CONFIG_NODES_SHIFT=1
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -161,13 +168,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -200,20 +207,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -239,7 +234,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -252,15 +257,7 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -275,6 +272,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # User Modules And Translation Layers
 #
 # CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -311,7 +309,6 @@ CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -334,29 +331,15 @@ CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -365,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -392,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -407,6 +383,8 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -427,6 +405,8 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -434,79 +414,31 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_NE2000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -514,15 +446,7 @@ CONFIG_SMC91X=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -530,6 +454,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -546,6 +471,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -584,35 +510,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
 CONFIG_DS1302=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -620,65 +525,76 @@ CONFIG_DS1302=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 CONFIG_VIDEO_M32R_AR=m
 CONFIG_VIDEO_M32R_AR_M64278=m
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Radio Adapters
-#
-
-#
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 CONFIG_FB_S1D13XXX=y
 # CONFIG_FB_VIRTUAL is not set
 
@@ -688,29 +604,25 @@ CONFIG_FB_S1D13XXX=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_M32R_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -723,35 +635,20 @@ CONFIG_LOGO_M32R_CLUT224=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 CONFIG_MMC=y
 CONFIG_MMC_DEBUG=y
-CONFIG_MMC_BLOCK=y
-# CONFIG_MMC_TIFM_SD is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
+# CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# LED Triggers
-#
-
-#
-# InfiniBand support
+# MMC/SD Card Drivers
 #
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# MMC/SD Host Controller Drivers
 #
+# CONFIG_NEW_LEDS is not set
 
 #
 # Real Time Clock
@@ -759,17 +656,9 @@ CONFIG_MMC_BLOCK=y
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -846,7 +735,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
@@ -869,6 +757,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -876,7 +765,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -929,6 +817,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 CONFIG_PROFILING=y
@@ -941,29 +834,27 @@ CONFIG_OPROFILE=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi/defconfig.nommu b/arch/m32r/configs/mappi.nommu_defconfig
index fbf6c384c9..e3379de1f0 100644
--- a/arch/m32r/mappi/defconfig.nommu
+++ b/arch/m32r/configs/mappi.nommu_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Wed Dec 13 17:57:45 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:36 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -27,13 +30,14 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_IKCONFIG_PROC is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -45,28 +49,28 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
-CONFIG_SLAB=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -119,13 +123,18 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00080000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 # CONFIG_SMP is not set
 CONFIG_NODES_SHIFT=1
@@ -133,6 +142,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -151,10 +161,6 @@ CONFIG_M32R_PCC=y
 CONFIG_PCCARD_NONSTATIC=y
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_FLAT=y
@@ -170,13 +176,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -209,20 +215,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -248,7 +242,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -261,29 +265,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -292,18 +277,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_IDE is not set
 
 #
@@ -311,74 +288,26 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
-CONFIG_NE2000=y
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# PCMCIA network device support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_NET_PCMCIA is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -386,15 +315,7 @@ CONFIG_NE2000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -402,6 +323,7 @@ CONFIG_NE2000=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -418,6 +340,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -452,41 +375,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -494,47 +396,56 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Multimedia devices
+# Multifunction device drivers
 #
-# CONFIG_VIDEO_DEV is not set
+# CONFIG_MFD_SM501 is not set
 
 #
-# Digital Video Broadcasting Devices
+# Multimedia devices
 #
-# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Sound
+# Display device support
 #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
 
 #
-# USB support
+# Sound
 #
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -547,50 +458,18 @@ CONFIG_FIRMWARE_EDID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -676,6 +555,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -683,7 +563,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -736,6 +615,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -747,29 +631,27 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi/defconfig.smp b/arch/m32r/configs/mappi.smp_defconfig
index 168669202b..b86fb37fc6 100644
--- a/arch/m32r/mappi/defconfig.smp
+++ b/arch/m32r/configs/mappi.smp_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Wed Dec 13 17:50:59 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:35 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -23,17 +26,19 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -46,17 +51,18 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -64,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -122,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00080000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 CONFIG_SMP=y
 CONFIG_CHIP_M32700_TS1=y
@@ -138,6 +149,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -156,10 +168,6 @@ CONFIG_M32R_PCC=y
 CONFIG_PCCARD_NONSTATIC=y
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -173,12 +181,12 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 # CONFIG_PACKET is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -211,20 +219,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -250,7 +246,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -263,15 +269,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -286,6 +284,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -311,7 +310,6 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -333,29 +331,15 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -364,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=m
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=m
@@ -391,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=m
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -406,74 +383,26 @@ CONFIG_IDE_GENERIC=m
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
-CONFIG_NE2000=y
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# PCMCIA network device support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_NET_PCMCIA is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -481,15 +410,7 @@ CONFIG_NE2000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -497,6 +418,7 @@ CONFIG_NE2000=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -516,6 +438,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -550,41 +473,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -592,47 +494,56 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Multimedia devices
+# Multifunction device drivers
 #
-# CONFIG_VIDEO_DEV is not set
+# CONFIG_MFD_SM501 is not set
 
 #
-# Digital Video Broadcasting Devices
+# Multimedia devices
 #
-# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Sound
+# Display device support
 #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
 
 #
-# USB support
+# Sound
 #
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -645,50 +556,18 @@ CONFIG_FIRMWARE_EDID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -761,9 +640,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-CONFIG_JFFS_FS=y
-CONFIG_JFFS_FS_VERBOSE=0
-CONFIG_JFFS_PROC_FS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -794,6 +670,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -801,7 +678,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -854,6 +730,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -865,31 +746,29 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi/defconfig.up b/arch/m32r/configs/mappi.up_defconfig
index 5ba00603c1..114a6c9b60 100644
--- a/arch/m32r/mappi/defconfig.up
+++ b/arch/m32r/configs/mappi.up_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Wed Dec 13 17:51:20 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:35 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -24,16 +27,18 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -46,29 +51,29 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -121,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00080000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 # CONFIG_SMP is not set
 CONFIG_NODES_SHIFT=1
@@ -135,6 +146,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -153,10 +165,6 @@ CONFIG_M32R_PCC=y
 CONFIG_PCCARD_NONSTATIC=y
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -170,12 +178,12 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 # CONFIG_PACKET is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -208,20 +216,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -247,7 +243,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -260,15 +266,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -283,6 +281,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -308,7 +307,6 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -330,29 +328,15 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -361,18 +345,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=m
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=m
@@ -388,14 +364,15 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=m
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -403,74 +380,26 @@ CONFIG_IDE_GENERIC=m
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
-CONFIG_NE2000=y
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# PCMCIA network device support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_NET_PCMCIA is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -478,15 +407,7 @@ CONFIG_NE2000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -494,6 +415,7 @@ CONFIG_NE2000=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -513,6 +435,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -547,41 +470,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -589,47 +491,56 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Multimedia devices
+# Multifunction device drivers
 #
-# CONFIG_VIDEO_DEV is not set
+# CONFIG_MFD_SM501 is not set
 
 #
-# Digital Video Broadcasting Devices
+# Multimedia devices
 #
-# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Sound
+# Display device support
 #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
 
 #
-# USB support
+# Sound
 #
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -642,50 +553,18 @@ CONFIG_FIRMWARE_EDID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -758,9 +637,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-CONFIG_JFFS_FS=y
-CONFIG_JFFS_FS_VERBOSE=0
-CONFIG_JFFS_PROC_FS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -791,6 +667,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -798,7 +675,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -851,6 +727,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -862,31 +743,29 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi2/defconfig.opsp b/arch/m32r/configs/mappi2.opsp_defconfig
index b379ae96e6..54bb6e25d3 100644
--- a/arch/m32r/mappi2/defconfig.opsp
+++ b/arch/m32r/configs/mappi2.opsp_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Wed Dec 13 19:40:30 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:36 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -24,18 +27,19 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_IKCONFIG_PROC is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -47,29 +51,29 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -122,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00008000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 # CONFIG_SMP is not set
 CONFIG_NODES_SHIFT=1
@@ -136,6 +146,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -153,10 +164,6 @@ CONFIG_PCMCIA_IOCTL=y
 # CONFIG_M32R_CFC is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -170,13 +177,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -209,20 +216,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -248,7 +243,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -261,29 +266,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -292,18 +278,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -320,14 +298,15 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -335,6 +314,8 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -355,6 +336,8 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -362,93 +345,33 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_NE2000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# PCMCIA network device support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_NET_PCMCIA is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -456,15 +379,7 @@ CONFIG_SMC91X=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -472,6 +387,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -488,6 +404,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -525,41 +442,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -567,56 +463,55 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_M32R_AR is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Radio Adapters
-#
-
-#
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 
 #
@@ -624,16 +519,15 @@ CONFIG_FIRMWARE_EDID=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -646,50 +540,18 @@ CONFIG_DUMMY_CONSOLE=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -784,6 +646,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -791,7 +654,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -844,6 +706,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -855,29 +722,27 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi2/defconfig.vdec2 b/arch/m32r/configs/mappi2.vdec2_defconfig
index fe5b2a63cd..42247ae4fc 100644
--- a/arch/m32r/mappi2/defconfig.vdec2
+++ b/arch/m32r/configs/mappi2.vdec2_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Wed Dec 13 19:31:44 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:36 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -24,18 +27,19 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_IKCONFIG_PROC is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -47,29 +51,29 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -120,13 +124,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00008000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 # CONFIG_SMP is not set
 CONFIG_NODES_SHIFT=1
@@ -134,6 +144,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -151,10 +162,6 @@ CONFIG_PCMCIA_IOCTL=y
 # CONFIG_M32R_CFC is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -168,13 +175,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -207,20 +214,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -246,7 +241,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -259,29 +264,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -290,18 +276,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -318,14 +296,15 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -333,6 +312,8 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -353,6 +334,8 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -360,93 +343,33 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_NE2000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# PCMCIA network device support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_NET_PCMCIA is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -454,15 +377,7 @@ CONFIG_SMC91X=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -470,6 +385,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -486,6 +402,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -523,41 +440,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -565,56 +461,55 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_M32R_AR is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Radio Adapters
-#
-
-#
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 
 #
@@ -622,16 +517,15 @@ CONFIG_FIRMWARE_EDID=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -644,50 +538,18 @@ CONFIG_DUMMY_CONSOLE=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -782,6 +644,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -789,7 +652,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -842,6 +704,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -853,29 +720,27 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi3/defconfig.smp b/arch/m32r/configs/mappi3.smp_defconfig
index 2f352267a6..18c564f4ea 100644
--- a/arch/m32r/mappi3/defconfig.smp
+++ b/arch/m32r/configs/mappi3.smp_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Mon Dec 11 19:57:33 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:36 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -23,17 +26,19 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -46,17 +51,18 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -64,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -122,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00080000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 CONFIG_SMP=y
 # CONFIG_CHIP_M32700_TS1 is not set
@@ -138,6 +149,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -156,10 +168,6 @@ CONFIG_PCMCIA_IOCTL=y
 # CONFIG_M32R_CFC is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -173,12 +181,12 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 # CONFIG_PACKET is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -211,20 +219,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -250,7 +246,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -263,15 +269,7 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -286,6 +284,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -311,7 +310,6 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -333,29 +331,15 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -364,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -391,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -406,77 +383,30 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_NE2000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# PCMCIA network device support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_NET_PCMCIA is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -484,15 +414,7 @@ CONFIG_SMC91X=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -500,6 +422,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -519,6 +442,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -553,41 +477,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -595,47 +498,56 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Multimedia devices
+# Multifunction device drivers
 #
-# CONFIG_VIDEO_DEV is not set
+# CONFIG_MFD_SM501 is not set
 
 #
-# Digital Video Broadcasting Devices
+# Multimedia devices
 #
-# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Sound
+# Display device support
 #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
 
 #
-# USB support
+# Sound
 #
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -648,50 +560,18 @@ CONFIG_FIRMWARE_EDID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -764,9 +644,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-CONFIG_JFFS_FS=y
-CONFIG_JFFS_FS_VERBOSE=0
-CONFIG_JFFS_PROC_FS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -797,6 +674,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -804,7 +682,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -857,6 +734,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -868,31 +750,29 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/oaks32r/defconfig.nommu b/arch/m32r/configs/oaks32r_defconfig
index aaa00828e0..cc0f99a592 100644
--- a/arch/m32r/oaks32r/defconfig.nommu
+++ b/arch/m32r/configs/oaks32r_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Tue Dec 12 12:09:17 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:36 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -27,12 +30,13 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -44,28 +48,28 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
-CONFIG_SLAB=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -114,13 +118,18 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00010000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 # CONFIG_SMP is not set
 CONFIG_NODES_SHIFT=1
@@ -128,6 +137,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -136,10 +146,6 @@ CONFIG_NODES_SHIFT=1
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_FLAT=y
@@ -155,13 +161,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -194,20 +200,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -233,7 +227,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -246,29 +250,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -277,18 +262,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_IDE is not set
 
 #
@@ -296,69 +273,25 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
-CONFIG_NE2000=y
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -366,15 +299,7 @@ CONFIG_NE2000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -382,6 +307,7 @@ CONFIG_NE2000=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -398,6 +324,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -432,34 +359,13 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -467,47 +373,56 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Multimedia devices
+# Multifunction device drivers
 #
-# CONFIG_VIDEO_DEV is not set
+# CONFIG_MFD_SM501 is not set
 
 #
-# Digital Video Broadcasting Devices
+# Multimedia devices
 #
-# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Sound
+# Display device support
 #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
 
 #
-# USB support
+# Sound
 #
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -520,50 +435,18 @@ CONFIG_FIRMWARE_EDID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -643,6 +526,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -650,7 +534,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -703,6 +586,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -714,29 +602,27 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/opsput/defconfig.opsput b/arch/m32r/configs/opsput_defconfig
index 461f95e72d..39f5c1a506 100644
--- a/arch/m32r/opsput/defconfig.opsput
+++ b/arch/m32r/configs/opsput_defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Wed Dec 13 18:34:36 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:37 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -23,18 +26,19 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_IKCONFIG_PROC is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -46,29 +50,29 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -121,13 +125,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00010000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_PREEMPT is not set
 # CONFIG_SMP is not set
 CONFIG_NODES_SHIFT=1
@@ -135,6 +145,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -154,10 +165,6 @@ CONFIG_M32R_CFC_NUM=1
 CONFIG_PCCARD_NONSTATIC=y
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -171,13 +178,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -210,20 +217,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -249,7 +244,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -262,30 +267,12 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -294,18 +281,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_IDE is not set
 
 #
@@ -313,6 +292,8 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -333,6 +314,8 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -340,93 +323,33 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_NE2000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# PCMCIA network device support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_NET_PCMCIA is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -434,15 +357,7 @@ CONFIG_SMC91X=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -450,6 +365,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -466,6 +382,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -501,42 +418,21 @@ CONFIG_SERIAL_M32R_PLDSIO=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
 CONFIG_DS1302=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -544,47 +440,56 @@ CONFIG_DS1302=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Multimedia devices
+# Multifunction device drivers
 #
-# CONFIG_VIDEO_DEV is not set
+# CONFIG_MFD_SM501 is not set
 
 #
-# Digital Video Broadcasting Devices
+# Multimedia devices
 #
-# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Sound
+# Display device support
 #
-# CONFIG_SOUND is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
 
 #
-# USB support
+# Sound
 #
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -597,50 +502,18 @@ CONFIG_FIRMWARE_EDID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
 # Real Time Clock
 #
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -735,6 +608,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -742,7 +616,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -795,6 +668,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -806,27 +684,28 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
-# CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 
@@ -835,16 +714,16 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/configs/usrv_defconfig b/arch/m32r/configs/usrv_defconfig
new file mode 100644
index 0000000000..62e813e30c
--- /dev/null
+++ b/arch/m32r/configs/usrv_defconfig
@@ -0,0 +1,774 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:37 2007
+#
+CONFIG_M32R=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_CPUSETS is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# Processor type and features
+#
+# CONFIG_PLAT_MAPPI is not set
+CONFIG_PLAT_USRV=y
+# CONFIG_PLAT_M32700UT is not set
+# CONFIG_PLAT_OPSPUT is not set
+# CONFIG_PLAT_OAKS32R is not set
+# CONFIG_PLAT_MAPPI2 is not set
+# CONFIG_PLAT_MAPPI3 is not set
+# CONFIG_PLAT_M32104UT is not set
+CONFIG_CHIP_M32700=y
+# CONFIG_CHIP_M32102 is not set
+# CONFIG_CHIP_M32104 is not set
+# CONFIG_CHIP_VDEC2 is not set
+# CONFIG_CHIP_OPSP is not set
+CONFIG_MMU=y
+CONFIG_TLB_ENTRIES=32
+CONFIG_ISA_M32R2=y
+CONFIG_ISA_DSP_LEVEL2=y
+CONFIG_ISA_DUAL_ISSUE=y
+CONFIG_BUS_CLOCK=50000000
+CONFIG_TIMER_DIVIDE=128
+# CONFIG_CPU_LITTLE_ENDIAN is not set
+CONFIG_MEMORY_START=0x08000000
+CONFIG_MEMORY_SIZE=0x02000000
+CONFIG_NOHIGHMEM=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+# CONFIG_PREEMPT is not set
+CONFIG_SMP=y
+# CONFIG_CHIP_M32700_TS1 is not set
+CONFIG_NR_CPUS=2
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_ISA is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+# CONFIG_M32R_PCC is not set
+CONFIG_M32R_CFC=y
+CONFIG_M32R_CFC_NUM=2
+CONFIG_PCCARD_NONSTATIC=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET 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_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+CONFIG_IEEE80211=y
+CONFIG_IEEE80211_DEBUG=y
+CONFIG_IEEE80211_CRYPT_WEP=y
+CONFIG_IEEE80211_CRYPT_CCMP=y
+CONFIG_IEEE80211_CRYPT_TKIP=y
+# CONFIG_IEEE80211_SOFTMAC is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+# CONFIG_MTD_CFI_NOSWAP is not set
+CONFIG_MTD_CFI_BE_BYTE_SWAP=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 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_OTP is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_RAM=y
+CONFIG_MTD_ROM=y
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+CONFIG_NET_PCMCIA=y
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_PCNET=y
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_M32R_SIO is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_RTC is not set
+# CONFIG_R3964 is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_USB_SUPPORT=y
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 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_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/defconfig b/arch/m32r/defconfig
index 13579917af..af3b981791 100644
--- a/arch/m32r/defconfig
+++ b/arch/m32r/defconfig
@@ -1,12 +1,15 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19
-# Tue Dec 12 17:52:38 2006
+# Linux kernel version: 2.6.23-rc1
+# Wed Aug  1 17:22:35 2007
 #
 CONFIG_M32R=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_NO_IOPORT=y
+CONFIG_NO_DMA=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -23,19 +26,20 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -47,17 +51,18 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -65,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -123,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_IRAM_START=0x00f00000
 CONFIG_IRAM_SIZE=0x00080000
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PREEMPT=y
 CONFIG_SMP=y
 # CONFIG_CHIP_M32700_TS1 is not set
@@ -139,6 +149,7 @@ CONFIG_NODES_SHIFT=1
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ISA is not set
 
 #
@@ -147,10 +158,6 @@ CONFIG_NODES_SHIFT=1
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -164,13 +171,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -203,20 +210,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -242,7 +237,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -255,15 +260,7 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -278,6 +275,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # User Modules And Translation Layers
 #
 # CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -314,7 +312,6 @@ CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -337,29 +334,15 @@ CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -368,18 +351,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -395,14 +370,15 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -410,6 +386,8 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
@@ -430,6 +408,8 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -437,79 +417,31 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_NE2000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -517,15 +449,7 @@ CONFIG_SMC91X=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -533,6 +457,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -549,6 +474,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -587,35 +513,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_RTC is not set
 CONFIG_DS1302=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -623,65 +528,76 @@ CONFIG_DS1302=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 CONFIG_VIDEO_M32R_AR=m
 CONFIG_VIDEO_M32R_AR_M64278=m
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Radio Adapters
-#
-
-#
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 CONFIG_FB_S1D13XXX=y
 # CONFIG_FB_VIRTUAL is not set
 
@@ -691,29 +607,25 @@ CONFIG_FB_S1D13XXX=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_M32R_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -726,35 +638,20 @@ CONFIG_LOGO_M32R_CLUT224=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 CONFIG_MMC=y
 CONFIG_MMC_DEBUG=y
-CONFIG_MMC_BLOCK=y
-# CONFIG_MMC_TIFM_SD is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
+# CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# LED Triggers
-#
-
-#
-# InfiniBand support
+# MMC/SD Card Drivers
 #
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# MMC/SD Host Controller Drivers
 #
+# CONFIG_NEW_LEDS is not set
 
 #
 # Real Time Clock
@@ -762,17 +659,9 @@ CONFIG_MMC_BLOCK=y
 # CONFIG_RTC_CLASS is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -849,7 +738,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
@@ -872,6 +760,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -879,7 +768,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -932,6 +820,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 CONFIG_PROFILING=y
@@ -944,29 +837,27 @@ CONFIG_OPROFILE=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
-# CONFIG_HEADERS_CHECK is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/kernel/Makefile b/arch/m32r/kernel/Makefile
index 5a2fa88690..e97e26e87c 100644
--- a/arch/m32r/kernel/Makefile
+++ b/arch/m32r/kernel/Makefile
@@ -8,14 +8,6 @@ obj-y	:= process.o entry.o traps.o align.o irq.o setup.o time.o \
         m32r_ksyms.o sys_m32r.o semaphore.o signal.o ptrace.o
 
 obj-$(CONFIG_SMP)               += smp.o smpboot.o
-obj-$(CONFIG_PLAT_MAPPI)        += setup_mappi.o io_mappi.o
-obj-$(CONFIG_PLAT_MAPPI2)       += setup_mappi2.o io_mappi2.o
-obj-$(CONFIG_PLAT_MAPPI3)       += setup_mappi3.o io_mappi3.o
-obj-$(CONFIG_PLAT_USRV)         += setup_usrv.o io_usrv.o
-obj-$(CONFIG_PLAT_M32700UT)     += setup_m32700ut.o io_m32700ut.o
-obj-$(CONFIG_PLAT_OPSPUT)       += setup_opsput.o io_opsput.o
 obj-$(CONFIG_MODULES)           += module.o
-obj-$(CONFIG_PLAT_OAKS32R)      += setup_oaks32r.o io_oaks32r.o
-obj-$(CONFIG_PLAT_M32104UT)     += setup_m32104ut.o io_m32104ut.o
 
 EXTRA_AFLAGS    := -traditional
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index a2c472c054..d4eaa2fd18 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -109,15 +109,10 @@
 #define SP(reg)                 @(0x68,reg)
 #define ORIG_R0(reg)            @(0x6C,reg)
 
-CF_MASK         = 0x00000001
-TF_MASK         = 0x00000100
-IF_MASK         = 0x00000200
-DF_MASK         = 0x00000400
-NT_MASK         = 0x00004000
-VM_MASK         = 0x00020000
+#define nr_syscalls ((syscall_table_size)/4)
 
 #ifdef CONFIG_PREEMPT
-#define preempt_stop(x)         CLI(x)
+#define preempt_stop(x)         DISABLE_INTERRUPTS(x)
 #else
 #define preempt_stop(x)
 #define resume_kernel           restore_all
@@ -149,7 +144,7 @@ ret_from_intr:
 #endif
         beqz    r4, resume_kernel
 ENTRY(resume_userspace)
-        CLI(r4)                         ; make sure we don't miss an interrupt
+        DISABLE_INTERRUPTS(r4)          ; make sure we don't miss an interrupt
                                         ; setting need_resched or sigpending
                                         ; between sampling and the iret
         GET_THREAD_INFO(r8)
@@ -173,11 +168,11 @@ need_resched:
         beqz    r4, restore_all
         LDIMM   (r4, PREEMPT_ACTIVE)
         st      r4, @(TI_PRE_COUNT, r8)
-        STI(r4)
+        ENABLE_INTERRUPTS(r4)
         bl      schedule
         ldi     r4, #0
         st      r4, @(TI_PRE_COUNT, r8)
-        CLI(r4)
+        DISABLE_INTERRUPTS(r4)
         bra     need_resched
 #endif
 
@@ -185,7 +180,7 @@ need_resched:
 ENTRY(system_call)
         SWITCH_TO_KERNEL_STACK
         SAVE_ALL
-        STI(r4)                         ; Enable interrupt
+        ENABLE_INTERRUPTS(r4)           ; Enable interrupt
         st      sp, PTREGS(sp)          ; implicit pt_regs parameter
         cmpui   r7, #NR_syscalls
         bnc     syscall_badsys
@@ -203,7 +198,7 @@ syscall_call:
         jl      r7                      ; execute system call
         st      r0, R0(sp)              ; save the return value
 syscall_exit:
-        CLI(r4)                         ; make sure we don't miss an interrupt
+        DISABLE_INTERRUPTS(r4)          ; make sure we don't miss an interrupt
                                         ; setting need_resched or sigpending
                                         ; between sampling and the iret
         ld      r9, @(TI_FLAGS, r8)
@@ -220,7 +215,7 @@ work_pending:
         beqz    r4, work_notifysig
 work_resched:
         bl      schedule
-        CLI(r4)                         ; make sure we don't miss an interrupt
+        DISABLE_INTERRUPTS(r4)          ; make sure we don't miss an interrupt
                                         ; setting need_resched or sigpending
                                         ; between sampling and the iret
         ld      r9, @(TI_FLAGS, r8)
@@ -262,7 +257,7 @@ syscall_exit_work:
         ld      r9, @(TI_FLAGS, r8)
         and3    r4, r9, #_TIF_SYSCALL_TRACE
         beqz    r4, work_pending
-        STI(r4)                         ; could let do_syscall_trace() call
+        ENABLE_INTERRUPTS(r4)           ; could let do_syscall_trace() call
                                         ; schedule() instead
         bl      do_syscall_trace
         bra     resume_userspace
@@ -290,16 +285,12 @@ syscall_badsys:
  */
 ENTRY(ei_handler)
 #if defined(CONFIG_CHIP_M32700)
-        SWITCH_TO_KERNEL_STACK
         ; WORKAROUND: force to clear SM bit and use the kernel stack (SPI).
+        SWITCH_TO_KERNEL_STACK
 #endif
         SAVE_ALL
         mv      r1, sp                  ; arg1(regs)
-#if defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \
-        || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \
-        || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104)
-
-;    GET_ICU_STATUS;
+        ; get ICU status
         seth    r0, #shigh(M32R_ICU_ISTS_ADDR)
         ld      r0, @(low(M32R_ICU_ISTS_ADDR),r0)
         push    r0
@@ -314,10 +305,15 @@ ENTRY(ei_handler)
         ;; IRQ exist check
 #if defined(CONFIG_CHIP_M32700)
         /* WORKAROUND: IMASK bug M32700-TS1, TS2 chip. */
-        beqz    r0, 3f                  ; if (!irq_num) goto exit
-#else
+        bnez    r0, 0f
+        ld24    r14, #0x00070000
+        seth    r0, #shigh(M32R_ICU_IMASK_ADDR)
+        st      r14, @(low(M32R_ICU_IMASK_ADDR),r0)
+        bra     1f
+        .fillinsn
+0:
+#endif /* CONFIG_CHIP_M32700 */
         beqz    r0, 1f                  ; if (!irq_num) goto exit
-#endif  /* WORKAROUND */
         ;; IPI check
         cmpi    r0, #(M32R_IRQ_IPI0<<2) ; ISN < IPI0 check
         bc      2f
@@ -332,220 +328,56 @@ ENTRY(ei_handler)
         .fillinsn
 1:
         addi    sp, #4
-        bra     ret_to_intr
-#if defined(CONFIG_CHIP_M32700)
-        /* WORKAROUND: IMASK bug M32700-TS1, TS2 chip. */
-        .fillinsn
-3:
-        ld24    r14, #0x00070000
-        seth    r0, #shigh(M32R_ICU_IMASK_ADDR)
-        st      r14, @(low(M32R_ICU_IMASK_ADDR), r0)
-        addi    sp, #4
-        bra     ret_to_intr
-#endif  /* WORKAROUND */
-        ;; do_IRQ
+        bra     restore_all
         .fillinsn
 2:
         srli    r0, #2
-#if defined(CONFIG_PLAT_USRV)
-        add3    r2, r0, #-(M32R_IRQ_INT1)       ; INT1# interrupt
-        bnez    r2, 9f
-        ; read ICU status register of PLD
-        seth    r0, #high(PLD_ICUISTS)
-        or3     r0, r0, #low(PLD_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        addi    r0, #(M32700UT_PLD_IRQ_BASE)
-        .fillinsn
-9:
-#elif defined(CONFIG_PLAT_M32700UT)
-        add3    r2, r0, #-(M32R_IRQ_INT1)       ; INT1# interrupt
-        bnez    r2, check_int0
-        ; read ICU status register of PLD
-        seth    r0, #high(PLD_ICUISTS)
-        or3     r0, r0, #low(PLD_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        addi    r0, #(M32700UT_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_int0:
-        add3    r2, r0, #-(M32R_IRQ_INT0)       ; INT0# interrupt
-        bnez    r2, check_int2
-        ; read ICU status of LAN-board
-        seth    r0, #high(M32700UT_LAN_ICUISTS)
-        or3     r0, r0, #low(M32700UT_LAN_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        add3    r0, r0, #(M32700UT_LAN_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_int2:
-        add3    r2, r0, #-(M32R_IRQ_INT2)       ; INT2# interrupt
-        bnez    r2, check_end
-        ; read ICU status of LCD-board
-        seth    r0, #high(M32700UT_LCD_ICUISTS)
-        or3     r0, r0, #low(M32700UT_LCD_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        add3    r0, r0, #(M32700UT_LCD_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_end:
-#elif defined(CONFIG_PLAT_OPSPUT)
-        add3    r2, r0, #-(M32R_IRQ_INT1)       ; INT1# interrupt
-        bnez    r2, check_int0
-        ; read ICU status register of PLD
-        seth    r0, #high(PLD_ICUISTS)
-        or3     r0, r0, #low(PLD_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        addi    r0, #(OPSPUT_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_int0:
-        add3    r2, r0, #-(M32R_IRQ_INT0)       ; INT0# interrupt
-        bnez    r2, check_int2
-        ; read ICU status of LAN-board
-        seth    r0, #high(OPSPUT_LAN_ICUISTS)
-        or3     r0, r0, #low(OPSPUT_LAN_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        add3    r0, r0, #(OPSPUT_LAN_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_int2:
-        add3    r2, r0, #-(M32R_IRQ_INT2)       ; INT2# interrupt
-        bnez    r2, check_end
-        ; read ICU status of LCD-board
-        seth    r0, #high(OPSPUT_LCD_ICUISTS)
-        or3     r0, r0, #low(OPSPUT_LCD_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        add3    r0, r0, #(OPSPUT_LCD_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_end:
-#endif  /* CONFIG_PLAT_OPSPUT */
-        bl      do_IRQ                  ; r0(irq), r1(regs)
-#else  /* not CONFIG_SMP */
+#else /* not CONFIG_SMP */
         srli    r0, #22                 ; r0(irq)
-#if defined(CONFIG_PLAT_USRV)
+#endif /* not CONFIG_SMP */
+
+#if defined(CONFIG_PLAT_HAS_INT1ICU)
         add3    r2, r0, #-(M32R_IRQ_INT1)       ; INT1# interrupt
-        bnez    r2, 1f
-        ; read ICU status register of PLD
-        seth    r0, #high(PLD_ICUISTS)
-        or3     r0, r0, #low(PLD_ICUISTS)
-        lduh    r0, @r0
+        bnez    r2, 3f
+        seth    r0, #shigh(M32R_INT1ICU_ISTS)
+        lduh    r0, @(low(M32R_INT1ICU_ISTS),r0)        ; bit10-6 : ISN
         slli    r0, #21
         srli    r0, #27                         ; ISN
-        addi    r0, #(M32700UT_PLD_IRQ_BASE)
-        .fillinsn
-1:
-#elif defined(CONFIG_PLAT_M32700UT)
-        add3    r2, r0, #-(M32R_IRQ_INT1)       ; INT1# interrupt
-        bnez    r2, check_int0
-        ; read ICU status register of PLD
-        seth    r0, #high(PLD_ICUISTS)
-        or3     r0, r0, #low(PLD_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        addi    r0, #(M32700UT_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_int0:
-        add3    r2, r0, #-(M32R_IRQ_INT0)       ; INT0# interrupt
-        bnez    r2, check_int2
-        ; read ICU status of LAN-board
-        seth    r0, #high(M32700UT_LAN_ICUISTS)
-        or3     r0, r0, #low(M32700UT_LAN_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        add3    r0, r0, #(M32700UT_LAN_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_int2:
-        add3    r2, r0, #-(M32R_IRQ_INT2)       ; INT2# interrupt
-        bnez    r2, check_end
-        ; read ICU status of LCD-board
-        seth    r0, #high(M32700UT_LCD_ICUISTS)
-        or3     r0, r0, #low(M32700UT_LCD_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        add3    r0, r0, #(M32700UT_LCD_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_end:
-#elif defined(CONFIG_PLAT_OPSPUT)
-        add3    r2, r0, #-(M32R_IRQ_INT1)       ; INT1# interrupt
-        bnez    r2, check_int0
-        ; read ICU status register of PLD
-        seth    r0, #high(PLD_ICUISTS)
-        or3     r0, r0, #low(PLD_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        addi    r0, #(OPSPUT_PLD_IRQ_BASE)
-        bra     check_end
-        .fillinsn
-check_int0:
-        add3    r2, r0, #-(M32R_IRQ_INT0)       ; INT0# interrupt
-        bnez    r2, check_int2
-        ; read ICU status of LAN-board
-        seth    r0, #high(OPSPUT_LAN_ICUISTS)
-        or3     r0, r0, #low(OPSPUT_LAN_ICUISTS)
-        lduh    r0, @r0
-        slli    r0, #21
-        srli    r0, #27                         ; ISN
-        add3    r0, r0, #(OPSPUT_LAN_PLD_IRQ_BASE)
+        addi    r0, #(M32R_INT1ICU_IRQ_BASE)
         bra     check_end
         .fillinsn
-check_int2:
-        add3    r2, r0, #-(M32R_IRQ_INT2)       ; INT2# interrupt
-        bnez    r2, check_end
-        ; read ICU status of LCD-board
-        seth    r0, #high(OPSPUT_LCD_ICUISTS)
-        or3     r0, r0, #low(OPSPUT_LCD_ICUISTS)
-        lduh    r0, @r0
+3:
+#endif /* CONFIG_PLAT_HAS_INT1ICU */
+#if defined(CONFIG_PLAT_HAS_INT0ICU)
+        add3    r2, r0, #-(M32R_IRQ_INT0)       ; INT0# interrupt
+        bnez    r2, 4f
+        seth    r0, #shigh(M32R_INT0ICU_ISTS)
+        lduh    r0, @(low(M32R_INT0ICU_ISTS),r0)        ; bit10-6 : ISN
         slli    r0, #21
-        srli    r0, #27                         ; ISN
-        add3    r0, r0, #(OPSPUT_LCD_PLD_IRQ_BASE)
+        srli    r0, #27                         ; ISN
+        add3    r0, r0, #(M32R_INT0ICU_IRQ_BASE)
         bra     check_end
         .fillinsn
-check_end:
-#elif defined(CONFIG_PLAT_M32104UT)
-        add3    r2, r0, #-(M32R_IRQ_INT1)       ; INT1# interrupt
-        bnez    r2, check_end
-        ; read ICU status register of PLD
-        seth    r0, #high(PLD_ICUISTS)
-        or3     r0, r0, #low(PLD_ICUISTS)
-        lduh    r0, @r0
+4:
+#endif /* CONFIG_PLAT_HAS_INT0ICU */
+#if defined(CONFIG_PLAT_HAS_INT2ICU)
+        add3    r2, r0, #-(M32R_IRQ_INT2)       ; INT2# interrupt
+        bnez    r2, 5f
+        seth    r0, #shigh(M32R_INT2ICU_ISTS)
+        lduh    r0, @(low(M32R_INT2ICU_ISTS),r0)        ; bit10-6 : ISN
         slli    r0, #21
-        srli    r0, #27                         ; ISN
-        addi    r0, #(M32104UT_PLD_IRQ_BASE)
-        bra     check_end
+        srli    r0, #27                         ; ISN
+        add3    r0, r0, #(M32R_INT2ICU_IRQ_BASE)
+        ; bra   check_end
         .fillinsn
+5:
+#endif /* CONFIG_PLAT_HAS_INT2ICU */
+
 check_end:
-#endif  /* CONFIG_PLAT_M32104UT */
         bl      do_IRQ
-#endif  /* CONFIG_SMP */
         pop     r14
         seth    r0, #shigh(M32R_ICU_IMASK_ADDR)
         st      r14, @(low(M32R_ICU_IMASK_ADDR),r0)
-#else
-#error no chip configuration
-#endif
-ret_to_intr:
         bra  ret_from_intr
 
 /*
@@ -631,7 +463,7 @@ inst:
 
 
 ENTRY(alignment_check)
-/* void alignment_check(int error_code) */
+        /* void alignment_check(int error_code) */
         SWITCH_TO_KERNEL_STACK
         SAVE_ALL
         ldi     r1, #0x30                       ; error_code
@@ -641,7 +473,7 @@ error_code:
         bra     ret_from_exception
 
 ENTRY(rie_handler)
-/* void rie_handler(int error_code) */
+        /* void rie_handler(int error_code) */
         SWITCH_TO_KERNEL_STACK
         SAVE_ALL
         ldi     r1, #0x20                       ; error_code
@@ -650,7 +482,7 @@ ENTRY(rie_handler)
         bra     error_code
 
 ENTRY(pie_handler)
-/* void pie_handler(int error_code) */
+        /* void pie_handler(int error_code) */
         SWITCH_TO_KERNEL_STACK
         SAVE_ALL
         ldi     r1, #0                          ; error_code ; FIXME
@@ -659,8 +491,8 @@ ENTRY(pie_handler)
         bra     error_code
 
 ENTRY(debug_trap)
-        .global withdraw_debug_trap
         /* void debug_trap(void) */
+        .global withdraw_debug_trap
         SWITCH_TO_KERNEL_STACK
         SAVE_ALL
         mv      r0, sp                          ; pt_regs
@@ -679,11 +511,9 @@ ENTRY(ill_trap)
         bl      do_ill_trap
         bra     error_code
 
-
-/* Cache flushing handler */
 ENTRY(cache_flushing_handler)
-        .global _flush_cache_all
         /* void _flush_cache_all(void); */
+        .global _flush_cache_all
         SWITCH_TO_KERNEL_STACK
         push    r0
         push    r1
@@ -706,292 +536,7 @@ ENTRY(cache_flushing_handler)
         pop     r0
         rte
 
-.data
-ENTRY(sys_call_table)
-        .long sys_restart_syscall       /* 0  -  old "setup()" system call*/
-        .long sys_exit
-        .long sys_fork
-        .long sys_read
-        .long sys_write
-        .long sys_open                  /* 5 */
-        .long sys_close
-        .long sys_waitpid
-        .long sys_creat
-        .long sys_link
-        .long sys_unlink                /* 10 */
-        .long sys_execve
-        .long sys_chdir
-        .long sys_time
-        .long sys_mknod
-        .long sys_chmod                 /* 15 */
-        .long sys_ni_syscall            /* lchown16 syscall holder */
-        .long sys_ni_syscall            /* old break syscall holder */
-        .long sys_ni_syscall            /* old stat syscall holder */
-        .long sys_lseek
-        .long sys_getpid                /* 20 */
-        .long sys_mount
-        .long sys_oldumount
-        .long sys_ni_syscall            /* setuid16 syscall holder */
-        .long sys_ni_syscall            /* getuid16 syscall holder */
-        .long sys_stime                 /* 25 */
-        .long sys_ptrace
-        .long sys_alarm
-        .long sys_ni_syscall            /* old fstat syscall holder */
-        .long sys_pause
-        .long sys_utime                 /* 30 */
-        .long sys_ni_syscall            /* old stty syscall holder */
-        .long sys_cachectl              /* for M32R */ /* old gtty syscall holder */
-        .long sys_access
-        .long sys_ni_syscall            /* nice syscall holder */
-        .long sys_ni_syscall            /* 35  -  old ftime syscall holder */
-        .long sys_sync
-        .long sys_kill
-        .long sys_rename
-        .long sys_mkdir
-        .long sys_rmdir                 /* 40 */
-        .long sys_dup
-        .long sys_pipe
-        .long sys_times
-        .long sys_ni_syscall            /* old prof syscall holder */
-        .long sys_brk                   /* 45 */
-        .long sys_ni_syscall            /* setgid16 syscall holder */
-        .long sys_getgid                /* will be unused */
-        .long sys_ni_syscall            /* signal syscall holder */
-        .long sys_ni_syscall            /* geteuid16  syscall holder */
-        .long sys_ni_syscall            /* 50 - getegid16 syscall holder */
-        .long sys_acct
-        .long sys_umount                /* recycled never used phys() */
-        .long sys_ni_syscall            /* old lock syscall holder */
-        .long sys_ioctl
-        .long sys_fcntl                 /* 55 - will be unused */
-        .long sys_ni_syscall            /* mpx syscall holder */
-        .long sys_setpgid
-        .long sys_ni_syscall            /* old ulimit syscall holder */
-        .long sys_ni_syscall            /* sys_olduname */
-        .long sys_umask                 /* 60 */
-        .long sys_chroot
-        .long sys_ustat
-        .long sys_dup2
-        .long sys_getppid
-        .long sys_getpgrp               /* 65 */
-        .long sys_setsid
-        .long sys_ni_syscall            /* sigaction syscall holder */
-        .long sys_ni_syscall            /* sgetmask syscall holder */
-        .long sys_ni_syscall            /* ssetmask syscall holder */
-        .long sys_ni_syscall            /* 70 - setreuid16 syscall holder */
-        .long sys_ni_syscall            /* setregid16 syscall holder */
-        .long sys_ni_syscall            /* sigsuspend syscall holder */
-        .long sys_ni_syscall            /* sigpending syscall holder */
-        .long sys_sethostname
-        .long sys_setrlimit             /* 75 */
-        .long sys_getrlimit/*will be unused*/
-        .long sys_getrusage
-        .long sys_gettimeofday
-        .long sys_settimeofday
-        .long sys_ni_syscall            /* 80 - getgroups16 syscall holder */
-        .long sys_ni_syscall            /* setgroups16 syscall holder */
-        .long sys_ni_syscall            /* sys_oldselect */
-        .long sys_symlink
-        .long sys_ni_syscall            /* old lstat syscall holder */
-        .long sys_readlink              /* 85 */
-        .long sys_uselib
-        .long sys_swapon
-        .long sys_reboot
-        .long sys_ni_syscall            /* readdir syscall holder */
-        .long sys_ni_syscall            /* 90 - old_mmap syscall holder */
-        .long sys_munmap
-        .long sys_truncate
-        .long sys_ftruncate
-        .long sys_fchmod
-        .long sys_ni_syscall            /* 95 - fchwon16  syscall holder */
-        .long sys_getpriority
-        .long sys_setpriority
-        .long sys_ni_syscall            /* old profil syscall holder */
-        .long sys_statfs
-        .long sys_fstatfs               /* 100 */
-        .long sys_ni_syscall            /* ioperm syscall holder */
-        .long sys_socketcall
-        .long sys_syslog
-        .long sys_setitimer
-        .long sys_getitimer             /* 105 */
-        .long sys_newstat
-        .long sys_newlstat
-        .long sys_newfstat
-        .long sys_ni_syscall            /* old uname syscall holder */
-        .long sys_ni_syscall            /* 110  -  iopl syscall holder */
-        .long sys_vhangup
-        .long sys_ni_syscall            /* idle syscall holder */
-        .long sys_ni_syscall            /* vm86old syscall holder */
-        .long sys_wait4
-        .long sys_swapoff               /* 115 */
-        .long sys_sysinfo
-        .long sys_ipc
-        .long sys_fsync
-        .long sys_ni_syscall            /* sigreturn syscall holder */
-        .long sys_clone                 /* 120 */
-        .long sys_setdomainname
-        .long sys_newuname
-        .long sys_ni_syscall            /* modify_ldt syscall holder */
-        .long sys_adjtimex
-        .long sys_mprotect              /* 125 */
-        .long sys_ni_syscall            /* sigprocmask syscall holder */
-        .long sys_ni_syscall            /* create_module syscall holder */
-        .long sys_init_module
-        .long sys_delete_module
-        .long sys_ni_syscall            /* 130 - get_kernel_syms */
-        .long sys_quotactl
-        .long sys_getpgid
-        .long sys_fchdir
-        .long sys_bdflush
-        .long sys_sysfs                 /* 135 */
-        .long sys_personality
-        .long sys_ni_syscall            /* afs_syscall syscall holder */
-        .long sys_ni_syscall            /* setfsuid16 syscall holder */
-        .long sys_ni_syscall            /* setfsgid16 syscall holder */
-        .long sys_llseek                /* 140 */
-        .long sys_getdents
-        .long sys_select
-        .long sys_flock
-        .long sys_msync
-        .long sys_readv                 /* 145 */
-        .long sys_writev
-        .long sys_getsid
-        .long sys_fdatasync
-        .long sys_sysctl
-        .long sys_mlock                 /* 150 */
-        .long sys_munlock
-        .long sys_mlockall
-        .long sys_munlockall
-        .long sys_sched_setparam
-        .long sys_sched_getparam        /* 155 */
-        .long sys_sched_setscheduler
-        .long sys_sched_getscheduler
-        .long sys_sched_yield
-        .long sys_sched_get_priority_max
-        .long sys_sched_get_priority_min        /* 160 */
-        .long sys_sched_rr_get_interval
-        .long sys_nanosleep
-        .long sys_mremap
-        .long sys_ni_syscall            /* setresuid16 syscall holder */
-        .long sys_ni_syscall            /* 165 - getresuid16 syscall holder */
-        .long sys_tas                   /* vm86 syscall holder */
-        .long sys_ni_syscall            /* query_module syscall holder */
-        .long sys_poll
-        .long sys_nfsservctl
-        .long sys_setresgid             /* 170 */
-        .long sys_getresgid
-        .long sys_prctl
-        .long sys_rt_sigreturn
-        .long sys_rt_sigaction
-        .long sys_rt_sigprocmask        /* 175 */
-        .long sys_rt_sigpending
-        .long sys_rt_sigtimedwait
-        .long sys_rt_sigqueueinfo
-        .long sys_rt_sigsuspend
-        .long sys_pread64               /* 180 */
-        .long sys_pwrite64
-        .long sys_ni_syscall            /* chown16 syscall holder */
-        .long sys_getcwd
-        .long sys_capget
-        .long sys_capset                /* 185 */
-        .long sys_sigaltstack
-        .long sys_sendfile
-        .long sys_ni_syscall            /* streams1 */
-        .long sys_ni_syscall            /* streams2 */
-        .long sys_vfork                 /* 190 */
-        .long sys_getrlimit
-        .long sys_mmap2
-        .long sys_truncate64
-        .long sys_ftruncate64
-        .long sys_stat64                /* 195 */
-        .long sys_lstat64
-        .long sys_fstat64
-        .long sys_lchown
-        .long sys_getuid
-        .long sys_getgid                /* 200 */
-        .long sys_geteuid
-        .long sys_getegid
-        .long sys_setreuid
-        .long sys_setregid
-        .long sys_getgroups             /* 205 */
-        .long sys_setgroups
-        .long sys_fchown
-        .long sys_setresuid
-        .long sys_getresuid
-        .long sys_setresgid             /* 210 */
-        .long sys_getresgid
-        .long sys_chown
-        .long sys_setuid
-        .long sys_setgid
-        .long sys_setfsuid              /* 215 */
-        .long sys_setfsgid
-        .long sys_pivot_root
-        .long sys_mincore
-        .long sys_madvise
-        .long sys_getdents64            /* 220 */
-        .long sys_fcntl64
-        .long sys_ni_syscall            /* reserved for TUX */
-        .long sys_ni_syscall            /* Reserved for Security */
-        .long sys_gettid
-        .long sys_readahead             /* 225 */
-        .long sys_setxattr
-        .long sys_lsetxattr
-        .long sys_fsetxattr
-        .long sys_getxattr
-        .long sys_lgetxattr             /* 230 */
-        .long sys_fgetxattr
-        .long sys_listxattr
-        .long sys_llistxattr
-        .long sys_flistxattr
-        .long sys_removexattr           /* 235 */
-        .long sys_lremovexattr
-        .long sys_fremovexattr
-        .long sys_tkill
-        .long sys_sendfile64
-        .long sys_futex                 /* 240 */
-        .long sys_sched_setaffinity
-        .long sys_sched_getaffinity
-        .long sys_ni_syscall            /* reserved for "set_thread_area" system call */
-        .long sys_ni_syscall            /* reserved for "get_thread_area" system call */
-        .long sys_io_setup              /* 245 */
-        .long sys_io_destroy
-        .long sys_io_getevents
-        .long sys_io_submit
-        .long sys_io_cancel
-        .long sys_fadvise64             /* 250 */
-        .long sys_ni_syscall
-        .long sys_exit_group
-        .long sys_lookup_dcookie
-        .long sys_epoll_create
-        .long sys_epoll_ctl             /* 255 */
-        .long sys_epoll_wait
-        .long sys_remap_file_pages
-        .long sys_set_tid_address
-        .long sys_timer_create
-        .long sys_timer_settime         /* 260 */
-        .long sys_timer_gettime
-        .long sys_timer_getoverrun
-        .long sys_timer_delete
-        .long sys_clock_settime
-        .long sys_clock_gettime         /* 265 */
-        .long sys_clock_getres
-        .long sys_clock_nanosleep
-        .long sys_statfs64
-        .long sys_fstatfs64
-        .long sys_tgkill                /* 270 */
-        .long sys_utimes
-        .long sys_fadvise64_64
-        .long sys_ni_syscall            /* Reserved for sys_vserver */
-        .long sys_ni_syscall            /* Reserved for sys_mbind */
-        .long sys_ni_syscall            /* Reserved for sys_get_mempolicy */
-        .long sys_ni_syscall            /* Reserved for sys_set_mempolicy */
-        .long sys_mq_open
-        .long sys_mq_unlink
-        .long sys_mq_timedsend
-        .long sys_mq_timedreceive       /* 280 */
-        .long sys_mq_notify
-        .long sys_mq_getsetattr
-        .long sys_ni_syscall            /* reserved for kexec */
-        .long sys_waitid
+        .section .rodata,"a"
+#include "syscall_table.S"
 
 syscall_table_size=(.-sys_call_table)
diff --git a/arch/m32r/kernel/syscall_table.S b/arch/m32r/kernel/syscall_table.S
new file mode 100644
index 0000000000..751ac2a3d1
--- /dev/null
+++ b/arch/m32r/kernel/syscall_table.S
@@ -0,0 +1,286 @@
+ENTRY(sys_call_table)
+        .long sys_restart_syscall       /* 0  -  old "setup()" system call*/
+        .long sys_exit
+        .long sys_fork
+        .long sys_read
+        .long sys_write
+        .long sys_open                  /* 5 */
+        .long sys_close
+        .long sys_waitpid
+        .long sys_creat
+        .long sys_link
+        .long sys_unlink                /* 10 */
+        .long sys_execve
+        .long sys_chdir
+        .long sys_time
+        .long sys_mknod
+        .long sys_chmod                 /* 15 */
+        .long sys_ni_syscall            /* lchown16 syscall holder */
+        .long sys_ni_syscall            /* old break syscall holder */
+        .long sys_ni_syscall            /* old stat syscall holder */
+        .long sys_lseek
+        .long sys_getpid                /* 20 */
+        .long sys_mount
+        .long sys_oldumount
+        .long sys_ni_syscall            /* setuid16 syscall holder */
+        .long sys_ni_syscall            /* getuid16 syscall holder */
+        .long sys_stime                 /* 25 */
+        .long sys_ptrace
+        .long sys_alarm
+        .long sys_ni_syscall            /* old fstat syscall holder */
+        .long sys_pause
+        .long sys_utime                 /* 30 */
+        .long sys_ni_syscall            /* old stty syscall holder */
+        .long sys_cachectl              /* for M32R */ /* old gtty syscall holder */
+        .long sys_access
+        .long sys_ni_syscall            /* nice syscall holder */
+        .long sys_ni_syscall            /* 35  -  old ftime syscall holder */
+        .long sys_sync
+        .long sys_kill
+        .long sys_rename
+        .long sys_mkdir
+        .long sys_rmdir                 /* 40 */
+        .long sys_dup
+        .long sys_pipe
+        .long sys_times
+        .long sys_ni_syscall            /* old prof syscall holder */
+        .long sys_brk                   /* 45 */
+        .long sys_ni_syscall            /* setgid16 syscall holder */
+        .long sys_getgid                /* will be unused */
+        .long sys_ni_syscall            /* signal syscall holder */
+        .long sys_ni_syscall            /* geteuid16  syscall holder */
+        .long sys_ni_syscall            /* 50 - getegid16 syscall holder */
+        .long sys_acct
+        .long sys_umount                /* recycled never used phys() */
+        .long sys_ni_syscall            /* old lock syscall holder */
+        .long sys_ioctl
+        .long sys_fcntl                 /* 55 - will be unused */
+        .long sys_ni_syscall            /* mpx syscall holder */
+        .long sys_setpgid
+        .long sys_ni_syscall            /* old ulimit syscall holder */
+        .long sys_ni_syscall            /* sys_olduname */
+        .long sys_umask                 /* 60 */
+        .long sys_chroot
+        .long sys_ustat
+        .long sys_dup2
+        .long sys_getppid
+        .long sys_getpgrp               /* 65 */
+        .long sys_setsid
+        .long sys_ni_syscall            /* sigaction syscall holder */
+        .long sys_ni_syscall            /* sgetmask syscall holder */
+        .long sys_ni_syscall            /* ssetmask syscall holder */
+        .long sys_ni_syscall            /* 70 - setreuid16 syscall holder */
+        .long sys_ni_syscall            /* setregid16 syscall holder */
+        .long sys_ni_syscall            /* sigsuspend syscall holder */
+        .long sys_ni_syscall            /* sigpending syscall holder */
+        .long sys_sethostname
+        .long sys_setrlimit             /* 75 */
+        .long sys_getrlimit/*will be unused*/
+        .long sys_getrusage
+        .long sys_gettimeofday
+        .long sys_settimeofday
+        .long sys_ni_syscall            /* 80 - getgroups16 syscall holder */
+        .long sys_ni_syscall            /* setgroups16 syscall holder */
+        .long sys_ni_syscall            /* sys_oldselect */
+        .long sys_symlink
+        .long sys_ni_syscall            /* old lstat syscall holder */
+        .long sys_readlink              /* 85 */
+        .long sys_uselib
+        .long sys_swapon
+        .long sys_reboot
+        .long sys_ni_syscall            /* readdir syscall holder */
+        .long sys_ni_syscall            /* 90 - old_mmap syscall holder */
+        .long sys_munmap
+        .long sys_truncate
+        .long sys_ftruncate
+        .long sys_fchmod
+        .long sys_ni_syscall            /* 95 - fchwon16  syscall holder */
+        .long sys_getpriority
+        .long sys_setpriority
+        .long sys_ni_syscall            /* old profil syscall holder */
+        .long sys_statfs
+        .long sys_fstatfs               /* 100 */
+        .long sys_ni_syscall            /* ioperm syscall holder */
+        .long sys_socketcall
+        .long sys_syslog
+        .long sys_setitimer
+        .long sys_getitimer             /* 105 */
+        .long sys_newstat
+        .long sys_newlstat
+        .long sys_newfstat
+        .long sys_ni_syscall            /* old uname syscall holder */
+        .long sys_ni_syscall            /* 110  -  iopl syscall holder */
+        .long sys_vhangup
+        .long sys_ni_syscall            /* idle syscall holder */
+        .long sys_ni_syscall            /* vm86old syscall holder */
+        .long sys_wait4
+        .long sys_swapoff               /* 115 */
+        .long sys_sysinfo
+        .long sys_ipc
+        .long sys_fsync
+        .long sys_ni_syscall            /* sigreturn syscall holder */
+        .long sys_clone                 /* 120 */
+        .long sys_setdomainname
+        .long sys_newuname
+        .long sys_ni_syscall            /* modify_ldt syscall holder */
+        .long sys_adjtimex
+        .long sys_mprotect              /* 125 */
+        .long sys_ni_syscall            /* sigprocmask syscall holder */
+        .long sys_ni_syscall            /* create_module syscall holder */
+        .long sys_init_module
+        .long sys_delete_module
+        .long sys_ni_syscall            /* 130 - get_kernel_syms */
+        .long sys_quotactl
+        .long sys_getpgid
+        .long sys_fchdir
+        .long sys_bdflush
+        .long sys_sysfs                 /* 135 */
+        .long sys_personality
+        .long sys_ni_syscall            /* afs_syscall syscall holder */
+        .long sys_ni_syscall            /* setfsuid16 syscall holder */
+        .long sys_ni_syscall            /* setfsgid16 syscall holder */
+        .long sys_llseek                /* 140 */
+        .long sys_getdents
+        .long sys_select
+        .long sys_flock
+        .long sys_msync
+        .long sys_readv                 /* 145 */
+        .long sys_writev
+        .long sys_getsid
+        .long sys_fdatasync
+        .long sys_sysctl
+        .long sys_mlock                 /* 150 */
+        .long sys_munlock
+        .long sys_mlockall
+        .long sys_munlockall
+        .long sys_sched_setparam
+        .long sys_sched_getparam        /* 155 */
+        .long sys_sched_setscheduler
+        .long sys_sched_getscheduler
+        .long sys_sched_yield
+        .long sys_sched_get_priority_max
+        .long sys_sched_get_priority_min        /* 160 */
+        .long sys_sched_rr_get_interval
+        .long sys_nanosleep
+        .long sys_mremap
+        .long sys_ni_syscall            /* setresuid16 syscall holder */
+        .long sys_ni_syscall            /* 165 - getresuid16 syscall holder */
+        .long sys_tas                   /* vm86 syscall holder */
+        .long sys_ni_syscall            /* query_module syscall holder */
+        .long sys_poll
+        .long sys_nfsservctl
+        .long sys_setresgid             /* 170 */
+        .long sys_getresgid
+        .long sys_prctl
+        .long sys_rt_sigreturn
+        .long sys_rt_sigaction
+        .long sys_rt_sigprocmask        /* 175 */
+        .long sys_rt_sigpending
+        .long sys_rt_sigtimedwait
+        .long sys_rt_sigqueueinfo
+        .long sys_rt_sigsuspend
+        .long sys_pread64               /* 180 */
+        .long sys_pwrite64
+        .long sys_ni_syscall            /* chown16 syscall holder */
+        .long sys_getcwd
+        .long sys_capget
+        .long sys_capset                /* 185 */
+        .long sys_sigaltstack
+        .long sys_sendfile
+        .long sys_ni_syscall            /* streams1 */
+        .long sys_ni_syscall            /* streams2 */
+        .long sys_vfork                 /* 190 */
+        .long sys_getrlimit
+        .long sys_mmap2
+        .long sys_truncate64
+        .long sys_ftruncate64
+        .long sys_stat64                /* 195 */
+        .long sys_lstat64
+        .long sys_fstat64
+        .long sys_lchown
+        .long sys_getuid
+        .long sys_getgid                /* 200 */
+        .long sys_geteuid
+        .long sys_getegid
+        .long sys_setreuid
+        .long sys_setregid
+        .long sys_getgroups             /* 205 */
+        .long sys_setgroups
+        .long sys_fchown
+        .long sys_setresuid
+        .long sys_getresuid
+        .long sys_setresgid             /* 210 */
+        .long sys_getresgid
+        .long sys_chown
+        .long sys_setuid
+        .long sys_setgid
+        .long sys_setfsuid              /* 215 */
+        .long sys_setfsgid
+        .long sys_pivot_root
+        .long sys_mincore
+        .long sys_madvise
+        .long sys_getdents64            /* 220 */
+        .long sys_fcntl64
+        .long sys_ni_syscall            /* reserved for TUX */
+        .long sys_ni_syscall            /* Reserved for Security */
+        .long sys_gettid
+        .long sys_readahead             /* 225 */
+        .long sys_setxattr
+        .long sys_lsetxattr
+        .long sys_fsetxattr
+        .long sys_getxattr
+        .long sys_lgetxattr             /* 230 */
+        .long sys_fgetxattr
+        .long sys_listxattr
+        .long sys_llistxattr
+        .long sys_flistxattr
+        .long sys_removexattr           /* 235 */
+        .long sys_lremovexattr
+        .long sys_fremovexattr
+        .long sys_tkill
+        .long sys_sendfile64
+        .long sys_futex                 /* 240 */
+        .long sys_sched_setaffinity
+        .long sys_sched_getaffinity
+        .long sys_ni_syscall            /* reserved for "set_thread_area" system call */
+        .long sys_ni_syscall            /* reserved for "get_thread_area" system call */
+        .long sys_io_setup              /* 245 */
+        .long sys_io_destroy
+        .long sys_io_getevents
+        .long sys_io_submit
+        .long sys_io_cancel
+        .long sys_fadvise64             /* 250 */
+        .long sys_ni_syscall
+        .long sys_exit_group
+        .long sys_lookup_dcookie
+        .long sys_epoll_create
+        .long sys_epoll_ctl             /* 255 */
+        .long sys_epoll_wait
+        .long sys_remap_file_pages
+        .long sys_set_tid_address
+        .long sys_timer_create
+        .long sys_timer_settime         /* 260 */
+        .long sys_timer_gettime
+        .long sys_timer_getoverrun
+        .long sys_timer_delete
+        .long sys_clock_settime
+        .long sys_clock_gettime         /* 265 */
+        .long sys_clock_getres
+        .long sys_clock_nanosleep
+        .long sys_statfs64
+        .long sys_fstatfs64
+        .long sys_tgkill                /* 270 */
+        .long sys_utimes
+        .long sys_fadvise64_64
+        .long sys_ni_syscall            /* Reserved for sys_vserver */
+        .long sys_ni_syscall            /* Reserved for sys_mbind */
+        .long sys_ni_syscall            /* Reserved for sys_get_mempolicy */
+        .long sys_ni_syscall            /* Reserved for sys_set_mempolicy */
+        .long sys_mq_open
+        .long sys_mq_unlink
+        .long sys_mq_timedsend
+        .long sys_mq_timedreceive       /* 280 */
+        .long sys_mq_notify
+        .long sys_mq_getsetattr
+        .long sys_ni_syscall            /* reserved for kexec */
+        .long sys_waitid
diff --git a/arch/m32r/platforms/Makefile b/arch/m32r/platforms/Makefile
new file mode 100644
index 0000000000..da03e1a8fe
--- /dev/null
+++ b/arch/m32r/platforms/Makefile
@@ -0,0 +1,9 @@
+# arch/m32r/platforms/Makefile
+obj-$(CONFIG_PLAT_M32104UT)     += m32104ut/
+obj-$(CONFIG_PLAT_M32700UT)     += m32700ut/
+obj-$(CONFIG_PLAT_MAPPI)        += mappi/
+obj-$(CONFIG_PLAT_MAPPI2)       += mappi2/
+obj-$(CONFIG_PLAT_MAPPI3)       += mappi3/
+obj-$(CONFIG_PLAT_OAKS32R)      += oaks32r/
+obj-$(CONFIG_PLAT_OPSPUT)       += opsput/
+obj-$(CONFIG_PLAT_USRV)         += usrv/
diff --git a/arch/m32r/platforms/m32104ut/Makefile b/arch/m32r/platforms/m32104ut/Makefile
new file mode 100644
index 0000000000..0de59084f2
--- /dev/null
+++ b/arch/m32r/platforms/m32104ut/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/kernel/io_m32104ut.c b/arch/m32r/platforms/m32104ut/io.c
index 2189eca30b..e5d8be6fbb 100644
--- a/arch/m32r/kernel/io_m32104ut.c
+++ b/arch/m32r/platforms/m32104ut/io.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/io_m32104ut.c
+ *  linux/arch/m32r/platforms/m32104ut/io.c
  *
  *  Typical I/O routines for M32104UT board.
  *
diff --git a/arch/m32r/kernel/setup_m32104ut.c b/arch/m32r/platforms/m32104ut/setup.c
index 1692b321f4..98138b4e92 100644
--- a/arch/m32r/kernel/setup_m32104ut.c
+++ b/arch/m32r/platforms/m32104ut/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/setup_m32104ut.c
+ *  linux/arch/m32r/platforms/m32104ut/setup.c
  *
  *  Setup routines for M32104UT Board
  *
diff --git a/arch/m32r/platforms/m32700ut/Makefile b/arch/m32r/platforms/m32700ut/Makefile
new file mode 100644
index 0000000000..0de59084f2
--- /dev/null
+++ b/arch/m32r/platforms/m32700ut/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB
index 525dab4698..525dab4698 100644
--- a/arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB
+++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB
diff --git a/arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB
index aa503657a4..aa503657a4 100644
--- a/arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB
+++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB
diff --git a/arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB
index adc608aab2..adc608aab2 100644
--- a/arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB
+++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB
diff --git a/arch/m32r/kernel/io_m32700ut.c b/arch/m32r/platforms/m32700ut/io.c
index 5898f4031a..6862586e58 100644
--- a/arch/m32r/kernel/io_m32700ut.c
+++ b/arch/m32r/platforms/m32700ut/io.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/io_m32700ut.c
+ *  linux/arch/m32r/platforms/m32700ut/io.c
  *
  *  Typical I/O routines for M32700UT board.
  *
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/platforms/m32700ut/setup.c
index 7efc145c74..77b0ae9379 100644
--- a/arch/m32r/kernel/setup_m32700ut.c
+++ b/arch/m32r/platforms/m32700ut/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/setup_m32700ut.c
+ *  linux/arch/m32r/platforms/m32700ut/setup.c
  *
  *  Setup routines for Renesas M32700UT Board
  *
diff --git a/arch/m32r/platforms/mappi/Makefile b/arch/m32r/platforms/mappi/Makefile
new file mode 100644
index 0000000000..0de59084f2
--- /dev/null
+++ b/arch/m32r/platforms/mappi/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/mappi/dot.gdbinit b/arch/m32r/platforms/mappi/dot.gdbinit
index 7a1d293863..7a1d293863 100644
--- a/arch/m32r/mappi/dot.gdbinit
+++ b/arch/m32r/platforms/mappi/dot.gdbinit
diff --git a/arch/m32r/mappi/dot.gdbinit.nommu b/arch/m32r/platforms/mappi/dot.gdbinit.nommu
index 297536cf67..297536cf67 100644
--- a/arch/m32r/mappi/dot.gdbinit.nommu
+++ b/arch/m32r/platforms/mappi/dot.gdbinit.nommu
diff --git a/arch/m32r/mappi/dot.gdbinit.smp b/arch/m32r/platforms/mappi/dot.gdbinit.smp
index 171489a440..171489a440 100644
--- a/arch/m32r/mappi/dot.gdbinit.smp
+++ b/arch/m32r/platforms/mappi/dot.gdbinit.smp
diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/platforms/mappi/io.c
index 31396789ab..ac1c396d47 100644
--- a/arch/m32r/kernel/io_mappi.c
+++ b/arch/m32r/platforms/mappi/io.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/io_mappi.c
+ *  linux/arch/m32r/platforms/mappi/io.c
  *
  *  Typical I/O routines for Mappi board.
  *
diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/platforms/mappi/setup.c
index fe73c9ec61..3ec087ff22 100644
--- a/arch/m32r/kernel/setup_mappi.c
+++ b/arch/m32r/platforms/mappi/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/setup_mappi.c
+ *  linux/arch/m32r/platforms/mappi/setup.c
  *
  *  Setup routines for Renesas MAPPI Board
  *
diff --git a/arch/m32r/platforms/mappi2/Makefile b/arch/m32r/platforms/mappi2/Makefile
new file mode 100644
index 0000000000..0de59084f2
--- /dev/null
+++ b/arch/m32r/platforms/mappi2/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/mappi2/dot.gdbinit.vdec2 b/arch/m32r/platforms/mappi2/dot.gdbinit.vdec2
index 797a830bd4..797a830bd4 100644
--- a/arch/m32r/mappi2/dot.gdbinit.vdec2
+++ b/arch/m32r/platforms/mappi2/dot.gdbinit.vdec2
diff --git a/arch/m32r/kernel/io_mappi2.c b/arch/m32r/platforms/mappi2/io.c
index ecc6aa88f9..da58960b3f 100644
--- a/arch/m32r/kernel/io_mappi2.c
+++ b/arch/m32r/platforms/mappi2/io.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/io_mappi2.c
+ *  linux/arch/m32r/platforms/mappi2/io.c
  *
  *  Typical I/O routines for Mappi2 board.
  *
diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/platforms/mappi2/setup.c
index 55abb21027..d87969c635 100644
--- a/arch/m32r/kernel/setup_mappi2.c
+++ b/arch/m32r/platforms/mappi2/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/setup_mappi2.c
+ *  linux/arch/m32r/platforms/mappi2/setup.c
  *
  *  Setup routines for Renesas MAPPI-II(M3A-ZA36) Board
  *
diff --git a/arch/m32r/platforms/mappi3/Makefile b/arch/m32r/platforms/mappi3/Makefile
new file mode 100644
index 0000000000..0de59084f2
--- /dev/null
+++ b/arch/m32r/platforms/mappi3/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/mappi3/dot.gdbinit b/arch/m32r/platforms/mappi3/dot.gdbinit
index 89c22184e1..89c22184e1 100644
--- a/arch/m32r/mappi3/dot.gdbinit
+++ b/arch/m32r/platforms/mappi3/dot.gdbinit
diff --git a/arch/m32r/kernel/io_mappi3.c b/arch/m32r/platforms/mappi3/io.c
index a13b5f6b07..1bc3f90fdc 100644
--- a/arch/m32r/kernel/io_mappi3.c
+++ b/arch/m32r/platforms/mappi3/io.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/io_mappi3.c
+ *  linux/arch/m32r/platforms/mappi3/io.c
  *
  *  Typical I/O routines for Mappi3 board.
  *
diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/platforms/mappi3/setup.c
index 93dc010c7f..785b4bd6d9 100644
--- a/arch/m32r/kernel/setup_mappi3.c
+++ b/arch/m32r/platforms/mappi3/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/setup_mappi3.c
+ *  linux/arch/m32r/platforms/mappi3/setup.c
  *
  *  Setup routines for Renesas MAPPI-III(M3A-2170) Board
  *
diff --git a/arch/m32r/platforms/oaks32r/Makefile b/arch/m32r/platforms/oaks32r/Makefile
new file mode 100644
index 0000000000..0de59084f2
--- /dev/null
+++ b/arch/m32r/platforms/oaks32r/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/oaks32r/dot.gdbinit.nommu b/arch/m32r/platforms/oaks32r/dot.gdbinit.nommu
index d481d972b8..d481d972b8 100644
--- a/arch/m32r/oaks32r/dot.gdbinit.nommu
+++ b/arch/m32r/platforms/oaks32r/dot.gdbinit.nommu
diff --git a/arch/m32r/kernel/io_oaks32r.c b/arch/m32r/platforms/oaks32r/io.c
index 068bf47060..364a3b2e89 100644
--- a/arch/m32r/kernel/io_oaks32r.c
+++ b/arch/m32r/platforms/oaks32r/io.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/io_oaks32r.c
+ *  linux/arch/m32r/platforms/oaks32r/io.c
  *
  *  Typical I/O routines for OAKS32R board.
  *
diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/platforms/oaks32r/setup.c
index cd62598e3c..6faa5db68e 100644
--- a/arch/m32r/kernel/setup_oaks32r.c
+++ b/arch/m32r/platforms/oaks32r/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/setup_oaks32r.c
+ *  linux/arch/m32r/platforms/oaks32r/setup.c
  *
  *  Setup routines for OAKS32R Board
  *
diff --git a/arch/m32r/platforms/opsput/Makefile b/arch/m32r/platforms/opsput/Makefile
new file mode 100644
index 0000000000..0de59084f2
--- /dev/null
+++ b/arch/m32r/platforms/opsput/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/opsput/dot.gdbinit b/arch/m32r/platforms/opsput/dot.gdbinit
index b7e6c66408..b7e6c66408 100644
--- a/arch/m32r/opsput/dot.gdbinit
+++ b/arch/m32r/platforms/opsput/dot.gdbinit
diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/platforms/opsput/io.c
index 3cbb1f717e..379efb7712 100644
--- a/arch/m32r/kernel/io_opsput.c
+++ b/arch/m32r/platforms/opsput/io.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/io_opsput.c
+ *  linux/arch/m32r/platforms/opsput/io.c
  *
  *  Typical I/O routines for OPSPUT board.
  *
diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/platforms/opsput/setup.c
index 62d6b71de4..fab13fd854 100644
--- a/arch/m32r/kernel/setup_opsput.c
+++ b/arch/m32r/platforms/opsput/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/setup_opsput.c
+ *  linux/arch/m32r/platforms/opsput/setup.c
  *
  *  Setup routines for Renesas OPSPUT Board
  *
diff --git a/arch/m32r/platforms/usrv/Makefile b/arch/m32r/platforms/usrv/Makefile
new file mode 100644
index 0000000000..0de59084f2
--- /dev/null
+++ b/arch/m32r/platforms/usrv/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/kernel/io_usrv.c b/arch/m32r/platforms/usrv/io.c
index a8c0e2eceb..f5e50d37ba 100644
--- a/arch/m32r/kernel/io_usrv.c
+++ b/arch/m32r/platforms/usrv/io.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/io_usrv.c
+ *  linux/arch/m32r/platforms/usrv/io.c
  *
  *  Typical I/O routines for uServer board.
  *
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 
 #include <linux/types.h>
-#include "../drivers/m32r_cfc.h"
+#include "../../../../drivers/pcmcia/m32r_cfc.h"
 
 extern void pcc_ioread_byte(int, unsigned long, void *, size_t, size_t, int);
 extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int);
diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/platforms/usrv/setup.c
index f5b4b5ac31..89588d649e 100644
--- a/arch/m32r/kernel/setup_usrv.c
+++ b/arch/m32r/platforms/usrv/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m32r/kernel/setup_usrv.c
+ *  linux/arch/m32r/platforms/usrv/setup.c
  *
  *  Setup routines for MITSUBISHI uServer
  *
@@ -198,7 +198,7 @@ void __init init_IRQ(void)
 #endif  /* CONFIG_SERIAL_M32R_SIO */
 
         /* INT#67-#71: CFC#0 IREQ on PLD */
-        for (i = 0 ; i < CONFIG_CFC_NUM ; i++ ) {
+        for (i = 0 ; i < CONFIG_M32R_CFC_NUM ; i++ ) {
                 irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED;
                 irq_desc[PLD_IRQ_CF0 + i].chip = &m32700ut_pld_irq_type;
                 irq_desc[PLD_IRQ_CF0 + i].action = 0;
@@ -246,4 +246,3 @@ void __init init_IRQ(void)
         icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD11;
         enable_mappi_irq(M32R_IRQ_INT1);
 }
-
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index e162ee685d..918f5dbeae 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -735,4 +735,14 @@ sys_call_table:
         .long sys_tee
         .long sys_vmsplice
         .long sys_move_pages            /* 310 */
+        .long sys_sched_setaffinity
+        .long sys_sched_getaffinity
+        .long sys_kexec_load
+        .long sys_getcpu
+        .long sys_epoll_pwait           /* 315 */
+        .long sys_utimensat
+        .long sys_signalfd
+        .long sys_timerfd
+        .long sys_eventfd
+        .long sys_fallocate             /* 320 */
 
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c
index 2cf0690b78..e792d3cba4 100644
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
@@ -116,7 +116,6 @@ static inline void singlestep_disable(struct task_struct *child)
 void ptrace_disable(struct task_struct *child)
 {
         singlestep_disable(child);
-        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 }
 
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index 846f975346..47502d5ec1 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -28,6 +28,7 @@
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/reboot.h>
+#include <linux/fs.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index 48e6b33e8b..15d62c5279 100644
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -18,6 +18,7 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/fs.h>
 
 #include <asm/setup.h>
 #include <asm/uaccess.h>
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S
index 4603f4f3c9..9620093514 100644
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
@@ -329,6 +329,16 @@ ENTRY(sys_call_table)
         .long sys_tee
         .long sys_vmsplice
         .long sys_move_pages            /* 310 */
+        .long sys_sched_setaffinity
+        .long sys_sched_getaffinity
+        .long sys_kexec_load
+        .long sys_getcpu
+        .long sys_epoll_pwait           /* 315 */
+        .long sys_utimensat
+        .long sys_signalfd
+        .long sys_timerfd
+        .long sys_eventfd
+        .long sys_fallocate             /* 320 */
 
         .rept NR_syscalls-(.-sys_call_table)/4
                 .long sys_ni_syscall
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3b404b7dfa..3b807b4bc7 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -28,7 +28,6 @@ config BASLER_EXCITE
         select MIPS_RM9122
         select SYS_HAS_CPU_RM9000
         select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_KGDB
         help
@@ -81,10 +80,10 @@ config MACH_DECSTATION
           If you have one of the following DECstation Models you definitely
           want to choose R4xx0 for the CPU Type:
 
-                DECstation 5000/50
-                DECstation 5000/150
-                DECstation 5000/260
-                DECsystem 5900/260
+                DECstation 5000/50
+                DECstation 5000/150
+                DECstation 5000/260
+                DECsystem 5900/260
 
           otherwise choose R3000.
 
@@ -126,6 +125,7 @@ config LEMOTE_FULONG
         select SYS_SUPPORTS_HIGHMEM
         select SYS_HAS_EARLY_PRINTK
         select GENERIC_HARDIRQS_NO__DO_IRQ
+        select GENERIC_ISA_DMA_SUPPORT_BROKEN
         select CPU_HAS_WB
         help
           Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
@@ -192,8 +192,7 @@ config MIPS_MALTA
           board.
 
 config MIPS_SEAD
-        bool "MIPS SEAD board (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "MIPS SEAD board"
         select IRQ_CPU
         select DMA_NONCOHERENT
         select SYS_HAS_EARLY_PRINTK
@@ -528,6 +527,7 @@ config TOSHIBA_JMR3927
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select MIPS_TX3927
+        select IRQ_TXX9
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_TX39XX
         select SYS_SUPPORTS_32BIT_KERNEL
@@ -540,7 +540,9 @@ config TOSHIBA_RBTX4927
         select DMA_NONCOHERENT
         select HAS_TXX9_SERIAL
         select HW_HAS_PCI
-        select I8259
+        select IRQ_CPU
+        select IRQ_TXX9
+        select I8259 if TOSHIBA_FPCIB0
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_TX49XX
         select SYS_SUPPORTS_32BIT_KERNEL
@@ -555,12 +557,11 @@ config TOSHIBA_RBTX4927
 
 config TOSHIBA_RBTX4938
         bool "Toshiba RBTX4938 board"
-        select HAVE_STD_PC_SERIAL_PORT
         select DMA_NONCOHERENT
-        select GENERIC_ISA_DMA
         select HAS_TXX9_SERIAL
         select HW_HAS_PCI
-        select I8259
+        select IRQ_CPU
+        select IRQ_TXX9
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_TX49XX
         select SYS_SUPPORTS_32BIT_KERNEL
@@ -604,7 +605,6 @@ source "arch/mips/sibyte/Kconfig"
 source "arch/mips/tx4927/Kconfig"
 source "arch/mips/tx4938/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
-source "arch/mips/philips/pnx8550/common/Kconfig"
 
 endmenu
 
@@ -693,9 +693,9 @@ config EARLY_PRINTK
 config SYS_HAS_EARLY_PRINTK
         bool
 
-config GENERIC_ISA_DMA
+config HOTPLUG_CPU
         bool
-        select ZONE_DMA
+        default n
 
 config I8259
         bool
@@ -712,9 +712,13 @@ config MIPS_DISABLE_OBSOLETE_IDE
 config NO_IOPORT
         def_bool n
 
+config GENERIC_ISA_DMA
+        bool
+        select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
+
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
         bool
-        select ZONE_DMA
+        select GENERIC_ISA_DMA
 
 config GENERIC_GPIO
         bool
@@ -768,6 +772,9 @@ config IRQ_MSP_SLP
 config IRQ_MSP_CIC
         bool
 
+config IRQ_TXX9
+        bool
+
 config MIPS_BOARDS_GEN
         bool
 
@@ -811,20 +818,6 @@ config EMMA2RH
 config SERIAL_RM9000
         bool
 
-#
-# Unfortunately not all GT64120 systems run the chip at the same clock.
-# As the user for the clock rate and try to minimize the available options.
-#
-choice
-        prompt "Galileo Chip Clock"
-        depends on MOMENCO_OCELOT
-        default SYSCLK_100 if MOMENCO_OCELOT
-
-config SYSCLK_100
-        bool "100" if MOMENCO_OCELOT
-
-endchoice
-
 config ARC32
         bool
 
@@ -1427,8 +1420,7 @@ config SB1_PASS_2_1_WORKAROUNDS
         default y
 
 config 64BIT_PHYS_ADDR
-        bool "Support for 64-bit physical address space"
-        depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT
+        bool
 
 config CPU_HAS_LLSC
         bool
diff --git a/arch/mips/au1000/Kconfig b/arch/mips/au1000/Kconfig
index abea880982..29c95d9721 100644
--- a/arch/mips/au1000/Kconfig
+++ b/arch/mips/au1000/Kconfig
@@ -136,6 +136,7 @@ config SOC_AU1200
 
 config SOC_AU1X00
         bool
+        select 64BIT_PHYS_ADDR
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_APM_EMULATION
diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c
index 7abe420994..8527856aec 100644
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
@@ -131,12 +131,12 @@ int au1xxx_gpio_direction_input(unsigned gpio)
 {
         if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
-                ;
+                return -ENODEV;
 #else
                 return au1xxx_gpio2_direction_input(gpio);
 #endif
-        else
-                return au1xxx_gpio1_direction_input(gpio);
+
+        return au1xxx_gpio1_direction_input(gpio);
 }
 
 EXPORT_SYMBOL(au1xxx_gpio_direction_input);
@@ -145,12 +145,12 @@ int au1xxx_gpio_direction_output(unsigned gpio, int value)
 {
         if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
-                ;
+                return -ENODEV;
 #else
                 return au1xxx_gpio2_direction_output(gpio, value);
 #endif
-        else
-                return au1xxx_gpio1_direction_output(gpio, value);
+
+        return au1xxx_gpio1_direction_output(gpio, value);
 }
 
 EXPORT_SYMBOL(au1xxx_gpio_direction_output);
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c
index 6c25e6c09f..9be99a6893 100644
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
@@ -74,6 +74,7 @@ static int __init au1x_pci_setup(void)
                 printk(KERN_ERR "Unable to ioremap pci space\n");
                 return 1;
         }
+        au1x_controller.io_map_base = virt_io_addr;
 
 #ifdef CONFIG_DMA_NONCOHERENT
         {
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c
index 7bc5af8917..2c460c1165 100644
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
@@ -54,11 +54,11 @@ void board_reset (void)
 
 void __init board_setup(void)
 {
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         // enable USB power switch
         au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
         au_writel( 0x100000, GPIO2_OUTPUT );
-#endif // defined (CONFIG_USB_OHCI)
+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/pb1000/board_setup.c
index 824cfafaff..0aed89114b 100644
--- a/arch/mips/au1000/pb1000/board_setup.c
+++ b/arch/mips/au1000/pb1000/board_setup.c
@@ -54,7 +54,7 @@ void __init board_setup(void)
         au_writel(0, SYS_PINSTATERD);
         udelay(100);
 
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         /* zero and disable FREQ2 */
         sys_freqctrl = au_readl(SYS_FREQCTRL0);
         sys_freqctrl &= ~0xFFF00000;
@@ -102,7 +102,7 @@ void __init board_setup(void)
         /*
          * Route 48MHz FREQ2 into USB Host and/or Device
          */
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
 #endif
         au_writel(sys_clksrc, SYS_CLKSRC);
@@ -116,7 +116,7 @@ void __init board_setup(void)
         au_writel(pin_func, SYS_PINFUNC);
         au_writel(0x2800, SYS_TRIOUTCLR);
         au_writel(0x0030, SYS_OUTPUTCLR);
-#endif // defined (CONFIG_USB_OHCI)
+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
         // make gpio 15 an input (for interrupt line)
         pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100);
diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/pb1100/board_setup.c
index 6bc1f8e1b6..259ca05860 100644
--- a/arch/mips/au1000/pb1100/board_setup.c
+++ b/arch/mips/au1000/pb1100/board_setup.c
@@ -54,7 +54,7 @@ void __init board_setup(void)
         au_writel(0, SYS_PININPUTEN);
         udelay(100);
 
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         {
                 u32 pin_func, sys_freqctrl, sys_clksrc;
 
@@ -98,7 +98,7 @@ void __init board_setup(void)
                 pin_func |= 0x8000;
                 au_writel(pin_func, SYS_PINFUNC);
         }
-#endif // defined (CONFIG_USB_OHCI)
+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
         /* Enable sys bus clock divider when IDLE state or no bus activity. */
         au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c
index c9b655616f..a2d850db89 100644
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
@@ -56,7 +56,7 @@ void __init board_setup(void)
         au_writel(0, SYS_PINSTATERD);
         udelay(100);
 
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 
         /* GPIO201 is input for PCMCIA card detect */
         /* GPIO203 is input for PCMCIA interrupt request */
@@ -85,7 +85,7 @@ void __init board_setup(void)
         /*
          * Route 48MHz FREQ2 into USB Host and/or Device
          */
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
 #endif
         au_writel(sys_clksrc, SYS_CLKSRC);
@@ -95,7 +95,7 @@ void __init board_setup(void)
         // 2nd USB port is USB host
         pin_func |= 0x8000;
         au_writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI)
+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
 
 
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 67a80f4c7d..700a3a2d68 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -663,8 +663,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
 # CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
-CONFIG_SIBYTE_SB1250_DUART=y
-CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
+CONFIG_SERIAL_SB1250_DUART=y
+CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
 
 #
 # Serial drivers
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index 4dc3197e2e..8ecbbb226c 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:22 2007
+# Linux kernel version: 2.6.23-rc2
+# Wed Aug  8 10:23:16 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
@@ -73,6 +60,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -82,6 +71,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -103,7 +93,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -119,7 +108,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,48 +121,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -187,32 +174,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -232,16 +217,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -254,10 +236,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -267,7 +246,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -309,20 +287,13 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_INET6_TUNNEL is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -348,7 +319,17 @@ CONFIG_NETWORK_SECMARK=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -361,30 +342,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
+# CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -397,19 +358,9 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -424,15 +375,16 @@ CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -440,16 +392,9 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -460,30 +405,17 @@ CONFIG_IDE_GENERIC=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -497,22 +429,16 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -521,6 +447,7 @@ CONFIG_NET_PCI=y
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_B44 is not set
 # CONFIG_FORCEDETH is not set
+# CONFIG_TC35815 is not set
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_E100 is not set
@@ -539,50 +466,15 @@ CONFIG_8139TOO_PIO=y
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=m
-# CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -592,15 +484,7 @@ CONFIG_NETXEN_NIC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -608,6 +492,7 @@ CONFIG_NETXEN_NIC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -624,6 +509,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -658,34 +544,17 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
 CONFIG_GPIO_VR41XX=y
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -693,32 +562,33 @@ CONFIG_GPIO_VR41XX=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -726,65 +596,16 @@ CONFIG_GPIO_VR41XX=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-# CONFIG_HID is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -798,18 +619,29 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
 
 #
-# RTC drivers
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_VR41XX=y
-# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_VR41XX=y
+
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -823,12 +655,9 @@ CONFIG_RTC_DRV_VR41XX=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -836,8 +665,14 @@ CONFIG_RTC_DRV_VR41XX=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
@@ -852,7 +687,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
 CONFIG_GENERIC_ACL=y
 
 #
@@ -879,7 +714,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -905,14 +740,12 @@ CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
+# CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
-CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -920,7 +753,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -936,10 +768,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
+# CONFIG_DLM is not set
 
 #
 # Profiling support
@@ -957,7 +786,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
 
@@ -966,10 +794,6 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -990,6 +814,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -1008,10 +833,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
 
 #
 # Library routines
@@ -1019,10 +841,13 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 6d6a01b9a8..ebcb7ad881 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc2
-# Fri May 25 11:17:29 2007
+# Linux kernel version: 2.6.23-rc2
+# Tue Aug  7 22:12:54 2007
 #
 CONFIG_MIPS=y
 
@@ -13,33 +13,35 @@ CONFIG_MIPS=y
 CONFIG_MIPS_COBALT=y
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -54,6 +56,7 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_I8259=y
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -64,6 +67,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -101,7 +105,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -117,43 +120,40 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -185,19 +185,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Block layer
-#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -236,10 +234,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -286,20 +281,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -335,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -347,12 +331,7 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
+# CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -430,20 +409,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
 # UBI - Unsorted block images
 #
 # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -453,17 +420,11 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -471,6 +432,7 @@ CONFIG_BLK_DEV_LOOP=y
 #
 CONFIG_RAID_ATTRS=y
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -492,6 +454,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -499,45 +462,8 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -593,10 +519,6 @@ CONFIG_ATA=y
 CONFIG_PATA_VIA=y
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -612,41 +534,24 @@ CONFIG_PATA_VIA=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=y
 CONFIG_TULIP=y
@@ -661,10 +566,6 @@ CONFIG_TULIP=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
-
-#
-# Token Ring devices
-#
 # CONFIG_TR is not set
 
 #
@@ -672,6 +573,16 @@ CONFIG_TULIP=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -682,15 +593,7 @@ CONFIG_TULIP=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -698,6 +601,7 @@ CONFIG_TULIP=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_POLLDEV=y
 
 #
 # Userland interfaces
@@ -705,7 +609,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -725,7 +629,6 @@ CONFIG_INPUT_COBALT_BTNS=y
 # CONFIG_INPUT_POWERMATE is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
-CONFIG_INPUT_POLLDEV=y
 
 #
 # Hardware I/O ports
@@ -761,24 +664,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
 CONFIG_COBALT_LCD=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
@@ -788,11 +682,8 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -817,6 +708,7 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -829,55 +721,131 @@ CONFIG_DUMMY_CONSOLE=y
 # Sound
 #
 # CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 
 #
-# HID Devices
+# USB Input Devices
 #
-# CONFIG_HID is not set
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
 
 #
-# USB support
+# USB HID Boot Protocol drivers
 #
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
 #
-# USB Gadget Support
+# may also be needed; see USB_STORAGE Help for more information
 #
-# CONFIG_USB_GADGET is not set
-# CONFIG_MMC is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
 
 #
-# LED devices
+# USB Imaging devices
 #
-# CONFIG_NEW_LEDS is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
 
 #
-# LED drivers
+# USB port drivers
 #
 
 #
-# LED Triggers
+# USB Serial Converter support
 #
+# CONFIG_USB_SERIAL is not set
 
 #
-# InfiniBand support
+# USB Miscellaneous drivers
 #
-# CONFIG_INFINIBAND is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# USB DSL modem support
 #
 
 #
-# Real Time Clock
+# USB Gadget Support
 #
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -894,10 +862,6 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_TEST is not set
 
 #
-# I2C RTC drivers
-#
-
-#
 # SPI RTC drivers
 #
 
@@ -906,8 +870,10 @@ CONFIG_RTC_INTF_DEV=y
 #
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -928,6 +894,11 @@ CONFIG_RTC_DRV_CMOS=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1032,7 +1003,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1074,10 +1044,6 @@ CONFIG_CMDLINE=""
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
@@ -1088,6 +1054,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 5467d750b6..d0d07faeb8 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:28 2007
+# Linux kernel version: 2.6.23-rc2
+# Wed Aug  8 10:36:25 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_CASIO_E55=y
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
@@ -72,6 +59,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -81,6 +70,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -102,7 +92,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -118,7 +107,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -132,45 +120,44 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -183,32 +170,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -226,6 +211,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Bus options (PCI, PCMCIA, EISA, ISA, TC)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ISA=y
 CONFIG_MMU=y
 
@@ -234,10 +220,6 @@ CONFIG_MMU=y
 #
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -247,10 +229,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -267,46 +246,18 @@ CONFIG_PM=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
 # CONFIG_PNP is not set
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
-CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
-
-#
-# Misc devices
-#
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -321,15 +272,16 @@ CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -337,43 +289,10 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# ISDN subsystem
-#
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -381,14 +300,12 @@ CONFIG_IDE_GENERIC=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
+# CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 # CONFIG_INPUT_EVDEV is not set
@@ -400,6 +317,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -433,45 +351,16 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-
-#
-# ISA-based Watchdog Cards
-#
-# CONFIG_PCWATCHDOG is not set
-# CONFIG_MIXCOMWD is not set
-# CONFIG_WDT is not set
+# CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 CONFIG_GPIO_VR41XX=y
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -479,31 +368,32 @@ CONFIG_GPIO_VR41XX=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -512,65 +402,49 @@ CONFIG_GPIO_VR41XX=y
 # CONFIG_VGA_CONSOLE is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
-# LED drivers
+# RTC interfaces
 #
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# LED Triggers
+# SPI RTC drivers
 #
 
 #
-# InfiniBand support
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# on-CPU RTC drivers
 #
-
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_DRV_VR41XX=y
 
 #
 # DMA Engine support
@@ -586,12 +460,9 @@ CONFIG_HID=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -599,8 +470,14 @@ CONFIG_HID=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
@@ -614,7 +491,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
 CONFIG_GENERIC_ACL=y
 
 #
@@ -687,7 +564,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
 
@@ -696,10 +572,6 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
@@ -707,8 +579,11 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
 #
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 # CONFIG_CRC32 is not set
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 934d8a0089..670039bb1a 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:32 2007
+# Linux kernel version: 2.6.23-rc2
+# Tue Aug  7 12:39:49 2007
 #
 CONFIG_MIPS=y
 
@@ -9,52 +9,40 @@ CONFIG_MIPS=y
 # Machine selection
 #
 CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 CONFIG_SGI_IP22=y
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -67,6 +55,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARC=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -82,6 +73,7 @@ CONFIG_ARC_PROMLIB=y
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -122,8 +114,6 @@ CONFIG_IP22_CPU_SCACHE=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
-# CONFIG_64BIT_PHYS_ADDR is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -139,6 +129,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -152,35 +144,33 @@ CONFIG_HZ=1000
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -193,32 +183,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -237,6 +225,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # Bus options (PCI, PCMCIA, EISA, ISA, TC)
 #
 CONFIG_HW_HAS_EISA=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_EISA is not set
 CONFIG_MMU=y
 
@@ -245,10 +234,6 @@ CONFIG_MMU=y
 #
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -261,7 +246,7 @@ CONFIG_TRAD_SIGNALS=y
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_SUSPEND is not set
 
 #
 # Networking
@@ -271,7 +256,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -308,10 +292,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-
-#
-# IP: Virtual Server Configuration
-#
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
@@ -346,10 +326,11 @@ CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MIP6=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@@ -371,8 +352,6 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
@@ -380,6 +359,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -398,11 +378,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -423,6 +405,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
@@ -490,25 +473,13 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_RAW=m
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -527,9 +498,6 @@ CONFIG_SCTP_HMAC_MD5=y
 #
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_CLK_JIFFIES is not set
-CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
-# CONFIG_NET_SCH_CLK_CPU is not set
 
 #
 # Queueing/Scheduling
@@ -538,6 +506,7 @@ CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
@@ -562,10 +531,16 @@ CONFIG_NET_CLS_U32=m
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_CLS_POLICE=y
 # CONFIG_NET_CLS_IND is not set
-CONFIG_NET_ESTIMATOR=y
 
 #
 # Network testing
@@ -574,14 +549,26 @@ CONFIG_NET_ESTIMATOR=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-CONFIG_FIB_RULES=y
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -593,47 +580,19 @@ CONFIG_FIB_RULES=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -641,6 +600,7 @@ CONFIG_ATA_OVER_ETH=m
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 CONFIG_SCSI_TGT=m
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -663,6 +623,7 @@ CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -670,51 +631,21 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SCSI_FC_ATTRS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_SGIWD93_SCSI=y
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_IFB is not set
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+CONFIG_MACVLAN=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -728,36 +659,25 @@ CONFIG_CICADA_PHY=m
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
+# CONFIG_AX88796 is not set
 # CONFIG_DM9000 is not set
 CONFIG_SGISEEQ=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+# CONFIG_LIBERTAS is not set
+CONFIG_HOSTAP=m
+# CONFIG_HOSTAP_FIRMWARE is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -765,15 +685,7 @@ CONFIG_SGISEEQ=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -781,6 +693,7 @@ CONFIG_SGISEEQ=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -806,9 +719,16 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_PS2_ALPS is not set
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_SERIAL=m
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -844,15 +764,7 @@ CONFIG_SERIAL_CORE=m
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -864,20 +776,10 @@ CONFIG_INDYDOG=m
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
 CONFIG_SGI_DS1286=m
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -885,32 +787,33 @@ CONFIG_MAX_RAW_DEVS=256
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -920,31 +823,20 @@ CONFIG_FIRMWARE_EDID=y
 CONFIG_SGI_NEWPORT_CONSOLE=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_SGI_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -957,36 +849,8 @@ CONFIG_HID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1003,12 +867,9 @@ CONFIG_HID=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -1121,6 +982,7 @@ CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1136,7 +998,6 @@ CONFIG_CIFS=m
 CONFIG_CODA_FS=m
 # CONFIG_CODA_FS_OLD_API is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1158,6 +1019,7 @@ CONFIG_SGI_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 
 #
 # Native Language Support
@@ -1207,8 +1069,6 @@ CONFIG_NLS_UTF8=m
 # Distributed Lock Manager
 #
 CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
 # CONFIG_DLM_DEBUG is not set
 
 #
@@ -1227,7 +1087,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE=""
 
@@ -1237,12 +1096,9 @@ CONFIG_CMDLINE=""
 CONFIG_KEYS=y
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ABLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
@@ -1261,6 +1117,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -1279,10 +1136,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
 
 #
 # Library routines
@@ -1290,7 +1144,9 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_BITREVERSE=m
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=m
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=m
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
@@ -1301,3 +1157,4 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index eb35f7518d..49bcc58929 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -1,66 +1,52 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:32 2007
+# Linux kernel version: 2.6.23-rc2
+# Tue Aug  7 13:04:24 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 CONFIG_SGI_IP27=y
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_SGI_SN_M_MODE=y
 # CONFIG_SGI_SN_N_MODE is not set
 # CONFIG_MAPPED_KERNEL is not set
 # CONFIG_REPLICATE_KTEXT is not set
 # CONFIG_REPLICATE_EXHANDLERS is not set
-CONFIG_EARLY_PRINTK=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -72,6 +58,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_ARC=y
 CONFIG_DMA_IP27=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -82,6 +71,7 @@ CONFIG_BOOT_ELF64=y
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -119,7 +109,6 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -141,7 +130,8 @@ CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 CONFIG_SMP=y
 CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_NR_CPUS_DEFAULT_64=y
@@ -161,36 +151,34 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_PREEMPT_BKL=y
 # CONFIG_MIPS_INSANE_LARGE is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -203,18 +191,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -222,12 +211,9 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -248,16 +234,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -279,7 +262,6 @@ CONFIG_BINFMT_ELF32=y
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
 
 #
 # Networking
@@ -289,7 +271,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -331,20 +312,13 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_INET6_TUNNEL is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -363,9 +337,6 @@ CONFIG_NETWORK_SECMARK=y
 #
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_CLK_JIFFIES is not set
-CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
-# CONFIG_NET_SCH_CLK_CPU is not set
 
 #
 # Queueing/Scheduling
@@ -374,6 +345,7 @@ CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
@@ -398,10 +370,15 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_PEDIT=m
+# CONFIG_NET_ACT_SIMP is not set
 CONFIG_NET_CLS_POLICE=y
 # CONFIG_NET_CLS_IND is not set
-CONFIG_NET_ESTIMATOR=y
 
 #
 # Network testing
@@ -410,13 +387,24 @@ CONFIG_NET_ESTIMATOR=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
+CONFIG_RFKILL=m
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -429,30 +417,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -463,21 +431,11 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -485,6 +443,7 @@ CONFIG_SGI_IOC4=m
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 CONFIG_SCSI_TGT=m
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
@@ -507,6 +466,7 @@ CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -517,10 +477,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -551,15 +508,7 @@ CONFIG_SCSI_QLOGIC_1280=y
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=m
@@ -578,6 +527,8 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_RDAC=m
+# CONFIG_DM_DELAY is not set
 
 #
 # Fusion MPT device support
@@ -590,30 +541,18 @@ CONFIG_DM_MULTIPATH_EMC=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+CONFIG_NETDEVICES_MULTIQUEUE=y
+CONFIG_IFB=m
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+CONFIG_MACVLAN=m
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -627,30 +566,21 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 # CONFIG_BROADCOM_PHY is not set
+CONFIG_ICPLUS_PHY=m
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+CONFIG_AX88796=m
 CONFIG_SGI_IOC3_ETH=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -661,35 +591,57 @@ CONFIG_SGI_IOC3_ETH=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
+CONFIG_VIA_VELOCITY=m
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_QLA3XXX=m
 # CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_10000=y
 # CONFIG_CHELSIO_T1 is not set
 CONFIG_CHELSIO_T3=m
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+# CONFIG_MLX4_CORE is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+CONFIG_IPW2100_DEBUG=y
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+CONFIG_IPW2200_DEBUG=y
+CONFIG_LIBERTAS=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PRISM54=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA=y
+CONFIG_BCM43XX_PIO=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -700,15 +652,7 @@ CONFIG_NETXEN_NIC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -756,34 +700,17 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=m
 # CONFIG_RTC is not set
 CONFIG_SGI_IP27_RTC=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -791,43 +718,40 @@ CONFIG_SGI_IP27_RTC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -841,37 +765,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -888,12 +784,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+CONFIG_UIO=y
+# CONFIG_UIO_CIF is not set
 
 #
 # File systems
@@ -992,6 +886,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -999,7 +894,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1021,6 +915,7 @@ CONFIG_SGI_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 
 #
 # Native Language Support
@@ -1031,8 +926,6 @@ CONFIG_SGI_PARTITION=y
 # Distributed Lock Manager
 #
 CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
 # CONFIG_DLM_DEBUG is not set
 
 #
@@ -1051,7 +944,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE=""
 CONFIG_SYS_SUPPORTS_KGDB=y
@@ -1062,12 +954,13 @@ CONFIG_SYS_SUPPORTS_KGDB=y
 CONFIG_KEYS=y
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ABLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
@@ -1086,6 +979,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -1104,21 +998,21 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=m
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 95a72d2750..eb96791c33 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc3
-# Thu Mar 15 00:40:40 2007
+# Linux kernel version: 2.6.23-rc1
+# Thu Aug  2 23:07:36 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 CONFIG_TOSHIBA_JMR3927=y
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -66,10 +53,12 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_IRQ_TXX9=y
 CONFIG_MIPS_TX3927=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -77,6 +66,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -112,21 +102,17 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -139,37 +125,30 @@ CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
+# CONFIG_SECCOMP is not set
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -181,23 +160,20 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
@@ -221,6 +197,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 
 #
@@ -228,10 +205,6 @@ CONFIG_MMU=y
 #
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -251,7 +224,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -266,7 +238,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
@@ -280,38 +251,17 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET 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_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
 
 #
 # QoS and/or fair queueing
@@ -325,7 +275,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
 
 #
 # Device Drivers
@@ -337,34 +294,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
@@ -372,16 +308,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -389,16 +316,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -409,46 +329,28 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_IEEE1394 is not set
 
 #
-# I2O device support
+# An alternative FireWire stack is available with EXPERIMENTAL=y
 #
+# CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -464,76 +366,28 @@ CONFIG_TC35815=y
 # CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 # CONFIG_SIS900 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_SC92031 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NETXEN_NIC is not set
-
-#
-# Token Ring devices
-#
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -541,6 +395,7 @@ CONFIG_TC35815=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -557,6 +412,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -607,33 +463,15 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y
 # CONFIG_UNIX98_PTYS is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -641,17 +479,9 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 
 #
 # Multifunction device drivers
@@ -662,75 +492,31 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-# CONFIG_HID is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -744,17 +530,28 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
 
 #
-# RTC drivers
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 CONFIG_RTC_DRV_DS1742=y
 # CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
+# on-CPU RTC drivers
+#
+
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -768,24 +565,19 @@ CONFIG_RTC_DRV_DS1742=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
 #
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -820,18 +612,11 @@ CONFIG_SYSFS=y
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
 #
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -844,21 +629,16 @@ CONFIG_RAMFS=y
 #
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 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_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -872,16 +652,6 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 
 #
-# Distributed Lock Manager
-#
-# CONFIG_DLM is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -892,7 +662,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE=""
 
@@ -901,10 +670,6 @@ CONFIG_CMDLINE=""
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
@@ -913,8 +678,11 @@ CONFIG_CMDLINE=""
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index fbfa568588..fbd2d802fd 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Sun Feb 18 21:27:55 2007
+# Linux kernel version: 2.6.23-rc2
+# Tue Aug  7 12:59:29 2007
 #
 CONFIG_MIPS=y
 
@@ -9,52 +9,40 @@ CONFIG_MIPS=y
 # Machine selection
 #
 CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 CONFIG_MIPS_MALTA=y
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -67,25 +55,28 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_I8259=y
 CONFIG_MIPS_BONITO64=y
 CONFIG_MIPS_MSC=y
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_IRQ_CPU=y
 CONFIG_MIPS_BOARDS_GEN=y
-CONFIG_MIPS_GT64120=y
+CONFIG_PCI_GT64XXX_PCI0=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_BOOT_ELF32=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5
-CONFIG_HAVE_STD_PC_SERIAL_PORT=y
 
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 CONFIG_CPU_MIPS32_R2=y
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -131,14 +122,14 @@ CONFIG_CPU_HAS_PREFETCH=y
 # CONFIG_MIPS_MT_DISABLED is not set
 CONFIG_MIPS_MT_SMP=y
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_MIPS_MT=y
 CONFIG_SYS_SUPPORTS_MULTITHREADING=y
 CONFIG_MIPS_MT_FPAFF=y
-# CONFIG_64BIT_PHYS_ADDR is not set
+# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_LLSC=y
 # CONFIG_CPU_HAS_SMARTMIPS is not set
 CONFIG_CPU_MIPSR2_IRQ_VI=y
+CONFIG_CPU_MIPSR2_IRQ_EI=y
 CONFIG_CPU_MIPSR2_SRS=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -157,8 +148,11 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_SMP=y
 CONFIG_SYS_SUPPORTS_SMP=y
+CONFIG_NR_CPUS_DEFAULT_2=y
 CONFIG_NR_CPUS=2
 # CONFIG_HZ_48 is not set
 CONFIG_HZ_100=y
@@ -174,35 +168,33 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_BKL=y
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -215,18 +207,19 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -234,14 +227,11 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -261,16 +251,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -286,7 +273,6 @@ CONFIG_TRAD_SIGNALS=y
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
 
 #
 # Networking
@@ -296,7 +282,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -314,7 +299,6 @@ CONFIG_ASK_IP_FIB_HASH=y
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
@@ -342,10 +326,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-
-#
-# IP: Virtual Server Configuration
-#
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
@@ -380,6 +360,7 @@ CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -405,8 +386,6 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
@@ -414,6 +393,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -432,11 +412,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -458,6 +440,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
@@ -549,25 +532,13 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 CONFIG_BRIDGE=m
@@ -591,9 +562,6 @@ CONFIG_IPDDP_DECAP=y
 #
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_FIFO=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
 
 #
 # Queueing/Scheduling
@@ -602,6 +570,7 @@ CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
@@ -626,10 +595,16 @@ CONFIG_NET_CLS_U32=m
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_CLS_POLICE=y
 CONFIG_NET_CLS_IND=y
-CONFIG_NET_ESTIMATOR=y
 
 #
 # Network testing
@@ -638,14 +613,26 @@ CONFIG_NET_ESTIMATOR=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-CONFIG_FIB_RULES=y
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -658,15 +645,7 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -710,7 +689,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -737,30 +715,23 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_CAFE is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
+# UBI - Unsorted block images
 #
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=y
 
 #
-# Block devices
+# UBI debugging options
 #
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -775,21 +746,11 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -805,6 +766,7 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
@@ -812,12 +774,12 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDEPCI_SHARE_IRQ is not set
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
@@ -846,7 +808,6 @@ CONFIG_BLK_DEV_TC86C001=m
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -854,6 +815,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
 CONFIG_SCSI_TGT=m
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
@@ -876,6 +838,7 @@ CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -883,12 +846,8 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
@@ -925,15 +884,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -952,6 +903,8 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_RDAC=m
+# CONFIG_DM_DELAY is not set
 
 #
 # Fusion MPT device support
@@ -964,30 +917,18 @@ CONFIG_DM_MULTIPATH_EMC=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+CONFIG_NETDEVICES_MULTIQUEUE=y
+CONFIG_IFB=m
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+CONFIG_MACVLAN=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -1000,23 +941,17 @@ CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
-# CONFIG_BROADCOM_PHY is not set
+CONFIG_BROADCOM_PHY=m
+CONFIG_ICPLUS_PHY=m
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+CONFIG_AX88796=m
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -1026,6 +961,7 @@ CONFIG_PCNET32=y
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_B44 is not set
 # CONFIG_FORCEDETH is not set
+CONFIG_TC35815=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_E100 is not set
@@ -1040,10 +976,7 @@ CONFIG_PCNET32=y
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -1054,36 +987,58 @@ CONFIG_PCNET32=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_10000=y
 # CONFIG_CHELSIO_T1 is not set
 CONFIG_CHELSIO_T3=m
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+# CONFIG_MLX4_CORE is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
+# Wireless LAN
+#
+CONFIG_WLAN_PRE80211=y
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBERTAS=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PRISM54=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA=y
+CONFIG_BCM43XX_PIO=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -1094,15 +1049,7 @@ CONFIG_NETXEN_NIC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -1110,6 +1057,7 @@ CONFIG_NETXEN_NIC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -1129,6 +1077,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -1171,32 +1120,16 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=m
 CONFIG_RTC=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -1204,32 +1137,33 @@ CONFIG_RTC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -1237,22 +1171,15 @@ CONFIG_RTC=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1266,37 +1193,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1313,12 +1212,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
 
 #
 # File systems
@@ -1451,6 +1348,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1458,7 +1356,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1531,7 +1428,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE=""
 
@@ -1540,12 +1436,13 @@ CONFIG_CMDLINE=""
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ABLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
@@ -1564,6 +1461,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -1582,10 +1480,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
@@ -1593,7 +1488,9 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=m
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
@@ -1604,3 +1501,4 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index 239810b6c8..8334350d72 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:35 2007
+# Linux kernel version: 2.6.23-rc2
+# Wed Aug  8 15:09:51 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
@@ -73,6 +60,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -82,6 +71,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -103,7 +93,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -119,7 +108,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,48 +121,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -187,32 +174,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -232,29 +217,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-# CONFIG_CARDBUS is not set
-
-#
-# PC-card bridges
-#
-# CONFIG_YENTA is not set
-# CONFIG_PD6729 is not set
-# CONFIG_I82092 is not set
-# CONFIG_PCMCIA_VRC4173 is not set
-
-#
-# PCI Hotplug Support
-#
+# CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -267,10 +236,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -280,7 +246,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -313,26 +278,17 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+# CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -358,14 +314,17 @@ CONFIG_NETWORK_SECMARK=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -378,30 +337,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -412,19 +351,9 @@ CONFIG_CONNECTOR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -435,20 +364,20 @@ CONFIG_BLK_DEV_IDE=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -456,16 +385,9 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -476,135 +398,38 @@ CONFIG_IDE_GENERIC=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
 CONFIG_MII=m
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=m
-# CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-CONFIG_HERMES=m
-# CONFIG_PLX_HERMES is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-# CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_BCM43XX is not set
-# CONFIG_ZD1211RW is not set
-CONFIG_NET_WIRELESS=y
-
-#
-# 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_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-
-#
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+CONFIG_USB_PEGASUS=m
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -614,15 +439,7 @@ CONFIG_PCMCIA_AXNET=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -630,14 +447,12 @@ CONFIG_PCMCIA_AXNET=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 # CONFIG_INPUT_EVDEV is not set
@@ -649,18 +464,14 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=m
+# CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -680,46 +491,25 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 #
 # Non-8250 serial port support
 #
-# CONFIG_SERIAL_VR41XX is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_VR41XX=y
+CONFIG_SERIAL_VR41XX_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_GPIO_VR41XX is not set
+CONFIG_GPIO_VR41XX=y
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -727,33 +517,33 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -761,22 +551,13 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+# CONFIG_HID_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -787,8 +568,8 @@ CONFIG_USB=m
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -802,6 +583,7 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -819,43 +601,9 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-# CONFIG_USB_HID is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-CONFIG_USB_PEGASUS=m
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 # CONFIG_USB_MON is not set
 
 #
@@ -887,6 +635,7 @@ CONFIG_USB_PEGASUS=m
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -897,38 +646,43 @@ CONFIG_USB_PEGASUS=m
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
+# RTC interfaces
 #
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# InfiniBand support
+# SPI RTC drivers
 #
-# CONFIG_INFINIBAND is not set
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
-# Real Time Clock
+# on-CPU RTC drivers
 #
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_DRV_VR41XX=y
 
 #
 # DMA Engine support
@@ -944,12 +698,9 @@ CONFIG_USB_PEGASUS=m
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -973,7 +724,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -1005,7 +756,6 @@ CONFIG_CONFIGFS_FS=m
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -1029,6 +779,7 @@ CONFIG_NFS_FS=y
 CONFIG_LOCKD=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1036,7 +787,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1052,10 +802,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
+# CONFIG_DLM is not set
 
 #
 # Profiling support
@@ -1073,73 +820,26 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73"
 
 #
 # Security options
 #
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
+# CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
-CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=m
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC32 is not set
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/rbhma4200_defconfig b/arch/mips/configs/rbhma4200_defconfig
index 9913980add..9383a59809 100644
--- a/arch/mips/configs/rbhma4200_defconfig
+++ b/arch/mips/configs/rbhma4200_defconfig
@@ -1,58 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
-# Wed May  9 23:44:19 2007
+# Linux kernel version: 2.6.23-rc1
+# Thu Aug  2 22:55:57 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 CONFIG_TOSHIBA_RBTX4927=y
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_TOSHIBA_FPCIB0 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -65,17 +54,20 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_I8259=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_IRQ_CPU=y
+CONFIG_IRQ_TXX9=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -114,22 +106,18 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -142,31 +130,24 @@ CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
+# CONFIG_SECCOMP is not set
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -175,7 +156,6 @@ CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -187,7 +167,11 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
 # CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
@@ -195,19 +179,11 @@ CONFIG_SLAB=y
 # CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 # CONFIG_MODULE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
@@ -273,7 +249,6 @@ CONFIG_IP_PNP=y
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
@@ -288,38 +263,17 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET 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_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
 
 #
 # QoS and/or fair queueing
@@ -333,14 +287,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
 
 #
 # Wireless
 #
 # CONFIG_CFG80211 is not set
 # CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
 
@@ -354,30 +306,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -389,18 +324,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -408,16 +332,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -428,83 +345,34 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_IEEE1394 is not set
 
 #
-# I2O device support
+# An alternative FireWire stack is available with EXPERIMENTAL=y
 #
+# CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NE2000=y
 # CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NETXEN_NIC is not set
-
-#
-# Token Ring devices
-#
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
@@ -512,28 +380,13 @@ CONFIG_NE2000=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -577,29 +430,14 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
@@ -608,11 +446,8 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -624,11 +459,8 @@ CONFIG_DEVPORT=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
 # Graphics support
@@ -640,56 +472,17 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -706,19 +499,18 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_TEST is not set
 
 #
-# I2C RTC drivers
-#
-
-#
 # SPI RTC drivers
 #
 
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 CONFIG_RTC_DRV_DS1742=y
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -739,24 +531,19 @@ CONFIG_RTC_DRV_DS1742=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
 #
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -793,18 +580,11 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
 #
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -818,7 +598,6 @@ CONFIG_RAMFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
@@ -826,15 +605,10 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 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_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -848,16 +622,6 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 
 #
-# Distributed Lock Manager
-#
-# CONFIG_DLM is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -877,10 +641,6 @@ CONFIG_SYS_SUPPORTS_KGDB=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
@@ -889,7 +649,9 @@ CONFIG_SYS_SUPPORTS_KGDB=y
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 40453cd7c7..d1b56cc0fd 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,48 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc5
-# Fri Jun 22 21:39:45 2007
+# Linux kernel version: 2.6.23-rc1
+# Thu Aug  2 22:59:53 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 CONFIG_TOSHIBA_RBTX4938=y
+# CONFIG_WR_PPMC is not set
 
 #
 # Multiplex Pin Select
@@ -61,17 +60,16 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_I8259=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_GPIO=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_IRQ_CPU=y
+CONFIG_IRQ_TXX9=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5
-CONFIG_HAVE_STD_PC_SERIAL_PORT=y
 
 #
 # CPU selection
@@ -114,22 +112,18 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -142,31 +136,24 @@ CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
+# CONFIG_SECCOMP is not set
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -175,7 +162,6 @@ CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -199,19 +185,11 @@ CONFIG_SLAB=y
 # CONFIG_SLOB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 # CONFIG_MODULE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
@@ -277,7 +255,6 @@ CONFIG_IP_PNP=y
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
@@ -292,26 +269,17 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET 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_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
 
 #
 # QoS and/or fair queueing
@@ -325,14 +293,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
 
 #
 # Wireless
 #
 # CONFIG_CFG80211 is not set
 # CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
 
@@ -346,30 +312,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -381,14 +330,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -396,12 +338,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -412,39 +351,28 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_FIREWIRE is not set
-# CONFIG_IEEE1394 is not set
 
 #
-# I2O device support
+# An alternative FireWire stack is available with EXPERIMENTAL=y
 #
+# CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NE2000=y
@@ -461,14 +389,12 @@ CONFIG_TC35815=y
 # CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 # CONFIG_SIS900 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_SC92031 is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
@@ -480,22 +406,11 @@ CONFIG_TC35815=y
 # CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -534,24 +449,14 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
@@ -564,19 +469,15 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Master Controller Drivers
 #
-# CONFIG_SPI_BITBANG is not set
 CONFIG_SPI_TXX9=y
 
 #
 # SPI Protocol Masters
 #
 CONFIG_SPI_AT25=y
-# CONFIG_SPI_SPIDEV is not set
-
-#
-# Dallas's 1-wire bus
-#
+# CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -601,56 +502,17 @@ CONFIG_SPI_AT25=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -667,10 +529,6 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 # CONFIG_RTC_DRV_TEST is not set
 
 #
-# I2C RTC drivers
-#
-
-#
 # SPI RTC drivers
 #
 CONFIG_RTC_DRV_RS5C348=y
@@ -681,8 +539,10 @@ CONFIG_RTC_DRV_RS5C348=y
 #
 # CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -703,16 +563,19 @@ CONFIG_RTC_DRV_RS5C348=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -749,18 +612,11 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
 #
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -774,7 +630,6 @@ CONFIG_RAMFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
@@ -782,15 +637,10 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 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_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -804,16 +654,6 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 
 #
-# Distributed Lock Manager
-#
-# CONFIG_DLM is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -833,10 +673,6 @@ CONFIG_SYS_SUPPORTS_KGDB=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
@@ -847,6 +683,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index e72fdf36b3..93f9e8331a 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -655,8 +655,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
 # CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
-CONFIG_SIBYTE_SB1250_DUART=y
-CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
+CONFIG_SERIAL_SB1250_DUART=y
+CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
 
 #
 # Serial drivers
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig
index e9f2cef4c7..326aa7aa40 100644
--- a/arch/mips/configs/tb0219_defconfig
+++ b/arch/mips/configs/tb0219_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc6
-# Sun Apr 15 01:06:01 2007
+# Linux kernel version: 2.6.23-rc2
+# Wed Aug  8 16:11:47 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
@@ -76,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -85,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -106,7 +96,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -122,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -136,46 +124,44 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -191,32 +177,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -236,16 +220,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -258,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -271,14 +249,9 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -288,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set
@@ -305,34 +277,25 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+# CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -358,10 +321,20 @@ CONFIG_NETWORK_SECMARK=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 
 #
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
 # Device Drivers
 #
 
@@ -372,30 +345,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -412,16 +365,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -429,16 +373,9 @@ CONFIG_SGI_IOC4=m
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -449,30 +386,17 @@ CONFIG_SGI_IOC4=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -486,29 +410,46 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_TC35815 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+CONFIG_8139TOO=y
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+CONFIG_VIA_RHINE=y
+CONFIG_VIA_RHINE_MMIO=y
+# CONFIG_VIA_RHINE_NAPI is not set
+# CONFIG_SC92031 is not set
+CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -520,35 +461,29 @@ CONFIG_R8169=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
+CONFIG_VIA_VELOCITY=y
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=m
+# CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -558,15 +493,7 @@ CONFIG_NETXEN_NIC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -574,6 +501,7 @@ CONFIG_NETXEN_NIC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -590,6 +518,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -624,35 +553,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 CONFIG_GPIO_TB0219=y
 # CONFIG_DRM is not set
 CONFIG_GPIO_VR41XX=y
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -660,17 +572,9 @@ CONFIG_GPIO_VR41XX=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 
 #
 # Multifunction device drivers
@@ -681,17 +585,20 @@ CONFIG_GPIO_VR41XX=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -704,16 +611,8 @@ CONFIG_DUMMY_CONSOLE=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+# CONFIG_HID_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -724,8 +623,8 @@ CONFIG_USB=m
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -735,7 +634,6 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -743,6 +641,7 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -760,43 +659,9 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-# CONFIG_USB_HID is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
 #
@@ -840,37 +705,9 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -884,18 +721,29 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
 
 #
-# RTC drivers
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_VR41XX=y
-# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_VR41XX=y
+
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -909,12 +757,9 @@ CONFIG_RTC_DRV_VR41XX=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -922,8 +767,14 @@ CONFIG_RTC_DRV_VR41XX=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
@@ -938,7 +789,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
 CONFIG_GENERIC_ACL=y
 
 #
@@ -965,7 +816,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -1003,6 +854,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1010,7 +862,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1026,10 +877,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
+# CONFIG_DLM is not set
 
 #
 # Profiling support
@@ -1047,7 +895,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
 
@@ -1056,63 +903,20 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
+CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index aea6756884..9fd0faeacf 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,68 +1,56 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:41 2007
+# Linux kernel version: 2.6.23-rc2
+# Thu Aug  9 11:16:55 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
 CONFIG_TANBAC_TB022X=y
-CONFIG_TANBAC_TB0226=y
-# CONFIG_TANBAC_TB0287 is not set
 # CONFIG_VICTOR_MPC30X is not set
 # CONFIG_ZAO_CAPCELLA is not set
+# CONFIG_TANBAC_TB0219 is not set
+CONFIG_TANBAC_TB0226=y
+# CONFIG_TANBAC_TB0287 is not set
 CONFIG_PCI_VR41XX=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -75,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -84,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -105,7 +96,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -121,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,48 +124,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -189,32 +177,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -234,16 +220,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
 # CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -256,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -269,14 +249,9 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -286,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set
@@ -302,34 +276,25 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+# CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -355,10 +320,20 @@ CONFIG_NETWORK_SECMARK=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 
 #
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
 # Device Drivers
 #
 
@@ -369,30 +344,10 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
+# CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -407,19 +362,9 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -427,6 +372,7 @@ CONFIG_SGI_IOC4=m
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 CONFIG_SCSI_TGT=m
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -448,6 +394,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -458,51 +405,8 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
+# CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -516,59 +420,26 @@ CONFIG_SCSI_AIC94XX=m
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
+# CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -577,6 +448,7 @@ CONFIG_NET_PCI=y
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_B44 is not set
 # CONFIG_FORCEDETH is not set
+# CONFIG_TC35815 is not set
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=y
@@ -591,50 +463,25 @@ CONFIG_E100=y
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=m
-# CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -645,15 +492,7 @@ CONFIG_NETXEN_NIC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -661,6 +500,7 @@ CONFIG_NETXEN_NIC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -677,6 +517,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -711,35 +552,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_TANBAC_TB0219 is not set
+# CONFIG_GPIO_TB0219 is not set
 # CONFIG_DRM is not set
 CONFIG_GPIO_VR41XX=y
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -747,33 +571,33 @@ CONFIG_GPIO_VR41XX=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -781,22 +605,13 @@ CONFIG_GPIO_VR41XX=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+# CONFIG_HID_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -807,8 +622,8 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -818,7 +633,6 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -826,11 +640,12 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
 #
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=y
 # CONFIG_USB_PRINTER is not set
 
 #
@@ -854,44 +669,10 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-# CONFIG_USB_HID is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 # CONFIG_USB_MON is not set
 
 #
@@ -924,6 +705,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -934,37 +716,9 @@ CONFIG_USB_STORAGE=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -978,18 +732,29 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
 
 #
-# RTC drivers
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_VR41XX=y
-# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_VR41XX=y
+
+#
 # DMA Engine support
 #
 # CONFIG_DMA_ENGINE is not set
@@ -1003,12 +768,9 @@ CONFIG_RTC_DRV_VR41XX=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -1032,7 +794,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
 CONFIG_GENERIC_ACL=y
 
 #
@@ -1059,7 +821,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -1097,6 +859,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1104,7 +867,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1120,10 +882,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
+# CONFIG_DLM is not set
 
 #
 # Profiling support
@@ -1141,7 +900,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
 
@@ -1150,62 +908,20 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=m
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
-# CONFIG_CRC32 is not set
-CONFIG_LIBCRC32C=m
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=m
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index 66383ecff2..499b6bd7ee 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -1,68 +1,56 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc1
-# Thu Feb 22 10:38:09 2007
+# Linux kernel version: 2.6.23-rc2
+# Thu Aug  9 14:03:54 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
 CONFIG_TANBAC_TB022X=y
-# CONFIG_TANBAC_TB0226 is not set
-CONFIG_TANBAC_TB0287=y
 # CONFIG_VICTOR_MPC30X is not set
 # CONFIG_ZAO_CAPCELLA is not set
+# CONFIG_TANBAC_TB0219 is not set
+# CONFIG_TANBAC_TB0226 is not set
+CONFIG_TANBAC_TB0287=y
 CONFIG_PCI_VR41XX=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -75,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -84,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -105,7 +96,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -121,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,86 +124,83 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_HOTPLUG is not set
+CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -234,15 +220,14 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_MMU=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-
-#
-# PCI Hotplug Support
-#
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
 
 #
 # Executable file formats
@@ -254,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -267,14 +249,9 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -284,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set
@@ -301,9 +277,9 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_ADVANCED=y
@@ -317,6 +293,8 @@ CONFIG_TCP_CONG_HTCP=m
 # CONFIG_TCP_CONG_SCALABLE is not set
 # CONFIG_TCP_CONG_LP is not set
 # CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
 CONFIG_DEFAULT_BIC=y
 # CONFIG_DEFAULT_CUBIC is not set
 # CONFIG_DEFAULT_HTCP is not set
@@ -324,26 +302,14 @@ CONFIG_DEFAULT_BIC=y
 # CONFIG_DEFAULT_WESTWOOD is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="bic"
-CONFIG_TCP_MD5SIG=y
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -369,10 +335,20 @@ CONFIG_NETWORK_SECMARK=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 
 #
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
 # Device Drivers
 #
 
@@ -381,31 +357,12 @@ CONFIG_FIB_RULES=y
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -420,19 +377,9 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-CONFIG_SGI_IOC4=m
-# CONFIG_TIFM_CORE is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -440,6 +387,7 @@ CONFIG_SGI_IOC4=m
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 CONFIG_SCSI_TGT=m
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -461,6 +409,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -468,48 +417,8 @@ CONFIG_SCSI_SCAN_ASYNC=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
+# CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -532,6 +441,7 @@ CONFIG_ATA=y
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
@@ -564,10 +474,6 @@ CONFIG_PATA_SIL680=y
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -581,17 +487,16 @@ CONFIG_PATA_SIL680=y
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 CONFIG_IEEE1394=m
 
 #
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
 
 #
-# Device Drivers
+# Controllers
 #
 
 #
@@ -600,59 +505,63 @@ CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
 CONFIG_IEEE1394_OHCI1394=m
 
 #
-# Protocol Drivers
+# Protocols
 #
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_TC35815 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+CONFIG_8139TOO=y
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+CONFIG_VIA_RHINE=y
+CONFIG_VIA_RHINE_MMIO=y
+# CONFIG_VIA_RHINE_NAPI is not set
+# CONFIG_SC92031 is not set
+CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
@@ -664,35 +573,29 @@ CONFIG_R8169=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
+CONFIG_VIA_VELOCITY=y
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-CONFIG_CHELSIO_T3=m
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-# CONFIG_MYRI10GE is not set
-CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -703,15 +606,7 @@ CONFIG_NETXEN_NIC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -719,11 +614,15 @@ CONFIG_NETXEN_NIC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
-# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 # CONFIG_INPUT_EVDEV is not set
@@ -735,6 +634,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -769,35 +669,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_TANBAC_TB0219 is not set
+# CONFIG_GPIO_TB0219 is not set
 # CONFIG_DRM is not set
 CONFIG_GPIO_VR41XX=y
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -805,17 +688,9 @@ CONFIG_GPIO_VR41XX=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 
 #
 # Multifunction device drivers
@@ -826,23 +701,31 @@ CONFIG_MFD_SM501=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -850,7 +733,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_TILEBLITTING is not set
 
 #
-# Frambuffer hardware drivers
+# Frame buffer hardware drivers
 #
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
@@ -871,8 +754,10 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_SMIVGX is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 CONFIG_FB_SM501=y
 # CONFIG_FB_VIRTUAL is not set
 
@@ -881,27 +766,44 @@ CONFIG_FB_SM501=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-
-#
-# Logo configuration
-#
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 # CONFIG_LOGO is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 
 #
-# HID Devices
+# USB Input Devices
 #
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
 
 #
-# USB support
+# USB HID Boot Protocol drivers
 #
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -912,8 +814,8 @@ CONFIG_USB=m
 # Miscellaneous USB options
 #
 # CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -923,7 +825,6 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -931,6 +832,7 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -959,47 +861,10 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
 #
@@ -1032,6 +897,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 
 #
 # USB DSL modem support
@@ -1041,37 +907,9 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1088,12 +926,9 @@ CONFIG_USB_MON=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -1111,7 +946,7 @@ CONFIG_JBD=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=y
 CONFIG_XFS_QUOTA=y
 # CONFIG_XFS_SECURITY is not set
@@ -1125,10 +960,11 @@ CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_QUOTACTL=y
-# CONFIG_DNOTIFY is not set
+CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
 # CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # CD-ROM/DVD Filesystems
@@ -1151,10 +987,10 @@ CONFIG_PROC_KCORE=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -1181,12 +1017,18 @@ CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1194,7 +1036,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1210,10 +1051,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
+# CONFIG_DLM is not set
 
 #
 # Profiling support
@@ -1231,7 +1069,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
 
@@ -1240,63 +1077,20 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO is not set
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
+CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index db6fd4f157..b52256ca0b 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:42 2007
+# Linux kernel version: 2.6.23-rc2
+# Thu Aug  9 14:33:57 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 CONFIG_IBM_WORKPAD=y
 # CONFIG_NEC_CMBVR4133 is not set
@@ -72,6 +59,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -81,6 +70,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -102,7 +92,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -118,7 +107,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -132,48 +120,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -186,32 +173,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -229,6 +214,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Bus options (PCI, PCMCIA, EISA, ISA, TC)
 #
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ISA=y
 CONFIG_MMU=y
 
@@ -250,10 +236,6 @@ CONFIG_PCMCIA_PROBE=y
 CONFIG_PCMCIA_VRC4171=y
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -263,10 +245,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_PM is not set
 
 #
 # Networking
@@ -276,7 +255,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -301,34 +279,25 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+# CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -354,8 +323,17 @@ CONFIG_NETWORK_SECMARK=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
 CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -368,31 +346,11 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
+# CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
 # CONFIG_PNP is not set
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
@@ -400,17 +358,9 @@ CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -426,15 +376,16 @@ CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -442,135 +393,38 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
+# CONFIG_NET_ETHERNET is not set
 CONFIG_MII=m
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_DM9000 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 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-# CONFIG_WAVELAN is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+# CONFIG_LIBERTAS is not set
 CONFIG_HERMES=m
 # CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA_SPECTRUM is not set
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_HOSTAP is not set
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -580,10 +434,6 @@ CONFIG_PCMCIA_NMCLAN=m
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_AXNET=m
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -591,15 +441,7 @@ CONFIG_PCMCIA_AXNET=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -607,6 +449,7 @@ CONFIG_PCMCIA_AXNET=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -623,6 +466,7 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -656,19 +500,10 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
@@ -678,17 +513,10 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
-# CONFIG_GPIO_VR41XX is not set
+CONFIG_GPIO_VR41XX=y
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -696,32 +524,33 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -730,65 +559,51 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_VGA_CONSOLE is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
+# RTC interfaces
 #
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# InfiniBand support
+# SPI RTC drivers
 #
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
-# Real Time Clock
+# on-CPU RTC drivers
 #
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_DRV_VR41XX=y
 
 #
 # DMA Engine support
@@ -804,23 +619,25 @@ CONFIG_HID=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
 #
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
@@ -836,7 +653,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+# CONFIG_FUSE_FS is not set
 CONFIG_GENERIC_ACL=y
 
 #
@@ -863,7 +680,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -885,17 +702,22 @@ CONFIG_CONFIGFS_FS=m
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
 # CONFIG_NFSD_TCP is not set
-CONFIG_LOCKD=y
-CONFIG_EXPORTFS=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -903,7 +725,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -919,10 +740,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Distributed Lock Manager
 #
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
+# CONFIG_DLM is not set
 
 #
 # Profiling support
@@ -940,7 +758,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
 
@@ -949,52 +766,7 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO is not set
 
 #
 # Library routines
@@ -1002,10 +774,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index b8a5e75ba0..3e634f2f54 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(dec_kn_slot_size);
 
 int dec_tc_bus;
 
-spinlock_t ioasic_ssr_lock;
+DEFINE_SPINLOCK(ioasic_ssr_lock);
 
 volatile u32 *ioasic_base;
 
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index d3d81fb276..670039bb1a 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:14 2007
+# Linux kernel version: 2.6.23-rc2
+# Tue Aug  7 12:39:49 2007
 #
 CONFIG_MIPS=y
 
@@ -9,52 +9,40 @@ CONFIG_MIPS=y
 # Machine selection
 #
 CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 CONFIG_SGI_IP22=y
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -67,6 +55,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARC=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -82,6 +73,7 @@ CONFIG_ARC_PROMLIB=y
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -122,8 +114,6 @@ CONFIG_IP22_CPU_SCACHE=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
-# CONFIG_64BIT_PHYS_ADDR is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -139,6 +129,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -152,35 +144,33 @@ CONFIG_HZ=1000
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
+# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -193,32 +183,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -237,6 +225,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # Bus options (PCI, PCMCIA, EISA, ISA, TC)
 #
 CONFIG_HW_HAS_EISA=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_EISA is not set
 CONFIG_MMU=y
 
@@ -245,10 +234,6 @@ CONFIG_MMU=y
 #
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -261,7 +246,7 @@ CONFIG_TRAD_SIGNALS=y
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_SUSPEND is not set
 
 #
 # Networking
@@ -271,7 +256,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -308,10 +292,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-
-#
-# IP: Virtual Server Configuration
-#
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
@@ -346,10 +326,11 @@ CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MIP6=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@@ -371,8 +352,6 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
@@ -380,6 +359,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -398,11 +378,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -423,6 +405,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
@@ -490,25 +473,13 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_RAW=m
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -527,9 +498,6 @@ CONFIG_SCTP_HMAC_MD5=y
 #
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_CLK_JIFFIES is not set
-CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
-# CONFIG_NET_SCH_CLK_CPU is not set
 
 #
 # Queueing/Scheduling
@@ -538,6 +506,7 @@ CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
@@ -562,10 +531,16 @@ CONFIG_NET_CLS_U32=m
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_CLS_POLICE=y
 # CONFIG_NET_CLS_IND is not set
-CONFIG_NET_ESTIMATOR=y
 
 #
 # Network testing
@@ -574,14 +549,26 @@ CONFIG_NET_ESTIMATOR=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-CONFIG_FIB_RULES=y
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -593,47 +580,19 @@ CONFIG_FIB_RULES=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -641,6 +600,7 @@ CONFIG_ATA_OVER_ETH=m
 #
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 CONFIG_SCSI_TGT=m
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -663,6 +623,7 @@ CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -670,51 +631,21 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SCSI_FC_ATTRS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_SGIWD93_SCSI=y
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_IFB is not set
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+CONFIG_MACVLAN=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -728,36 +659,25 @@ CONFIG_CICADA_PHY=m
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
+# CONFIG_AX88796 is not set
 # CONFIG_DM9000 is not set
 CONFIG_SGISEEQ=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
+CONFIG_STRIP=m
+CONFIG_WLAN_80211=y
+# CONFIG_LIBERTAS is not set
+CONFIG_HOSTAP=m
+# CONFIG_HOSTAP_FIRMWARE is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -765,15 +685,7 @@ CONFIG_SGISEEQ=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -781,6 +693,7 @@ CONFIG_SGISEEQ=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -806,9 +719,16 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_PS2_ALPS is not set
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_SERIAL=m
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -844,15 +764,7 @@ CONFIG_SERIAL_CORE=m
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -864,20 +776,10 @@ CONFIG_INDYDOG=m
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
 CONFIG_SGI_DS1286=m
-# CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -885,32 +787,33 @@ CONFIG_MAX_RAW_DEVS=256
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
 
 #
-# Hardware Monitoring support
+# Multifunction device drivers
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 
 #
@@ -920,31 +823,20 @@ CONFIG_FIRMWARE_EDID=y
 CONFIG_SGI_NEWPORT_CONSOLE=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_SGI_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -957,36 +849,8 @@ CONFIG_HID=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1003,12 +867,9 @@ CONFIG_HID=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -1121,6 +982,7 @@ CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1136,7 +998,6 @@ CONFIG_CIFS=m
 CONFIG_CODA_FS=m
 # CONFIG_CODA_FS_OLD_API is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1158,6 +1019,7 @@ CONFIG_SGI_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 
 #
 # Native Language Support
@@ -1207,8 +1069,6 @@ CONFIG_NLS_UTF8=m
 # Distributed Lock Manager
 #
 CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
 # CONFIG_DLM_DEBUG is not set
 
 #
@@ -1227,7 +1087,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
 CONFIG_CMDLINE=""
 
@@ -1237,12 +1096,9 @@ CONFIG_CMDLINE=""
 CONFIG_KEYS=y
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ABLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
@@ -1261,6 +1117,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -1279,10 +1136,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
 
 #
 # Library routines
@@ -1290,7 +1144,9 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_BITREVERSE=m
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=m
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=m
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
@@ -1301,3 +1157,4 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index 1187b44a3d..d9efe692e5 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -45,9 +45,6 @@
 #error JMR3927_IRQ_END > NR_IRQS
 #endif
 
-#define irc_dlevel      0
-#define irc_elevel      1
-
 static unsigned char irc_level[TX3927_NUM_IR] = {
         5, 5, 5, 5, 5, 5,       /* INT[5:0] */
         7, 7,                   /* SIO */
@@ -80,34 +77,6 @@ static void unmask_irq_ioc(unsigned int irq)
         (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
 }
 
-static void mask_irq_irc(unsigned int irq)
-{
-        unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
-        volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
-        if (irq_nr & 1)
-                *ilrp = (*ilrp & 0x00ff) | (irc_dlevel << 8);
-        else
-                *ilrp = (*ilrp & 0xff00) | irc_dlevel;
-        /* update IRCSR */
-        tx3927_ircptr->imr = 0;
-        tx3927_ircptr->imr = irc_elevel;
-        /* flush write buffer */
-        (void)tx3927_ircptr->ssr;
-}
-
-static void unmask_irq_irc(unsigned int irq)
-{
-        unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
-        volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
-        if (irq_nr & 1)
-                *ilrp = (*ilrp & 0x00ff) | (irc_level[irq_nr] << 8);
-        else
-                *ilrp = (*ilrp & 0xff00) | irc_level[irq_nr];
-        /* update IRCSR */
-        tx3927_ircptr->imr = 0;
-        tx3927_ircptr->imr = irc_elevel;
-}
-
 asmlinkage void plat_irq_dispatch(void)
 {
         unsigned long cp0_cause = read_c0_cause();
@@ -168,10 +137,6 @@ void __init arch_init_irq(void)
         /* clear PCI Reset interrupts */
         jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);
 
-        /* enable interrupt control */
-        tx3927_ircptr->cer = TX3927_IRCER_ICE;
-        tx3927_ircptr->imr = irc_elevel;
-
         jmr3927_irq_init();
 
         /* setup IOC interrupt 1 (PCI, MODEM) */
@@ -193,20 +158,13 @@ static struct irq_chip jmr3927_irq_ioc = {
         .unmask = unmask_irq_ioc,
 };
 
-static struct irq_chip jmr3927_irq_irc = {
-        .name = "jmr3927_irc",
-        .ack = mask_irq_irc,
-        .mask = mask_irq_irc,
-        .mask_ack = mask_irq_irc,
-        .unmask = unmask_irq_irc,
-};
-
 static void __init jmr3927_irq_init(void)
 {
         u32 i;
 
-        for (i = JMR3927_IRQ_IRC; i < JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC; i++)
-                set_irq_chip_and_handler(i, &jmr3927_irq_irc, handle_level_irq);
+        txx9_irq_init(TX3927_IRC_REG);
+        for (i = 0; i < TXx9_MAX_IR; i++)
+                txx9_irq_set_pri(i, irc_level[i]);
         for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++)
                 set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq);
 }
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c
index 8303001516..fde56e86c2 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/jmr3927/rbhma3100/setup.c
@@ -290,19 +290,6 @@ static void __init tx3927_setup(void)
                tx3927_ccfgptr->crir,
                tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg);
 
-        /* IRC */
-        /* disable interrupt control */
-        tx3927_ircptr->cer = 0;
-        /* mask all IRC interrupts */
-        tx3927_ircptr->imr = 0;
-        for (i = 0; i < TX3927_NUM_IR / 2; i++) {
-                tx3927_ircptr->ilr[i] = 0;
-        }
-        /* setup IRC interrupt mode (Low Active) */
-        for (i = 0; i < TX3927_NUM_IR / 8; i++) {
-                tx3927_ircptr->cr[i] = 0;
-        }
-
         /* TMR */
         /* disable all timers */
         for (i = 0; i < TX3927_NR_TMR; i++) {
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 07344cb375..2fd96d95a3 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_IRQ_CPU)		+= irq_cpu.o
 obj-$(CONFIG_IRQ_CPU_RM7K)      += irq-rm7000.o
 obj-$(CONFIG_IRQ_CPU_RM9K)      += irq-rm9000.o
 obj-$(CONFIG_MIPS_BOARDS_GEN)   += irq-msc01.o
+obj-$(CONFIG_IRQ_TXX9)          += irq_txx9.o
 
 obj-$(CONFIG_32BIT)             += scall32-o32.o
 obj-$(CONFIG_64BIT)             += scall64-64.o
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 013327286c..ca136298ac 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -232,6 +232,10 @@ void output_mm_defines(void)
         constant("#define _PMD_T_LOG2    ", PMD_T_LOG2);
         constant("#define _PTE_T_LOG2    ", PTE_T_LOG2);
         linefeed;
+        constant("#define _PGD_ORDER     ", PGD_ORDER);
+        constant("#define _PMD_ORDER     ", PMD_ORDER);
+        constant("#define _PTE_ORDER     ", PTE_ORDER);
+        linefeed;
         constant("#define _PMD_SHIFT     ", PMD_SHIFT);
         constant("#define _PGDIR_SHIFT   ", PGDIR_SHIFT);
         linefeed;
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index c09337b947..6648fde20b 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004  Maciej W. Rozycki
+ * Copyright (C) 2003, 2004, 2007  Maciej W. Rozycki
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@ static inline void align_mod(const int align, const int mod)
                 ".endr\n\t"
                 ".set   pop"
                 :
-                : "n" (align), "n" (mod));
+                : GCC_IMM_ASM (align), GCC_IMM_ASM (mod));
 }
 
 static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 06448a9656..3e004161eb 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -199,7 +199,14 @@ static inline void check_wait(void)
                 if ((c->processor_id & 0xff) <= 0x64)
                         break;
 
-                cpu_wait = r4k_wait;
+                /*
+                 * Another rev is incremeting c0_count at a reduced clock
+                 * rate while in WAIT mode.  So we basically have the choice
+                 * between using the cp0 timer as clocksource or avoiding
+                 * the WAIT instruction.  Until more details are known,
+                 * disable the use of WAIT for 20Kc entirely.
+                   cpu_wait = r4k_wait;
+                 */
                 break;
         case CPU_RM9000:
                 if ((c->processor_id & 0x00ff) >= 0x40)
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 2345160e63..3a2d255361 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -36,6 +36,7 @@ void mask_and_ack_8259A(unsigned int);
 static struct irq_chip i8259A_chip = {
         .name           = "XT-PIC",
         .mask           = disable_8259A_irq,
+        .disable        = disable_8259A_irq,
         .unmask         = enable_8259A_irq,
         .mask_ack       = mask_and_ack_8259A,
 };
@@ -176,10 +177,7 @@ handle_real_irq:
                 outb(cached_master_mask, PIC_MASTER_IMR);
                 outb(0x60+irq,PIC_MASTER_CMD);  /* 'Specific EOI to master */
         }
-#ifdef CONFIG_MIPS_MT_SMTC
-        if (irq_hwmask[irq] & ST0_IM)
-                set_c0_status(irq_hwmask[irq] & ST0_IM);
-#endif /* CONFIG_MIPS_MT_SMTC */
+        smtc_im_ack_irq(irq);
         spin_unlock_irqrestore(&i8259A_lock, flags);
         return;
 
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 6980deb6dc..28b2a8f009 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -725,7 +725,7 @@ asmlinkage int irix_getcontext(struct pt_regs *regs)
                current->comm, current->pid, ctx);
 #endif
 
-        if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx)));
+        if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx)))
                 return -EFAULT;
 
         error = __put_user(current->thread.irix_oldctx, &ctx->link);
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c
index 410868b5ea..1ecdd50bfc 100644
--- a/arch/mips/kernel/irq-msc01.c
+++ b/arch/mips/kernel/irq-msc01.c
@@ -52,11 +52,8 @@ static void level_mask_and_ack_msc_irq(unsigned int irq)
         mask_msc_irq(irq);
         if (!cpu_has_veic)
                 MSCIC_WRITE(MSC01_IC_EOI, 0);
-#ifdef CONFIG_MIPS_MT_SMTC
         /* This actually needs to be a call into platform code */
-        if (irq_hwmask[irq] & ST0_IM)
-                set_c0_status(irq_hwmask[irq] & ST0_IM);
-#endif /* CONFIG_MIPS_MT_SMTC */
+        smtc_im_ack_irq(irq);
 }
 
 /*
@@ -73,10 +70,7 @@ static void edge_mask_and_ack_msc_irq(unsigned int irq)
                 MSCIC_WRITE(MSC01_IC_SUP+irq*8, r | ~MSC01_IC_SUP_EDGE_BIT);
                 MSCIC_WRITE(MSC01_IC_SUP+irq*8, r);
         }
-#ifdef CONFIG_MIPS_MT_SMTC
-        if (irq_hwmask[irq] & ST0_IM)
-                set_c0_status(irq_hwmask[irq] & ST0_IM);
-#endif /* CONFIG_MIPS_MT_SMTC */
+        smtc_im_ack_irq(irq);
 }
 
 /*
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index aeded6c17d..a990aad2f0 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -74,20 +74,12 @@ EXPORT_SYMBOL_GPL(free_irqno);
  */
 void ack_bad_irq(unsigned int irq)
 {
+        smtc_im_ack_irq(irq);
         printk("unexpected IRQ # %d\n", irq);
 }
 
 atomic_t irq_err_count;
 
-#ifdef CONFIG_MIPS_MT_SMTC
-/*
- * SMTC Kernel needs to manipulate low-level CPU interrupt mask
- * in do_IRQ. These are passed in setup_irq_smtc() and stored
- * in this table.
- */
-unsigned long irq_hwmask[NR_IRQS];
-#endif /* CONFIG_MIPS_MT_SMTC */
-
 /*
  * Generic, controller-independent functions:
  */
diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c
new file mode 100644
index 0000000000..a4d1462c27
--- /dev/null
+++ b/arch/mips/kernel/irq_txx9.c
@@ -0,0 +1,192 @@
+/*
+ * linux/arch/mips/kernel/irq_txx9.c
+ *
+ * Based on linux/arch/mips/jmr3927/rbhma3100/irq.c,
+ *          linux/arch/mips/tx4927/common/tx4927_irq.c,
+ *          linux/arch/mips/tx4938/common/irq.c
+ *
+ * Copyright 2001, 2003-2005 MontaVista Software Inc.
+ * Author: MontaVista Software, Inc.
+ *         ahennessy@mvista.com
+ *         source@mvista.com
+ * Copyright (C) 2000-2001 Toshiba Corporation
+ *
+ * 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/init.h>
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <asm/txx9irq.h>
+
+struct txx9_irc_reg {
+        u32 cer;
+        u32 cr[2];
+        u32 unused0;
+        u32 ilr[8];
+        u32 unused1[4];
+        u32 imr;
+        u32 unused2[7];
+        u32 scr;
+        u32 unused3[7];
+        u32 ssr;
+        u32 unused4[7];
+        u32 csr;
+};
+
+/* IRCER : Int. Control Enable */
+#define TXx9_IRCER_ICE  0x00000001
+
+/* IRCR : Int. Control */
+#define TXx9_IRCR_LOW   0x00000000
+#define TXx9_IRCR_HIGH  0x00000001
+#define TXx9_IRCR_DOWN  0x00000002
+#define TXx9_IRCR_UP    0x00000003
+#define TXx9_IRCR_EDGE(cr)      ((cr) & 0x00000002)
+
+/* IRSCR : Int. Status Control */
+#define TXx9_IRSCR_EIClrE       0x00000100
+#define TXx9_IRSCR_EIClr_MASK   0x0000000f
+
+/* IRCSR : Int. Current Status */
+#define TXx9_IRCSR_IF   0x00010000
+#define TXx9_IRCSR_ILV_MASK     0x00000700
+#define TXx9_IRCSR_IVL_MASK     0x0000001f
+
+#define irc_dlevel      0
+#define irc_elevel      1
+
+static struct txx9_irc_reg __iomem *txx9_ircptr __read_mostly;
+
+static struct {
+        unsigned char level;
+        unsigned char mode;
+} txx9irq[TXx9_MAX_IR] __read_mostly;
+
+static void txx9_irq_unmask(unsigned int irq)
+{
+        unsigned int irq_nr = irq - TXX9_IRQ_BASE;
+        u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16 ) / 2];
+        int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8;
+
+        __raw_writel((__raw_readl(ilrp) & ~(0xff << ofs))
+                     | (txx9irq[irq_nr].level << ofs),
+                     ilrp);
+#ifdef CONFIG_CPU_TX39XX
+        /* update IRCSR */
+        __raw_writel(0, &txx9_ircptr->imr);
+        __raw_writel(irc_elevel, &txx9_ircptr->imr);
+#endif
+}
+
+static inline void txx9_irq_mask(unsigned int irq)
+{
+        unsigned int irq_nr = irq - TXX9_IRQ_BASE;
+        u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16) / 2];
+        int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8;
+
+        __raw_writel((__raw_readl(ilrp) & ~(0xff << ofs))
+                     | (irc_dlevel << ofs),
+                     ilrp);
+#ifdef CONFIG_CPU_TX39XX
+        /* update IRCSR */
+        __raw_writel(0, &txx9_ircptr->imr);
+        __raw_writel(irc_elevel, &txx9_ircptr->imr);
+        /* flush write buffer */
+        __raw_readl(&txx9_ircptr->ssr);
+#else
+        mmiowb();
+#endif
+}
+
+static void txx9_irq_mask_ack(unsigned int irq)
+{
+        unsigned int irq_nr = irq - TXX9_IRQ_BASE;
+
+        txx9_irq_mask(irq);
+        /* clear edge detection */
+        if (unlikely(TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)))
+                __raw_writel(TXx9_IRSCR_EIClrE | irq_nr, &txx9_ircptr->scr);
+}
+
+static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type)
+{
+        unsigned int irq_nr = irq - TXX9_IRQ_BASE;
+        u32 cr;
+        u32 __iomem *crp;
+        int ofs;
+        int mode;
+
+        if (flow_type & IRQF_TRIGGER_PROBE)
+                return 0;
+        switch (flow_type & IRQF_TRIGGER_MASK) {
+        case IRQF_TRIGGER_RISING:       mode = TXx9_IRCR_UP;    break;
+        case IRQF_TRIGGER_FALLING:      mode = TXx9_IRCR_DOWN;  break;
+        case IRQF_TRIGGER_HIGH: mode = TXx9_IRCR_HIGH;  break;
+        case IRQF_TRIGGER_LOW:  mode = TXx9_IRCR_LOW;   break;
+        default:
+                return -EINVAL;
+        }
+        crp = &txx9_ircptr->cr[(unsigned int)irq_nr / 8];
+        cr = __raw_readl(crp);
+        ofs = (irq_nr & (8 - 1)) * 2;
+        cr &= ~(0x3 << ofs);
+        cr |= (mode & 0x3) << ofs;
+        __raw_writel(cr, crp);
+        txx9irq[irq_nr].mode = mode;
+        return 0;
+}
+
+static struct irq_chip txx9_irq_chip = {
+        .name           = "TXX9",
+        .ack            = txx9_irq_mask_ack,
+        .mask           = txx9_irq_mask,
+        .mask_ack       = txx9_irq_mask_ack,
+        .unmask         = txx9_irq_unmask,
+        .set_type       = txx9_irq_set_type,
+};
+
+void __init txx9_irq_init(unsigned long baseaddr)
+{
+        int i;
+
+        txx9_ircptr = ioremap(baseaddr, sizeof(struct txx9_irc_reg));
+        for (i = 0; i < TXx9_MAX_IR; i++) {
+                txx9irq[i].level = 4; /* middle level */
+                txx9irq[i].mode = TXx9_IRCR_LOW;
+                set_irq_chip_and_handler(TXX9_IRQ_BASE + i,
+                                         &txx9_irq_chip, handle_level_irq);
+        }
+
+        /* mask all IRC interrupts */
+        __raw_writel(0, &txx9_ircptr->imr);
+        for (i = 0; i < 8; i++)
+                __raw_writel(0, &txx9_ircptr->ilr[i]);
+        /* setup IRC interrupt mode (Low Active) */
+        for (i = 0; i < 2; i++)
+                __raw_writel(0, &txx9_ircptr->cr[i]);
+        /* enable interrupt control */
+        __raw_writel(TXx9_IRCER_ICE, &txx9_ircptr->cer);
+        __raw_writel(irc_elevel, &txx9_ircptr->imr);
+}
+
+int __init txx9_irq_set_pri(int irc_irq, int new_pri)
+{
+        int old_pri;
+
+        if ((unsigned int)irc_irq >= TXx9_MAX_IR)
+                return 0;
+        old_pri = txx9irq[irc_irq].level;
+        txx9irq[irc_irq].level = new_pri;
+        return old_pri;
+}
+
+int txx9_irq(void)
+{
+        u32 csr = __raw_readl(&txx9_ircptr->csr);
+
+        if (likely(!(csr & TXx9_IRCSR_IF)))
+                return TXX9_IRQ_BASE + (csr & (TXx9_MAX_IR - 1));
+        return -1;
+}
diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c
index 22960d67cf..85beb9b0b2 100644
--- a/arch/mips/kernel/machine_kexec.c
+++ b/arch/mips/kernel/machine_kexec.c
@@ -78,11 +78,8 @@ machine_kexec(struct kimage *image)
          */
         local_irq_disable();
 
-        flush_icache_range(reboot_code_buffer,
-                           reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);
-
         printk("Will call new kernel at %08lx\n", image->start);
         printk("Bye ...\n");
-        flush_cache_all();
+        __flush_cache_all();
         ((noretfun_t) reboot_code_buffer)();
 }
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index 7169a4db37..56750b02ab 100644
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/device.h>
+#include <linux/kallsyms.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/module.h>
@@ -84,8 +85,9 @@ void mips_mt_regdump(unsigned long mvpctl)
                                        read_vpe_c0_vpeconf0());
                                 printk("   VPE%d.Status : %08lx\n",
                                        i, read_vpe_c0_status());
-                                printk("   VPE%d.EPC : %08lx\n",
+                                printk("   VPE%d.EPC : %08lx ",
                                        i, read_vpe_c0_epc());
+                                print_symbol("%s\n", read_vpe_c0_epc());
                                 printk("   VPE%d.Cause : %08lx\n",
                                        i, read_vpe_c0_cause());
                                 printk("   VPE%d.Config7 : %08lx\n",
@@ -110,7 +112,8 @@ void mips_mt_regdump(unsigned long mvpctl)
                 }
                 printk("   TCStatus : %08lx\n", tcstatval);
                 printk("   TCBind : %08lx\n", read_tc_c0_tcbind());
-                printk("   TCRestart : %08lx\n", read_tc_c0_tcrestart());
+                printk("   TCRestart : %08lx ", read_tc_c0_tcrestart());
+                print_symbol("%s\n", read_tc_c0_tcrestart());
                 printk("   TCHalt : %08lx\n", haltval);
                 printk("   TCContext : %08lx\n", read_tc_c0_tccontext());
                 if (!haltval)
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index aab89e97ab..1ba00c1550 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -56,8 +56,6 @@ static struct chan_waitqueues {
         struct mutex mutex;
 } channel_wqs[RTLX_CHANNELS];
 
-static struct irqaction irq;
-static int irq_num;
 static struct vpe_notifications notify;
 static int sp_stopping = 0;
 
@@ -111,7 +109,7 @@ static void __used dump_rtlx(void)
 static int rtlx_init(struct rtlx_info *rtlxi)
 {
         if (rtlxi->id != RTLX_ID) {
-                printk(KERN_ERR "no valid RTLX id at 0x%p 0x%x\n", rtlxi, rtlxi->id);
+                printk(KERN_ERR "no valid RTLX id at 0x%p 0x%lx\n", rtlxi, rtlxi->id);
                 return -ENOEXEC;
         }
 
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 53d7a97719..118be24224 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -375,7 +375,7 @@ EXPORT(sysn32_call_table)
         PTR     sys_mkdirat
         PTR     sys_mknodat
         PTR     sys_fchownat
-        PTR     sys_futimesat                   /* 6255 */
+        PTR     compat_sys_futimesat            /* 6255 */
         PTR     sys_newfstatat
         PTR     sys_unlinkat
         PTR     sys_renameat
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index b3ed731a24..dd68afce7d 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -525,5 +525,5 @@ sys_call_table:
         PTR     compat_sys_signalfd
         PTR     compat_sys_timerfd
         PTR     sys_eventfd
-        PTR     sys_fallocate                   /* 4320 */
+        PTR     sys32_fallocate                 /* 4320 */
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 19b30d6f17..05dcce4163 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -287,7 +287,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * (unsigned long)idle->thread_info the gp
  * assumes a 1:1 mapping of TC => VPE
  */
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
         struct thread_info *gp = task_thread_info(idle);
         dvpe();
@@ -321,7 +321,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
         evpe(EVPE_ENABLE);
 }
 
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
         /* Enable per-cpu interrupts */
 
@@ -330,7 +330,7 @@ void prom_init_secondary(void)
                         (STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP6 | STATUSF_IP7));
 }
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
         write_c0_compare(read_c0_count() + (8* mips_hpt_frequency/HZ));
 
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 16aa5d3711..f09404377e 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -25,10 +25,11 @@
 #include <asm/smtc_proc.h>
 
 /*
- * This file should be built into the kernel only if CONFIG_MIPS_MT_SMTC is set.
+ * SMTC Kernel needs to manipulate low-level CPU interrupt mask
+ * in do_IRQ. These are passed in setup_irq_smtc() and stored
+ * in this table.
  */
-
-#define MIPS_CPU_IPI_IRQ        1
+unsigned long irq_hwmask[NR_IRQS];
 
 #define LOCK_MT_PRA() \
         local_irq_save(flags); \
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index d48d1d5bea..9a5596bf85 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/param.h>
+#include <linux/profile.h>
 #include <linux/time.h>
 #include <linux/timex.h>
 #include <linux/smp.h>
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index c8e291c830..6379003f9d 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -606,6 +606,8 @@ asmlinkage void do_ov(struct pt_regs *regs)
  */
 asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
 {
+        siginfo_t info;
+
         die_if_kernel("FP exception in kernel code", regs);
 
         if (fcr31 & FPU_CSR_UNI_X) {
@@ -641,9 +643,22 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
                         force_sig(sig, current);
 
                 return;
-        }
-
-        force_sig(SIGFPE, current);
+        } else if (fcr31 & FPU_CSR_INV_X)
+                info.si_code = FPE_FLTINV;
+        else if (fcr31 & FPU_CSR_DIV_X)
+                info.si_code = FPE_FLTDIV;
+        else if (fcr31 & FPU_CSR_OVF_X)
+                info.si_code = FPE_FLTOVF;
+        else if (fcr31 & FPU_CSR_UDF_X)
+                info.si_code = FPE_FLTUND;
+        else if (fcr31 & FPU_CSR_INE_X)
+                info.si_code = FPE_FLTRES;
+        else
+                info.si_code = __SI_FAULT;
+        info.si_signo = SIGFPE;
+        info.si_errno = 0;
+        info.si_addr = (void __user *) regs->cp0_epc;
+        force_sig_info(SIGFPE, &info, current);
 }
 
 asmlinkage void do_bp(struct pt_regs *regs)
@@ -1035,19 +1050,11 @@ void ejtag_exception_handler(struct pt_regs *regs)
 /*
  * NMI exception handler.
  */
-void nmi_exception_handler(struct pt_regs *regs)
+NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
 {
-#ifdef CONFIG_MIPS_MT_SMTC
-        unsigned long dvpret = dvpe();
-        bust_spinlocks(1);
-        printk("NMI taken!!!!\n");
-        mips_mt_regdump(dvpret);
-#else
         bust_spinlocks(1);
         printk("NMI taken!!!!\n");
-#endif /* CONFIG_MIPS_MT_SMTC */
         die("NMI", regs);
-        while(1) ;
 }
 
 #define VECTORSPACING 0x100     /* for EI/VI mode */
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index bc9bae2a73..087ab99748 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -45,6 +45,8 @@ SECTIONS
   __dbe_table : { *(__dbe_table) }
   __stop___dbe_table = .;
 
+  NOTES
+
   RODATA
 
   /* writeable */
@@ -142,15 +144,16 @@ SECTIONS
         *(.exitcall.exit)
 
         /* ABI crap starts here */
-        *(.comment)
         *(.MIPS.options)
-        *(.note)
         *(.options)
         *(.pdr)
         *(.reginfo)
-        *(.mdebug*)
   }
 
+  /* These mark the ABI of the kernel for debuggers.  */
+  .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
+  .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
+
   /* This is the MIPS specific mdebug section.  */
   .mdebug : { *(.mdebug) }
 
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 91ed1eb331..8810dfb915 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -28,4 +28,4 @@ obj-$(CONFIG_CPU_TX49XX)	+= dump_tlb.o
 obj-$(CONFIG_CPU_VR41XX)        += dump_tlb.o
 
 # libgcc-style stuff needed in the kernel
-obj-y += ashldi3.o ashrdi3.o lshrdi3.o ucmpdi2.o
+obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o
diff --git a/arch/mips/lib/cmpdi2.c b/arch/mips/lib/cmpdi2.c
new file mode 100644
index 0000000000..8c1306437e
--- /dev/null
+++ b/arch/mips/lib/cmpdi2.c
@@ -0,0 +1,27 @@
+#include <linux/module.h>
+
+#include "libgcc.h"
+
+word_type __cmpdi2(long long a, long long b)
+{
+        const DWunion au = {
+                .ll = a
+        };
+        const DWunion bu = {
+                .ll = b
+        };
+
+        if (au.s.high < bu.s.high)
+                return 0;
+        else if (au.s.high > bu.s.high)
+                return 2;
+
+        if ((unsigned int) au.s.low < (unsigned int) bu.s.low)
+                return 0;
+        else if ((unsigned int) au.s.low > (unsigned int) bu.s.low)
+                return 2;
+
+        return 1;
+}
+
+EXPORT_SYMBOL(__cmpdi2);
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c
index 97aeb8c4e6..b73f21823c 100644
--- a/arch/mips/mips-boards/malta/malta_int.c
+++ b/arch/mips/mips-boards/malta/malta_int.c
@@ -256,7 +256,7 @@ asmlinkage void plat_irq_dispatch(void)
 
         if (irq == MIPSCPU_INT_I8259A)
                 malta_hw0_irqdispatch();
-        else if (irq > 0)
+        else if (irq >= 0)
                 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
         else
                 spurious_interrupt();
diff --git a/arch/mips/mips-boards/malta/malta_smtc.c b/arch/mips/mips-boards/malta/malta_smtc.c
index 0fb4c26990..ae05d058cb 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -1,6 +1,7 @@
 /*
  * Malta Platform-specific hooks for SMP operation
  */
+#include <linux/irq.h>
 #include <linux/init.h>
 
 #include <asm/mipsregs.h>
@@ -24,7 +25,7 @@ void core_send_ipi(int cpu, unsigned int action)
  * Platform "CPU" startup hook
  */
 
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
         smtc_boot_secondary(cpu, idle);
 }
@@ -33,7 +34,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
  * Post-config but pre-boot cleanup entry point
  */
 
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
         void smtc_init_secondary(void);
         int myvpe;
@@ -42,10 +43,11 @@ void prom_init_secondary(void)
         myvpe = read_c0_tcbind() & TCBIND_CURVPE;
         if (myvpe != 0) {
                 /* Ideally, this should be done only once per VPE, but... */
-                clear_c0_status(STATUSF_IP2);
-                set_c0_status(STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP3
-                                | STATUSF_IP4 | STATUSF_IP5 | STATUSF_IP6
-                                | STATUSF_IP7);
+                clear_c0_status(ST0_IM);
+                set_c0_status((0x100 << cp0_compare_irq)
+                                | (0x100 << MIPS_CPU_IPI_IRQ));
+                if (cp0_perfcount_irq >= 0)
+                        set_c0_status(0x100 << cp0_perfcount_irq);
         }
 
         smtc_init_secondary();
@@ -74,7 +76,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * SMP initialization finalization entry point
  */
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
         smtc_smp_finish();
 }
diff --git a/arch/mips/mips-boards/sim/sim_int.c b/arch/mips/mips-boards/sim/sim_int.c
deleted file mode 100644
index 766e0159ee..0000000000
--- a/arch/mips/mips-boards/sim/sim_int.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 1999, 2005 MIPS Technologies, Inc.  All rights reserved.
- *
- *  This program is free software; you can distribute 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 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/init.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/kernel_stat.h>
-#include <asm/mips-boards/simint.h>
-#include <asm/irq_cpu.h>
-
-static inline int clz(unsigned long x)
-{
-        __asm__ (
-        "       .set    push                                    \n"
-        "       .set    mips32                                  \n"
-        "       clz     %0, %1                                  \n"
-        "       .set    pop                                     \n"
-        : "=r" (x)
-        : "r" (x));
-
-        return x;
-}
-
-/*
- * Version of ffs that only looks at bits 12..15.
- */
-static inline unsigned int irq_ffs(unsigned int pending)
-{
-#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
-        return -clz(pending) + 31 - CAUSEB_IP;
-#else
-        unsigned int a0 = 7;
-        unsigned int t0;
-
-        t0 = s0 & 0xf000;
-        t0 = t0 < 1;
-        t0 = t0 << 2;
-        a0 = a0 - t0;
-        s0 = s0 << t0;
-
-        t0 = s0 & 0xc000;
-        t0 = t0 < 1;
-        t0 = t0 << 1;
-        a0 = a0 - t0;
-        s0 = s0 << t0;
-
-        t0 = s0 & 0x8000;
-        t0 = t0 < 1;
-        //t0 = t0 << 2;
-        a0 = a0 - t0;
-        //s0 = s0 << t0;
-
-        return a0;
-#endif
-}
-
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
-        int irq;
-
-        irq = irq_ffs(pending);
-
-        if (irq > 0)
-                do_IRQ(MIPS_CPU_IRQ_BASE + irq);
-        else
-                spurious_interrupt();
-}
-
-void __init arch_init_irq(void)
-{
-        mips_cpu_irq_init();
-}
diff --git a/arch/mips/mipssim/sim_smp.c b/arch/mips/mipssim/sim_smp.c
index 38fa807b99..ccbbccac23 100644
--- a/arch/mips/mipssim/sim_smp.c
+++ b/arch/mips/mipssim/sim_smp.c
@@ -53,7 +53,7 @@ void core_send_ipi(int cpu, unsigned int action)
  * Platform "CPU" startup hook
  */
 
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
         smtc_boot_secondary(cpu, idle);
@@ -64,7 +64,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
  * Post-config but pre-boot cleanup entry point
  */
 
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
         void smtc_init_secondary(void);
@@ -103,7 +103,7 @@ void plat_prepare_cpus(unsigned int max_cpus)
  * SMP initialization finalization entry point
  */
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
         smtc_smp_finish();
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 76903c7276..f60b3dc0fc 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -35,7 +35,7 @@ static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
 static inline int cpu_is_noncoherent_r10000(struct device *dev)
 {
         return !plat_device_is_coherent(dev) &&
-               (current_cpu_data.cputype == CPU_R10000 &&
+               (current_cpu_data.cputype == CPU_R10000 ||
                current_cpu_data.cputype == CPU_R12000);
 }
 
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index b8cb0dde3a..5240432e6d 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -8,6 +8,7 @@
  * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
  */
+#include <linux/bug.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/signal.h>
@@ -26,6 +27,7 @@
 #include <linux/proc_fs.h>
 #include <linux/pfn.h>
 
+#include <asm/asm-offsets.h>
 #include <asm/bootinfo.h>
 #include <asm/cachectl.h>
 #include <asm/cpu.h>
@@ -131,6 +133,8 @@ void *kmap_coherent(struct page *page, unsigned long addr)
         pte_t pte;
         int tlbidx;
 
+        BUG_ON(Page_dcache_dirty(page));
+
         inc_preempt_count();
         idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1);
 #ifdef CONFIG_MIPS_MT_SMTC
@@ -207,7 +211,7 @@ void copy_user_highpage(struct page *to, struct page *from,
         void *vfrom, *vto;
 
         vto = kmap_atomic(to, KM_USER1);
-        if (cpu_has_dc_aliases) {
+        if (cpu_has_dc_aliases && !Page_dcache_dirty(from)) {
                 vfrom = kmap_coherent(from, vaddr);
                 copy_page(vto, vfrom);
                 kunmap_coherent();
@@ -498,7 +502,13 @@ unsigned long pgd_current[NR_CPUS];
  * different layout ...
  */
 #define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order)))
-pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);
+
+/*
+ * gcc 3.3 and older have trouble determining that PTRS_PER_PGD and PGD_ORDER
+ * are constants.  So we use the variants from asm-offset.h until that gcc
+ * will officially be retired.
+ */
+pgd_t swapper_pg_dir[_PTRS_PER_PGD] __page_aligned(_PGD_ORDER);
 #ifdef CONFIG_64BIT
 #ifdef MODULE_START
 pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);
diff --git a/arch/mips/mm/pg-r4k.c b/arch/mips/mm/pg-r4k.c
index dc795be628..e47e9e9486 100644
--- a/arch/mips/mm/pg-r4k.c
+++ b/arch/mips/mm/pg-r4k.c
@@ -209,7 +209,7 @@ static inline void build_cdex_p(void)
         }
 
         if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x())
-                build_insn_word(0x3c01a000);    /* lui     $at, 0xa000  */
+                build_insn_word(0x8c200000);    /* lw      $zero, ($at) */
 
         mi.c_format.opcode     = cache_op;
         mi.c_format.rs         = 4;             /* $a0 */
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 4ec0964b83..6c425b0524 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -58,6 +58,21 @@ static __init int __maybe_unused r10000_llsc_war(void)
 }
 
 /*
+ * Found by experiment: At least some revisions of the 4kc throw under
+ * some circumstances a machine check exception, triggered by invalid
+ * values in the index register.  Delaying the tlbp instruction until
+ * after the next branch,  plus adding an additional nop in front of
+ * tlbwi/tlbwr avoids the invalid index register values. Nobody knows
+ * why; it's not an issue caused by the core RTL.
+ *
+ */
+static __init int __attribute__((unused)) m4kc_tlbp_war(void)
+{
+        return (current_cpu_data.processor_id & 0xffff00) ==
+               (PRID_COMP_MIPS | PRID_IMP_4KC);
+}
+
+/*
  * A little micro-assembler, intended for TLB refill handler
  * synthesizing. It is intentionally kept simple, does only support
  * a subset of instructions, and does not try to hide pipeline effects
@@ -78,7 +93,7 @@ enum fields
         SET = 0x200
 };
 
-#define OP_MASK         0x2f
+#define OP_MASK         0x3f
 #define OP_SH           26
 #define RS_MASK         0x1f
 #define RS_SH           21
@@ -92,7 +107,7 @@ enum fields
 #define IMM_SH          0
 #define JIMM_MASK       0x3ffffff
 #define JIMM_SH         0
-#define FUNC_MASK       0x2f
+#define FUNC_MASK       0x3f
 #define FUNC_SH         0
 #define SET_MASK        0x7
 #define SET_SH          0
@@ -894,6 +909,8 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
         case CPU_20KC:
         case CPU_25KF:
         case CPU_LOONGSON2:
+                if (m4kc_tlbp_war())
+                        i_nop(p);
                 tlbw(p);
                 break;
 
@@ -1705,7 +1722,8 @@ build_r4000_tlbchange_handler_head(u32 **p, struct label **l,
         l_smp_pgtable_change(l, *p);
 # endif
         iPTE_LW(p, l, pte, ptr); /* get even pte */
-        build_tlb_probe_entry(p);
+        if (!m4kc_tlbp_war())
+                build_tlb_probe_entry(p);
 }
 
 static void __init
@@ -1747,6 +1765,8 @@ static void __init build_r4000_tlb_load_handler(void)
 
         build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1);
         build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl);
+        if (m4kc_tlbp_war())
+                build_tlb_probe_entry(&p);
         build_make_valid(&p, &r, K0, K1);
         build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1);
 
@@ -1781,6 +1801,8 @@ static void __init build_r4000_tlb_store_handler(void)
 
         build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1);
         build_pte_writable(&p, &l, &r, K0, K1, label_nopage_tlbs);
+        if (m4kc_tlbp_war())
+                build_tlb_probe_entry(&p);
         build_make_write(&p, &r, K0, K1);
         build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1);
 
@@ -1815,6 +1837,8 @@ static void __init build_r4000_tlb_modify_handler(void)
 
         build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1);
         build_pte_modifiable(&p, &l, &r, K0, K1, label_nopage_tlbm);
+        if (m4kc_tlbp_war())
+                build_tlb_probe_entry(&p);
         /* Present and writable bits set, set accessed and dirty bits. */
         build_make_write(&p, &r, K0, K1);
         build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1);
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c
index 8008e31c5e..fe54514493 100644
--- a/arch/mips/pci/ops-mace.c
+++ b/arch/mips/pci/ops-mace.c
@@ -29,22 +29,20 @@
  * 4  N/C
  */
 
-#define chkslot(_bus,_devfn)                                    \
-do {                                                            \
-        if ((_bus)->number > 0 || PCI_SLOT (_devfn) < 1 \
-            || PCI_SLOT (_devfn) > 3)                           \
-                return PCIBIOS_DEVICE_NOT_FOUND;                \
-} while (0)
+static inline int mkaddr(struct pci_bus *bus, unsigned int devfn,
+        unsigned int reg)
+{
+        return ((bus->number & 0xff) << 16) |
+                ((devfn & 0xff) << 8) |
+                (reg & 0xfc);
+}
 
-#define mkaddr(_devfn, _reg) \
-((((_devfn) & 0xffUL) << 8) | ((_reg) & 0xfcUL))
 
 static int
 mace_pci_read_config(struct pci_bus *bus, unsigned int devfn,
                      int reg, int size, u32 *val)
 {
-        chkslot(bus, devfn);
-        mace->pci.config_addr = mkaddr(devfn, reg);
+        mace->pci.config_addr = mkaddr(bus, devfn, reg);
         switch (size) {
         case 1:
                 *val = mace->pci.config_data.b[(reg & 3) ^ 3];
@@ -66,8 +64,7 @@ static int
 mace_pci_write_config(struct pci_bus *bus, unsigned int devfn,
                       int reg, int size, u32 val)
 {
-        chkslot(bus, devfn);
-        mace->pci.config_addr = mkaddr(devfn, reg);
+        mace->pci.config_addr = mkaddr(bus, devfn, reg);
         switch (size) {
         case 1:
                 mace->pci.config_data.b[(reg & 3) ^ 3] = val;
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 99d8f4fd3f..589b745d82 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -75,7 +75,7 @@ pcibios_align_resource(void *data, struct resource *res,
         res->start = start;
 }
 
-void __init register_pci_controller(struct pci_controller *hose)
+void __devinit register_pci_controller(struct pci_controller *hose)
 {
         if (request_resource(&iomem_resource, hose->mem_resource) < 0)
                 goto out;
@@ -141,6 +141,7 @@ static int __init pcibios_init(void)
 
                 bus = pci_scan_bus(next_busno, hose->pci_ops, hose);
                 hose->bus = bus;
+                need_domain_info = need_domain_info || hose->index;
                 hose->need_domain_info = need_domain_info;
                 if (bus) {
                         next_busno = bus->subordinate + 1;
@@ -230,7 +231,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         return pcibios_plat_dev_init(dev);
 }
 
-static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
+static void pcibios_fixup_device_resources(struct pci_dev *dev,
         struct pci_bus *bus)
 {
         /* Update device resources.  */
@@ -251,7 +252,7 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
         }
 }
 
-void __devinit pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
 {
         /* Propagate hose info into the subordinate devices.  */
 
@@ -282,8 +283,7 @@ pcibios_update_irq(struct pci_dev *dev, int irq)
         pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
 
-void __devinit
-pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
+void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
                          struct resource *res)
 {
         struct pci_controller *hose = (struct pci_controller *)dev->sysdata;
diff --git a/arch/mips/philips/pnx8550/common/Kconfig b/arch/mips/philips/pnx8550/common/Kconfig
deleted file mode 100644
index 072572d173..0000000000
--- a/arch/mips/philips/pnx8550/common/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-# Place holder
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index 1c852d6a76..b0f12cd296 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -77,7 +77,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * stack so the first thing we do is throw away that stuff and load useful
  * values into the registers ...
  */
-void __init prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
         unsigned long gp = (unsigned long) task_thread_info(idle);
         unsigned long sp = __KSTK_TOS(idle);
@@ -97,12 +97,12 @@ void prom_cpus_done(void)
  *  After we've done initial boot, this function is called to allow the
  *  board code to clean up state, if needed
  */
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
         set_c0_status(ST0_CO | ST0_IE | ST0_IM);
 }
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
 }
 
diff --git a/arch/mips/qemu/q-smp.c b/arch/mips/qemu/q-smp.c
index 786bbfa214..4b0178d0df 100644
--- a/arch/mips/qemu/q-smp.c
+++ b/arch/mips/qemu/q-smp.c
@@ -22,11 +22,11 @@ void core_send_ipi(int cpu, unsigned int action)
  *  After we've done initial boot, this function is called to allow the
  *  board code to clean up state, if needed
  */
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
 }
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
 }
 
@@ -43,7 +43,7 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
 /*
  * Firmware CPU startup hook
  */
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
 }
 
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c
index ddb6506d83..01a805dcc6 100644
--- a/arch/mips/sgi-ip22/ip22-mc.c
+++ b/arch/mips/sgi-ip22/ip22-mc.c
@@ -47,7 +47,7 @@ struct mem {
 /*
  * Detect installed memory, do some sanity checks and notify kernel about it
  */
-static void probe_memory(void)
+static void __init probe_memory(void)
 {
         int i, j, found, cnt = 0;
         struct mem bank[4];
diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
index 78b608d2d4..28ffec8e5d 100644
--- a/arch/mips/sgi-ip22/ip22-platform.c
+++ b/arch/mips/sgi-ip22/ip22-platform.c
@@ -150,8 +150,8 @@ static int __init sgiseeq_devinit(void)
                 return res;
 
         /* Second HPC is missing? */
-        if (ip22_is_fullhouse() ||
-            !get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
+        if (!ip22_is_fullhouse() ||
+            get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
                 return 0;
 
         sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 | SGIMC_GIOPAR_EXP164 |
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c
index 25097ecc9b..e7ce7982db 100644
--- a/arch/mips/sgi-ip22/ip22-setup.c
+++ b/arch/mips/sgi-ip22/ip22-setup.c
@@ -29,6 +29,7 @@
 #include <asm/sgi/ip22.h>
 
 unsigned long sgi_gfxaddr;
+EXPORT_SYMBOL_GPL(sgi_gfxaddr);
 
 /*
  * Stop-A is originally a Sun thing that isn't standard on IP22 so to avoid
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index 8e88a442b2..de3d01823a 100644
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -114,8 +114,8 @@ static unsigned long dosample(void)
         } while (msb);
 
         /* Stop the counter. */
-        writeb(sgint->tcword, (SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL |
-                               SGINT_TCWORD_MSWST));
+        writeb(SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL | SGINT_TCWORD_MSWST,
+               &sgint->tcword);
         /*
          * Return the difference, this is how far the r4k counter increments
          * for every 1/HZ seconds. We round off the nearest 1 MHz of master
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index ba8e079463..856649cf9f 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -207,11 +207,9 @@ static int intr_connect_level(int cpu, int bit)
 {
         nasid_t nasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));
         struct slice_data *si = cpu_data[cpu].data;
-        unsigned long flags;
 
         set_bit(bit, si->irq_enable_mask);
 
-        local_irq_save(flags);
         if (!cputoslice(cpu)) {
                 REMOTE_HUB_S(nasid, PI_INT_MASK0_A, si->irq_enable_mask[0]);
                 REMOTE_HUB_S(nasid, PI_INT_MASK1_A, si->irq_enable_mask[1]);
@@ -219,7 +217,6 @@ static int intr_connect_level(int cpu, int bit)
                 REMOTE_HUB_S(nasid, PI_INT_MASK0_B, si->irq_enable_mask[0]);
                 REMOTE_HUB_S(nasid, PI_INT_MASK1_B, si->irq_enable_mask[1]);
         }
-        local_irq_restore(flags);
 
         return 0;
 }
@@ -285,6 +282,8 @@ static unsigned int startup_bridge_irq(unsigned int irq)
 
         bridge->b_wid_tflush;
 
+        intr_connect_level(cpu, swlevel);
+
         return 0;       /* Never anything pending.  */
 }
 
@@ -292,7 +291,6 @@ static unsigned int startup_bridge_irq(unsigned int irq)
 static void shutdown_bridge_irq(unsigned int irq)
 {
         struct bridge_controller *bc = IRQ_TO_BRIDGE(irq);
-        struct hub_data *hub = hub_data(cpu_to_node(bc->irq_cpu));
         bridge_t *bridge = bc->base;
         int pin, swlevel;
         cpuid_t cpu;
@@ -307,8 +305,6 @@ static void shutdown_bridge_irq(unsigned int irq)
         swlevel = find_level(&cpu, irq);
         intr_disconnect_level(cpu, swlevel);
 
-        __clear_bit(swlevel, hub->irq_alloc_mask);
-
         bridge->b_int_enable &= ~(1 << pin);
         bridge->b_wid_tflush;
 }
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 08e79141b4..fbb27728a7 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -171,7 +171,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * set sp to the kernel stack of the newly created idle process, gp to the proc
  * struct so that current_thread_info() will work.
  */
-void __init prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
         unsigned long gp = (unsigned long)task_thread_info(idle);
         unsigned long sp = __KSTK_TOS(idle);
@@ -191,7 +191,7 @@ void __init prom_cpus_done(void)
 {
 }
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
 }
 
diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c
index ba3697ee7f..7309e48d16 100644
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@ -41,8 +41,8 @@ static struct platform_device uart8250_device = {
 
 static int __init uart8250_init(void)
 {
-        uart8250_data[0].iobase = (unsigned long) &mace->isa.serial1;
-        uart8250_data[1].iobase = (unsigned long) &mace->isa.serial1;
+        uart8250_data[0].membase = (void __iomem *) &mace->isa.serial1;
+        uart8250_data[1].membase = (void __iomem *) &mace->isa.serial1;
 
         return platform_device_register(&uart8250_device);
 }
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
index e6b003ec67..fdd7bd98fb 100644
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
@@ -48,7 +48,6 @@ config SIBYTE_BCM1x55
 
 config SIBYTE_SB1xxx_SOC
         bool
-        depends on EXPERIMENTAL
         select DMA_COHERENT
         select SIBYTE_CFE
         select SWAP_IO_SPACE
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index ba0c4b776c..e729b5f302 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb);
 
 /* Default to UART1 */
 int kgdb_port = 1;
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
 extern char sb1250_duart_present[];
 #endif
 #endif
@@ -100,8 +100,8 @@ DEFINE_SPINLOCK(bcm1480_imr_lock);
 
 void bcm1480_mask_irq(int cpu, int irq)
 {
-        unsigned long flags;
-        u64 cur_ints,hl_spacing;
+        unsigned long flags, hl_spacing;
+        u64 cur_ints;
 
         spin_lock_irqsave(&bcm1480_imr_lock, flags);
         hl_spacing = 0;
@@ -117,8 +117,8 @@ void bcm1480_mask_irq(int cpu, int irq)
 
 void bcm1480_unmask_irq(int cpu, int irq)
 {
-        unsigned long flags;
-        u64 cur_ints,hl_spacing;
+        unsigned long flags, hl_spacing;
+        u64 cur_ints;
 
         spin_lock_irqsave(&bcm1480_imr_lock, flags);
         hl_spacing = 0;
@@ -404,7 +404,7 @@ void __init arch_init_irq(void)
         if (kgdb_flag) {
                 kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;
 
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
                 sb1250_duart_present[kgdb_port] = 0;
 #endif
                 /* Setup uart 1 settings, mapper */
diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c
index bb28f28e80..7e1aa348b8 100644
--- a/arch/mips/sibyte/bcm1480/setup.c
+++ b/arch/mips/sibyte/bcm1480/setup.c
@@ -15,6 +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.
  */
+#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/reboot.h>
@@ -35,6 +36,7 @@ unsigned int soc_type;
 EXPORT_SYMBOL(soc_type);
 unsigned int periph_rev;
 unsigned int zbbus_mhz;
+EXPORT_SYMBOL(zbbus_mhz);
 
 static unsigned int part_type;
 
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c
index c6ec748175..4cec9d798d 100644
--- a/arch/mips/sibyte/cfe/console.c
+++ b/arch/mips/sibyte/cfe/console.c
@@ -46,7 +46,7 @@ static int cfe_console_setup(struct console *cons, char *str)
         /* XXXKW think about interaction with 'console=' cmdline arg */
         /* If none of the console options are configured, the build will break. */
         if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) {
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
                 if (!strcmp(consdev, "uart0")) {
                         setleds("u0cn");
                 } else if (!strcmp(consdev, "uart1")) {
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c
index eab20e2db3..5de4cff9d1 100644
--- a/arch/mips/sibyte/cfe/smp.c
+++ b/arch/mips/sibyte/cfe/smp.c
@@ -58,7 +58,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * Setup the PC, SP, and GP of a secondary processor and start it
  * running!
  */
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
         int retval;
 
@@ -72,7 +72,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
 /*
  * Code to run on secondary just after probing the CPU
  */
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
 #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
         extern void bcm1480_smp_init(void);
@@ -89,7 +89,7 @@ void prom_init_secondary(void)
  * Do any tidying up before marking online and running the idle
  * loop
  */
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
 #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
         extern void bcm1480_smp_finish(void);
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 0e6a13c0bd..ad593a6c20 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -61,7 +61,7 @@ static int kgdb_irq;
 
 /* Default to UART1 */
 int kgdb_port = 1;
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
 extern char sb1250_duart_present[];
 #endif
 #endif
@@ -359,7 +359,7 @@ void __init arch_init_irq(void)
         if (kgdb_flag) {
                 kgdb_irq = K_INT_UART_0 + kgdb_port;
 
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
                 sb1250_duart_present[kgdb_port] = 0;
 #endif
                 /* Setup uart 1 settings, mapper */
diff --git a/arch/mips/sni/pcimt_scache.c b/arch/mips/sni/pcimt_scache.c
deleted file mode 100644
index a59d457fa8..0000000000
--- a/arch/mips/sni/pcimt_scache.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * arch/mips/sni/pcimt_scache.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) 1997, 1998 by Ralf Baechle
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <asm/bcache.h>
-#include <asm/sni.h>
-
-#define cacheconf (*(volatile unsigned int *)PCIMT_CACHECONF)
-#define invspace (*(volatile unsigned int *)PCIMT_INVSPACE)
-
-void __init sni_pcimt_sc_init(void)
-{
-        unsigned int scsiz, sc_size;
-
-        scsiz = cacheconf & 7;
-        if (scsiz == 0) {
-                printk("Second level cache is deactived.\n");
-                return;
-        }
-        if (scsiz >= 6) {
-                printk("Invalid second level cache size configured, "
-                       "deactivating second level cache.\n");
-                cacheconf = 0;
-                return;
-        }
-
-        sc_size = 128 << scsiz;
-        printk("%dkb second level cache detected, deactivating.\n", sc_size);
-        cacheconf = 0;
-}
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index 2eada8aea6..38b6a97a31 100644
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -40,10 +40,6 @@ void sni_machine_restart(char *command)
         }
 }
 
-void sni_machine_halt(void)
-{
-}
-
 void sni_machine_power_off(void)
 {
         *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd;
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 4fedfbda0c..6edbb3051c 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -26,7 +26,6 @@
 unsigned int sni_brd_type;
 
 extern void sni_machine_restart(char *command);
-extern void sni_machine_halt(void);
 extern void sni_machine_power_off(void);
 
 static void __init sni_display_setup(void)
@@ -87,7 +86,6 @@ void __init plat_mem_setup(void)
         }
 
         _machine_restart = sni_machine_restart;
-        _machine_halt = sni_machine_halt;
         pm_power_off = sni_machine_power_off;
 
         sni_display_setup();
diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile
index 9cb9535eba..18375787e0 100644
--- a/arch/mips/tx4927/common/Makefile
+++ b/arch/mips/tx4927/common/Makefile
@@ -10,3 +10,5 @@ obj-y	+= tx4927_prom.o tx4927_setup.o tx4927_irq.o
 
 obj-$(CONFIG_TOSHIBA_FPCIB0)       += smsc_fdc37m81x.o
 obj-$(CONFIG_KGDB)                 += tx4927_dbgio.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c
index 00b0b975f3..0aabd57fda 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -23,398 +23,20 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
 #include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/irq.h>
-#include <linux/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/irq.h>
+#include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
-#include <asm/system.h>
 #include <asm/tx4927/tx4927.h>
 #ifdef CONFIG_TOSHIBA_RBTX4927
 #include <asm/tx4927/toshiba_rbtx4927.h>
 #endif
 
-/*
- * DEBUG
- */
-
-#undef TX4927_IRQ_DEBUG
-
-#ifdef TX4927_IRQ_DEBUG
-#define TX4927_IRQ_NONE        0x00000000
-
-#define TX4927_IRQ_INFO        ( 1 <<  0 )
-#define TX4927_IRQ_WARN        ( 1 <<  1 )
-#define TX4927_IRQ_EROR        ( 1 <<  2 )
-
-#define TX4927_IRQ_INIT        ( 1 <<  5 )
-#define TX4927_IRQ_NEST1       ( 1 <<  6 )
-#define TX4927_IRQ_NEST2       ( 1 <<  7 )
-#define TX4927_IRQ_NEST3       ( 1 <<  8 )
-#define TX4927_IRQ_NEST4       ( 1 <<  9 )
-
-#define TX4927_IRQ_CP0_INIT     ( 1 << 10 )
-#define TX4927_IRQ_CP0_ENABLE   ( 1 << 13 )
-#define TX4927_IRQ_CP0_DISABLE  ( 1 << 14 )
-
-#define TX4927_IRQ_PIC_INIT     ( 1 << 20 )
-#define TX4927_IRQ_PIC_ENABLE   ( 1 << 23 )
-#define TX4927_IRQ_PIC_DISABLE  ( 1 << 24 )
-
-#define TX4927_IRQ_ALL         0xffffffff
-#endif
-
-#ifdef TX4927_IRQ_DEBUG
-static const u32 tx4927_irq_debug_flag = (TX4927_IRQ_NONE
-                                          | TX4927_IRQ_INFO
-                                          | TX4927_IRQ_WARN | TX4927_IRQ_EROR
-//                                       | TX4927_IRQ_CP0_INIT
-//                                       | TX4927_IRQ_CP0_ENABLE
-//                                       | TX4927_IRQ_CP0_ENDIRQ
-//                                       | TX4927_IRQ_PIC_INIT
-//                                       | TX4927_IRQ_PIC_ENABLE
-//                                       | TX4927_IRQ_PIC_DISABLE
-//                                       | TX4927_IRQ_INIT
-//                                       | TX4927_IRQ_NEST1
-//                                       | TX4927_IRQ_NEST2
-//                                       | TX4927_IRQ_NEST3
-//                                       | TX4927_IRQ_NEST4
-    );
-#endif
-
-#ifdef TX4927_IRQ_DEBUG
-#define TX4927_IRQ_DPRINTK(flag,str...) \
-        if ( (tx4927_irq_debug_flag) & (flag) ) \
-        { \
-           char tmp[100]; \
-           sprintf( tmp, str ); \
-           printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \
-        }
-#else
-#define TX4927_IRQ_DPRINTK(flag,str...)
-#endif
-
-/*
- * Forwad definitions for all pic's
- */
-
-static void tx4927_irq_cp0_enable(unsigned int irq);
-static void tx4927_irq_cp0_disable(unsigned int irq);
-
-static void tx4927_irq_pic_enable(unsigned int irq);
-static void tx4927_irq_pic_disable(unsigned int irq);
-
-/*
- * Kernel structs for all pic's
- */
-
-#define TX4927_CP0_NAME "TX4927-CP0"
-static struct irq_chip tx4927_irq_cp0_type = {
-        .name           = TX4927_CP0_NAME,
-        .ack            = tx4927_irq_cp0_disable,
-        .mask           = tx4927_irq_cp0_disable,
-        .mask_ack       = tx4927_irq_cp0_disable,
-        .unmask         = tx4927_irq_cp0_enable,
-};
-
-#define TX4927_PIC_NAME "TX4927-PIC"
-static struct irq_chip tx4927_irq_pic_type = {
-        .name           = TX4927_PIC_NAME,
-        .ack            = tx4927_irq_pic_disable,
-        .mask           = tx4927_irq_pic_disable,
-        .mask_ack       = tx4927_irq_pic_disable,
-        .unmask         = tx4927_irq_pic_enable,
-};
-
-#define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }
-static struct irqaction tx4927_irq_pic_action =
-TX4927_PIC_ACTION(TX4927_PIC_NAME);
-
-#define CCP0_STATUS 12
-#define CCP0_CAUSE 13
-
-/*
- * Functions for cp0
- */
-
-#define tx4927_irq_cp0_mask(irq) ( 1 << ( irq-TX4927_IRQ_CP0_BEG+8 ) )
-
-static void
-tx4927_irq_cp0_modify(unsigned cp0_reg, unsigned clr_bits, unsigned set_bits)
-{
-        unsigned long val = 0;
-
-        switch (cp0_reg) {
-        case CCP0_STATUS:
-                val = read_c0_status();
-                break;
-
-        case CCP0_CAUSE:
-                val = read_c0_cause();
-                break;
-
-        }
-
-        val &= (~clr_bits);
-        val |= (set_bits);
-
-        switch (cp0_reg) {
-        case CCP0_STATUS:{
-                        write_c0_status(val);
-                        break;
-                }
-        case CCP0_CAUSE:{
-                        write_c0_cause(val);
-                        break;
-                }
-        }
-}
-
-static void __init tx4927_irq_cp0_init(void)
-{
-        int i;
-
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_INIT, "beg=%d end=%d\n",
-                           TX4927_IRQ_CP0_BEG, TX4927_IRQ_CP0_END);
-
-        for (i = TX4927_IRQ_CP0_BEG; i <= TX4927_IRQ_CP0_END; i++)
-                set_irq_chip_and_handler(i, &tx4927_irq_cp0_type,
-                                         handle_level_irq);
-}
-
-static void tx4927_irq_cp0_enable(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENABLE, "irq=%d \n", irq);
-
-        tx4927_irq_cp0_modify(CCP0_STATUS, 0, tx4927_irq_cp0_mask(irq));
-}
-
-static void tx4927_irq_cp0_disable(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_DISABLE, "irq=%d \n", irq);
-
-        tx4927_irq_cp0_modify(CCP0_STATUS, tx4927_irq_cp0_mask(irq), 0);
-}
-
-/*
- * Functions for pic
- */
-u32 tx4927_irq_pic_addr(int irq)
-{
-        /* MVMCP -- need to formulize this */
-        irq -= TX4927_IRQ_PIC_BEG;
-        switch (irq) {
-        case 17:
-        case 16:
-        case 1:
-        case 0:
-                return (0xff1ff610);
-
-        case 19:
-        case 18:
-        case 3:
-        case 2:
-                return (0xff1ff614);
-
-        case 21:
-        case 20:
-        case 5:
-        case 4:
-                return (0xff1ff618);
-
-        case 23:
-        case 22:
-        case 7:
-        case 6:
-                return (0xff1ff61c);
-
-        case 25:
-        case 24:
-        case 9:
-        case 8:
-                return (0xff1ff620);
-
-        case 27:
-        case 26:
-        case 11:
-        case 10:
-                return (0xff1ff624);
-
-        case 29:
-        case 28:
-        case 13:
-        case 12:
-                return (0xff1ff628);
-
-        case 31:
-        case 30:
-        case 15:
-        case 14:
-                return (0xff1ff62c);
-
-        }
-        return (0);
-}
-
-u32 tx4927_irq_pic_mask(int irq)
-{
-        /* MVMCP -- need to formulize this */
-        irq -= TX4927_IRQ_PIC_BEG;
-        switch (irq) {
-        case 31:
-        case 29:
-        case 27:
-        case 25:
-        case 23:
-        case 21:
-        case 19:
-        case 17:{
-                        return (0x07000000);
-                }
-        case 30:
-        case 28:
-        case 26:
-        case 24:
-        case 22:
-        case 20:
-        case 18:
-        case 16:{
-                        return (0x00070000);
-                }
-        case 15:
-        case 13:
-        case 11:
-        case 9:
-        case 7:
-        case 5:
-        case 3:
-        case 1:{
-                        return (0x00000700);
-                }
-        case 14:
-        case 12:
-        case 10:
-        case 8:
-        case 6:
-        case 4:
-        case 2:
-        case 0:{
-                        return (0x00000007);
-                }
-        }
-        return (0x00000000);
-}
-
-static void tx4927_irq_pic_modify(unsigned pic_reg, unsigned clr_bits,
-        unsigned set_bits)
-{
-        unsigned long val = 0;
-
-        val = TX4927_RD(pic_reg);
-        val &= (~clr_bits);
-        val |= (set_bits);
-        TX4927_WR(pic_reg, val);
-}
-
-static void __init tx4927_irq_pic_init(void)
-{
-        int i;
-
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_INIT, "beg=%d end=%d\n",
-                           TX4927_IRQ_PIC_BEG, TX4927_IRQ_PIC_END);
-
-        for (i = TX4927_IRQ_PIC_BEG; i <= TX4927_IRQ_PIC_END; i++)
-                set_irq_chip_and_handler(i, &tx4927_irq_pic_type,
-                                         handle_level_irq);
-
-        setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action);
-
-        TX4927_WR(0xff1ff640, 0x6);     /* irq level mask -- only accept hightest */
-        TX4927_WR(0xff1ff600, TX4927_RD(0xff1ff600) | 0x1);     /* irq enable */
-}
-
-static void tx4927_irq_pic_enable(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_ENABLE, "irq=%d\n", irq);
-
-        tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq), 0,
-                              tx4927_irq_pic_mask(irq));
-}
-
-static void tx4927_irq_pic_disable(unsigned int irq)
-{
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_DISABLE, "irq=%d\n", irq);
-
-        tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq),
-                              tx4927_irq_pic_mask(irq), 0);
-}
-
-/*
- * Main init functions
- */
 void __init tx4927_irq_init(void)
 {
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "-\n");
-
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_cp0_init()\n");
-        tx4927_irq_cp0_init();
-
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_pic_init()\n");
-        tx4927_irq_pic_init();
-
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "+\n");
-}
-
-static int tx4927_irq_nested(void)
-{
-        int sw_irq = 0;
-        u32 level2;
-
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST1, "-\n");
-
-        level2 = TX4927_RD(0xff1ff6a0);
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST2, "=level2a=0x%x\n", level2);
-
-        if ((level2 & 0x10000) == 0) {
-                level2 &= 0x1f;
-                TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST3, "=level2b=0x%x\n", level2);
-
-                sw_irq = TX4927_IRQ_PIC_BEG + level2;
-                TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST3, "=sw_irq=%d\n", sw_irq);
-
-                if (sw_irq == 27) {
-                        TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST4, "=irq-%d\n",
-                                           sw_irq);
-
-#ifdef CONFIG_TOSHIBA_RBTX4927
-                        {
-                                sw_irq = toshiba_rbtx4927_irq_nested(sw_irq);
-                        }
-#endif
-
-                        TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST4, "=irq+%d\n",
-                                           sw_irq);
-                }
-        }
-
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST2, "=sw_irq=%d\n", sw_irq);
-
-        TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST1, "+\n");
-
-        return (sw_irq);
+        mips_cpu_irq_init();
+        txx9_irq_init(TX4927_IRC_REG);
+        set_irq_chained_handler(TX4927_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);
 }
 
 asmlinkage void plat_irq_dispatch(void)
@@ -424,9 +46,12 @@ asmlinkage void plat_irq_dispatch(void)
         if (pending & STATUSF_IP7)                      /* cpu timer */
                 do_IRQ(TX4927_IRQ_CPU_TIMER);
         else if (pending & STATUSF_IP2) {               /* tx4927 pic */
-                unsigned int irq = tx4927_irq_nested();
-
-                if (unlikely(irq == 0)) {
+                int irq = txx9_irq();
+#ifdef CONFIG_TOSHIBA_RBTX4927
+                if (irq == TX4927_IRQ_NEST_EXT_ON_PIC)
+                        irq = toshiba_rbtx4927_irq_nested(irq);
+#endif
+                if (unlikely(irq < 0)) {
                         spurious_interrupt();
                         return;
                 }
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
index 8a991f3c1a..13f96725d7 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile
+++ b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
@@ -1,3 +1,5 @@
 obj-y   += toshiba_rbtx4927_prom.o
 obj-y   += toshiba_rbtx4927_setup.o
 obj-y   += toshiba_rbtx4927_irq.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index e265fcd31b..9607ad5e73 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -133,6 +133,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
 #include <linux/bootmem.h>
 #include <linux/blkdev.h>
 #ifdef CONFIG_TOSHIBA_FPCIB0
+#include <asm/i8259.h>
 #include <asm/tx4927/smsc_fdc37m81x.h>
 #endif
 #include <asm/tx4927/toshiba_rbtx4927.h>
@@ -151,11 +152,6 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
 #define TOSHIBA_RBTX4927_IRQ_IOC_ENABLE    ( 1 << 13 )
 #define TOSHIBA_RBTX4927_IRQ_IOC_DISABLE   ( 1 << 14 )
 
-#define TOSHIBA_RBTX4927_IRQ_ISA_INIT      ( 1 << 20 )
-#define TOSHIBA_RBTX4927_IRQ_ISA_ENABLE    ( 1 << 23 )
-#define TOSHIBA_RBTX4927_IRQ_ISA_DISABLE   ( 1 << 24 )
-#define TOSHIBA_RBTX4927_IRQ_ISA_MASK      ( 1 << 25 )
-
 #define TOSHIBA_RBTX4927_SETUP_ALL         0xffffffff
 #endif
 
@@ -167,10 +163,6 @@ static const u32 toshiba_rbtx4927_irq_debug_flag =
 //                                                 | TOSHIBA_RBTX4927_IRQ_IOC_INIT
 //                                                 | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE
 //                                                 | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE
-//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_INIT
-//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE
-//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE
-//                                                 | TOSHIBA_RBTX4927_IRQ_ISA_MASK
     );
 #endif
 
@@ -196,33 +188,14 @@ static const u32 toshiba_rbtx4927_irq_debug_flag =
 #define TOSHIBA_RBTX4927_IRQ_IOC_BEG  ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG) /* 56 */
 #define TOSHIBA_RBTX4927_IRQ_IOC_END  ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_END) /* 63 */
 
-
-#define TOSHIBA_RBTX4927_IRQ_ISA_BEG MI8259_IRQ_ISA_BEG
-#define TOSHIBA_RBTX4927_IRQ_ISA_END MI8259_IRQ_ISA_END
-#define TOSHIBA_RBTX4927_IRQ_ISA_MID ((TOSHIBA_RBTX4927_IRQ_ISA_BEG+TOSHIBA_RBTX4927_IRQ_ISA_END+1)/2)
-
-
 #define TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC TX4927_IRQ_NEST_EXT_ON_PIC
 #define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC (TOSHIBA_RBTX4927_IRQ_IOC_BEG+2)
-#define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA (TOSHIBA_RBTX4927_IRQ_ISA_BEG+2)
 
 extern int tx4927_using_backplane;
 
-#ifdef CONFIG_TOSHIBA_FPCIB0
-extern void enable_8259A_irq(unsigned int irq);
-extern void disable_8259A_irq(unsigned int irq);
-extern void mask_and_ack_8259A(unsigned int irq);
-#endif
-
 static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq);
 static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq);
 
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq);
-static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq);
-static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq);
-#endif
-
 #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
 static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
         .name = TOSHIBA_RBTX4927_IOC_NAME,
@@ -235,18 +208,6 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
 #define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006
 
 
-#ifdef CONFIG_TOSHIBA_FPCIB0
-#define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA"
-static struct irq_chip toshiba_rbtx4927_irq_isa_type = {
-        .name = TOSHIBA_RBTX4927_ISA_NAME,
-        .ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
-        .mask = toshiba_rbtx4927_irq_isa_disable,
-        .mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
-        .unmask = toshiba_rbtx4927_irq_isa_enable,
-};
-#endif
-
-
 u32 bit2num(u32 num)
 {
         u32 i;
@@ -271,31 +232,10 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
                 }
         }
 #ifdef CONFIG_TOSHIBA_FPCIB0
-        {
-                if (tx4927_using_backplane) {
-                        u32 level4;
-                        u32 level5;
-                        outb(0x0A, 0x20);
-                        level4 = inb(0x20) & 0xff;
-                        if (level4) {
-                                sw_irq =
-                                    TOSHIBA_RBTX4927_IRQ_ISA_BEG +
-                                    bit2num(level4);
-                                if (sw_irq !=
-                                    TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA) {
-                                        goto RETURN;
-                                }
-                        }
-
-                        outb(0x0A, 0xA0);
-                        level5 = inb(0xA0) & 0xff;
-                        if (level5) {
-                                sw_irq =
-                                    TOSHIBA_RBTX4927_IRQ_ISA_MID +
-                                    bit2num(level5);
-                                goto RETURN;
-                        }
-                }
+        if (tx4927_using_backplane) {
+                int irq = i8259_irq();
+                if (irq >= 0)
+                        sw_irq = irq;
         }
 #endif
 
@@ -307,12 +247,6 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
 #define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL }
 static struct irqaction toshiba_rbtx4927_irq_ioc_action =
 TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME);
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static struct irqaction toshiba_rbtx4927_irq_isa_master =
-TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_ISA_NAME "/M");
-static struct irqaction toshiba_rbtx4927_irq_isa_slave =
-TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_ISA_NAME "/S");
-#endif
 
 
 /**********************************************************************************/
@@ -378,92 +312,6 @@ static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq)
 }
 
 
-/**********************************************************************************/
-/* Functions for isa                                                              */
-/**********************************************************************************/
-
-
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static void __init toshiba_rbtx4927_irq_isa_init(void)
-{
-        int i;
-
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_INIT,
-                                     "beg=%d end=%d\n",
-                                     TOSHIBA_RBTX4927_IRQ_ISA_BEG,
-                                     TOSHIBA_RBTX4927_IRQ_ISA_END);
-
-        for (i = TOSHIBA_RBTX4927_IRQ_ISA_BEG;
-             i <= TOSHIBA_RBTX4927_IRQ_ISA_END; i++)
-                set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_isa_type,
-                                         handle_level_irq);
-
-        setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC,
-                  &toshiba_rbtx4927_irq_isa_master);
-        setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA,
-                  &toshiba_rbtx4927_irq_isa_slave);
-
-        /* make sure we are looking at IRR (not ISR) */
-        outb(0x0A, 0x20);
-        outb(0x0A, 0xA0);
-}
-#endif
-
-
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_ENABLE,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        enable_8259A_irq(irq);
-}
-#endif
-
-
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_DISABLE,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        disable_8259A_irq(irq);
-}
-#endif
-
-
-#ifdef CONFIG_TOSHIBA_FPCIB0
-static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq)
-{
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_MASK,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        mask_and_ack_8259A(irq);
-}
-#endif
-
-
 void __init arch_init_irq(void)
 {
         extern void tx4927_irq_init(void);
@@ -471,12 +319,11 @@ void __init arch_init_irq(void)
         tx4927_irq_init();
         toshiba_rbtx4927_irq_ioc_init();
 #ifdef CONFIG_TOSHIBA_FPCIB0
-        {
-                if (tx4927_using_backplane) {
-                        toshiba_rbtx4927_irq_isa_init();
-                }
-        }
+        if (tx4927_using_backplane)
+                init_i8259_irqs();
 #endif
+        /* Onboard 10M Ether: High Active */
+        set_irq_type(RBTX4927_RTL_8019_IRQ, IRQF_TRIGGER_HIGH);
 
         wbflush();
 }
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index ea5a70b252..3e84237abe 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -151,7 +151,6 @@ unsigned long mips_memory_upper;
 static int tx4927_ccfg_toeon = 1;
 static int tx4927_pcic_trdyto = 0;      /* default: disabled */
 unsigned long tx4927_ce_base[8];
-void tx4927_pci_setup(void);
 void tx4927_reset_pci_pcic(void);
 int tx4927_pci66 = 0;           /* 0:auto */
 #endif
@@ -442,7 +441,7 @@ arch_initcall(tx4927_pcibios_init);
 extern struct resource pci_io_resource;
 extern struct resource pci_mem_resource;
 
-void tx4927_pci_setup(void)
+void __init tx4927_pci_setup(void)
 {
         static int called = 0;
         extern unsigned int tx4927_get_mem_size(void);
@@ -748,12 +747,6 @@ void __init toshiba_rbtx4927_setup(void)
         }
 #endif
 
-        /* setup irq stuff */
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       ":Setting up tx4927 pic.\n");
-        TX4927_WR(0xff1ff604, 0x00000400);      /* irq trigger */
-        TX4927_WR(0xff1ff608, 0x00000000);      /* irq trigger */
-
         /* setup serial stuff */
         TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
                                        ":Setting up tx4927 sio.\n");
@@ -915,7 +908,7 @@ void __init toshiba_rbtx4927_setup(void)
                         req.iotype = UPIO_MEM;
                         req.membase = (char *)(0xff1ff300 + i * 0x100);
                         req.mapbase = 0xff1ff300 + i * 0x100;
-                        req.irq = 32 + i;
+                        req.irq = TX4927_IRQ_PIC_BEG + 8 + i;
                         req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
                         req.uartclk = 50000000;
                         early_serial_txx9_setup(&req);
diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile
index 83cda518f2..8352eca679 100644
--- a/arch/mips/tx4938/common/Makefile
+++ b/arch/mips/tx4938/common/Makefile
@@ -9,3 +9,4 @@
 obj-y   += prom.o setup.o irq.o
 obj-$(CONFIG_KGDB) += dbgio.o
 
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c
index 3a2dbfc250..c059b899d1 100644
--- a/arch/mips/tx4938/common/irq.c
+++ b/arch/mips/tx4938/common/irq.c
@@ -11,284 +11,21 @@
  *
  * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
  */
-#include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
 #include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/irq.h>
-#include <asm/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/irq.h>
+#include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
-#include <asm/system.h>
-#include <asm/wbflush.h>
 #include <asm/tx4938/rbtx4938.h>
 
-/**********************************************************************************/
-/* Forwad definitions for all pic's                                               */
-/**********************************************************************************/
-
-static void tx4938_irq_cp0_enable(unsigned int irq);
-static void tx4938_irq_cp0_disable(unsigned int irq);
-
-static void tx4938_irq_pic_enable(unsigned int irq);
-static void tx4938_irq_pic_disable(unsigned int irq);
-
-/**********************************************************************************/
-/* Kernel structs for all pic's                                                   */
-/**********************************************************************************/
-
-#define TX4938_CP0_NAME "TX4938-CP0"
-static struct irq_chip tx4938_irq_cp0_type = {
-        .name = TX4938_CP0_NAME,
-        .ack = tx4938_irq_cp0_disable,
-        .mask = tx4938_irq_cp0_disable,
-        .mask_ack = tx4938_irq_cp0_disable,
-        .unmask = tx4938_irq_cp0_enable,
-};
-
-#define TX4938_PIC_NAME "TX4938-PIC"
-static struct irq_chip tx4938_irq_pic_type = {
-        .name = TX4938_PIC_NAME,
-        .ack = tx4938_irq_pic_disable,
-        .mask = tx4938_irq_pic_disable,
-        .mask_ack = tx4938_irq_pic_disable,
-        .unmask = tx4938_irq_pic_enable,
-};
-
-static struct irqaction tx4938_irq_pic_action = {
-        .handler = no_action,
-        .flags = 0,
-        .mask = CPU_MASK_NONE,
-        .name = TX4938_PIC_NAME
-};
-
-/**********************************************************************************/
-/* Functions for cp0                                                              */
-/**********************************************************************************/
-
-#define tx4938_irq_cp0_mask(irq) ( 1 << ( irq-TX4938_IRQ_CP0_BEG+8 ) )
-
-static void __init
-tx4938_irq_cp0_init(void)
-{
-        int i;
-
-        for (i = TX4938_IRQ_CP0_BEG; i <= TX4938_IRQ_CP0_END; i++)
-                set_irq_chip_and_handler(i, &tx4938_irq_cp0_type,
-                                         handle_level_irq);
-}
-
-static void
-tx4938_irq_cp0_enable(unsigned int irq)
-{
-        set_c0_status(tx4938_irq_cp0_mask(irq));
-}
-
-static void
-tx4938_irq_cp0_disable(unsigned int irq)
-{
-        clear_c0_status(tx4938_irq_cp0_mask(irq));
-}
-
-/**********************************************************************************/
-/* Functions for pic                                                              */
-/**********************************************************************************/
-
-u32
-tx4938_irq_pic_addr(int irq)
-{
-        /* MVMCP -- need to formulize this */
-        irq -= TX4938_IRQ_PIC_BEG;
-
-        switch (irq) {
-        case 17:
-        case 16:
-        case 1:
-        case 0:{
-                        return (TX4938_MKA(TX4938_IRC_IRLVL0));
-                }
-        case 19:
-        case 18:
-        case 3:
-        case 2:{
-                        return (TX4938_MKA(TX4938_IRC_IRLVL1));
-                }
-        case 21:
-        case 20:
-        case 5:
-        case 4:{
-                        return (TX4938_MKA(TX4938_IRC_IRLVL2));
-                }
-        case 23:
-        case 22:
-        case 7:
-        case 6:{
-                        return (TX4938_MKA(TX4938_IRC_IRLVL3));
-                }
-        case 25:
-        case 24:
-        case 9:
-        case 8:{
-                        return (TX4938_MKA(TX4938_IRC_IRLVL4));
-                }
-        case 27:
-        case 26:
-        case 11:
-        case 10:{
-                        return (TX4938_MKA(TX4938_IRC_IRLVL5));
-                }
-        case 29:
-        case 28:
-        case 13:
-        case 12:{
-                        return (TX4938_MKA(TX4938_IRC_IRLVL6));
-                }
-        case 31:
-        case 30:
-        case 15:
-        case 14:{
-                        return (TX4938_MKA(TX4938_IRC_IRLVL7));
-                }
-        }
-
-        return 0;
-}
-
-u32
-tx4938_irq_pic_mask(int irq)
-{
-        /* MVMCP -- need to formulize this */
-        irq -= TX4938_IRQ_PIC_BEG;
-
-        switch (irq) {
-        case 31:
-        case 29:
-        case 27:
-        case 25:
-        case 23:
-        case 21:
-        case 19:
-        case 17:{
-                        return (0x07000000);
-                }
-        case 30:
-        case 28:
-        case 26:
-        case 24:
-        case 22:
-        case 20:
-        case 18:
-        case 16:{
-                        return (0x00070000);
-                }
-        case 15:
-        case 13:
-        case 11:
-        case 9:
-        case 7:
-        case 5:
-        case 3:
-        case 1:{
-                        return (0x00000700);
-                }
-        case 14:
-        case 12:
-        case 10:
-        case 8:
-        case 6:
-        case 4:
-        case 2:
-        case 0:{
-                        return (0x00000007);
-                }
-        }
-        return 0x00000000;
-}
-
-static void
-tx4938_irq_pic_modify(unsigned pic_reg, unsigned clr_bits, unsigned set_bits)
-{
-        unsigned long val = 0;
-
-        val = TX4938_RD(pic_reg);
-        val &= (~clr_bits);
-        val |= (set_bits);
-        TX4938_WR(pic_reg, val);
-        mmiowb();
-        TX4938_RD(pic_reg);
-}
-
-static void __init
-tx4938_irq_pic_init(void)
-{
-        int i;
-
-        for (i = TX4938_IRQ_PIC_BEG; i <= TX4938_IRQ_PIC_END; i++)
-                set_irq_chip_and_handler(i, &tx4938_irq_pic_type,
-                                         handle_level_irq);
-
-        setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action);
-
-        TX4938_WR(0xff1ff640, 0x6);     /* irq level mask -- only accept hightest */
-        TX4938_WR(0xff1ff600, TX4938_RD(0xff1ff600) | 0x1);     /* irq enable */
-}
-
-static void
-tx4938_irq_pic_enable(unsigned int irq)
-{
-        tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq), 0,
-                              tx4938_irq_pic_mask(irq));
-}
-
-static void
-tx4938_irq_pic_disable(unsigned int irq)
-{
-        tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq),
-                              tx4938_irq_pic_mask(irq), 0);
-}
-
-/**********************************************************************************/
-/* Main init functions                                                            */
-/**********************************************************************************/
-
 void __init
 tx4938_irq_init(void)
 {
-        tx4938_irq_cp0_init();
-        tx4938_irq_pic_init();
+        mips_cpu_irq_init();
+        txx9_irq_init(TX4938_IRC_REG);
+        set_irq_chained_handler(TX4938_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);
 }
 
-int
-tx4938_irq_nested(void)
-{
-        int sw_irq = 0;
-        u32 level2;
-
-        level2 = TX4938_RD(0xff1ff6a0);
-        if ((level2 & 0x10000) == 0) {
-                level2 &= 0x1f;
-                sw_irq = TX4938_IRQ_PIC_BEG + level2;
-                if (sw_irq == 26) {
-                        {
-                                extern int toshiba_rbtx4938_irq_nested(int sw_irq);
-                                sw_irq = toshiba_rbtx4938_irq_nested(sw_irq);
-                        }
-                }
-        }
-
-        wbflush();
-        return sw_irq;
-}
+int toshiba_rbtx4938_irq_nested(int irq);
 
 asmlinkage void plat_irq_dispatch(void)
 {
@@ -297,8 +34,10 @@ asmlinkage void plat_irq_dispatch(void)
         if (pending & STATUSF_IP7)
                 do_IRQ(TX4938_IRQ_CPU_TIMER);
         else if (pending & STATUSF_IP2) {
-                int irq = tx4938_irq_nested();
-                if (irq)
+                int irq = txx9_irq();
+                if (irq == TX4938_IRQ_PIC_BEG + TX4938_IR_INT(0))
+                        irq = toshiba_rbtx4938_irq_nested(irq);
+                if (irq >= 0)
                         do_IRQ(irq);
                 else
                         spurious_interrupt();
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
index 10c94e62bf..675bb1c3e4 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile
+++ b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
@@ -7,3 +7,5 @@
 #
 
 obj-y   += prom.o setup.o irq.o spi_eeprom.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
index 91aea7aff5..f00185017e 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
@@ -181,7 +181,7 @@ void __init arch_init_irq(void)
         tx4938_irq_init();
         toshiba_rbtx4938_irq_ioc_init();
         /* Onboard 10M Ether: High Active */
-        TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM0), 0x00000040);
+        set_irq_type(RBTX4938_IRQ_ETHER, IRQF_TRIGGER_HIGH);
 
         wbflush();
 }
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index f9ad482749..f236b1ff89 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -773,10 +773,6 @@ void __init tx4938_board_setup(void)
                  txboard_add_phys_region(base, size);
         }
 
-        /* IRC */
-        /* disable interrupt control */
-        tx4938_ircptr->cer = 0;
-
         /* TMR */
         /* disable all timers */
         for (i = 0; i < TX4938_NR_TMR; i++) {
@@ -875,9 +871,6 @@ void __init toshiba_rbtx4938_setup(void)
         if (txx9_master_clock == 0)
                 txx9_master_clock = 25000000; /* 25MHz */
         tx4938_board_setup();
-        /* setup irq stuff */
-        TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM0), 0x00000000);    /* irq trigger */
-        TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM1), 0x00000000);    /* irq trigger */
         /* setup serial stuff */
         TX4938_WR(0xff1ff314, 0x00000000);      /* h/w flow control off */
         TX4938_WR(0xff1ff414, 0x00000000);      /* h/w flow control off */
@@ -897,7 +890,7 @@ void __init toshiba_rbtx4938_setup(void)
                         req.iotype = UPIO_MEM;
                         req.membase = (char *)(0xff1ff300 + i * 0x100);
                         req.mapbase = 0xff1ff300 + i * 0x100;
-                        req.irq = 32 + i;
+                        req.irq = RBTX4938_IRQ_IRC_SIO(i);
                         req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
                         req.uartclk = 50000000;
                         early_serial_txx9_setup(&req);
@@ -1115,14 +1108,14 @@ static void __init txx9_spi_init(unsigned long base, int irq)
                         .flags  = IORESOURCE_IRQ,
                 },
         };
-        platform_device_register_simple("txx9spi", 0,
+        platform_device_register_simple("spi_txx9", 0,
                                         res, ARRAY_SIZE(res));
 }
 
 static int __init rbtx4938_spi_init(void)
 {
         struct spi_board_info srtc_info = {
-                .modalias = "rs5c348",
+                .modalias = "rtc-rs5c348",
                 .max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */
                 .bus_num = 0,
                 .chip_select = 16 + SRTC_CS,
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index bb23ff71c2..2989c6682b 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -285,147 +285,6 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
         return err;
 }
 
-struct linux32_dirent {
-        u32             d_ino;
-        compat_off_t    d_off;
-        u16             d_reclen;
-        char            d_name[1];
-};
-
-struct old_linux32_dirent {
-        u32     d_ino;
-        u32     d_offset;
-        u16     d_namlen;
-        char    d_name[1];
-};
-
-struct getdents32_callback {
-        struct linux32_dirent __user * current_dir;
-        struct linux32_dirent __user * previous;
-        int count;
-        int error;
-};
-
-struct readdir32_callback {
-        struct old_linux32_dirent __user * dirent;
-        int count;
-};
-
-#define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
-static int filldir32 (void *__buf, const char *name, int namlen,
-                        loff_t offset, u64 ino, unsigned int d_type)
-{
-        struct linux32_dirent __user * dirent;
-        struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
-        int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, 4);
-        u32 d_ino;
-
-        buf->error = -EINVAL;   /* only used if we fail.. */
-        if (reclen > buf->count)
-                return -EINVAL;
-        d_ino = ino;
-        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
-                return -EOVERFLOW;
-        dirent = buf->previous;
-        if (dirent)
-                put_user(offset, &dirent->d_off);
-        dirent = buf->current_dir;
-        buf->previous = dirent;
-        put_user(d_ino, &dirent->d_ino);
-        put_user(reclen, &dirent->d_reclen);
-        copy_to_user(dirent->d_name, name, namlen);
-        put_user(0, dirent->d_name + namlen);
-        dirent = ((void __user *)dirent) + reclen;
-        buf->current_dir = dirent;
-        buf->count -= reclen;
-        return 0;
-}
-
-asmlinkage long
-sys32_getdents (unsigned int fd, void __user * dirent, unsigned int count)
-{
-        struct file * file;
-        struct linux32_dirent __user * lastdirent;
-        struct getdents32_callback buf;
-        int error;
-
-        error = -EFAULT;
-        if (!access_ok(VERIFY_WRITE, dirent, count))
-                goto out;
-
-        error = -EBADF;
-        file = fget(fd);
-        if (!file)
-                goto out;
-
-        buf.current_dir = (struct linux32_dirent __user *) dirent;
-        buf.previous = NULL;
-        buf.count = count;
-        buf.error = 0;
-
-        error = vfs_readdir(file, filldir32, &buf);
-        if (error < 0)
-                goto out_putf;
-        error = buf.error;
-        lastdirent = buf.previous;
-        if (lastdirent) {
-                if (put_user(file->f_pos, &lastdirent->d_off))
-                        error = -EFAULT;
-                else
-                        error = count - buf.count;
-        }
-
-out_putf:
-        fput(file);
-out:
-        return error;
-}
-
-static int fillonedir32(void * __buf, const char * name, int namlen,
-                        loff_t offset, u64 ino, unsigned int d_type)
-{
-        struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
-        struct old_linux32_dirent __user * dirent;
-        u32 d_ino;
-
-        if (buf->count)
-                return -EINVAL;
-        d_ino = ino;
-        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
-                return -EOVERFLOW;
-        buf->count++;
-        dirent = buf->dirent;
-        put_user(d_ino, &dirent->d_ino);
-        put_user(offset, &dirent->d_offset);
-        put_user(namlen, &dirent->d_namlen);
-        copy_to_user(dirent->d_name, name, namlen);
-        put_user(0, dirent->d_name + namlen);
-        return 0;
-}
-
-asmlinkage long
-sys32_readdir (unsigned int fd, void __user * dirent, unsigned int count)
-{
-        int error;
-        struct file * file;
-        struct readdir32_callback buf;
-
-        error = -EBADF;
-        file = fget(fd);
-        if (!file)
-                goto out;
-
-        buf.count = 0;
-        buf.dirent = dirent;
-
-        error = vfs_readdir(file, fillonedir32, &buf);
-        if (error >= 0)
-                error = buf.count;
-        fput(file);
-out:
-        return error;
-}
-
 /*** copied from mips64 ***/
 /*
  * Ooo, nasty.  We need here to frob 32-bit unsigned longs to
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 627f3c28ad..2540786a97 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -222,9 +222,7 @@
         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)
+        ENTRY_COMP(getdents)
         /* it is POSSIBLE that select will be OK because even though fd_set
          * contains longs, the macros and sizes are clever. */
         ENTRY_COMP(select)
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index d4e6a93c8d..ee7a16eb6f 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -81,6 +81,8 @@ SECTIONS
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
 
+  NOTES
+
   __start___unwind = .;         /* unwind info */
   .PARISC.unwind : { *(.PARISC.unwind) }
   __stop___unwind = .;
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 502f47c017..44c065a6b5 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -99,6 +99,7 @@
                         #size-cells = <0>;
                         interrupt-parent = < &ipic >;
                         interrupts = <26 8>;
+                        dr_mode = "peripheral";
                         phy_type = "ulpi";
                 };
 
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index d9ac24e8de..8b47c84642 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,9 +1,23 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 12:32:34 2007
+# Linux kernel version: 2.6.23-rc3
+# Wed Aug 22 15:19:19 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+# CONFIG_POWER4_ONLY is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,51 +37,33 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-# CONFIG_POWER4_ONLY is not set
-CONFIG_POWER3=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 CONFIG_PPC_DCR_MMIO=y
 CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -96,16 +93,13 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -113,12 +107,9 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -138,7 +129,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
@@ -158,7 +151,11 @@ CONFIG_PS3_HTAB_SIZE=20
 CONFIG_PS3_USE_LPAR_ADDR=y
 CONFIG_PS3_VUART=y
 CONFIG_PS3_PS3AV=y
-CONFIG_PS3_SYS_MANAGER=y
+CONFIG_PS3_SYS_MANAGER=m
+CONFIG_PS3_STORAGE=y
+CONFIG_PS3_DISK=y
+CONFIG_PS3_ROM=m
+CONFIG_PS3_FLASH=m
 CONFIG_PPC_CELL=y
 CONFIG_PPC_CELL_NATIVE=y
 CONFIG_PPC_IBM_CELL_BLADE=y
@@ -171,6 +168,7 @@ CONFIG_SPU_BASE=y
 CONFIG_CBE_RAS=y
 CONFIG_CBE_THERM=m
 CONFIG_CBE_CPUFREQ=m
+CONFIG_CBE_CPUFREQ_PMI=m
 # CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
 CONFIG_UDBG_RTAS_CONSOLE=y
@@ -183,7 +181,7 @@ CONFIG_PPC_RTAS=y
 # CONFIG_RTAS_ERROR_LOGGING is not set
 CONFIG_RTAS_PROC=y
 CONFIG_RTAS_FLASH=y
-# CONFIG_PPC_PMI is not set
+CONFIG_PPC_PMI=m
 CONFIG_MMIO_NVRAM=y
 # CONFIG_PPC_MPC106 is not set
 # CONFIG_PPC_970_NAP is not set
@@ -206,6 +204,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 # CPU Frequency drivers
 #
 # CONFIG_CPM2 is not set
+CONFIG_AXON_RAM=m
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -248,6 +248,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_PPC_HAS_HASH_64K=y
@@ -268,7 +269,9 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCI_DEBUG is not set
@@ -359,6 +362,7 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -377,6 +381,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
@@ -448,6 +453,7 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -462,28 +468,12 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -499,14 +489,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -572,6 +559,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -604,10 +592,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 CONFIG_SCSI_SAS_ATTRS=y
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -622,7 +607,6 @@ CONFIG_SCSI_SAS_ATTRS=y
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -696,10 +680,6 @@ CONFIG_PATA_PDC2027X=m
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_SCC is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -717,6 +697,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_MULTIPATH_EMC is not set
+# CONFIG_DM_MULTIPATH_RDAC is not set
 # CONFIG_DM_DELAY is not set
 
 #
@@ -728,43 +709,30 @@ CONFIG_FUSION=y
 CONFIG_FUSION_SAS=y
 CONFIG_FUSION_MAX_SGE=128
 # CONFIG_FUSION_CTL is not set
+# CONFIG_FUSION_LOGGING is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 CONFIG_BONDING=m
+CONFIG_MACVLAN=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=y
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -781,11 +749,12 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SIS190 is not set
 CONFIG_SKGE=m
 CONFIG_SKY2=m
-# CONFIG_SK98LIN is not set
+# CONFIG_SKY2_DEBUG is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
 CONFIG_SPIDER_NET=y
+CONFIG_GELIC_NET=m
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
 CONFIG_NETDEV_10000=y
@@ -824,15 +793,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -925,10 +886,6 @@ CONFIG_UNIX98_PTYS=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_RTAS=y
 CONFIG_HVC_BEAT=y
-
-#
-# IPMI
-#
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -963,10 +920,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -1000,6 +953,7 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -1011,11 +965,13 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1026,11 +982,8 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -1055,6 +1008,7 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -1068,10 +1022,7 @@ CONFIG_DUMMY_CONSOLE=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
 
@@ -1085,10 +1036,7 @@ CONFIG_HID=m
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1122,6 +1070,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1199,23 +1148,7 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -1231,14 +1164,13 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 # CONFIG_INFINIBAND_SRP is not set
 # CONFIG_INFINIBAND_ISER is not set
+CONFIG_EDAC=y
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
+# Reporting subsystems
 #
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_MM_EDAC=y
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1255,6 +1187,12 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 #
 
 #
+# Userspace I/O
+#
+CONFIG_UIO=m
+# CONFIG_UIO_CIF is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1357,7 +1295,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1439,6 +1376,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
@@ -1471,9 +1409,10 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_DETECT_SOFTLOCKUP is not set
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -1504,10 +1443,6 @@ CONFIG_IRQSTACKS=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -1546,7 +1481,4 @@ CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index 0dc9874b46..b4ac498c3c 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
@@ -1,9 +1,23 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 12:33:17 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:32:07 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+# CONFIG_POWER4_ONLY is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,50 +37,32 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-# CONFIG_POWER4_ONLY is not set
-CONFIG_POWER3=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_OF_PLATFORM_PCI=y
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -101,10 +98,6 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -112,12 +105,9 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_BLK_DEV_BSG=y
 
 #
 # IO Schedulers
@@ -137,7 +127,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
@@ -171,6 +163,7 @@ CONFIG_PPC_UDBG_BEAT=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -212,6 +205,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_PPC_HAS_HASH_64K=y
@@ -232,6 +226,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -363,6 +358,7 @@ CONFIG_IP_NF_QUEUE=m
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -377,28 +373,12 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -414,14 +394,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -487,6 +464,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_PROC_FS is not set
@@ -519,10 +497,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -537,7 +512,6 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -556,10 +530,6 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -577,6 +547,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 # CONFIG_DM_MULTIPATH_EMC is not set
+# CONFIG_DM_MULTIPATH_RDAC is not set
 # CONFIG_DM_DELAY is not set
 
 #
@@ -592,37 +563,23 @@ CONFIG_DM_MULTIPATH=m
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -637,7 +594,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -680,15 +636,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -775,10 +723,6 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_BEAT=y
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -807,10 +751,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -844,6 +784,7 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -855,11 +796,13 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -870,11 +813,8 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -899,6 +839,7 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -912,10 +853,7 @@ CONFIG_DUMMY_CONSOLE=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -926,10 +864,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -960,6 +895,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1037,32 +973,9 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1079,6 +992,11 @@ CONFIG_USB_MON=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1189,7 +1107,6 @@ CONFIG_SUNRPC=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1271,6 +1188,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
@@ -1297,6 +1215,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1339,10 +1258,6 @@ CONFIG_PPC_EARLY_DEBUG_BEAT=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -1382,7 +1297,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 7a747c4385..c3977e334b 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,9 +1,26 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 12:36:45 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:33:50 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+# CONFIG_ALTIVEC is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,62 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_GENERIC_TBSYNC=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-CONFIG_CLASSIC32=y
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_ALTIVEC is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -105,10 +98,6 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
@@ -116,14 +105,11 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -143,7 +129,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+CONFIG_CLASSIC32=y
 CONFIG_PPC_CHRP=y
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
@@ -169,6 +158,7 @@ CONFIG_PPC_MPC106=y
 # CONFIG_CPU_FREQ is not set
 # CONFIG_TAU is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -200,6 +190,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -214,9 +206,9 @@ CONFIG_ISA=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -296,6 +288,7 @@ CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set
 CONFIG_NF_CONNTRACK_FTP=m
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -313,6 +306,7 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
 # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
@@ -332,6 +326,7 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 # CONFIG_NETFILTER_XT_MATCH_STRING is not set
 # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
@@ -407,6 +402,7 @@ CONFIG_NF_NAT_SIP=m
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -421,27 +417,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
 # CONFIG_PNP is not set
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=y
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_BLK_CPQ_DA is not set
@@ -460,14 +441,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -533,6 +511,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -563,12 +542,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -622,15 +597,6 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -646,27 +612,17 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
@@ -676,10 +632,6 @@ CONFIG_MII=y
 # CONFIG_LANCE is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_VENDOR_RACAL is not set
-
-#
-# Tulip family network device support
-#
 CONFIG_NET_TULIP=y
 # CONFIG_DE2104X is not set
 # CONFIG_TULIP is not set
@@ -732,7 +684,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -776,6 +727,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
@@ -783,15 +735,7 @@ CONFIG_SLHC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -892,10 +836,6 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_BRIQ_PANEL=m
 # CONFIG_HVC_RTAS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -908,10 +848,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -947,6 +883,7 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -959,12 +896,14 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -975,11 +914,8 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -998,8 +934,8 @@ CONFIG_I2C_ALGOBIT=y
 # Graphics support
 #
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 
 #
 # Display device support
@@ -1010,6 +946,7 @@ CONFIG_DISPLAY_SUPPORT=m
 # Display hardware drivers
 #
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
@@ -1080,6 +1017,7 @@ CONFIG_VGA_CONSOLE=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -1093,10 +1031,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -1107,10 +1042,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 # CONFIG_USB_HIDDEV is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1132,7 +1064,6 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1141,6 +1072,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1219,32 +1151,9 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1261,6 +1170,11 @@ CONFIG_USB_MON=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1348,7 +1262,6 @@ CONFIG_RAMFS=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1430,6 +1343,7 @@ CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
@@ -1456,6 +1370,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1490,10 +1405,6 @@ CONFIG_XMON_DISASSEMBLY=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=m
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -1531,7 +1442,4 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index 5762cddfc1..ebb8167608 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_defconfig
@@ -1,9 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 12:38:33 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:34:11 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+CONFIG_44x=y
+# CONFIG_E200 is not set
+CONFIG_4xx=y
+CONFIG_BOOKE=y
+CONFIG_PTE_64BIT=y
+CONFIG_PHYS_64BIT=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +30,39 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-CONFIG_44x=y
-# CONFIG_E200 is not set
 CONFIG_PPC_DCR_NATIVE=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_DCR=y
-CONFIG_4xx=y
-CONFIG_BOOKE=y
-CONFIG_PTE_64BIT=y
-CONFIG_PHYS_64BIT=y
-# CONFIG_PPC_MM_SLICES is not set
-CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -102,24 +96,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -155,6 +142,7 @@ CONFIG_440GP=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_SECCOMP=y
@@ -196,9 +186,9 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -306,6 +296,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -320,27 +311,12 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -356,14 +332,12 @@ CONFIG_BLK_DEV_RAM_SIZE=35000
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+# CONFIG_XILINX_SYSACE is not set
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -371,12 +345,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -389,35 +360,17 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
-CONFIG_IBM_EMAC=y
-CONFIG_IBM_EMAC_RXB=128
-CONFIG_IBM_EMAC_TXB=64
-CONFIG_IBM_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
-# CONFIG_IBM_EMAC_DEBUG is not set
-CONFIG_IBM_EMAC_ZMII=y
 CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
@@ -429,7 +382,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -459,15 +411,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -512,10 +456,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -526,10 +466,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
@@ -539,11 +475,8 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -568,6 +501,7 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -575,10 +509,7 @@ CONFIG_DEVPORT=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -593,32 +524,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -635,6 +543,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -723,7 +636,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -750,6 +662,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
@@ -774,6 +687,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -796,7 +710,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -804,10 +717,6 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -845,7 +754,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index a217f4ebcf..a655d87b3f 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -1,9 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 12:38:34 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:34:59 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+CONFIG_POWER4_ONLY=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,50 +36,33 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 CONFIG_GENERIC_TBSYNC=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_PPC64_SWSUSP=y
-
-#
-# Processor support
-#
-CONFIG_POWER4_ONLY=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -101,10 +98,6 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -112,12 +105,9 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_BLK_DEV_BSG=y
 
 #
 # IO Schedulers
@@ -137,7 +127,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
@@ -182,6 +174,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 #
 CONFIG_CPU_FREQ_PMAC64=y
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -219,12 +212,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 # CONFIG_PPC_HAS_HASH_64K is not set
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
+CONFIG_SUSPEND_SMP_POSSIBLE=y
 CONFIG_SECCOMP=y
 # CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
@@ -237,6 +232,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
@@ -308,6 +304,7 @@ CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set
 CONFIG_NF_CONNTRACK_FTP=m
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -365,6 +362,7 @@ CONFIG_LLC=y
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -379,28 +377,12 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -418,14 +400,11 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -493,6 +472,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -525,10 +505,7 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -543,7 +520,6 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -616,10 +592,6 @@ CONFIG_SATA_SVW=y
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
@@ -672,10 +644,6 @@ CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=y
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB_PMU=y
@@ -688,31 +656,21 @@ CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
 CONFIG_WINDFARM_PM112=y
 # CONFIG_PMAC_RACKMETER is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 CONFIG_SUNGEM=y
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -730,7 +688,6 @@ CONFIG_E1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
@@ -787,6 +744,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
@@ -794,15 +752,7 @@ CONFIG_SLHC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -876,10 +826,6 @@ CONFIG_HW_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -893,10 +839,6 @@ CONFIG_AGP_UNINORTH=m
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=256
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -931,6 +873,7 @@ CONFIG_I2C_POWERMAC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -942,11 +885,13 @@ CONFIG_I2C_POWERMAC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -957,11 +902,8 @@ CONFIG_I2C_POWERMAC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -981,14 +923,15 @@ CONFIG_DAB=y
 # Graphics support
 #
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 
 #
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 CONFIG_VGASTATE=y
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
@@ -1049,6 +992,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -1111,6 +1055,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_CMIPCI is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_LAYLA20 is not set
@@ -1160,6 +1105,10 @@ CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 
 #
+# ALSA PowerPC devices
+#
+
+#
 # Apple Onboard Audio driver
 #
 CONFIG_SND_AOA=m
@@ -1183,13 +1132,14 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_SOC is not set
 
 #
-# Open Sound System
+# SoC Audio support for SuperH
 #
-# CONFIG_SOUND_PRIME is not set
 
 #
-# HID Devices
+# Open Sound System
 #
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -1205,10 +1155,7 @@ CONFIG_LOGITECH_FF=y
 CONFIG_THRUSTMASTER_FF=y
 # CONFIG_ZEROPLUS_FF is not set
 CONFIG_USB_HIDDEV=y
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1230,7 +1177,6 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1242,6 +1188,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1326,6 +1273,7 @@ CONFIG_USB_SERIAL_MCT_U232=m
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
 CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_OTI6858 is not set
 # CONFIG_USB_SERIAL_HP4X is not set
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
@@ -1371,32 +1319,9 @@ CONFIG_USB_APPLEDISPLAY=m
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1413,6 +1338,11 @@ CONFIG_USB_APPLEDISPLAY=m
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1538,7 +1468,6 @@ CONFIG_CIFS=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1620,6 +1549,7 @@ CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -1647,6 +1577,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1677,10 +1608,6 @@ CONFIG_BOOTX_TEXT=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1720,7 +1647,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index 04b94f884a..97d0202a9f 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -1,9 +1,24 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 13:22:36 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:35:41 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +29,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-CONFIG_CLASSIC32=y
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_ALTIVEC is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -102,23 +94,16 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 # CONFIG_MODULE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -138,7 +123,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # CONFIG_PPC_MULTIPLATFORM is not set
 CONFIG_EMBEDDED6xx=y
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -159,8 +146,8 @@ CONFIG_MPIC_WEIRD=y
 # CONFIG_PPC_INDIRECT_IO is not set
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
-# CONFIG_TAU is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -189,6 +176,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,115200"
@@ -206,6 +195,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -316,6 +306,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -330,26 +321,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -366,14 +342,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -381,6 +354,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -410,12 +384,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -506,10 +476,6 @@ CONFIG_ATA=y
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -525,19 +491,13 @@ CONFIG_ATA=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -554,11 +514,8 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
@@ -567,10 +524,6 @@ CONFIG_MII=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=y
 # CONFIG_TYPHOON is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -585,7 +538,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -617,15 +569,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -691,10 +635,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -706,10 +646,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
@@ -719,20 +655,24 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -757,6 +697,7 @@ CONFIG_HWMON=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -764,16 +705,10 @@ CONFIG_HWMON=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -788,32 +723,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -830,6 +742,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -922,7 +839,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -965,6 +881,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -989,6 +906,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1014,7 +932,6 @@ CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
 CONFIG_XMON_DISASSEMBLY=y
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1022,8 +939,4 @@ CONFIG_XMON_DISASSEMBLY=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 8e33674524..3fe1929460 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,9 +1,23 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 13:22:39 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:37:16 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+# CONFIG_POWER4_ONLY is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+# CONFIG_ALTIVEC is not set
+CONFIG_PPC_STD_MMU=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,50 +37,32 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-# CONFIG_POWER4_ONLY is not set
-CONFIG_POWER3=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
-# CONFIG_ALTIVEC is not set
-CONFIG_PPC_STD_MMU=y
-# CONFIG_PPC_MM_SLICES is not set
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=32
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
@@ -102,10 +99,6 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -113,12 +106,9 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_BLK_DEV_BSG=y
 
 #
 # IO Schedulers
@@ -138,7 +128,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_PSERIES is not set
 CONFIG_LPARCFG=y
 CONFIG_PPC_ISERIES=y
@@ -174,6 +166,7 @@ CONFIG_PPC_INDIRECT_IO=y
 CONFIG_GENERIC_IOMAP=y
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -210,6 +203,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 # CONFIG_PPC_HAS_HASH_64K is not set
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
@@ -228,6 +222,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -299,6 +294,7 @@ CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set
 CONFIG_NF_CONNTRACK_FTP=m
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -316,9 +312,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
@@ -339,6 +337,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
@@ -427,6 +426,7 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -441,28 +441,12 @@ CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -477,14 +461,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -492,6 +473,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
@@ -525,10 +507,7 @@ CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -543,7 +522,6 @@ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -563,10 +541,6 @@ CONFIG_SCSI_IBMVSCSI=m
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
@@ -598,37 +572,23 @@ CONFIG_DM_ZERO=m
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -665,7 +625,6 @@ CONFIG_E1000=m
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -703,6 +662,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
@@ -711,15 +671,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -782,10 +734,6 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_ISERIES=y
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -798,10 +746,6 @@ CONFIG_GEN_RTC=y
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=256
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
@@ -811,11 +755,8 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -840,6 +781,7 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -854,55 +796,12 @@ CONFIG_DUMMY_CONSOLE=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-# CONFIG_HID is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -919,6 +818,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1052,7 +956,6 @@ CONFIG_CIFS_POSIX=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1119,6 +1022,7 @@ CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -1149,6 +1053,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1179,10 +1084,6 @@ CONFIG_IRQSTACKS=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1222,7 +1123,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 78fd07c5f4..a4e3ee045a 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1,9 +1,24 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 13:25:19 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:38 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +29,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-CONFIG_CLASSIC32=y
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_ALTIVEC is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -103,24 +95,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -140,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # CONFIG_PPC_MULTIPLATFORM is not set
 CONFIG_EMBEDDED6xx=y
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -163,8 +150,8 @@ CONFIG_MPIC=y
 # CONFIG_PPC_INDIRECT_IO is not set
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
-# CONFIG_TAU is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -193,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -206,10 +195,10 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -297,6 +286,7 @@ CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -314,9 +304,11 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
 # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
@@ -337,6 +329,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 # CONFIG_NETFILTER_XT_MATCH_STRING is not set
 # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
@@ -425,6 +418,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -439,10 +433,6 @@ CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
@@ -526,20 +516,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # UBI - Unsorted block images
 #
 # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -557,14 +536,11 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -572,6 +548,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -601,12 +578,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -696,10 +669,6 @@ CONFIG_PATA_SIL680=y
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -715,37 +684,23 @@ CONFIG_PATA_SIL680=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 CONFIG_NET_TULIP=y
 # CONFIG_DE2104X is not set
 CONFIG_TULIP=y
@@ -770,7 +725,6 @@ CONFIG_R8169=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -812,15 +766,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -898,10 +844,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
@@ -912,10 +854,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -950,6 +888,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -961,12 +900,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 CONFIG_SENSORS_EEPROM=m
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -977,14 +918,12 @@ CONFIG_SENSORS_EEPROM=m
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -1011,14 +950,17 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -1053,6 +995,7 @@ CONFIG_HWMON=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -1066,10 +1009,7 @@ CONFIG_DUMMY_CONSOLE=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
 
@@ -1083,10 +1023,7 @@ CONFIG_HID=m
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1108,7 +1045,6 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1120,6 +1056,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1192,6 +1129,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
 # CONFIG_USB_SERIAL_HP4X is not set
 # CONFIG_USB_SERIAL_SAFE is not set
 # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
@@ -1235,32 +1173,9 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1287,6 +1202,7 @@ CONFIG_RTC_DRV_RS5C372=y
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
 
 #
 # SPI RTC drivers
@@ -1295,9 +1211,12 @@ CONFIG_RTC_DRV_RS5C372=y
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -1318,6 +1237,11 @@ CONFIG_RTC_DRV_RS5C372=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1437,7 +1361,6 @@ CONFIG_CIFS=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1503,6 +1426,7 @@ CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
@@ -1532,6 +1456,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1554,7 +1479,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1562,10 +1486,6 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1604,7 +1524,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index 9c30ca4516..d42e226d3a 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_defconfig
@@ -1,10 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 13:26:09 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:38 2007
 #
 # CONFIG_PPC64 is not set
-CONFIG_PPC_PM_NEEDS_RTC_LIB=y
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+# CONFIG_ALTIVEC is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-CONFIG_CLASSIC32=y
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_ALTIVEC is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -101,24 +93,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -138,7 +123,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+CONFIG_CLASSIC32=y
 # CONFIG_PPC_CHRP is not set
 CONFIG_PPC_MPC52xx=y
 CONFIG_PPC_MPC5200=y
@@ -161,6 +149,7 @@ CONFIG_PPC_LITE5200=y
 # CONFIG_CPU_FREQ is not set
 # CONFIG_TAU is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -190,12 +179,15 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
 # CONFIG_HIBERNATION is not set
 CONFIG_SECCOMP=y
 # CONFIG_WANT_DEVICE_TREE is not set
@@ -210,6 +202,7 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -320,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -334,26 +328,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -370,14 +349,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -385,6 +361,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_PROC_FS is not set
@@ -414,12 +391,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -511,10 +484,6 @@ CONFIG_PATA_MPC52xx=y
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -530,26 +499,16 @@ CONFIG_PATA_MPC52xx=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
 CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
@@ -562,7 +521,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -594,15 +552,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -640,10 +590,6 @@ CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -654,10 +600,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
@@ -667,11 +609,8 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -696,6 +635,7 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -703,10 +643,7 @@ CONFIG_DEVPORT=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -721,33 +658,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
-CONFIG_RTC_LIB=y
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -764,6 +677,11 @@ CONFIG_RTC_LIB=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -846,7 +764,6 @@ CONFIG_RAMFS=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -872,6 +789,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 # CONFIG_CRC32 is not set
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -895,6 +813,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -925,8 +844,4 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index eb3d9ad655..96b538bc67 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,9 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 13:27:35 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:38:16 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+CONFIG_POWER4_ONLY=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+# CONFIG_ALTIVEC is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,49 +36,32 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_GENERIC_TBSYNC=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-CONFIG_POWER4_ONLY=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
-# CONFIG_ALTIVEC is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -99,10 +96,6 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -110,12 +103,9 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
@@ -167,6 +159,7 @@ CONFIG_PPC_970_NAP=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -203,6 +196,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 # CONFIG_PPC_HAS_HASH_64K is not set
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
@@ -221,6 +215,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
@@ -318,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -332,28 +328,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -368,14 +348,11 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -439,12 +416,9 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -457,37 +431,23 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -523,7 +483,6 @@ CONFIG_E1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
@@ -564,15 +523,7 @@ CONFIG_USB_PEGASUS=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -641,10 +592,6 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_RTAS=y
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -656,10 +603,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -693,6 +636,7 @@ CONFIG_I2C_AMD8111=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -704,11 +648,13 @@ CONFIG_I2C_AMD8111=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -719,11 +665,8 @@ CONFIG_I2C_AMD8111=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -748,6 +691,7 @@ CONFIG_I2C_AMD8111=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -761,10 +705,7 @@ CONFIG_DUMMY_CONSOLE=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -775,10 +716,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 # CONFIG_USB_HIDDEV is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -800,7 +738,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -809,6 +746,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -880,6 +818,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
 # CONFIG_USB_SERIAL_HP4X is not set
 # CONFIG_USB_SERIAL_SAFE is not set
 # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
@@ -924,32 +863,9 @@ CONFIG_USB_EZUSB=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -966,6 +882,11 @@ CONFIG_USB_EZUSB=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1064,7 +985,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1146,6 +1066,7 @@ CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
@@ -1171,6 +1092,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 CONFIG_DEBUG_SLAB=y
@@ -1205,10 +1127,6 @@ CONFIG_BOOTX_TEXT=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1246,7 +1164,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 174a290ee7..05814a3b0e 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -1,9 +1,24 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:54 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:39 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +29,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-CONFIG_CLASSIC32=y
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_ALTIVEC is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -101,19 +93,12 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -133,7 +118,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # CONFIG_PPC_MULTIPLATFORM is not set
 CONFIG_EMBEDDED6xx=y
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -154,8 +141,8 @@ CONFIG_MPIC_WEIRD=y
 # CONFIG_PPC_INDIRECT_IO is not set
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
-# CONFIG_TAU is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -184,6 +171,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -199,6 +188,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -308,6 +298,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -320,26 +311,11 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -356,14 +332,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -371,6 +344,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -399,12 +373,8 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -495,10 +465,6 @@ CONFIG_SATA_MV=y
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -514,19 +480,13 @@ CONFIG_SATA_MV=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -543,21 +503,14 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -595,7 +548,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -627,15 +579,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -697,10 +641,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -712,10 +652,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
@@ -725,20 +661,24 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -763,6 +703,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -770,16 +711,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -794,32 +729,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -836,6 +748,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -928,7 +845,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -971,6 +887,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -993,7 +910,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1001,8 +917,4 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 4a429294e4..4b68032588 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -1,9 +1,24 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:55 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:39 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,59 +29,36 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-CONFIG_PPC_82xx=y
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION="powerpc8272"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -99,15 +91,7 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
@@ -129,6 +113,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+CONFIG_PPC_82xx=y
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -148,6 +137,7 @@ CONFIG_8272=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 CONFIG_CPM2=y
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -172,6 +162,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -186,6 +178,7 @@ CONFIG_ZONE_DMA=y
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
+# CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
@@ -319,26 +312,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -347,11 +325,8 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_BLINK is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -381,19 +356,13 @@ CONFIG_IDE_PROC_FS=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
@@ -411,11 +380,8 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_FS_ENET=y
@@ -440,15 +406,7 @@ CONFIG_PPP_DEFLATE=y
 CONFIG_SLHC=y
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -533,10 +491,6 @@ CONFIG_SERIAL_CPM_SCC4=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
@@ -544,10 +498,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_I2C is not set
 
 #
@@ -555,11 +505,8 @@ CONFIG_HW_RANDOM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -584,6 +531,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -591,16 +539,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -614,41 +556,29 @@ CONFIG_HID=y
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
+CONFIG_USB_GADGET_M66592=y
+CONFIG_USB_M66592=y
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=y
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_RTC_CLASS is not set
 
 #
 # DMA Engine support
@@ -664,6 +594,11 @@ CONFIG_USB_GADGET=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -826,6 +761,7 @@ CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -846,6 +782,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -868,7 +805,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUGGER is not set
 # CONFIG_KGDB_CONSOLE is not set
 CONFIG_BDI_SWITCH=y
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -876,10 +812,6 @@ CONFIG_BDI_SWITCH=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -913,7 +845,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig
index b7d3dffc98..f387dac69d 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_defconfig
@@ -1,9 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:55 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:39 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -158,6 +149,7 @@ CONFIG_PPC_MPC831x=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -314,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -328,10 +323,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
@@ -411,20 +402,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # UBI - Unsorted block images
 #
 # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -442,14 +422,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -457,6 +434,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -486,12 +464,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -527,10 +501,6 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
@@ -555,19 +525,13 @@ CONFIG_MD_RAID1=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -584,21 +548,14 @@ CONFIG_CICADA_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -632,7 +589,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -675,15 +631,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -745,10 +693,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -777,10 +721,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -815,6 +755,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -826,12 +767,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -855,14 +798,13 @@ CONFIG_SPI_MPC83xx=y
 #
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
-
-#
-# Dallas's 1-wire bus
-#
+# CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -890,14 +832,17 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -933,6 +878,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -940,10 +886,7 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -957,10 +900,7 @@ CONFIG_HID=y
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -980,9 +920,9 @@ CONFIG_USB_DEVICE_CLASS=y
 #
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_EHCI_FSL=y
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -994,6 +934,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1069,15 +1010,19 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
 CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_NET2280=y
 # CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
@@ -1089,32 +1034,9 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1141,6 +1063,7 @@ CONFIG_RTC_DRV_DS1307=y
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
 
 #
 # SPI RTC drivers
@@ -1151,9 +1074,12 @@ CONFIG_RTC_DRV_DS1307=y
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -1176,6 +1102,11 @@ CONFIG_NET_DMA=y
 CONFIG_INTEL_IOATDMA=y
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1272,7 +1203,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1315,6 +1245,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -1338,6 +1269,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1360,7 +1292,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1368,10 +1299,6 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1409,7 +1336,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig
index 75ce78139a..fc6695302c 100644
--- a/arch/powerpc/configs/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/mpc832x_mds_defconfig
@@ -1,9 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:55 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:40 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -159,6 +150,7 @@ CONFIG_PPC_MPC832x=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_QUICC_ENGINE=y
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -188,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -202,10 +196,10 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -315,6 +309,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -327,26 +322,11 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -363,14 +343,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -378,6 +355,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -407,12 +385,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -448,10 +422,6 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -467,19 +437,13 @@ CONFIG_SCSI_WAIT_SCAN=m
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -496,21 +460,14 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -525,7 +482,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -562,15 +518,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -632,10 +580,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -660,10 +604,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -698,6 +638,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
@@ -708,12 +649,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -724,14 +667,12 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -758,14 +699,17 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -800,6 +744,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -807,16 +752,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -831,32 +770,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -873,6 +789,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -968,7 +889,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1009,6 +929,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -1031,7 +952,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1039,10 +959,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1080,7 +996,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig
index 6a83b66dd9..6d1c3e8420 100644
--- a/arch/powerpc/configs/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/mpc832x_rdb_defconfig
@@ -1,9 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:56 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:27:19 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -159,6 +150,7 @@ CONFIG_PPC_MPC832x=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_QUICC_ENGINE=y
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -188,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -202,10 +196,10 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -315,6 +309,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -327,26 +322,11 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,14 +344,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -379,6 +356,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -408,12 +386,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -449,10 +423,6 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -468,19 +438,13 @@ CONFIG_SCSI_WAIT_SCAN=m
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -497,21 +461,14 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+CONFIG_ICPLUS_PHY=y
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -528,7 +485,6 @@ CONFIG_E1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -575,15 +531,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -645,10 +593,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -678,10 +622,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -716,6 +656,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -727,12 +668,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -743,14 +686,12 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -777,14 +718,17 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -820,6 +764,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -827,10 +772,7 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -844,10 +786,7 @@ CONFIG_HID=y
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -869,7 +808,6 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -881,6 +819,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -957,32 +896,9 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -999,6 +915,11 @@ CONFIG_USB_MON=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1097,7 +1018,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1182,6 +1102,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -1204,7 +1125,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1212,10 +1132,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1253,7 +1169,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index 85470b8cae..ddafa6b9af 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_defconfig
@@ -1,9 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:56 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:41 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -158,6 +149,7 @@ CONFIG_MPC834x=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -325,10 +320,6 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
@@ -408,20 +399,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # UBI - Unsorted block images
 #
 # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -439,14 +419,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_BLK_DEV_IDE is not set
@@ -458,6 +435,7 @@ CONFIG_IDE_MAX_HWIFS=4
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -487,12 +465,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -583,10 +557,6 @@ CONFIG_SATA_SIL=y
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
@@ -611,19 +581,13 @@ CONFIG_MD_RAID1=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -640,11 +604,8 @@ CONFIG_CICADA_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
 CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
@@ -657,7 +618,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -700,15 +660,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -749,10 +701,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -781,10 +729,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -819,6 +763,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -830,12 +775,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 CONFIG_SENSORS_PCF8574=y
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -858,11 +805,9 @@ CONFIG_SPI_MPC83xx=y
 #
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
-
-#
-# Dallas's 1-wire bus
-#
+# CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -888,6 +833,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -895,10 +841,7 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -918,13 +861,14 @@ CONFIG_USB_DEVICE_CLASS=y
 #
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_EHCI_FSL=y
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_OHCI_HCD is not set
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1001,32 +945,9 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1053,6 +974,7 @@ CONFIG_RTC_DRV_DS1307=y
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
 
 #
 # SPI RTC drivers
@@ -1063,9 +985,12 @@ CONFIG_RTC_DRV_DS1307=y
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -1088,6 +1013,11 @@ CONFIG_NET_DMA=y
 CONFIG_INTEL_IOATDMA=y
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1187,7 +1117,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1269,6 +1198,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -1291,7 +1221,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1299,10 +1228,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1340,7 +1265,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig
index 704ee8b285..8241c69858 100644
--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/mpc834x_itxgp_defconfig
@@ -1,9 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:56 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:41 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -158,6 +149,7 @@ CONFIG_MPC834x=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -325,10 +320,6 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
@@ -408,20 +399,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # UBI - Unsorted block images
 #
 # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -438,14 +418,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -453,6 +430,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -482,12 +460,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -523,10 +497,6 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -542,19 +512,13 @@ CONFIG_SCSI_SPI_ATTRS=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -571,11 +535,8 @@ CONFIG_CICADA_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 # CONFIG_NET_ETHERNET is not set
 CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
@@ -588,7 +549,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -621,15 +581,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -670,10 +622,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -697,10 +645,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -735,6 +679,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
@@ -745,12 +690,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 CONFIG_SENSORS_PCF8574=y
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -773,11 +720,9 @@ CONFIG_SPI_MPC83xx=y
 #
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
-
-#
-# Dallas's 1-wire bus
-#
+# CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -802,6 +747,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -809,14 +755,13 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_USB is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_FSL=y
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -827,32 +772,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -879,6 +801,7 @@ CONFIG_RTC_DRV_DS1307=y
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
 
 #
 # SPI RTC drivers
@@ -889,9 +812,12 @@ CONFIG_RTC_DRV_DS1307=y
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -914,6 +840,11 @@ CONFIG_NET_DMA=y
 CONFIG_INTEL_IOATDMA=y
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1013,7 +944,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1095,6 +1025,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -1117,7 +1048,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1125,10 +1055,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1166,7 +1092,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index c28b3ee3cb..06233b1a94 100644
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_defconfig
@@ -1,9 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:57 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:41 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -158,6 +149,7 @@ CONFIG_MPC834x=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -325,26 +320,11 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -361,14 +341,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -376,12 +353,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -394,19 +368,13 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -423,21 +391,14 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -471,7 +432,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -503,15 +463,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -573,10 +525,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -601,10 +549,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -639,6 +583,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
@@ -649,12 +594,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -665,14 +612,12 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -699,14 +644,17 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -741,6 +689,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -748,20 +697,16 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_USB is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_FSL=y
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -772,32 +717,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -814,6 +736,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -909,7 +836,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -948,6 +874,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -970,7 +897,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -978,10 +904,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1019,7 +941,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig
index bcbbc167f9..3045749d62 100644
--- a/arch/powerpc/configs/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/mpc836x_mds_defconfig
@@ -1,9 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:57 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:42 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_83xx=y
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-CONFIG_PPC_83xx=y
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_83xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -159,6 +150,7 @@ CONFIG_PPC_MPC836x=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_QUICC_ENGINE=y
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -187,6 +179,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -201,10 +195,10 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_FSL_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -314,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -326,26 +321,11 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -362,14 +342,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -377,6 +354,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -406,12 +384,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -447,10 +421,6 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -466,19 +436,13 @@ CONFIG_SCSI_WAIT_SCAN=m
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -495,21 +459,14 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -524,7 +481,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -561,15 +517,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -631,10 +579,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -659,10 +603,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -697,6 +637,7 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
@@ -707,12 +648,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -723,14 +666,12 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -757,14 +698,17 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -799,6 +743,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -806,16 +751,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -830,32 +769,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -872,6 +788,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -967,7 +888,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1008,6 +928,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -1030,7 +951,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1038,10 +958,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1079,7 +995,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index faedcf8d64..b282c3521d 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_defconfig
@@ -1,9 +1,26 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:58 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:42 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_85xx=y
+CONFIG_E500=y
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-CONFIG_PPC_85xx=y
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_85xx=y
-CONFIG_E500=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_BOOKE=y
-CONFIG_FSL_BOOKE=y
-# CONFIG_PHYS_64BIT is not set
-CONFIG_SPE=y
-# CONFIG_PPC_MM_SLICES is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -102,19 +96,12 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -155,6 +142,7 @@ CONFIG_MPIC=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -197,10 +187,10 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
+# CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
@@ -307,6 +297,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -321,26 +312,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -352,11 +328,8 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_BLINK is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_IDE is not set
 
 #
@@ -364,21 +337,16 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 CONFIG_PHYLIB=y
@@ -394,11 +362,8 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_NETDEV_1000=y
@@ -418,15 +383,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -487,10 +444,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -499,10 +452,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 # CONFIG_I2C is not set
 
@@ -511,20 +460,21 @@ CONFIG_GEN_RTC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -549,6 +499,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -556,16 +507,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -579,31 +524,8 @@ CONFIG_HID=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -620,6 +542,11 @@ CONFIG_HID=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -712,7 +639,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -751,6 +677,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -774,6 +701,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -795,7 +723,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -803,8 +730,4 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
index 7995231def..86582aefab 100644
--- a/arch/powerpc/configs/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/mpc8544_ds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22
-# Fri Jul 20 14:09:13 2007
+# Linux kernel version: 2.6.23-rc4
+# Wed Aug 29 16:41:04 2007
 #
 # CONFIG_PPC64 is not set
 
@@ -19,7 +19,7 @@ CONFIG_E500=y
 CONFIG_BOOKE=y
 CONFIG_FSL_BOOKE=y
 # CONFIG_PHYS_64BIT is not set
-# CONFIG_SPE is not set
+CONFIG_SPE=y
 # CONFIG_PPC_MM_SLICES is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
@@ -38,6 +38,7 @@ CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
@@ -48,15 +49,11 @@ CONFIG_DEFAULT_UIMAGE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
@@ -82,7 +79,7 @@ CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -152,6 +149,7 @@ CONFIG_PPC_I8259=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+CONFIG_FSL_ULI1575=y
 
 #
 # Kernel options
@@ -184,8 +182,7 @@ CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="root=/dev/sda3 rw console=ttyS0,115200"
+# CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
 CONFIG_WANT_DEVICE_TREE=y
@@ -239,7 +236,7 @@ CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
+CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
 CONFIG_NET_KEY=m
@@ -279,9 +276,23 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
@@ -338,12 +349,13 @@ CONFIG_FIB_RULES=y
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
@@ -356,9 +368,10 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=2
-CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -385,7 +398,8 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=y
 # CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=y
 # CONFIG_CHR_DEV_SCH is not set
 
@@ -404,12 +418,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -447,7 +457,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SRP is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_AHCI=y
 # CONFIG_SATA_SVW is not set
 # CONFIG_ATA_PIIX is not set
 # CONFIG_SATA_MV is not set
@@ -463,7 +473,7 @@ CONFIG_ATA=y
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
 # CONFIG_SATA_INIC162X is not set
-# CONFIG_PATA_ALI is not set
+CONFIG_PATA_ALI=y
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
@@ -519,7 +529,7 @@ CONFIG_ATA=y
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NETDEVICES_MULTIQUEUE is not set
-# CONFIG_DUMMY is not set
+CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
@@ -582,6 +592,16 @@ CONFIG_NETDEV_10000=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -647,10 +667,13 @@ CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
 
 #
 # Non-8250 serial port support
@@ -676,7 +699,62 @@ CONFIG_GEN_RTC_X=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
-# CONFIG_I2C is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_CHARDEV is not set
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
+CONFIG_SENSORS_EEPROM=y
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_M41T00 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
 
 #
 # SPI support
@@ -701,6 +779,32 @@ CONFIG_DVB_CORE=m
 CONFIG_DVB_CAPTURE_DRIVERS=y
 
 #
+# Supported SAA7146 based PCI Adapters
+#
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_USB is not set
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+# CONFIG_DVB_CINERGYT2 is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
 # Supported DVB Frontends
 #
 
@@ -712,27 +816,66 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # DVB-S (satellite) frontends
 #
+# CONFIG_DVB_STV0299 is not set
+# CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_S5H1420 is not set
+# CONFIG_DVB_TDA10086 is not set
 
 #
 # DVB-T (terrestrial) frontends
 #
+# CONFIG_DVB_SP8870 is not set
+# CONFIG_DVB_SP887X is not set
+# CONFIG_DVB_CX22700 is not set
+# CONFIG_DVB_CX22702 is not set
+# CONFIG_DVB_L64781 is not set
+# CONFIG_DVB_TDA1004X is not set
+# CONFIG_DVB_NXT6000 is not set
+# CONFIG_DVB_MT352 is not set
+# CONFIG_DVB_ZL10353 is not set
+# CONFIG_DVB_DIB3000MB is not set
+# CONFIG_DVB_DIB3000MC is not set
+# CONFIG_DVB_DIB7000M is not set
+# CONFIG_DVB_DIB7000P is not set
 
 #
 # DVB-C (cable) frontends
 #
+# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_TDA10021 is not set
+# CONFIG_DVB_TDA10023 is not set
+# CONFIG_DVB_STV0297 is not set
 
 #
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
 #
+# CONFIG_DVB_NXT200X is not set
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
+# CONFIG_DVB_BCM3510 is not set
+# CONFIG_DVB_LGDT330X is not set
 
 #
 # Tuners/PLL support
 #
+# CONFIG_DVB_PLL is not set
+# CONFIG_DVB_TDA826X is not set
+# CONFIG_DVB_TDA827X is not set
+# CONFIG_DVB_TUNER_QT1010 is not set
+# CONFIG_DVB_TUNER_MT2060 is not set
 
 #
 # Miscellaneous devices
 #
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_ISL6421 is not set
+# CONFIG_DVB_TUA6100 is not set
 CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
@@ -744,55 +887,261 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
 #
 # Console display driver support
 #
-# CONFIG_VGA_CONSOLE is not set
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE=y
 
 #
 # Sound
 #
-# CONFIG_SOUND is not set
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_AC97_CODEC=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+
+#
+# ALSA PowerMac devices
+#
+
+#
+# ALSA PowerPC devices
+#
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# SoC Audio support for SuperH
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
 #
-# USB Gadget Support
+# may also be needed; see USB_STORAGE Help for more information
 #
-# CONFIG_USB_GADGET is not set
-# CONFIG_MMC is not set
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
 
 #
-# LED devices
+# USB Imaging devices
 #
-# CONFIG_NEW_LEDS is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
 
 #
-# LED drivers
+# USB port drivers
 #
 
 #
-# LED Triggers
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
 #
-# CONFIG_INFINIBAND is not set
 
 #
-# Real Time Clock
+# USB Gadget Support
 #
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -809,10 +1158,28 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_TEST is not set
 
 #
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
 # Platform RTC drivers
 #
-# CONFIG_RTC_DRV_CMOS is not set
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
@@ -933,10 +1300,13 @@ CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
+CONFIG_NFSD=y
+# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
@@ -957,7 +1327,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
+CONFIG_MAC_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_MINIX_SUBPARTITION is not set
@@ -1078,7 +1448,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index a30bc6f621..0fb54c775c 100644
--- a/arch/powerpc/configs/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/mpc8560_ads_defconfig
@@ -1,9 +1,26 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:58 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:43 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_85xx=y
+CONFIG_E500=y
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-CONFIG_PPC_85xx=y
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_85xx=y
-CONFIG_E500=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_BOOKE=y
-CONFIG_FSL_BOOKE=y
-# CONFIG_PHYS_64BIT is not set
-CONFIG_SPE=y
-# CONFIG_PPC_MM_SLICES is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -102,19 +96,12 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -155,6 +142,7 @@ CONFIG_MPIC=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 CONFIG_CPM2=y
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_PROC_DEVICETREE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -197,10 +187,11 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -311,6 +302,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -325,26 +317,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -361,14 +338,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
@@ -376,12 +350,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -394,19 +365,13 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -423,21 +388,14 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -457,7 +415,6 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -489,15 +446,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -561,10 +510,6 @@ CONFIG_SERIAL_CPM_SCC2=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
@@ -576,10 +521,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
@@ -589,20 +530,24 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -627,6 +572,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -634,16 +580,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -658,32 +598,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -700,6 +617,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -792,7 +714,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -831,6 +752,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -854,6 +776,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -876,7 +799,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUGGER is not set
 # CONFIG_KGDB_CONSOLE is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -884,8 +806,4 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig
index 417d3e6abc..0307fe7b04 100644
--- a/arch/powerpc/configs/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/mpc8568mds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22
-# Fri Jul 20 13:55:04 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:43 2007
 #
 # CONFIG_PPC64 is not set
 
@@ -38,6 +38,7 @@ CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
@@ -48,15 +49,11 @@ CONFIG_DEFAULT_UIMAGE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
@@ -147,6 +144,7 @@ CONFIG_MPIC=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -191,7 +189,6 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
 CONFIG_FSL_PCI=y
 CONFIG_PCI=y
@@ -324,6 +321,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
@@ -384,12 +382,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -672,6 +666,7 @@ CONFIG_I2C_MPC=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -698,14 +693,17 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -740,6 +738,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -765,24 +764,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -986,7 +970,6 @@ CONFIG_FORCED_INLINING=y
 CONFIG_DEBUGGER=y
 # CONFIG_XMON is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 CONFIG_PPC_EARLY_DEBUG=y
 # CONFIG_PPC_EARLY_DEBUG_LPAR is not set
 # CONFIG_PPC_EARLY_DEBUG_G5 is not set
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index d9afe7009d..e6850c619f 100644
--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/mpc85xx_cds_defconfig
@@ -1,9 +1,26 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:56:59 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:43 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_85xx=y
+CONFIG_E500=y
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-CONFIG_PPC_85xx=y
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_85xx=y
-CONFIG_E500=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_BOOKE=y
-CONFIG_FSL_BOOKE=y
-# CONFIG_PHYS_64BIT is not set
-CONFIG_SPE=y
-# CONFIG_PPC_MM_SLICES is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -102,19 +96,12 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -146,7 +133,7 @@ CONFIG_MPC8540=y
 CONFIG_MPC85xx=y
 CONFIG_MPIC=y
 # CONFIG_MPIC_WEIRD is not set
-# CONFIG_PPC_I8259 is not set
+CONFIG_PPC_I8259=y
 # CONFIG_PPC_RTAS is not set
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_PPC_MPC106 is not set
@@ -155,6 +142,7 @@ CONFIG_MPIC=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -197,10 +187,11 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -311,6 +302,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -325,26 +317,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -361,14 +338,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -433,12 +407,9 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -451,19 +422,13 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -480,21 +445,14 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -511,7 +469,6 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -543,15 +500,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -614,10 +563,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -629,10 +574,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
@@ -642,20 +583,24 @@ CONFIG_DEVPORT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -680,6 +625,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -687,16 +633,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -711,32 +651,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -753,6 +670,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -845,7 +767,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -884,6 +805,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -907,6 +829,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -928,7 +851,6 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -936,8 +858,4 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index 1ac94a605b..b2f389dcad 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig
@@ -1,9 +1,26 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:57:00 2007
+# Linux kernel version: 2.6.23-rc4
+# Wed Aug 29 16:16:23 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,61 +31,41 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_GENERIC_TBSYNC=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFAULT_UIMAGE=y
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-CONFIG_PPC_86xx=y
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-CONFIG_SMP=y
-CONFIG_NR_CPUS=2
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-# CONFIG_SYSVIPC is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
+# CONFIG_USER_NS is not set
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
@@ -82,12 +79,12 @@ CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
-# CONFIG_ELF_CORE is not set
+CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
@@ -103,36 +100,40 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Block layer
-#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
+CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_CFQ=y
 # CONFIG_DEFAULT_AS is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_IOSCHED="cfq"
 
 #
 # Platform support
 #
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+CONFIG_PPC_86xx=y
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -151,6 +152,7 @@ CONFIG_PPC_I8259=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+CONFIG_FSL_ULI1575=y
 
 #
 # Kernel options
@@ -166,7 +168,7 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_BKL=y
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=m
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # CONFIG_IRQ_ALL_CPUS is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -181,10 +183,12 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 # CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
 
@@ -194,11 +198,11 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_FSL_SOC=y
-CONFIG_FSL_PCIE=y
+CONFIG_FSL_PCI=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -239,27 +243,37 @@ CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
-# CONFIG_NET_KEY is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
 CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 CONFIG_INET_TUNNEL=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -286,7 +300,12 @@ CONFIG_IPV6_SIT=y
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -313,6 +332,7 @@ CONFIG_IPV6_SIT=y
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
 
 #
 # Wireless
@@ -322,6 +342,7 @@ CONFIG_IPV6_SIT=y
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -336,26 +357,11 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,60 +370,172 @@ CONFIG_FW_LOADER=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 # CONFIG_IDE is not set
 
 #
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_AHCI=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+CONFIG_PATA_ALI=y
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
 # CONFIG_MD is not set
 
 #
 # Fusion MPT device support
 #
 # CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -434,21 +552,14 @@ CONFIG_PHYLIB=y
 CONFIG_VITESSE_PHY=y
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_PCI is not set
@@ -463,12 +574,11 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 CONFIG_GIANFAR=y
-# CONFIG_GFAR_NAPI is not set
+CONFIG_GFAR_NAPI=y
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
 CONFIG_NETDEV_10000=y
@@ -486,24 +596,27 @@ CONFIG_NETDEV_10000=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -575,25 +688,19 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
 CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_NVRAM is not set
-# CONFIG_GEN_RTC is not set
+CONFIG_NVRAM=y
+CONFIG_GEN_RTC=y
+CONFIG_GEN_RTC_X=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -628,6 +735,9 @@ CONFIG_I2C_MPC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
@@ -637,12 +747,14 @@ CONFIG_I2C_MPC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -653,11 +765,8 @@ CONFIG_SENSORS_EEPROM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -669,8 +778,108 @@ CONFIG_SENSORS_EEPROM=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-# CONFIG_DVB_CORE is not set
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_CORE_ATTACH is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_USB is not set
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+# CONFIG_DVB_CINERGYT2 is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# DVB-S (satellite) frontends
+#
+# CONFIG_DVB_STV0299 is not set
+# CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_S5H1420 is not set
+# CONFIG_DVB_TDA10086 is not set
+
+#
+# DVB-T (terrestrial) frontends
+#
+# CONFIG_DVB_SP8870 is not set
+# CONFIG_DVB_SP887X is not set
+# CONFIG_DVB_CX22700 is not set
+# CONFIG_DVB_CX22702 is not set
+# CONFIG_DVB_L64781 is not set
+# CONFIG_DVB_TDA1004X is not set
+# CONFIG_DVB_NXT6000 is not set
+# CONFIG_DVB_MT352 is not set
+# CONFIG_DVB_ZL10353 is not set
+# CONFIG_DVB_DIB3000MB is not set
+# CONFIG_DVB_DIB3000MC is not set
+# CONFIG_DVB_DIB7000M is not set
+# CONFIG_DVB_DIB7000P is not set
+
+#
+# DVB-C (cable) frontends
+#
+# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_TDA10021 is not set
+# CONFIG_DVB_TDA10023 is not set
+# CONFIG_DVB_STV0297 is not set
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+# CONFIG_DVB_NXT200X is not set
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
+# CONFIG_DVB_BCM3510 is not set
+# CONFIG_DVB_LGDT330X is not set
+
+#
+# Tuners/PLL support
+#
+# CONFIG_DVB_PLL is not set
+# CONFIG_DVB_TDA826X is not set
+# CONFIG_DVB_TDA827X is not set
+# CONFIG_DVB_TUNER_QT1010 is not set
+# CONFIG_DVB_TUNER_MT2060 is not set
+
+#
+# Miscellaneous devices
+#
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_ISL6421 is not set
+# CONFIG_DVB_TUA6100 is not set
 CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
@@ -682,6 +891,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -695,58 +905,293 @@ CONFIG_DUMMY_CONSOLE=y
 #
 # Sound
 #
-# CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_AC97_CODEC=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+
+#
+# ALSA PowerMac devices
+#
+
+#
+# ALSA PowerPC devices
+#
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# SoC Audio support for SuperH
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
 #
-# USB support
+# USB Input Devices
 #
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
 #
-# USB Gadget Support
+# may also be needed; see USB_STORAGE Help for more information
 #
-# CONFIG_USB_GADGET is not set
-# CONFIG_MMC is not set
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
 
 #
-# LED devices
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
 #
-# CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
+# USB Serial Converter support
 #
+# CONFIG_USB_SERIAL is not set
 
 #
-# LED Triggers
+# USB Miscellaneous drivers
 #
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 
 #
-# InfiniBand support
+# USB DSL modem support
 #
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
 # CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+
+#
+# SPI RTC drivers
+#
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# Platform RTC drivers
 #
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
-# Real Time Clock
+# on-CPU RTC drivers
 #
-# CONFIG_RTC_CLASS is not set
 
 #
 # DMA Engine support
@@ -762,6 +1207,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -783,9 +1233,10 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
-# CONFIG_INOTIFY is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
-# CONFIG_DNOTIFY is not set
+CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
@@ -793,15 +1244,23 @@ CONFIG_FS_MBCACHE=y
 #
 # CD-ROM/DVD Filesystems
 #
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
 
 #
 # DOS/FAT/NT Filesystems
 #
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
 
 #
 # Pseudo filesystems
@@ -819,19 +1278,23 @@ CONFIG_RAMFS=y
 #
 # Miscellaneous filesystems
 #
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
+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_EFS_FS=m
+CONFIG_CRAMFS=y
+CONFIG_VXFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
 
 #
 # Network File Systems
@@ -839,7 +1302,7 @@ CONFIG_RAMFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=y
 # CONFIG_NFSD_V3 is not set
@@ -850,15 +1313,15 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
 # CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 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_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -868,14 +1331,13 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
+CONFIG_MAC_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
+# CONFIG_LDM_PARTITION is not set
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
@@ -925,7 +1387,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # 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
+CONFIG_NLS_UTF8=m
 
 #
 # Distributed Lock Manager
@@ -941,7 +1403,9 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
@@ -951,6 +1415,7 @@ CONFIG_HAS_DMA=y
 # Instrumentation Support
 #
 # CONFIG_PROFILING is not set
+# CONFIG_KPROBES is not set
 
 #
 # Kernel hacking
@@ -964,6 +1429,7 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -976,17 +1442,17 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
 CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -994,8 +1460,42 @@ CONFIG_FORCED_INLINING=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_ECB is not set
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index e6b18ea8f6..143a0cd833 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_defconfig
@@ -1,9 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:57:00 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:44 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+CONFIG_PPC_8xx=y
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_8xx=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,56 +27,37 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-CONFIG_PPC_8xx=y
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_8xx=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_PPC_MM_SLICES is not set
-CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -95,19 +89,12 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -159,6 +146,7 @@ CONFIG_NO_UCODE_PATCH=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -188,6 +176,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_PROC_DEVICETREE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -202,6 +192,7 @@ CONFIG_ZONE_DMA=y
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
+# CONFIG_PCI_SYSCALL is not set
 # CONFIG_PCI_QSPAN is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 
@@ -310,6 +301,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -321,26 +313,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -349,11 +326,8 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_BLINK is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_IDE is not set
 
 #
@@ -361,21 +335,16 @@ CONFIG_BLK_DEV_LOOP=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 CONFIG_PHYLIB=y
@@ -391,16 +360,12 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIXED_MII_10_FDX=y
 CONFIG_FIXED_MII_100_FDX=y
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
-# CONFIG_FEC_8XX is not set
 CONFIG_FS_ENET=y
 CONFIG_FS_ENET_HAS_SCC=y
 CONFIG_FS_ENET_HAS_FEC=y
@@ -419,15 +384,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -511,10 +468,6 @@ CONFIG_SERIAL_CPM_SMC1=y
 CONFIG_SERIAL_CPM_SMC2=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
@@ -523,10 +476,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 # CONFIG_I2C is not set
 
@@ -535,20 +484,21 @@ CONFIG_GEN_RTC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -573,6 +523,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -580,16 +531,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -603,31 +548,8 @@ CONFIG_HID=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -644,6 +566,11 @@ CONFIG_HID=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -740,7 +667,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -783,6 +709,7 @@ CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
@@ -805,7 +732,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -813,8 +739,4 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index fc4f9b766a..d27e1f8c38 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -1,9 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc7
-# Sun Jul  1 23:57:01 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:45 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+CONFIG_PPC_8xx=y
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_8xx=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,56 +27,37 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-# CONFIG_CLASSIC32 is not set
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-CONFIG_PPC_8xx=y
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_8xx=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_PPC_MM_SLICES is not set
-CONFIG_NOT_COHERENT_CACHE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -95,19 +89,12 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -166,6 +153,7 @@ CONFIG_NO_UCODE_PATCH=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -195,6 +183,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_PROC_DEVICETREE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -209,6 +199,7 @@ CONFIG_ZONE_DMA=y
 CONFIG_FSL_SOC=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_DOMAINS is not set
+# CONFIG_PCI_SYSCALL is not set
 # CONFIG_PCI_QSPAN is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 
@@ -317,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -328,26 +320,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -356,11 +333,8 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_BLINK is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_IDE is not set
 
 #
@@ -368,21 +342,16 @@ CONFIG_BLK_DEV_LOOP=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 CONFIG_PHYLIB=y
@@ -398,16 +367,12 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIXED_MII_10_FDX=y
 # CONFIG_FIXED_MII_100_FDX is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
-# CONFIG_FEC_8XX is not set
 CONFIG_FS_ENET=y
 CONFIG_FS_ENET_HAS_SCC=y
 CONFIG_FS_ENET_HAS_FEC=y
@@ -426,15 +391,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -518,10 +475,6 @@ CONFIG_SERIAL_CPM_SMC1=y
 CONFIG_SERIAL_CPM_SMC2=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
@@ -530,10 +483,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 # CONFIG_I2C is not set
 
@@ -542,20 +491,21 @@ CONFIG_GEN_RTC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -580,6 +530,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -587,16 +538,10 @@ CONFIG_DAB=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -610,31 +555,8 @@ CONFIG_HID=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -651,6 +573,11 @@ CONFIG_HID=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -747,7 +674,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -790,6 +716,7 @@ CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
@@ -812,7 +739,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -820,8 +746,4 @@ CONFIG_ENABLE_MUST_CHECK=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 905998b925..295207030c 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -1,9 +1,22 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 13:51:39 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:40:47 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+CONFIG_POWER4_ONLY=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
+# CONFIG_VIRT_CPU_ACCOUNTING is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,49 +36,32 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-CONFIG_POWER4_ONLY=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MM_SLICES=y
-# CONFIG_VIRT_CPU_ACCOUNTING is not set
-CONFIG_SMP=y
-CONFIG_NR_CPUS=2
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
@@ -99,10 +96,6 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -110,12 +103,9 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
@@ -149,6 +141,7 @@ CONFIG_PPC_PASEMI=y
 #
 CONFIG_PPC_PASEMI_IOMMU=y
 CONFIG_PPC_PASEMI_MDIO=y
+CONFIG_ELECTRA_IDE=y
 # CONFIG_PPC_CELLEB is not set
 # CONFIG_PPC_PS3 is not set
 # CONFIG_PPC_CELL is not set
@@ -168,6 +161,7 @@ CONFIG_MPIC=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -204,6 +198,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 # CONFIG_PPC_HAS_HASH_64K is not set
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
@@ -222,6 +217,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -332,6 +328,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -346,10 +343,6 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
@@ -415,22 +408,10 @@ CONFIG_MTD_PHRAM=y
 # UBI - Unsorted block images
 #
 # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -446,14 +427,11 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -487,6 +465,7 @@ CONFIG_IDE_PROC_FS=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -517,12 +496,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 CONFIG_BLK_DEV_3W_XXXX_RAID=y
 CONFIG_SCSI_3W_9XXX=y
@@ -537,7 +512,6 @@ CONFIG_SCSI_3W_9XXX=y
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -556,13 +530,7 @@ CONFIG_SCSI_3W_9XXX=y
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_SATA_AHCI is not set
@@ -618,10 +586,7 @@ CONFIG_ATA_GENERIC=y
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
+CONFIG_PATA_PLATFORM=y
 # CONFIG_MD is not set
 
 #
@@ -658,19 +623,13 @@ CONFIG_IEEE1394_SBP2=y
 # CONFIG_IEEE1394_ETH1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set
 CONFIG_IEEE1394_RAWIO=y
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -687,21 +646,14 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -736,7 +688,6 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
@@ -779,15 +730,7 @@ CONFIG_PASEMI_MAC=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -865,10 +808,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=4
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
@@ -889,10 +828,6 @@ CONFIG_GEN_RTC_X=y
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=256
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -927,6 +862,7 @@ CONFIG_I2C_PASEMI=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -938,11 +874,13 @@ CONFIG_I2C_PASEMI=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -953,14 +891,12 @@ CONFIG_SENSORS_EEPROM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=y
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -987,14 +923,17 @@ CONFIG_SENSORS_LM85=y
 # CONFIG_SENSORS_LM87 is not set
 CONFIG_SENSORS_LM90=y
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -1024,14 +963,15 @@ CONFIG_DAB=y
 # Graphics support
 #
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 
 #
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 CONFIG_VGASTATE=y
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
@@ -1094,6 +1034,7 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -1156,6 +1097,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_CMIPCI is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_LAYLA20 is not set
@@ -1203,6 +1145,10 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 
 #
+# ALSA PowerPC devices
+#
+
+#
 # USB devices
 #
 CONFIG_SND_USB_AUDIO=y
@@ -1221,13 +1167,14 @@ CONFIG_SND_USB_USX2Y=y
 # CONFIG_SND_SOC is not set
 
 #
-# Open Sound System
+# SoC Audio support for SuperH
 #
-# CONFIG_SOUND_PRIME is not set
 
 #
-# HID Devices
+# Open Sound System
 #
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -1238,10 +1185,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 # CONFIG_USB_HIDDEV is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1263,7 +1207,6 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1276,6 +1219,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=y
 # CONFIG_USB_SL811_CS is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1354,32 +1298,16 @@ CONFIG_USB_LIBUSUAL=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
+CONFIG_EDAC=y
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
+# Reporting subsystems
 #
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_MM_EDAC=y
+CONFIG_EDAC_PASEMI=y
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1406,6 +1334,7 @@ CONFIG_RTC_DRV_DS1307=y
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
 
 #
 # SPI RTC drivers
@@ -1414,9 +1343,12 @@ CONFIG_RTC_DRV_DS1307=y
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -1437,6 +1369,11 @@ CONFIG_RTC_DRV_DS1307=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1541,7 +1478,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1623,6 +1559,7 @@ CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -1648,6 +1585,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1681,10 +1619,6 @@ CONFIG_XMON_DISASSEMBLY=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1723,7 +1657,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 08525d6fb1..cfc9c6573a 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,10 +1,25 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 14:11:36 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:44:46 2007
 #
 # CONFIG_PPC64 is not set
-CONFIG_PPC_PM_NEEDS_RTC_LIB=y
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,62 +30,39 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-CONFIG_CLASSIC32=y
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -105,24 +97,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 CONFIG_LSF=y
+CONFIG_BLK_DEV_BSG=y
 
 #
 # IO Schedulers
@@ -142,7 +127,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+CONFIG_CLASSIC32=y
 # CONFIG_PPC_CHRP is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
@@ -182,6 +170,7 @@ CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC601_SYNC_FIX=y
 # CONFIG_TAU is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -211,13 +200,17 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 CONFIG_PM_DEBUG=y
+# CONFIG_PM_VERBOSE is not set
 # CONFIG_DISABLE_CONSOLE_SUSPEND is not set
-CONFIG_PM_SYSFS_DEPRECATED=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_APM_EMULATION=y
@@ -231,9 +224,9 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -336,6 +329,7 @@ CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set
 CONFIG_NF_CONNTRACK_FTP=m
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -353,9 +347,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -376,6 +372,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
@@ -559,6 +556,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -573,27 +571,12 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 CONFIG_MAC_FLOPPY=m
 # CONFIG_BLK_CPQ_DA is not set
@@ -612,14 +595,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -689,6 +669,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
@@ -721,10 +702,7 @@ CONFIG_SCSI_FC_ATTRS=y
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -772,20 +750,8 @@ CONFIG_SCSI_MESH_SYNC_RATE=5
 CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
 CONFIG_SCSI_MAC53C94=y
 # CONFIG_SCSI_SRP is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
@@ -834,14 +800,11 @@ CONFIG_IEEE1394_OHCI1394=m
 #
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
 # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
 # CONFIG_IEEE1394_ETH1394 is not set
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB=y
@@ -860,21 +823,15 @@ CONFIG_THERM_ADT746X=m
 # CONFIG_WINDFARM is not set
 # CONFIG_ANSLCD is not set
 CONFIG_PMAC_RACKMETER=m
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_MACE=y
@@ -884,10 +841,6 @@ CONFIG_BMAC=y
 CONFIG_SUNGEM=y
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -922,7 +875,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -962,6 +914,7 @@ CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA_WL3501 is not set
 CONFIG_PRISM54=m
 # CONFIG_USB_ZD1201 is not set
+# CONFIG_RTL8187 is not set
 # CONFIG_HOSTAP is not set
 
 #
@@ -996,6 +949,7 @@ CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=y
 # CONFIG_NET_FC is not set
@@ -1003,15 +957,7 @@ CONFIG_SLHC=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -1093,10 +1039,6 @@ CONFIG_SERIAL_PMACZILOG=m
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -1123,10 +1065,6 @@ CONFIG_DRM_RADEON=m
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -1162,6 +1100,7 @@ CONFIG_I2C_POWERMAC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -1173,12 +1112,14 @@ CONFIG_I2C_POWERMAC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1189,11 +1130,13 @@ CONFIG_I2C_POWERMAC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+CONFIG_APM_POWER=y
+# CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_PMU=y
 # CONFIG_HWMON is not set
 
 #
@@ -1212,8 +1155,8 @@ CONFIG_I2C_POWERMAC=y
 # Graphics support
 #
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 
 #
 # Display device support
@@ -1224,6 +1167,7 @@ CONFIG_DISPLAY_SUPPORT=y
 # Display hardware drivers
 #
 CONFIG_VGASTATE=y
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_DDC=y
@@ -1299,6 +1243,7 @@ CONFIG_FB_3DFX=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -1361,6 +1306,7 @@ CONFIG_SND_DUMMY=m
 # CONFIG_SND_CMIPCI is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_LAYLA20 is not set
@@ -1410,6 +1356,10 @@ CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 
 #
+# ALSA PowerPC devices
+#
+
+#
 # Apple Onboard Audio driver
 #
 CONFIG_SND_AOA=m
@@ -1439,13 +1389,14 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_SOC is not set
 
 #
-# Open Sound System
+# SoC Audio support for SuperH
 #
-# CONFIG_SOUND_PRIME is not set
 
 #
-# HID Devices
+# Open Sound System
 #
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -1456,10 +1407,7 @@ CONFIG_USB_HID=y
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 # CONFIG_HID_FF is not set
 # CONFIG_USB_HIDDEV is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1473,6 +1421,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_PERSIST is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1482,7 +1431,6 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1491,6 +1439,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1574,6 +1523,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
 # CONFIG_USB_SERIAL_HP4X is not set
 # CONFIG_USB_SERIAL_SAFE is not set
 # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
@@ -1618,10 +1568,6 @@ CONFIG_USB_APPLEDISPLAY=m
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
@@ -1636,20 +1582,8 @@ CONFIG_LEDS_TRIGGERS=y
 # CONFIG_LEDS_TRIGGER_TIMER is not set
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
-CONFIG_RTC_LIB=y
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1666,6 +1600,11 @@ CONFIG_RTC_LIB=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1774,7 +1713,6 @@ CONFIG_SMB_FS=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1856,6 +1794,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -1887,6 +1826,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1919,10 +1859,6 @@ CONFIG_BOOTX_TEXT=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1962,7 +1898,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 6e503d98da..5f6224a1fe 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,9 +1,23 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 14:15:02 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:47:09 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+# CONFIG_POWER4_ONLY is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,54 +37,36 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_GENERIC_TBSYNC=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_PPC64_SWSUSP=y
-
-#
-# Processor support
-#
-# CONFIG_POWER4_ONLY is not set
-CONFIG_POWER3=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 CONFIG_PPC_DCR_MMIO=y
 CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=32
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 # CONFIG_TASK_XACCT is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -105,10 +102,6 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -116,12 +109,9 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_BLK_DEV_BSG=y
 
 #
 # IO Schedulers
@@ -141,7 +131,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_EEH=y
@@ -177,6 +169,7 @@ CONFIG_SPU_BASE=y
 CONFIG_CBE_RAS=y
 CONFIG_CBE_THERM=m
 CONFIG_CBE_CPUFREQ=m
+CONFIG_CBE_CPUFREQ_PMI=m
 # CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
 CONFIG_UDBG_RTAS_CONSOLE=y
@@ -217,6 +210,8 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 #
 CONFIG_CPU_FREQ_PMAC64=y
 # CONFIG_CPM2 is not set
+CONFIG_AXON_RAM=m
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -258,6 +253,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_PPC_HAS_HASH_64K=y
 # CONFIG_PPC_64K_PAGES is not set
@@ -265,6 +261,7 @@ CONFIG_PPC_HAS_HASH_64K=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
+CONFIG_SUSPEND_SMP_POSSIBLE=y
 CONFIG_SECCOMP=y
 # CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
@@ -277,6 +274,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
@@ -356,6 +354,7 @@ CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -374,9 +373,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -397,6 +398,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
@@ -481,6 +483,7 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -495,28 +498,12 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -532,14 +519,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -608,6 +592,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
@@ -640,10 +625,7 @@ CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -658,7 +640,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -739,10 +720,6 @@ CONFIG_SATA_SVW=y
 # CONFIG_PATA_VIA is not set
 CONFIG_PATA_WINBOND=y
 CONFIG_PATA_SCC=y
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
@@ -761,6 +738,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_DM_MULTIPATH_RDAC is not set
 # CONFIG_DM_DELAY is not set
 
 #
@@ -797,10 +775,6 @@ CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=y
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB_PMU=y
@@ -813,13 +787,11 @@ CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
 CONFIG_WINDFARM_PM112=y
 # CONFIG_PMAC_RACKMETER is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 # CONFIG_ARCNET is not set
@@ -836,13 +808,10 @@ CONFIG_MARVELL_PHY=m
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 CONFIG_BROADCOM_PHY=m
+# CONFIG_ICPLUS_PHY is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FIXED_MII_10_FDX=y
 CONFIG_FIXED_MII_100_FDX=y
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
@@ -851,10 +820,6 @@ CONFIG_SUNGEM=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=y
 # CONFIG_TYPHOON is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_IBMVETH=m
@@ -892,7 +857,6 @@ CONFIG_E1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
@@ -942,6 +906,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
@@ -950,15 +915,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -1065,10 +1022,6 @@ CONFIG_HVC_ISERIES=y
 CONFIG_HVC_RTAS=y
 CONFIG_HVC_BEAT=y
 CONFIG_HVCS=m
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -1081,10 +1034,6 @@ CONFIG_GEN_RTC=y
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=256
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -1119,6 +1068,7 @@ CONFIG_I2C_POWERMAC=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -1130,11 +1080,13 @@ CONFIG_I2C_POWERMAC=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1145,11 +1097,8 @@ CONFIG_I2C_POWERMAC=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -1168,8 +1117,8 @@ CONFIG_I2C_POWERMAC=y
 # Graphics support
 #
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 
 #
 # Display device support
@@ -1180,6 +1129,7 @@ CONFIG_DISPLAY_SUPPORT=y
 # Display hardware drivers
 #
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
@@ -1243,11 +1193,13 @@ CONFIG_FB_IBM_GXT4500=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
+CONFIG_FB_LOGO_EXTRA=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
@@ -1303,6 +1255,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_CMIPCI is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_LAYLA20 is not set
@@ -1352,6 +1305,10 @@ CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 
 #
+# ALSA PowerPC devices
+#
+
+#
 # Apple Onboard Audio driver
 #
 CONFIG_SND_AOA=m
@@ -1375,13 +1332,14 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 # CONFIG_SND_SOC is not set
 
 #
-# Open Sound System
+# SoC Audio support for SuperH
 #
-# CONFIG_SOUND_PRIME is not set
 
 #
-# HID Devices
+# Open Sound System
 #
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -1392,10 +1350,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1426,6 +1381,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1504,23 +1460,7 @@ CONFIG_USB_APPLEDISPLAY=m
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 CONFIG_INFINIBAND=m
 # CONFIG_INFINIBAND_USER_MAD is not set
 # CONFIG_INFINIBAND_USER_ACCESS is not set
@@ -1536,14 +1476,13 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
 # CONFIG_INFINIBAND_SRP is not set
 CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
+# Reporting subsystems
 #
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_MM_EDAC=y
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1560,6 +1499,11 @@ CONFIG_INFINIBAND_ISER=m
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1690,7 +1634,6 @@ CONFIG_CIFS_POSIX=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1772,6 +1715,7 @@ CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -1803,6 +1747,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1837,10 +1782,10 @@ CONFIG_BOOTX_TEXT=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1880,7 +1825,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index 858f865f2d..cce3d3da08 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_defconfig
@@ -1,9 +1,26 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 14:15:11 2007
+# Linux kernel version: 2.6.23-rc4
+# Tue Aug 28 21:24:45 2007
 #
 # CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_CHECK_CACHE_COHERENCY=y
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -14,63 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-CONFIG_CLASSIC32=y
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_86xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-CONFIG_6xx=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-# CONFIG_PPC_MM_SLICES is not set
-# CONFIG_SMP is not set
-CONFIG_NOT_COHERENT_CACHE=y
-CONFIG_CHECK_CACHE_COHERENCY=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -103,19 +95,12 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 # CONFIG_MODULES is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -135,7 +120,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # CONFIG_PPC_MULTIPLATFORM is not set
 CONFIG_EMBEDDED6xx=y
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
@@ -156,8 +143,8 @@ CONFIG_MV64X60=y
 # CONFIG_PPC_INDIRECT_IO is not set
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
-# CONFIG_TAU is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -187,6 +174,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
@@ -201,9 +190,9 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
-# CONFIG_PPC_INDIRECT_PCI_BE is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
@@ -315,6 +304,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -327,10 +317,6 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
@@ -406,20 +392,9 @@ CONFIG_MTD_PHYSMAP_OF=y
 # UBI - Unsorted block images
 #
 # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -437,14 +412,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -509,6 +481,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -537,12 +510,8 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -632,10 +601,6 @@ CONFIG_SATA_MV=y
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
 
 #
@@ -651,21 +616,15 @@ CONFIG_SATA_MV=y
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 CONFIG_MACINTOSH_DRIVERS=y
 # CONFIG_MAC_EMUMOUSEBTN is not set
 # CONFIG_WINDFARM is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_ARCNET is not set
@@ -682,21 +641,14 @@ CONFIG_PHYLIB=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
@@ -736,7 +688,6 @@ CONFIG_E1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -778,15 +729,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -850,10 +793,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -865,10 +804,6 @@ CONFIG_GEN_RTC=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -903,6 +838,7 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
@@ -914,12 +850,14 @@ CONFIG_I2C_MV64XXX=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -930,14 +868,12 @@ CONFIG_I2C_MV64XXX=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -964,14 +900,17 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -1006,6 +945,7 @@ CONFIG_HWMON=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -1020,10 +960,7 @@ CONFIG_DUMMY_CONSOLE=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -1034,10 +971,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 # CONFIG_USB_HIDDEV is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1059,7 +993,6 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1068,6 +1001,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1134,32 +1068,9 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1186,6 +1097,7 @@ CONFIG_RTC_DRV_MAX6900=y
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
 
 #
 # SPI RTC drivers
@@ -1194,9 +1106,12 @@ CONFIG_RTC_DRV_MAX6900=y
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -1217,6 +1132,11 @@ CONFIG_RTC_DRV_MAX6900=y
 #
 
 #
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1310,7 +1230,6 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1353,6 +1272,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
@@ -1375,7 +1295,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_BOOTX_TEXT is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1383,8 +1302,4 @@ CONFIG_DEBUG_BUGVERBOSE=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 0caf0dd5ea..0f274e5f69 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,9 +1,23 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 14:17:45 2007
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 16:50:02 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+# CONFIG_POWER4_ONLY is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=128
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,45 +37,27 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-# CONFIG_POWER4_ONLY is not set
-CONFIG_POWER3=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_OF_PLATFORM_PCI is not set
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=128
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
@@ -68,7 +65,7 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
@@ -105,10 +102,6 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -116,12 +109,9 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_BLK_DEV_BSG=y
 
 #
 # IO Schedulers
@@ -141,7 +131,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_EEH=y
@@ -179,6 +171,7 @@ CONFIG_IBMEBUS=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -221,6 +214,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_PPC_HAS_HASH_64K is not set
 # CONFIG_PPC_64K_PAGES is not set
@@ -228,6 +222,7 @@ CONFIG_SCHED_SMT=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
+CONFIG_SUSPEND_SMP_POSSIBLE=y
 CONFIG_SECCOMP=y
 # CONFIG_WANT_DEVICE_TREE is not set
 CONFIG_ISA_DMA_API=y
@@ -240,6 +235,7 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_PPC_INDIRECT_PCI is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
@@ -318,6 +314,7 @@ CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
+CONFIG_NF_CT_PROTO_UDPLITE=m
 # CONFIG_NF_CONNTRACK_AMANDA is not set
 CONFIG_NF_CONNTRACK_FTP=m
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -336,6 +333,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -356,6 +354,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
@@ -434,6 +433,7 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -448,16 +448,9 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
+CONFIG_OF_DEVICE=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 # CONFIG_PARPORT_SERIAL is not set
@@ -466,18 +459,9 @@ CONFIG_PARPORT_PC=m
 # CONFIG_PARPORT_GSC is not set
 # CONFIG_PARPORT_AX88796 is not set
 # CONFIG_PARPORT_1284 is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
@@ -493,14 +477,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_BLINK is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -565,6 +546,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
@@ -597,10 +579,7 @@ CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_SAS_ATTRS=m
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -615,7 +594,6 @@ CONFIG_SCSI_SAS_ATTRS=m
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -697,10 +675,6 @@ CONFIG_ATA=y
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
 CONFIG_PATA_WINBOND=y
-
-#
-# Multi-device support (RAID and LVM)
-#
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
@@ -718,6 +692,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_DM_MULTIPATH_RDAC is not set
 # CONFIG_DM_DELAY is not set
 
 #
@@ -733,27 +708,17 @@ CONFIG_DM_MULTIPATH_EMC=m
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
@@ -762,10 +727,6 @@ CONFIG_MII=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=y
 # CONFIG_TYPHOON is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_IBMVETH=y
@@ -804,7 +765,6 @@ CONFIG_E1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
 # CONFIG_BNX2 is not set
@@ -855,6 +815,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
@@ -863,15 +824,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -975,10 +928,6 @@ CONFIG_HVC_DRIVER=y
 CONFIG_HVC_CONSOLE=y
 CONFIG_HVC_RTAS=y
 CONFIG_HVCS=m
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
@@ -991,10 +940,6 @@ CONFIG_GEN_RTC=y
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=1024
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
@@ -1029,6 +974,7 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
@@ -1040,11 +986,13 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1055,11 +1003,8 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 
 #
@@ -1078,8 +1023,8 @@ CONFIG_I2C_ALGOBIT=y
 # Graphics support
 #
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 
 #
 # Display device support
@@ -1090,6 +1035,7 @@ CONFIG_DISPLAY_SUPPORT=y
 # Display hardware drivers
 #
 # CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=y
@@ -1152,6 +1098,7 @@ CONFIG_FB_IBM_GXT4500=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -1165,10 +1112,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -1179,10 +1123,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1204,7 +1145,6 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1213,6 +1153,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1291,23 +1232,7 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -1325,14 +1250,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
 CONFIG_INFINIBAND_SRP=m
 # CONFIG_INFINIBAND_ISER is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-
-#
-# Real Time Clock
-#
+# CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -1347,11 +1265,12 @@ CONFIG_INFINIBAND_SRP=m
 #
 # DMA Devices
 #
+# CONFIG_AUXDISPLAY is not set
 
 #
-# Auxiliary Display support
+# Userspace I/O
 #
-# CONFIG_KS0108 is not set
+# CONFIG_UIO is not set
 
 #
 # File systems
@@ -1485,7 +1404,6 @@ CONFIG_CIFS_POSIX=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1551,6 +1469,7 @@ CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -1582,6 +1501,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1617,10 +1537,6 @@ CONFIG_IRQSTACKS=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1660,7 +1576,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 9a8c9af43b..d6a38cd501 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -188,33 +188,21 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
         struct device_node *dn)
 {
         struct ibmebus_dev *dev;
-        const char *loc_code;
-        int length;
-
-        loc_code = of_get_property(dn, "ibm,loc-code", NULL);
-        if (!loc_code) {
-                printk(KERN_WARNING "%s: node %s missing 'ibm,loc-code'\n",
-                       __FUNCTION__, dn->name ? dn->name : "<unknown>");
-                return ERR_PTR(-EINVAL);
-        }
-
-        if (strlen(loc_code) == 0) {
-                printk(KERN_WARNING "%s: 'ibm,loc-code' is invalid\n",
-                       __FUNCTION__);
-                return ERR_PTR(-EINVAL);
-        }
+        int i, len, bus_len;
 
         dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL);
-        if (!dev) {
+        if (!dev)
                 return ERR_PTR(-ENOMEM);
-        }
 
         dev->ofdev.node = of_node_get(dn);
 
-        length = strlen(loc_code);
-        memcpy(dev->ofdev.dev.bus_id, loc_code
-                + (length - min(length, BUS_ID_SIZE - 1)),
-                min(length, BUS_ID_SIZE - 1));
+        len = strlen(dn->full_name + 1);
+        bus_len = min(len, BUS_ID_SIZE - 1);
+        memcpy(dev->ofdev.dev.bus_id, dn->full_name + 1
+               + (len - bus_len), bus_len);
+        for (i = 0; i < bus_len; i++)
+                if (dev->ofdev.dev.bus_id[i] == '/')
+                        dev->ofdev.dev.bus_id[i] = '_';
 
         /* Register with generic device framework. */
         if (ibmebus_register_device_common(dev, dn->name) != 0) {
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index cea8045ba4..90fa11c72e 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -493,7 +493,7 @@ static int __init serial_dev_init(void)
 
         return platform_device_register(&serial_device);
 }
-arch_initcall(serial_dev_init);
+device_initcall(serial_dev_init);
 
 
 /*
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a83727b308..8a1b001d0b 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -83,7 +83,7 @@ void flush_fp_to_thread(struct task_struct *tsk)
                          */
                         BUG_ON(tsk != current);
 #endif
-                        giveup_fpu(current);
+                        giveup_fpu(tsk);
                 }
                 preempt_enable();
         }
@@ -143,7 +143,7 @@ void flush_altivec_to_thread(struct task_struct *tsk)
 #ifdef CONFIG_SMP
                         BUG_ON(tsk != current);
 #endif
-                        giveup_altivec(current);
+                        giveup_altivec(tsk);
                 }
                 preempt_enable();
         }
@@ -182,7 +182,7 @@ void flush_spe_to_thread(struct task_struct *tsk)
 #ifdef CONFIG_SMP
                         BUG_ON(tsk != current);
 #endif
-                        giveup_spe(current);
+                        giveup_spe(tsk);
                 }
                 preempt_enable();
         }
@@ -605,6 +605,13 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
         regs->ccr = 0;
         regs->gpr[1] = sp;
 
+        /*
+         * We have just cleared all the nonvolatile GPRs, so make
+         * FULL_REGS(regs) return true.  This is necessary to allow
+         * ptrace to examine the thread immediately after exec.
+         */
+        regs->trap &= ~1UL;
+
 #ifdef CONFIG_PPC32
         regs->mq = 0;
         regs->nip = start;
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 727a6699f2..c627cf86d1 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -239,7 +239,7 @@ static void snapshot_tb_and_purr(void *data)
         struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data);
 
         local_irq_save(flags);
-        p->tb = mftb();
+        p->tb = get_tb_or_rtc();
         p->purr = mfspr(SPRN_PURR);
         wmb();
         p->initialized = 1;
@@ -317,7 +317,7 @@ static void snapshot_purr(void)
  */
 void snapshot_timebase(void)
 {
-        __get_cpu_var(last_jiffy) = get_tb();
+        __get_cpu_var(last_jiffy) = get_tb_or_rtc();
         snapshot_purr();
 }
 
@@ -684,6 +684,8 @@ void timer_interrupt(struct pt_regs * regs)
 
                 write_seqlock(&xtime_lock);
                 tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy;
+                if (__USE_RTC() && tb_next_jiffy >= 1000000000)
+                        tb_next_jiffy -= 1000000000;
                 if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) {
                         tb_last_jiffy = tb_next_jiffy;
                         do_timer(1);
@@ -977,7 +979,7 @@ void __init time_init(void)
         tb_to_ns_scale = scale;
         tb_to_ns_shift = shift;
         /* Save the current timebase to pretty up CONFIG_PRINTK_TIME */
-        boot_tb = get_tb();
+        boot_tb = get_tb_or_rtc();
 
         tm = get_boot_time();
 
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index cef01e4e89..213fa31ac5 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -98,6 +98,18 @@ static struct vdso_patch_def vdso_patches[] = {
                 CPU_FTR_USE_TB, 0,
                 "__kernel_gettimeofday", NULL
         },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_clock_gettime", NULL
+        },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_clock_getres", NULL
+        },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_get_tbfreq", NULL
+        },
 };
 
 /*
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index a73d2d7009..ff1811ac6c 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -74,6 +74,22 @@ static inline void slb_shadow_clear(unsigned long entry)
         get_slb_shadow()->save_area[entry].esid = 0;
 }
 
+static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags,
+                                        unsigned long entry)
+{
+        /*
+         * Updating the shadow buffer before writing the SLB ensures
+         * we don't get a stale entry here if we get preempted by PHYP
+         * between these two statements.
+         */
+        slb_shadow_update(ea, flags, entry);
+
+        asm volatile("slbmte  %0,%1" :
+                     : "r" (mk_vsid_data(ea, flags)),
+                       "r" (mk_esid_data(ea, entry))
+                     : "memory" );
+}
+
 void slb_flush_and_rebolt(void)
 {
         /* If you change this make sure you change SLB_NUM_BOLTED
@@ -226,12 +242,16 @@ void slb_initialize(void)
         vflags = SLB_VSID_KERNEL | vmalloc_llp;
 
         /* Invalidate the entire SLB (even slot 0) & all the ERATS */
-        slb_shadow_update(PAGE_OFFSET, lflags, 0);
-        asm volatile("isync; slbia; sync; slbmte  %0,%1; isync" ::
-                     "r" (get_slb_shadow()->save_area[0].vsid),
-                     "r" (get_slb_shadow()->save_area[0].esid) : "memory");
-
-        slb_shadow_update(VMALLOC_START, vflags, 1);
-
-        slb_flush_and_rebolt();
+        asm volatile("isync":::"memory");
+        asm volatile("slbmte  %0,%0"::"r" (0) : "memory");
+        asm volatile("isync; slbia; isync":::"memory");
+        create_shadowed_slbe(PAGE_OFFSET, lflags, 0);
+
+        create_shadowed_slbe(VMALLOC_START, vflags, 1);
+
+        /* We don't bolt the stack for the time being - we're in boot,
+         * so the stack is in the bolted segment.  By the time it goes
+         * elsewhere, we'll call _switch() which will bolt in the new
+         * one. */
+        asm volatile("isync":::"memory");
 }
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index e7fdf013cd..eafe7605cd 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -76,14 +76,14 @@ int mpc834x_usb_cfg(void)
                         if (port0_is_dr)
                                 printk(KERN_WARNING
                                         "834x USB port0 can't be used by both DR and MPH!\n");
-                        sicrl |= MPC834X_SICRL_USB0;
+                        sicrl &= ~MPC834X_SICRL_USB0;
                 }
                 prop = of_get_property(np, "port1", NULL);
                 if (prop) {
                         if (port1_is_dr)
                                 printk(KERN_WARNING
                                         "834x USB port1 can't be used by both DR and MPH!\n");
-                        sicrl |= MPC834X_SICRL_USB1;
+                        sicrl &= ~MPC834X_SICRL_USB1;
                 }
                 of_node_put(np);
         }
diff --git a/arch/powerpc/platforms/85xx/mpc8544_ds.c b/arch/powerpc/platforms/85xx/mpc8544_ds.c
index 0f834d8be4..48983bc56d 100644
--- a/arch/powerpc/platforms/85xx/mpc8544_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8544_ds.c
@@ -178,7 +178,9 @@ define_machine(mpc8544_ds) {
         .probe                  = mpc8544_ds_probe,
         .setup_arch             = mpc8544_ds_setup_arch,
         .init_IRQ               = mpc8544_ds_pic_init,
+#ifdef CONFIG_PCI
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
         .get_irq                = mpic_get_irq,
         .restart                = mpc85xx_restart,
         .calibrate_decr         = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 6a171e9abf..2d4cb78476 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -351,10 +351,10 @@ define_machine(mpc85xx_cds) {
         .get_irq        = mpic_get_irq,
 #ifdef CONFIG_PCI
         .restart        = mpc85xx_cds_restart,
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #else
         .restart        = mpc85xx_restart,
 #endif
         .calibrate_decr = generic_calibrate_decr,
         .progress       = udbg_progress,
-        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 };
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index be25ecd911..7ca7e676f1 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -207,5 +207,7 @@ define_machine(mpc85xx_mds) {
         .restart        = mpc85xx_restart,
         .calibrate_decr = generic_calibrate_decr,
         .progress       = udbg_progress,
+#ifdef CONFIG_PCI
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
 };
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 56b27caf7a..47aafa76c9 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -250,5 +250,7 @@ define_machine(mpc86xx_hpcn) {
         .time_init              = mpc86xx_time_init,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
+#ifdef CONFIG_PCI
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
 };
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index cfc2497415..19d4628edf 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -285,6 +285,7 @@ config AXON_RAM
 config FSL_ULI1575
         bool
         default n
+        select GENERIC_ISA_DMA
         help
           Supports for the ULI1575 PCIe south bridge that exists on some
           Freescale reference boards. The boards all use the ULI in pretty
diff --git a/arch/powerpc/platforms/cell/cbe_regs.h b/arch/powerpc/platforms/cell/cbe_regs.h
index 17d5971448..b24025f2ac 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.h
+++ b/arch/powerpc/platforms/cell/cbe_regs.h
@@ -113,10 +113,14 @@ struct cbe_pmd_regs {
         u64     checkstop_fir;                                  /* 0x0c00 */
         u64     recoverable_fir;                                /* 0x0c08 */
         u64     spec_att_mchk_fir;                              /* 0x0c10 */
-        u64     fir_mode_reg;                                   /* 0x0c18 */
+        u32     fir_mode_reg;                                   /* 0x0c18 */
+        u8      pad_0x0c1c_0x0c20 [4];                          /* 0x0c1c */
+#define CBE_PMD_FIR_MODE_M8             0x00800
         u64     fir_enable_mask;                                /* 0x0c20 */
 
-        u8      pad_0x0c28_0x1000 [0x1000 - 0x0c28];            /* 0x0c28 */
+        u8      pad_0x0c28_0x0ca8 [0x0ca8 - 0x0c28];            /* 0x0c28 */
+        u64     ras_esc_0;                                      /* 0x0ca8 */
+        u8      pad_0x0cb0_0x1000 [0x1000 - 0x0cb0];            /* 0x0cb0 */
 };
 
 extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np);
diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c
index e4132f8f51..fb5eda4846 100644
--- a/arch/powerpc/platforms/cell/cbe_thermal.c
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -88,17 +88,13 @@ static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)
 /* returns the value for a given spu in a given register */
 static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg)
 {
-        const unsigned int *id;
         union spe_reg value;
         struct spu *spu;
 
-        /* getting the id from the reg attribute will not work on future device-tree layouts
-         * in future we should store the id to the spu struct and use it here */
         spu = container_of(sysdev, struct spu, sysdev);
-        id = of_get_property(spu_devnode(spu), "reg", NULL);
         value.val = in_be64(&reg->val);
 
-        return value.spe[*id];
+        return value.spe[spu->spe_id];
 }
 
 static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf)
diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c
index 812bf563ed..4ede22d363 100644
--- a/arch/powerpc/platforms/cell/pervasive.c
+++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -38,6 +38,8 @@
 #include "pervasive.h"
 #include "cbe_regs.h"
 
+static int sysreset_hack;
+
 static void cbe_power_save(void)
 {
         unsigned long ctrl, thread_switch_control;
@@ -85,6 +87,9 @@ static void cbe_power_save(void)
 
 static int cbe_system_reset_exception(struct pt_regs *regs)
 {
+        int cpu;
+        struct cbe_pmd_regs __iomem *pmd;
+
         switch (regs->msr & SRR1_WAKEMASK) {
         case SRR1_WAKEEE:
                 do_IRQ(regs);
@@ -93,6 +98,18 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
                 timer_interrupt(regs);
                 break;
         case SRR1_WAKEMT:
+                /*
+                 * The BMC can inject user triggered system reset exceptions,
+                 * but cannot set the system reset reason in srr1,
+                 * so check an extra register here.
+                 */
+                if (sysreset_hack && (cpu = smp_processor_id()) == 0) {
+                        pmd = cbe_get_cpu_pmd_regs(cpu);
+                        if (in_be64(&pmd->ras_esc_0) & 0xffff) {
+                                out_be64(&pmd->ras_esc_0, 0);
+                                return 0;
+                        }
+                }
                 break;
 #ifdef CONFIG_CBE_RAS
         case SRR1_WAKESYSERR:
@@ -113,9 +130,12 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
 void __init cbe_pervasive_init(void)
 {
         int cpu;
+
         if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO))
                 return;
 
+        sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
+
         for_each_possible_cpu(cpu) {
                 struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu);
                 if (!regs)
@@ -124,6 +144,12 @@ void __init cbe_pervasive_init(void)
                  /* Enable Pause(0) control bit */
                 out_be64(&regs->pmcr, in_be64(&regs->pmcr) |
                                             CBE_PMD_PAUSE_ZERO_CONTROL);
+
+                /* Enable JTAG system-reset hack */
+                if (sysreset_hack)
+                        out_be32(&regs->fir_mode_reg,
+                                in_be32(&regs->fir_mode_reg) |
+                                CBE_PMD_FIR_MODE_M8);
         }
 
         ppc_md.power_save = cbe_power_save;
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 095a30304c..106d2921e2 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -236,27 +236,34 @@ static irqreturn_t
 spu_irq_class_0(int irq, void *data)
 {
         struct spu *spu;
+        unsigned long stat, mask;
 
         spu = data;
-        spu->class_0_pending = 1;
+
+        mask = spu_int_mask_get(spu, 0);
+        stat = spu_int_stat_get(spu, 0);
+        stat &= mask;
+
+        spin_lock(&spu->register_lock);
+        spu->class_0_pending |= stat;
+        spin_unlock(&spu->register_lock);
+
         spu->stop_callback(spu);
 
+        spu_int_stat_clear(spu, 0, stat);
+
         return IRQ_HANDLED;
 }
 
 int
 spu_irq_class_0_bottom(struct spu *spu)
 {
-        unsigned long stat, mask;
         unsigned long flags;
-
-        spu->class_0_pending = 0;
+        unsigned long stat;
 
         spin_lock_irqsave(&spu->register_lock, flags);
-        mask = spu_int_mask_get(spu, 0);
-        stat = spu_int_stat_get(spu, 0);
-
-        stat &= mask;
+        stat = spu->class_0_pending;
+        spu->class_0_pending = 0;
 
         if (stat & 1) /* invalid DMA alignment */
                 __spu_trap_dma_align(spu);
@@ -267,7 +274,6 @@ spu_irq_class_0_bottom(struct spu *spu)
         if (stat & 4) /* error on SPU */
                 __spu_trap_error(spu);
 
-        spu_int_stat_clear(spu, 0, stat);
         spin_unlock_irqrestore(&spu->register_lock, flags);
 
         return (stat & 0x7) ? -EIO : 0;
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 5eb8834618..0e14f53250 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -48,10 +48,18 @@ static u64 __init find_spu_unit_number(struct device_node *spe)
 {
         const unsigned int *prop;
         int proplen;
+
+        /* new device trees should provide the physical-id attribute */
+        prop = of_get_property(spe, "physical-id", &proplen);
+        if (proplen == 4)
+                return (u64)*prop;
+
+        /* celleb device tree provides the unit-id */
         prop = of_get_property(spe, "unit-id", &proplen);
         if (proplen == 4)
                 return (u64)*prop;
 
+        /* legacy device trees provide the id in the reg attribute */
         prop = of_get_property(spe, "reg", &proplen);
         if (proplen == 4)
                 return (u64)*prop;
diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c
index 07a0e815ab..ec01214e51 100644
--- a/arch/powerpc/platforms/cell/spufs/backing_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c
@@ -162,7 +162,8 @@ static int spu_backing_wbox_write(struct spu_context *ctx, u32 data)
                 BUG_ON(avail != (4 - slot));
                 ctx->csa.spu_mailbox_data[slot] = data;
                 ctx->csa.spu_chnlcnt_RW[29] = ++slot;
-                ctx->csa.prob.mb_stat_R = (((4 - slot) & 0xff) << 8);
+                ctx->csa.prob.mb_stat_R &= ~(0x00ff00);
+                ctx->csa.prob.mb_stat_R |= (((4 - slot) & 0xff) << 8);
                 gen_spu_event(ctx, MFC_SPU_MAILBOX_WRITTEN_EVENT);
                 ret = 4;
         } else {
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 4100ddc52f..7de4e91968 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -2177,8 +2177,8 @@ struct tree_descr spufs_dir_contents[] = {
         { "mbox_stat", &spufs_mbox_stat_fops, 0444, },
         { "ibox_stat", &spufs_ibox_stat_fops, 0444, },
         { "wbox_stat", &spufs_wbox_stat_fops, 0444, },
-        { "signal1", &spufs_signal1_nosched_fops, 0222, },
-        { "signal2", &spufs_signal2_nosched_fops, 0222, },
+        { "signal1", &spufs_signal1_fops, 0666, },
+        { "signal2", &spufs_signal2_fops, 0666, },
         { "signal1_type", &spufs_signal1_type, 0666, },
         { "signal2_type", &spufs_signal2_type, 0666, },
         { "cntl", &spufs_cntl_fops,  0666, },
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index 6abdd8fe20..958f10e90f 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -193,11 +193,7 @@ static int spu_reacquire_runnable(struct spu_context *ctx, u32 *npc,
         if (ret)
                 return ret;
 
-        ret = spu_run_init(ctx, npc);
-        if (ret) {
-                spu_release(ctx);
-                return ret;
-        }
+        spuctx_switch_state(ctx, SPU_UTIL_USER);
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index c784edd40e..5bebe7fbe0 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -579,7 +579,7 @@ static struct spu *find_victim(struct spu_context *ctx)
                 list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) {
                         struct spu_context *tmp = spu->ctx;
 
-                        if (tmp->prio > ctx->prio &&
+                        if (tmp && tmp->prio > ctx->prio &&
                             (!victim || tmp->prio > victim->prio))
                                 victim = spu->ctx;
                 }
@@ -611,9 +611,9 @@ static struct spu *find_victim(struct spu_context *ctx)
 
                         mutex_lock(&cbe_spu_info[node].list_mutex);
                         cbe_spu_info[node].nr_active--;
+                        spu_unbind_context(spu, victim);
                         mutex_unlock(&cbe_spu_info[node].list_mutex);
 
-                        spu_unbind_context(spu, victim);
                         victim->stats.invol_ctx_switch++;
                         spu->stats.invol_ctx_switch++;
                         mutex_unlock(&victim->state_mutex);
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index f33b21b9f5..9014d55c71 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -93,7 +93,7 @@ static void iobmap_build(struct iommu_table *tbl, long index,
 
         pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr);
 
-        bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
+        bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
 
         ip = ((u32 *)tbl->it_base) + index;
 
@@ -118,7 +118,7 @@ static void iobmap_free(struct iommu_table *tbl, long index,
 
         pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
 
-        bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
+        bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
 
         ip = ((u32 *)tbl->it_base) + index;
 
@@ -137,7 +137,7 @@ static void iommu_table_iobmap_setup(void)
         iommu_table_iobmap.it_busno = 0;
         iommu_table_iobmap.it_offset = 0;
         /* it_size is in number of entries */
-        iommu_table_iobmap.it_size = 0x80000000 >> PAGE_SHIFT;
+        iommu_table_iobmap.it_size = 0x80000000 >> IOBMAP_PAGE_SHIFT;
 
         /* Initialize the common IOMMU code */
         iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 87d52060fe..2eb8f92704 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -83,6 +83,7 @@ enum ps3_dev_type {
         PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
         PS3_DEV_TYPE_SB_GPIO = 6,
         PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,     /* 14 */
+        PS3_DEV_TYPE_STOR_DUMMY = 32,
         PS3_DEV_TYPE_NOACCESS = 255,
 };
 
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 8cc37cfea0..1c94824f7b 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -349,6 +349,35 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 return result;
         }
 
+        if (tmp.bus_type == PS3_BUS_TYPE_STORAGE) {
+                /*
+                 * A storage device may show up in the repository before the
+                 * hypervisor has finished probing its type and regions
+                 */
+                unsigned int num_regions;
+
+                if (tmp.dev_type == PS3_DEV_TYPE_STOR_DUMMY) {
+                        pr_debug("%s:%u storage device not ready\n", __func__,
+                                 __LINE__);
+                        return -ENODEV;
+                }
+
+                result = ps3_repository_read_stor_dev_num_regions(tmp.bus_index,
+                                                                  tmp.dev_index,
+                                                                  &num_regions);
+                if (result) {
+                        pr_debug("%s:%d read_stor_dev_num_regions failed\n",
+                                 __func__, __LINE__);
+                        return result;
+                }
+
+                if (!num_regions) {
+                        pr_debug("%s:%u storage device has no regions yet\n",
+                                 __func__, __LINE__);
+                        return -ENODEV;
+                }
+        }
+
         result = ps3_repository_read_dev_id(tmp.bus_index, tmp.dev_index,
                 &tmp.dev_id);
 
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 2952b22f1c..609945dbe3 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -63,7 +63,8 @@ int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
         x.minor = minor;
         x.rev = rev;
 
-        return (ps3_firmware_version.raw - x.raw);
+        return (ps3_firmware_version.raw > x.raw) -
+               (ps3_firmware_version.raw < x.raw);
 }
 EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
 
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index ac2a4b8a4c..d1630a074a 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -505,6 +505,8 @@ static void mfc_sr1_set(struct spu *spu, u64 sr1)
         static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK
                 | MFC_STATE1_PROBLEM_STATE_MASK);
 
+        sr1 |= MFC_STATE1_MASTER_RUN_CONTROL_MASK;
+
         BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed));
 
         spu_pdata(spu)->cache.sr1 = sr1;
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 5bd90a7eb7..f0b5ff17d8 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -419,7 +419,7 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
          * For the moment only implement delivery to all cpus or one cpu.
          * Get current irq_server for the given irq
          */
-        irq_server = get_irq_server(irq, 1);
+        irq_server = get_irq_server(virq, 1);
         if (irq_server == -1) {
                 char cpulist[128];
                 cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 2326d5dc57..ab037a3a40 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -59,8 +59,7 @@
 struct axon_ram_bank {
         struct of_device        *device;
         struct gendisk          *disk;
-        unsigned int            irq_correctable;
-        unsigned int            irq_uncorrectable;
+        unsigned int            irq_id;
         unsigned long           ph_addr;
         unsigned long           io_addr;
         unsigned long           size;
@@ -93,16 +92,9 @@ axon_ram_irq_handler(int irq, void *dev)
 
         BUG_ON(!bank);
 
-        if (irq == bank->irq_correctable) {
-                dev_err(&device->dev, "Correctable memory error occured\n");
-                bank->ecc_counter++;
-                return IRQ_HANDLED;
-        } else if (irq == bank->irq_uncorrectable) {
-                dev_err(&device->dev, "Uncorrectable memory error occured\n");
-                panic("Critical ECC error on %s", device->node->full_name);
-        }
-
-        return IRQ_NONE;
+        dev_err(&device->dev, "Correctable memory error occured\n");
+        bank->ecc_counter++;
+        return IRQ_HANDLED;
 }
 
 /**
@@ -259,28 +251,18 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
         blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
         add_disk(bank->disk);
 
-        bank->irq_correctable = irq_of_parse_and_map(device->node, 0);
-        bank->irq_uncorrectable = irq_of_parse_and_map(device->node, 1);
-        if ((bank->irq_correctable <= 0) || (bank->irq_uncorrectable <= 0)) {
+        bank->irq_id = irq_of_parse_and_map(device->node, 0);
+        if (bank->irq_id == NO_IRQ) {
                 dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
                 rc = -EFAULT;
                 goto failed;
         }
 
-        rc = request_irq(bank->irq_correctable, axon_ram_irq_handler,
-                        AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
-        if (rc != 0) {
-                dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
-                bank->irq_correctable = bank->irq_uncorrectable = 0;
-                rc = -EFAULT;
-                goto failed;
-        }
-
-        rc = request_irq(bank->irq_uncorrectable, axon_ram_irq_handler,
+        rc = request_irq(bank->irq_id, axon_ram_irq_handler,
                         AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
         if (rc != 0) {
                 dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
-                bank->irq_uncorrectable = 0;
+                bank->irq_id = NO_IRQ;
                 rc = -EFAULT;
                 goto failed;
         }
@@ -296,13 +278,9 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
 
 failed:
         if (bank != NULL) {
-                if (bank->irq_uncorrectable > 0)
-                        free_irq(bank->irq_uncorrectable, device);
-                if (bank->irq_correctable > 0)
-                        free_irq(bank->irq_correctable, device);
+                if (bank->irq_id != NO_IRQ)
+                        free_irq(bank->irq_id, device);
                 if (bank->disk != NULL) {
-                        if (bank->disk->queue != NULL)
-                                blk_cleanup_queue(bank->disk->queue);
                         if (bank->disk->major > 0)
                                 unregister_blkdev(bank->disk->major,
                                                 bank->disk->disk_name);
@@ -329,9 +307,7 @@ axon_ram_remove(struct of_device *device)
         BUG_ON(!bank || !bank->disk);
 
         device_remove_file(&device->dev, &dev_attr_ecc);
-        free_irq(bank->irq_uncorrectable, device);
-        free_irq(bank->irq_correctable, device);
-        blk_cleanup_queue(bank->disk->queue);
+        free_irq(bank->irq_id, device);
         unregister_blkdev(bank->disk->major, bank->disk->disk_name);
         del_gendisk(bank->disk);
         iounmap((void __iomem *) bank->io_addr);
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c
index 4f67b89ba1..dd5417aec1 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/commproc.c
@@ -395,4 +395,4 @@ uint cpm_dpram_phys(u8* addr)
 {
         return (dpram_pbase + (uint)(addr - dpram_vbase));
 }
-EXPORT_SYMBOL(cpm_dpram_addr);
+EXPORT_SYMBOL(cpm_dpram_phys);
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c
index 9244129747..c827715a50 100644
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2_common.c
@@ -102,7 +102,7 @@ cpm_setbrg(uint brg, uint rate)
                 brg -= 4;
         }
         bp += brg;
-        *bp = ((BRG_UART_CLK / rate) << 1) | CPM_BRG_EN;
+        out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
 
         cpm2_unmap(bp);
 }
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c
index 7088428e1f..9da880be4d 100644
--- a/arch/ppc/8xx_io/commproc.c
+++ b/arch/ppc/8xx_io/commproc.c
@@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump);
 
 void *cpm_dpram_addr(unsigned long offset)
 {
-        return ((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem + offset;
+        return (void *)(dpram_vbase + offset);
 }
 EXPORT_SYMBOL(cpm_dpram_addr);
 
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index 944c35c242..eb8d26f873 100644
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -495,9 +495,7 @@ LoadLargeDTLB:
         lwz     r11, 4(r0)
 
         lwz     r12, 16(r0)
-#ifdef CONFIG_8xx_CPU6
         lwz     r3, 8(r0)
-#endif
         rfi
 
 /* This is the data TLB error on the MPC8xx.  This could be due to
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 3d211aa33c..97ac58682d 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -34,6 +34,8 @@ isa-y			:= $(isa-y)-nofpu
 endif
 endif
 
+isa-y                   := $(isa-y)-up
+
 cflags-$(CONFIG_CPU_SH2)                := $(call cc-option,-m2,)
 cflags-$(CONFIG_CPU_SH2A)               += $(call cc-option,-m2a,) \
                                            $(call cc-option,-m2a-nofpu,)
@@ -46,7 +48,20 @@ cflags-$(CONFIG_CPU_SH4A)		+= $(call cc-option,-m4a,) \
 cflags-$(CONFIG_CPU_BIG_ENDIAN)         += -mb
 cflags-$(CONFIG_CPU_LITTLE_ENDIAN)      += -ml
 
-cflags-y        += $(call as-option,-Wa$(comma)-isa=$(isa-y),) -ffreestanding
+#
+# -Wa,-isa= tuning implies -Wa,-dsp for the versions of binutils that
+# support it, while -Wa,-dsp by itself limits the range of usable opcodes
+# on certain CPU subtypes. Try the ISA variant first, and if that fails,
+# fall back on -Wa,-dsp for the old binutils versions. Even without DSP
+# opcodes, we always want the best ISA tuning the version of binutils
+# will provide.
+#
+isaflags-y      := $(call as-option,-Wa$(comma)-isa=$(isa-y),)
+
+isaflags-$(CONFIG_SH_DSP)               := \
+        $(call as-option,-Wa$(comma)-isa=$(isa-y),-Wa$(comma)-dsp)
+
+cflags-y        += $(isaflags-y) -ffreestanding
 
 cflags-$(CONFIG_MORE_COMPILE_OPTIONS)   += \
         $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
index 6e4e965413..dab193293f 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
@@ -41,3 +41,8 @@ static int __init sh4202_devices_setup(void)
                                     ARRAY_SIZE(sh4202_devices));
 }
 __initcall(sh4202_devices_setup);
+
+void __init plat_irq_setup(void)
+{
+        /* do nothing - all IRL interrupts are handled by the board code */
+}
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c
index e2d02fd13f..d850785b20 100644
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
@@ -156,6 +156,8 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d
         dev->prom_node = dp;
 
         regs = of_get_property(dp, "reg", &len);
+        if (!regs)
+                len = 0;
         if (len % sizeof(struct linux_prom_registers)) {
                 prom_printf("UGH: proplen for %s was %d, need multiple of %d\n",
                             dev->prom_node->name, len,
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 9ddc5b9ce3..76effdbea0 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -8,6 +8,7 @@ lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \
          strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \
          strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \
          copy_user.o locks.o atomic.o \
-         lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o
+         lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o \
+         cmpdi2.o
 
 obj-y += iomap.o atomic32.o
diff --git a/arch/sparc/lib/cmpdi2.c b/arch/sparc/lib/cmpdi2.c
new file mode 100644
index 0000000000..8c1306437e
--- /dev/null
+++ b/arch/sparc/lib/cmpdi2.c
@@ -0,0 +1,27 @@
+#include <linux/module.h>
+
+#include "libgcc.h"
+
+word_type __cmpdi2(long long a, long long b)
+{
+        const DWunion au = {
+                .ll = a
+        };
+        const DWunion bu = {
+                .ll = b
+        };
+
+        if (au.s.high < bu.s.high)
+                return 0;
+        else if (au.s.high > bu.s.high)
+                return 2;
+
+        if ((unsigned int) au.s.low < (unsigned int) bu.s.low)
+                return 0;
+        else if ((unsigned int) au.s.low > (unsigned int) bu.s.low)
+                return 2;
+
+        return 1;
+}
+
+EXPORT_SYMBOL(__cmpdi2);
diff --git a/arch/sparc/lib/libgcc.h b/arch/sparc/lib/libgcc.h
new file mode 100644
index 0000000000..b84fd797f3
--- /dev/null
+++ b/arch/sparc/lib/libgcc.h
@@ -0,0 +1,18 @@
+#ifndef __ASM_LIBGCC_H
+#define __ASM_LIBGCC_H
+
+#include <asm/byteorder.h>
+
+typedef int word_type __attribute__ ((mode (__word__)));
+
+struct DWstruct {
+        int high, low;
+};
+
+typedef union
+{
+        struct DWstruct s;
+        long long ll;
+} DWunion;
+
+#endif /* __ASM_LIBGCC_H */
diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c
index 8d1cfb0d50..2a007a7844 100644
--- a/arch/sparc/prom/console.c
+++ b/arch/sparc/prom/console.c
@@ -17,9 +17,6 @@
 
 extern void restore_current(void);
 
-static char con_name_jmc[] = "/obio/su@"; /* "/obio/su@0,3002f8"; */
-#define CON_SIZE_JMC    (sizeof(con_name_jmc))
-
 /* Non blocking get character from console input device, returns -1
  * if no input was taken.  This can be used for polling.
  */
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 68338a601f..7d07297db8 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc1
-# Sun Jul 22 19:24:37 2007
+# Linux kernel version: 2.6.23-rc6
+# Sun Sep 16 09:52:11 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -32,15 +32,11 @@ CONFIG_HZ=100
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
@@ -555,6 +551,7 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
@@ -809,6 +806,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -1162,10 +1160,6 @@ CONFIG_USB_STORAGE=m
 # CONFIG_MMC is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_INFINIBAND is not set
-
-#
-# Real Time Clock
-#
 # CONFIG_RTC_CLASS is not set
 
 #
diff --git a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c
index f205fc7cbc..d208cc7804 100644
--- a/arch/sparc64/kernel/binfmt_aout32.c
+++ b/arch/sparc64/kernel/binfmt_aout32.c
@@ -177,7 +177,7 @@ static u32 __user *create_aout32_tables(char __user *p, struct linux_binprm *bpr
                         get_user(c,p++);
                 } while (c);
         }
-        put_user(NULL,argv);
+        put_user(0,argv);
         current->mm->arg_end = current->mm->env_start = (unsigned long) p;
         while (envc-->0) {
                 char c;
@@ -186,7 +186,7 @@ static u32 __user *create_aout32_tables(char __user *p, struct linux_binprm *bpr
                         get_user(c,p++);
                 } while (c);
         }
-        put_user(NULL,envp);
+        put_user(0,envp);
         current->mm->env_end = (unsigned long) p;
         return sp;
 }
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index bc9ae36f7a..04ab81cb4f 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -375,7 +375,10 @@ static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_de
                 dev->num_addrs = 0;
                 dev->num_irqs = 0;
         } else {
-                (void) of_get_property(dp, "reg", &len);
+                const int *regs = of_get_property(dp, "reg", &len);
+
+                if (!regs)
+                        len = 0;
                 dev->num_addrs = len / sizeof(struct linux_prom_registers);
 
                 for (i = 0; i < dev->num_addrs; i++)
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 63144ad476..c4147ad867 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -98,7 +98,7 @@ sparc64_boot:
         .globl  prom_boot_mapped_pc, prom_boot_mapping_mode
         .globl  prom_boot_mapping_phys_high, prom_boot_mapping_phys_low
         .globl  prom_compatible_name, prom_cpu_path, prom_cpu_compatible
-        .globl  is_sun4v, sun4v_chip_type
+        .globl  is_sun4v, sun4v_chip_type, prom_set_trap_table_name
 prom_peer_name:
         .asciz  "peer"
 prom_compatible_name:
@@ -121,6 +121,8 @@ prom_map_name:
         .asciz  "map"
 prom_unmap_name:
         .asciz  "unmap"
+prom_set_trap_table_name:
+        .asciz  "SUNW,set-trap-table"
 prom_sun4v_name:
         .asciz  "sun4v"
 prom_niagara_prefix:
@@ -691,15 +693,38 @@ setup_trap_table:
         sethi   %hi(kern_base), %g3
         ldx     [%g3 + %lo(kern_base)], %g3
         add     %g2, %g3, %o1
+        sethi   %hi(sparc64_ttable_tl0), %o0
 
-        call    prom_set_trap_table_sun4v
-         sethi  %hi(sparc64_ttable_tl0), %o0
+        set     prom_set_trap_table_name, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x00]
+        mov     2, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x08]
+        mov     0, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x10]
+        stx     %o0, [%sp + 2047 + 128 + 0x18]
+        stx     %o1, [%sp + 2047 + 128 + 0x20]
+        sethi   %hi(p1275buf), %g2
+        or      %g2, %lo(p1275buf), %g2
+        ldx     [%g2 + 0x08], %o1
+        call    %o1
+         add    %sp, (2047 + 128), %o0
 
         ba,pt   %xcc, 2f
          nop
 
-1:      call    prom_set_trap_table
-         sethi  %hi(sparc64_ttable_tl0), %o0
+1:      sethi   %hi(sparc64_ttable_tl0), %o0
+        set     prom_set_trap_table_name, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x00]
+        mov     1, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x08]
+        mov     0, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x10]
+        stx     %o0, [%sp + 2047 + 128 + 0x18]
+        sethi   %hi(p1275buf), %g2
+        or      %g2, %lo(p1275buf), %g2
+        ldx     [%g2 + 0x08], %o1
+        call    %o1
+         add    %sp, (2047 + 128), %o0
 
         /* Start using proper page size encodings in ctx register.  */
 2:      sethi   %hi(sparc64_kern_pri_context), %g3
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 384abf410c..23956096b3 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -217,8 +217,27 @@ struct irq_handler_data {
         void            (*pre_handler)(unsigned int, void *, void *);
         void            *pre_handler_arg1;
         void            *pre_handler_arg2;
+
+        u32             msi;
 };
 
+void sparc64_set_msi(unsigned int virt_irq, u32 msi)
+{
+        struct irq_handler_data *data = get_irq_chip_data(virt_irq);
+
+        if (data)
+                data->msi = msi;
+}
+
+u32 sparc64_get_msi(unsigned int virt_irq)
+{
+        struct irq_handler_data *data = get_irq_chip_data(virt_irq);
+
+        if (data)
+                return data->msi;
+        return 0xffffffff;
+}
+
 static inline struct ino_bucket *virt_irq_to_bucket(unsigned int virt_irq)
 {
         unsigned int real_irq = virt_to_real_irq(virt_irq);
@@ -308,7 +327,7 @@ static void sun4u_irq_disable(unsigned int virt_irq)
 
         if (likely(data)) {
                 unsigned long imap = data->imap;
-                u32 tmp = upa_readq(imap);
+                unsigned long tmp = upa_readq(imap);
 
                 tmp &= ~IMAP_VALID;
                 upa_writeq(tmp, imap);
@@ -741,7 +760,7 @@ unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
                         break;
         }
         if (devino >= msi_end)
-                return 0;
+                return -ENOSPC;
 
         sysino = sun4v_devino_to_sysino(devhandle, devino);
         bucket = &ivector_table[sysino];
@@ -755,8 +774,8 @@ unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
 
         data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC);
         if (unlikely(!data)) {
-                prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n");
-                prom_halt();
+                virt_irq_free(*virt_irq_p);
+                return -ENOMEM;
         }
         set_irq_chip_data(bucket->virt_irq, data);
 
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c
index 9f22e4ff60..856659bb13 100644
--- a/arch/sparc64/kernel/mdesc.c
+++ b/arch/sparc64/kernel/mdesc.c
@@ -777,8 +777,12 @@ void __devinit mdesc_fill_in_cpu_data(cpumask_t mask)
                 cpuid = *id;
 
 #ifdef CONFIG_SMP
-                if (cpuid >= NR_CPUS)
+                if (cpuid >= NR_CPUS) {
+                        printk(KERN_WARNING "Ignoring CPU %d which is "
+                               ">= NR_CPUS (%d)\n",
+                               cpuid, NR_CPUS);
                         continue;
+                }
                 if (!cpu_isset(cpuid, mask))
                         continue;
 #else
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 3d93e9203b..e8dac81d8a 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -393,7 +393,6 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         sd->host_controller = pbm;
         sd->prom_node = node;
         sd->op = of_find_device_by_node(node);
-        sd->msi_num = 0xffffffff;
 
         sd = &sd->op->dev.archdata;
         sd->iommu = pbm->iommu;
@@ -745,7 +744,7 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
 {
         struct device_node *child;
         const u32 *reg;
-        int reglen, devfn;
+        int reglen, devfn, prev_devfn;
         struct pci_dev *dev;
 
         if (ofpci_verbose)
@@ -753,14 +752,25 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
                        node->full_name, bus->number);
 
         child = NULL;
+        prev_devfn = -1;
         while ((child = of_get_next_child(node, child)) != NULL) {
                 if (ofpci_verbose)
                         printk("  * %s\n", child->full_name);
                 reg = of_get_property(child, "reg", &reglen);
                 if (reg == NULL || reglen < 20)
                         continue;
+
                 devfn = (reg[0] >> 8) & 0xff;
 
+                /* This is a workaround for some device trees
+                 * which list PCI devices twice.  On the V100
+                 * for example, device number 3 is listed twice.
+                 * Once as "pm" and once again as "lomp".
+                 */
+                if (devfn == prev_devfn)
+                        continue;
+                prev_devfn = devfn;
+
                 /* create a new pci_dev for this device */
                 dev = of_create_pci_dev(pbm, child, bus, devfn, 0);
                 if (!dev)
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index 2f61c4b125..c76bfbb7da 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -264,7 +264,7 @@ static int sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
         unsigned int func = PCI_FUNC(devfn);
         unsigned long ret;
 
-        if (bus_dev == pbm->pci_bus && devfn == 0x00)
+        if (!bus && devfn == 0x00)
                 return pci_host_bridge_read_pci_cfg(bus_dev, devfn, where,
                                                     size, value);
         if (config_out_of_range(pbm, bus, devfn, where)) {
@@ -300,7 +300,7 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
         unsigned int func = PCI_FUNC(devfn);
         unsigned long ret;
 
-        if (bus_dev == pbm->pci_bus && devfn == 0x00)
+        if (!bus && devfn == 0x00)
                 return pci_host_bridge_write_pci_cfg(bus_dev, devfn, where,
                                                      size, value);
         if (config_out_of_range(pbm, bus, devfn, where)) {
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 466f4aa8fc..da724b13e8 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -940,13 +940,13 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p,
         if (msi_num < 0)
                 return msi_num;
 
-        devino = sun4v_build_msi(pbm->devhandle, virt_irq_p,
-                                 pbm->msiq_first_devino,
-                                 (pbm->msiq_first_devino +
-                                  pbm->msiq_num));
-        err = -ENOMEM;
-        if (!devino)
+        err = sun4v_build_msi(pbm->devhandle, virt_irq_p,
+                              pbm->msiq_first_devino,
+                              (pbm->msiq_first_devino +
+                               pbm->msiq_num));
+        if (err < 0)
                 goto out_err;
+        devino = err;
 
         msiqid = ((devino - pbm->msiq_first_devino) +
                   pbm->msiq_first);
@@ -971,7 +971,7 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p,
         if (pci_sun4v_msi_setvalid(pbm->devhandle, msi_num, HV_MSIVALID_VALID))
                 goto out_err;
 
-        pdev->dev.archdata.msi_num = msi_num;
+        sparc64_set_msi(*virt_irq_p, msi_num);
 
         if (entry->msi_attrib.is_64) {
                 msg.address_hi = pbm->msi64_start >> 32;
@@ -993,8 +993,6 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p,
 
 out_err:
         free_msi(pbm, msi_num);
-        sun4v_destroy_msi(*virt_irq_p);
-        *virt_irq_p = 0;
         return err;
 
 }
@@ -1006,7 +1004,7 @@ static void pci_sun4v_teardown_msi_irq(unsigned int virt_irq,
         unsigned long msiqid, err;
         unsigned int msi_num;
 
-        msi_num = pdev->dev.archdata.msi_num;
+        msi_num = sparc64_get_msi(virt_irq);
         err = pci_sun4v_msi_getmsiq(pbm->devhandle, msi_num, &msiqid);
         if (err) {
                 printk(KERN_ERR "%s: getmsiq gives error %lu\n",
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index d1a78c976c..a246e962e5 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1046,7 +1046,8 @@ static void __init irq_trans_init(struct device_node *dp)
         if (!strcmp(dp->name, "fhc") &&
             !strcmp(dp->parent->name, "central"))
                 return central_irq_trans_init(dp);
-        if (!strcmp(dp->name, "virtual-devices"))
+        if (!strcmp(dp->name, "virtual-devices") ||
+            !strcmp(dp->name, "niu"))
                 return sun4v_vdev_irq_trans_init(dp);
 }
 
@@ -1583,8 +1584,12 @@ static void __init of_fill_in_cpu_data(void)
                 ncpus_probed++;
 
 #ifdef CONFIG_SMP
-                if (cpuid >= NR_CPUS)
+                if (cpuid >= NR_CPUS) {
+                        printk(KERN_WARNING "Ignoring CPU %d which is "
+                               ">= NR_CPUS (%d)\n",
+                               cpuid, NR_CPUS);
                         continue;
+                }
 #else
                 /* On uniprocessor we only want the values for the
                  * real physical cpu the kernel booted onto, however
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index b84c49e369..c73b7a48b0 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -353,6 +353,8 @@ static int __devinit smp_boot_one_cpu(unsigned int cpu)
         int timeout, ret;
 
         p = fork_idle(cpu);
+        if (IS_ERR(p))
+                return PTR_ERR(p);
         callin_flag = 0;
         cpu_new_thread = task_thread_info(p);
 
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 9533a25ce5..04e81dda13 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -345,7 +345,7 @@ after_lock_tlb:
         sethi           %hi(tramp_stack), %g1
         or              %g1, %lo(tramp_stack), %g1
         add             %g1, TRAMP_STACK_SIZE, %g1
-        sub             %g1, STACKFRAME_SZ + STACK_BIAS, %sp
+        sub             %g1, STACKFRAME_SZ + STACK_BIAS + 256, %sp
         mov             0, %fp
 
         /* Put garbage in these registers to trap any access to them.  */
@@ -411,15 +411,38 @@ after_lock_tlb:
         sethi           %hi(kern_base), %g3
         ldx             [%g3 + %lo(kern_base)], %g3
         add             %g2, %g3, %o1
+        sethi           %hi(sparc64_ttable_tl0), %o0
 
-        call            prom_set_trap_table_sun4v
-         sethi          %hi(sparc64_ttable_tl0), %o0
+        set             prom_set_trap_table_name, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x00]
+        mov             2, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x08]
+        mov             0, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x10]
+        stx             %o0, [%sp + 2047 + 128 + 0x18]
+        stx             %o1, [%sp + 2047 + 128 + 0x20]
+        sethi           %hi(p1275buf), %g2
+        or              %g2, %lo(p1275buf), %g2
+        ldx             [%g2 + 0x08], %o1
+        call            %o1
+         add            %sp, (2047 + 128), %o0
 
         ba,pt           %xcc, 2f
          nop
 
-1:      call            prom_set_trap_table
-         sethi          %hi(sparc64_ttable_tl0), %o0
+1:      sethi           %hi(sparc64_ttable_tl0), %o0
+        set             prom_set_trap_table_name, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x00]
+        mov             1, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x08]
+        mov             0, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x10]
+        stx             %o0, [%sp + 2047 + 128 + 0x18]
+        sethi           %hi(p1275buf), %g2
+        or              %g2, %lo(p1275buf), %g2
+        ldx             [%g2 + 0x08], %o1
+        call            %o1
+         add            %sp, (2047 + 128), %o0
 
 2:      ldx             [%l0], %g6
         ldx             [%g6 + TI_TASK], %g4
diff --git a/arch/sparc64/kernel/vio.c b/arch/sparc64/kernel/vio.c
index 1550ac5673..0c1ee619d8 100644
--- a/arch/sparc64/kernel/vio.c
+++ b/arch/sparc64/kernel/vio.c
@@ -292,7 +292,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
         }
         vdev->dp = dp;
 
-        printk(KERN_ERR "VIO: Adding device %s\n", vdev->dev.bus_id);
+        printk(KERN_INFO "VIO: Adding device %s\n", vdev->dev.bus_id);
 
         err = device_register(&vdev->dev);
         if (err) {
@@ -342,8 +342,33 @@ static struct mdesc_notifier_client vio_device_notifier = {
         .node_name      = "virtual-device-port",
 };
 
+/* We are only interested in domain service ports under the
+ * "domain-services" node.  On control nodes there is another port
+ * under "openboot" that we should not mess with as aparently that is
+ * reserved exclusively for OBP use.
+ */
+static void vio_add_ds(struct mdesc_handle *hp, u64 node)
+{
+        int found;
+        u64 a;
+
+        found = 0;
+        mdesc_for_each_arc(a, hp, node, MDESC_ARC_TYPE_BACK) {
+                u64 target = mdesc_arc_target(hp, a);
+                const char *name = mdesc_node_name(hp, target);
+
+                if (!strcmp(name, "domain-services")) {
+                        found = 1;
+                        break;
+                }
+        }
+
+        if (found)
+                (void) vio_create_one(hp, node, &root_vdev->dev);
+}
+
 static struct mdesc_notifier_client vio_ds_notifier = {
-        .add            = vio_add,
+        .add            = vio_add_ds,
         .remove         = vio_remove,
         .node_name      = "domain-services-port",
 };
diff --git a/arch/sparc64/lib/NGcopy_from_user.S b/arch/sparc64/lib/NGcopy_from_user.S
index 2d93456f76..e7f433f71b 100644
--- a/arch/sparc64/lib/NGcopy_from_user.S
+++ b/arch/sparc64/lib/NGcopy_from_user.S
@@ -1,6 +1,6 @@
 /* NGcopy_from_user.S: Niagara optimized copy from userspace.
  *
- * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
  */
 
 #define EX_LD(x)                \
@@ -8,8 +8,8 @@
         .section .fixup;        \
         .align 4;               \
 99:     wr      %g0, ASI_AIUS, %asi;\
-        retl;                   \
-         mov    1, %o0;         \
+        ret;                    \
+         restore %g0, 1, %o0;   \
         .section __ex_table,"a";\
         .align 4;               \
         .word 98b, 99b;         \
@@ -24,7 +24,7 @@
 #define LOAD(type,addr,dest)    type##a [addr] ASI_AIUS, dest
 #define LOAD_TWIN(addr_reg,dest0,dest1) \
         ldda [addr_reg] ASI_BLK_INIT_QUAD_LDD_AIUS, dest0
-#define EX_RETVAL(x)            0
+#define EX_RETVAL(x)            %g0
 
 #ifdef __KERNEL__
 #define PREAMBLE                                        \
diff --git a/arch/sparc64/lib/NGcopy_to_user.S b/arch/sparc64/lib/NGcopy_to_user.S
index 34112d5054..6ea01c5532 100644
--- a/arch/sparc64/lib/NGcopy_to_user.S
+++ b/arch/sparc64/lib/NGcopy_to_user.S
@@ -1,6 +1,6 @@
 /* NGcopy_to_user.S: Niagara optimized copy to userspace.
  *
- * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
  */
 
 #define EX_ST(x)                \
@@ -8,8 +8,8 @@
         .section .fixup;        \
         .align 4;               \
 99:     wr      %g0, ASI_AIUS, %asi;\
-        retl;                   \
-         mov    1, %o0;         \
+        ret;                    \
+         restore %g0, 1, %o0;   \
         .section __ex_table,"a";\
         .align 4;               \
         .word 98b, 99b;         \
@@ -23,7 +23,7 @@
 #define FUNC_NAME               NGcopy_to_user
 #define STORE(type,src,addr)    type##a src, [addr] ASI_AIUS
 #define STORE_ASI               ASI_BLK_INIT_QUAD_LDD_AIUS
-#define EX_RETVAL(x)            0
+#define EX_RETVAL(x)            %g0
 
 #ifdef __KERNEL__
         /* Writing to %asi is _expensive_ so we hardcode it.
diff --git a/arch/sparc64/lib/NGmemcpy.S b/arch/sparc64/lib/NGmemcpy.S
index 66063a9a66..96a14caf69 100644
--- a/arch/sparc64/lib/NGmemcpy.S
+++ b/arch/sparc64/lib/NGmemcpy.S
@@ -1,6 +1,6 @@
 /* NGmemcpy.S: Niagara optimized memcpy.
  *
- * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
  */
 
 #ifdef __KERNEL__
@@ -16,6 +16,12 @@
         wr      %g0, ASI_PNF, %asi
 #endif
 
+#ifdef __sparc_v9__
+#define SAVE_AMOUNT     128
+#else
+#define SAVE_AMOUNT     64
+#endif
+
 #ifndef STORE_ASI
 #define STORE_ASI       ASI_BLK_INIT_QUAD_LDD_P
 #endif
@@ -50,7 +56,11 @@
 #endif
 
 #ifndef STORE_INIT
+#ifndef SIMULATE_NIAGARA_ON_NON_NIAGARA
 #define STORE_INIT(src,addr)    stxa src, [addr] %asi
+#else
+#define STORE_INIT(src,addr)    stx src, [addr + 0x00]
+#endif
 #endif
 
 #ifndef FUNC_NAME
@@ -73,18 +83,19 @@
 
         .globl  FUNC_NAME
         .type   FUNC_NAME,#function
-FUNC_NAME:      /* %o0=dst, %o1=src, %o2=len */
-        srlx            %o2, 31, %g2
+FUNC_NAME:      /* %i0=dst, %i1=src, %i2=len */
+        PREAMBLE
+        save            %sp, -SAVE_AMOUNT, %sp
+        srlx            %i2, 31, %g2
         cmp             %g2, 0
         tne             %xcc, 5
-        PREAMBLE
-        mov             %o0, GLOBAL_SPARE
-        cmp             %o2, 0
+        mov             %i0, %o0
+        cmp             %i2, 0
         be,pn           %XCC, 85f
-         or             %o0, %o1, %o3
-        cmp             %o2, 16
+         or             %o0, %i1, %i3
+        cmp             %i2, 16
         blu,a,pn        %XCC, 80f
-         or             %o3, %o2, %o3
+         or             %i3, %i2, %i3
 
         /* 2 blocks (128 bytes) is the minimum we can do the block
          * copy with.  We need to ensure that we'll iterate at least
@@ -93,31 +104,31 @@ FUNC_NAME:	/* %o0=dst, %o1=src, %o2=len */
          * to (64 - 1) bytes from the length before we perform the
          * block copy loop.
          */
-        cmp             %o2, (2 * 64)
+        cmp             %i2, (2 * 64)
         blu,pt          %XCC, 70f
-         andcc          %o3, 0x7, %g0
+         andcc          %i3, 0x7, %g0
 
         /* %o0: dst
-         * %o1: src
-         * %o2: len  (known to be >= 128)
+         * %i1: src
+         * %i2: len  (known to be >= 128)
          *
-         * The block copy loops will use %o4/%o5,%g2/%g3 as
+         * The block copy loops will use %i4/%i5,%g2/%g3 as
          * temporaries while copying the data.
          */
 
-        LOAD(prefetch, %o1, #one_read)
+        LOAD(prefetch, %i1, #one_read)
         wr              %g0, STORE_ASI, %asi
 
         /* Align destination on 64-byte boundary.  */
-        andcc           %o0, (64 - 1), %o4
+        andcc           %o0, (64 - 1), %i4
         be,pt           %XCC, 2f
-         sub            %o4, 64, %o4
-        sub             %g0, %o4, %o4   ! bytes to align dst
-        sub             %o2, %o4, %o2
-1:      subcc           %o4, 1, %o4
-        EX_LD(LOAD(ldub, %o1, %g1))
+         sub            %i4, 64, %i4
+        sub             %g0, %i4, %i4   ! bytes to align dst
+        sub             %i2, %i4, %i2
+1:      subcc           %i4, 1, %i4
+        EX_LD(LOAD(ldub, %i1, %g1))
         EX_ST(STORE(stb, %g1, %o0))
-        add             %o1, 1, %o1
+        add             %i1, 1, %i1
         bne,pt          %XCC, 1b
         add             %o0, 1, %o0
 
@@ -136,111 +147,155 @@ FUNC_NAME:	/* %o0=dst, %o1=src, %o2=len */
          * aligned store data at a time, this is easy to ensure.
          */
 2:
-        andcc           %o1, (16 - 1), %o4
-        andn            %o2, (64 - 1), %g1      ! block copy loop iterator
-        sub             %o2, %g1, %o2           ! final sub-block copy bytes
+        andcc           %i1, (16 - 1), %i4
+        andn            %i2, (64 - 1), %g1      ! block copy loop iterator
         be,pt           %XCC, 50f
-         cmp            %o4, 8
-        be,a,pt         %XCC, 10f
-         sub            %o1, 0x8, %o1
+         sub            %i2, %g1, %i2           ! final sub-block copy bytes
+
+        cmp             %i4, 8
+        be,pt           %XCC, 10f
+         sub            %i1, %i4, %i1
 
         /* Neither 8-byte nor 16-byte aligned, shift and mask.  */
-        mov             %g1, %o4
-        and             %o1, 0x7, %g1
-        sll             %g1, 3, %g1
-        mov             64, %o3
-        andn            %o1, 0x7, %o1
-        EX_LD(LOAD(ldx, %o1, %g2))
-        sub             %o3, %g1, %o3
-        sllx            %g2, %g1, %g2
+        and             %i4, 0x7, GLOBAL_SPARE
+        sll             GLOBAL_SPARE, 3, GLOBAL_SPARE
+        mov             64, %i5
+        EX_LD(LOAD_TWIN(%i1, %g2, %g3))
+        sub             %i5, GLOBAL_SPARE, %i5
+        mov             16, %o4
+        mov             32, %o5
+        mov             48, %o7
+        mov             64, %i3
+
+        bg,pn           %XCC, 9f
+         nop
 
-#define SWIVEL_ONE_DWORD(SRC, TMP1, TMP2, PRE_VAL, PRE_SHIFT, POST_SHIFT, DST)\
-        EX_LD(LOAD(ldx, SRC, TMP1)); \
-        srlx            TMP1, PRE_SHIFT, TMP2; \
-        or              TMP2, PRE_VAL, TMP2; \
-        EX_ST(STORE_INIT(TMP2, DST)); \
-        sllx            TMP1, POST_SHIFT, PRE_VAL;
-
-1:      add             %o1, 0x8, %o1
-        SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x00)
-        add             %o1, 0x8, %o1
-        SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x08)
-        add             %o1, 0x8, %o1
-        SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x10)
-        add             %o1, 0x8, %o1
-        SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x18)
-        add             %o1, 32, %o1
-        LOAD(prefetch, %o1, #one_read)
-        sub             %o1, 32 - 8, %o1
-        SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x20)
-        add             %o1, 8, %o1
-        SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x28)
-        add             %o1, 8, %o1
-        SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x30)
-        add             %o1, 8, %o1
-        SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x38)
-        subcc           %o4, 64, %o4
-        bne,pt          %XCC, 1b
+#define MIX_THREE_WORDS(WORD1, WORD2, WORD3, PRE_SHIFT, POST_SHIFT, TMP) \
+        sllx            WORD1, POST_SHIFT, WORD1; \
+        srlx            WORD2, PRE_SHIFT, TMP; \
+        sllx            WORD2, POST_SHIFT, WORD2; \
+        or              WORD1, TMP, WORD1; \
+        srlx            WORD3, PRE_SHIFT, TMP; \
+        or              WORD2, TMP, WORD2;
+
+8:      EX_LD(LOAD_TWIN(%i1 + %o4, %o2, %o3))
+        MIX_THREE_WORDS(%g2, %g3, %o2, %i5, GLOBAL_SPARE, %o1)
+        LOAD(prefetch, %i1 + %i3, #one_read)
+
+        EX_ST(STORE_INIT(%g2, %o0 + 0x00))
+        EX_ST(STORE_INIT(%g3, %o0 + 0x08))
+
+        EX_LD(LOAD_TWIN(%i1 + %o5, %g2, %g3))
+        MIX_THREE_WORDS(%o2, %o3, %g2, %i5, GLOBAL_SPARE, %o1)
+
+        EX_ST(STORE_INIT(%o2, %o0 + 0x10))
+        EX_ST(STORE_INIT(%o3, %o0 + 0x18))
+
+        EX_LD(LOAD_TWIN(%i1 + %o7, %o2, %o3))
+        MIX_THREE_WORDS(%g2, %g3, %o2, %i5, GLOBAL_SPARE, %o1)
+
+        EX_ST(STORE_INIT(%g2, %o0 + 0x20))
+        EX_ST(STORE_INIT(%g3, %o0 + 0x28))
+
+        EX_LD(LOAD_TWIN(%i1 + %i3, %g2, %g3))
+        add             %i1, 64, %i1
+        MIX_THREE_WORDS(%o2, %o3, %g2, %i5, GLOBAL_SPARE, %o1)
+
+        EX_ST(STORE_INIT(%o2, %o0 + 0x30))
+        EX_ST(STORE_INIT(%o3, %o0 + 0x38))
+
+        subcc           %g1, 64, %g1
+        bne,pt          %XCC, 8b
          add            %o0, 64, %o0
 
-#undef SWIVEL_ONE_DWORD
+        ba,pt           %XCC, 60f
+         add            %i1, %i4, %i1
+
+9:      EX_LD(LOAD_TWIN(%i1 + %o4, %o2, %o3))
+        MIX_THREE_WORDS(%g3, %o2, %o3, %i5, GLOBAL_SPARE, %o1)
+        LOAD(prefetch, %i1 + %i3, #one_read)
+
+        EX_ST(STORE_INIT(%g3, %o0 + 0x00))
+        EX_ST(STORE_INIT(%o2, %o0 + 0x08))
+
+        EX_LD(LOAD_TWIN(%i1 + %o5, %g2, %g3))
+        MIX_THREE_WORDS(%o3, %g2, %g3, %i5, GLOBAL_SPARE, %o1)
+
+        EX_ST(STORE_INIT(%o3, %o0 + 0x10))
+        EX_ST(STORE_INIT(%g2, %o0 + 0x18))
+
+        EX_LD(LOAD_TWIN(%i1 + %o7, %o2, %o3))
+        MIX_THREE_WORDS(%g3, %o2, %o3, %i5, GLOBAL_SPARE, %o1)
+
+        EX_ST(STORE_INIT(%g3, %o0 + 0x20))
+        EX_ST(STORE_INIT(%o2, %o0 + 0x28))
+
+        EX_LD(LOAD_TWIN(%i1 + %i3, %g2, %g3))
+        add             %i1, 64, %i1
+        MIX_THREE_WORDS(%o3, %g2, %g3, %i5, GLOBAL_SPARE, %o1)
+
+        EX_ST(STORE_INIT(%o3, %o0 + 0x30))
+        EX_ST(STORE_INIT(%g2, %o0 + 0x38))
+
+        subcc           %g1, 64, %g1
+        bne,pt          %XCC, 9b
+         add            %o0, 64, %o0
 
-        srl             %g1, 3, %g1
         ba,pt           %XCC, 60f
-         add            %o1, %g1, %o1
+         add            %i1, %i4, %i1
 
 10:     /* Destination is 64-byte aligned, source was only 8-byte
          * aligned but it has been subtracted by 8 and we perform
          * one twin load ahead, then add 8 back into source when
          * we finish the loop.
          */
-        EX_LD(LOAD_TWIN(%o1, %o4, %o5))
-1:      add             %o1, 16, %o1
-        EX_LD(LOAD_TWIN(%o1, %g2, %g3))
-        add             %o1, 16 + 32, %o1
-        LOAD(prefetch, %o1, #one_read)
-        sub             %o1, 32, %o1
+        EX_LD(LOAD_TWIN(%i1, %o4, %o5))
+        mov     16, %o7
+        mov     32, %g2
+        mov     48, %g3
+        mov     64, %o1
+1:      EX_LD(LOAD_TWIN(%i1 + %o7, %o2, %o3))
+        LOAD(prefetch, %i1 + %o1, #one_read)
         EX_ST(STORE_INIT(%o5, %o0 + 0x00))      ! initializes cache line
-        EX_ST(STORE_INIT(%g2, %o0 + 0x08))
-        EX_LD(LOAD_TWIN(%o1, %o4, %o5))
-        add             %o1, 16, %o1
-        EX_ST(STORE_INIT(%g3, %o0 + 0x10))
+        EX_ST(STORE_INIT(%o2, %o0 + 0x08))
+        EX_LD(LOAD_TWIN(%i1 + %g2, %o4, %o5))
+        EX_ST(STORE_INIT(%o3, %o0 + 0x10))
         EX_ST(STORE_INIT(%o4, %o0 + 0x18))
-        EX_LD(LOAD_TWIN(%o1, %g2, %g3))
-        add             %o1, 16, %o1
+        EX_LD(LOAD_TWIN(%i1 + %g3, %o2, %o3))
         EX_ST(STORE_INIT(%o5, %o0 + 0x20))
-        EX_ST(STORE_INIT(%g2, %o0 + 0x28))
-        EX_LD(LOAD_TWIN(%o1, %o4, %o5))
-        EX_ST(STORE_INIT(%g3, %o0 + 0x30))
+        EX_ST(STORE_INIT(%o2, %o0 + 0x28))
+        EX_LD(LOAD_TWIN(%i1 + %o1, %o4, %o5))
+        add             %i1, 64, %i1
+        EX_ST(STORE_INIT(%o3, %o0 + 0x30))
         EX_ST(STORE_INIT(%o4, %o0 + 0x38))
         subcc           %g1, 64, %g1
         bne,pt          %XCC, 1b
          add            %o0, 64, %o0
 
         ba,pt           %XCC, 60f
-         add            %o1, 0x8, %o1
+         add            %i1, 0x8, %i1
 
 50:     /* Destination is 64-byte aligned, and source is 16-byte
          * aligned.
          */
-1:      EX_LD(LOAD_TWIN(%o1, %o4, %o5))
-        add     %o1, 16, %o1
-        EX_LD(LOAD_TWIN(%o1, %g2, %g3))
-        add     %o1, 16 + 32, %o1
-        LOAD(prefetch, %o1, #one_read)
-        sub     %o1, 32, %o1
+        mov     16, %o7
+        mov     32, %g2
+        mov     48, %g3
+        mov     64, %o1
+1:      EX_LD(LOAD_TWIN(%i1 + %g0, %o4, %o5))
+        EX_LD(LOAD_TWIN(%i1 + %o7, %o2, %o3))
+        LOAD(prefetch, %i1 + %o1, #one_read)
         EX_ST(STORE_INIT(%o4, %o0 + 0x00))      ! initializes cache line
         EX_ST(STORE_INIT(%o5, %o0 + 0x08))
-        EX_LD(LOAD_TWIN(%o1, %o4, %o5))
-        add     %o1, 16, %o1
-        EX_ST(STORE_INIT(%g2, %o0 + 0x10))
-        EX_ST(STORE_INIT(%g3, %o0 + 0x18))
-        EX_LD(LOAD_TWIN(%o1, %g2, %g3))
-        add     %o1, 16, %o1
+        EX_LD(LOAD_TWIN(%i1 + %g2, %o4, %o5))
+        EX_ST(STORE_INIT(%o2, %o0 + 0x10))
+        EX_ST(STORE_INIT(%o3, %o0 + 0x18))
+        EX_LD(LOAD_TWIN(%i1 + %g3, %o2, %o3))
+        add     %i1, 64, %i1
         EX_ST(STORE_INIT(%o4, %o0 + 0x20))
         EX_ST(STORE_INIT(%o5, %o0 + 0x28))
-        EX_ST(STORE_INIT(%g2, %o0 + 0x30))
-        EX_ST(STORE_INIT(%g3, %o0 + 0x38))
+        EX_ST(STORE_INIT(%o2, %o0 + 0x30))
+        EX_ST(STORE_INIT(%o3, %o0 + 0x38))
         subcc   %g1, 64, %g1
         bne,pt  %XCC, 1b
          add    %o0, 64, %o0
@@ -249,47 +304,47 @@ FUNC_NAME:	/* %o0=dst, %o1=src, %o2=len */
 60:     
         membar          #Sync
 
-        /* %o2 contains any final bytes still needed to be copied
+        /* %i2 contains any final bytes still needed to be copied
          * over. If anything is left, we copy it one byte at a time.
          */
-        RESTORE_ASI(%o3)
-        brz,pt          %o2, 85f
-         sub            %o0, %o1, %o3
+        RESTORE_ASI(%i3)
+        brz,pt          %i2, 85f
+         sub            %o0, %i1, %i3
         ba,a,pt         %XCC, 90f
 
         .align          64
 70: /* 16 < len <= 64 */
         bne,pn          %XCC, 75f
-         sub            %o0, %o1, %o3
+         sub            %o0, %i1, %i3
 
 72:
-        andn            %o2, 0xf, %o4
-        and             %o2, 0xf, %o2
-1:      subcc           %o4, 0x10, %o4
-        EX_LD(LOAD(ldx, %o1, %o5))
-        add             %o1, 0x08, %o1
-        EX_LD(LOAD(ldx, %o1, %g1))
-        sub             %o1, 0x08, %o1
-        EX_ST(STORE(stx, %o5, %o1 + %o3))
-        add             %o1, 0x8, %o1
-        EX_ST(STORE(stx, %g1, %o1 + %o3))
+        andn            %i2, 0xf, %i4
+        and             %i2, 0xf, %i2
+1:      subcc           %i4, 0x10, %i4
+        EX_LD(LOAD(ldx, %i1, %o4))
+        add             %i1, 0x08, %i1
+        EX_LD(LOAD(ldx, %i1, %g1))
+        sub             %i1, 0x08, %i1
+        EX_ST(STORE(stx, %o4, %i1 + %i3))
+        add             %i1, 0x8, %i1
+        EX_ST(STORE(stx, %g1, %i1 + %i3))
         bgu,pt          %XCC, 1b
-         add            %o1, 0x8, %o1
-73:     andcc           %o2, 0x8, %g0
+         add            %i1, 0x8, %i1
+73:     andcc           %i2, 0x8, %g0
         be,pt           %XCC, 1f
          nop
-        sub             %o2, 0x8, %o2
-        EX_LD(LOAD(ldx, %o1, %o5))
-        EX_ST(STORE(stx, %o5, %o1 + %o3))
-        add             %o1, 0x8, %o1
-1:      andcc           %o2, 0x4, %g0
+        sub             %i2, 0x8, %i2
+        EX_LD(LOAD(ldx, %i1, %o4))
+        EX_ST(STORE(stx, %o4, %i1 + %i3))
+        add             %i1, 0x8, %i1
+1:      andcc           %i2, 0x4, %g0
         be,pt           %XCC, 1f
          nop
-        sub             %o2, 0x4, %o2
-        EX_LD(LOAD(lduw, %o1, %o5))
-        EX_ST(STORE(stw, %o5, %o1 + %o3))
-        add             %o1, 0x4, %o1
-1:      cmp             %o2, 0
+        sub             %i2, 0x4, %i2
+        EX_LD(LOAD(lduw, %i1, %i5))
+        EX_ST(STORE(stw, %i5, %i1 + %i3))
+        add             %i1, 0x4, %i1
+1:      cmp             %i2, 0
         be,pt           %XCC, 85f
          nop
         ba,pt           %xcc, 90f
@@ -300,71 +355,71 @@ FUNC_NAME:	/* %o0=dst, %o1=src, %o2=len */
         sub             %g1, 0x8, %g1
         be,pn           %icc, 2f
          sub            %g0, %g1, %g1
-        sub             %o2, %g1, %o2
+        sub             %i2, %g1, %i2
 
 1:      subcc           %g1, 1, %g1
-        EX_LD(LOAD(ldub, %o1, %o5))
-        EX_ST(STORE(stb, %o5, %o1 + %o3))
+        EX_LD(LOAD(ldub, %i1, %i5))
+        EX_ST(STORE(stb, %i5, %i1 + %i3))
         bgu,pt          %icc, 1b
-         add            %o1, 1, %o1
+         add            %i1, 1, %i1
 
-2:      add             %o1, %o3, %o0
-        andcc           %o1, 0x7, %g1
+2:      add             %i1, %i3, %o0
+        andcc           %i1, 0x7, %g1
         bne,pt          %icc, 8f
          sll            %g1, 3, %g1
 
-        cmp             %o2, 16
+        cmp             %i2, 16
         bgeu,pt         %icc, 72b
          nop
         ba,a,pt         %xcc, 73b
 
-8:      mov             64, %o3
-        andn            %o1, 0x7, %o1
-        EX_LD(LOAD(ldx, %o1, %g2))
-        sub             %o3, %g1, %o3
-        andn            %o2, 0x7, %o4
+8:      mov             64, %i3
+        andn            %i1, 0x7, %i1
+        EX_LD(LOAD(ldx, %i1, %g2))
+        sub             %i3, %g1, %i3
+        andn            %i2, 0x7, %i4
         sllx            %g2, %g1, %g2
-1:      add             %o1, 0x8, %o1
-        EX_LD(LOAD(ldx, %o1, %g3))
-        subcc           %o4, 0x8, %o4
-        srlx            %g3, %o3, %o5
-        or              %o5, %g2, %o5
-        EX_ST(STORE(stx, %o5, %o0))
+1:      add             %i1, 0x8, %i1
+        EX_LD(LOAD(ldx, %i1, %g3))
+        subcc           %i4, 0x8, %i4
+        srlx            %g3, %i3, %i5
+        or              %i5, %g2, %i5
+        EX_ST(STORE(stx, %i5, %o0))
         add             %o0, 0x8, %o0
         bgu,pt          %icc, 1b
          sllx           %g3, %g1, %g2
 
         srl             %g1, 3, %g1
-        andcc           %o2, 0x7, %o2
+        andcc           %i2, 0x7, %i2
         be,pn           %icc, 85f
-         add            %o1, %g1, %o1
+         add            %i1, %g1, %i1
         ba,pt           %xcc, 90f
-         sub            %o0, %o1, %o3
+         sub            %o0, %i1, %i3
 
         .align          64
 80: /* 0 < len <= 16 */
-        andcc           %o3, 0x3, %g0
+        andcc           %i3, 0x3, %g0
         bne,pn          %XCC, 90f
-         sub            %o0, %o1, %o3
+         sub            %o0, %i1, %i3
 
 1:
-        subcc           %o2, 4, %o2
-        EX_LD(LOAD(lduw, %o1, %g1))
-        EX_ST(STORE(stw, %g1, %o1 + %o3))
+        subcc           %i2, 4, %i2
+        EX_LD(LOAD(lduw, %i1, %g1))
+        EX_ST(STORE(stw, %g1, %i1 + %i3))
         bgu,pt          %XCC, 1b
-         add            %o1, 4, %o1
+         add            %i1, 4, %i1
 
-85:     retl
-         mov            EX_RETVAL(GLOBAL_SPARE), %o0
+85:     ret
+         restore        EX_RETVAL(%i0), %g0, %o0
 
         .align          32
 90:
-        subcc           %o2, 1, %o2
-        EX_LD(LOAD(ldub, %o1, %g1))
-        EX_ST(STORE(stb, %g1, %o1 + %o3))
+        subcc           %i2, 1, %i2
+        EX_LD(LOAD(ldub, %i1, %g1))
+        EX_ST(STORE(stb, %g1, %i1 + %i3))
         bgu,pt          %XCC, 90b
-         add            %o1, 1, %o1
-        retl
-         mov            EX_RETVAL(GLOBAL_SPARE), %o0
+         add            %i1, 1, %i1
+        ret
+         restore        EX_RETVAL(%i0), %g0, %o0
 
         .size           FUNC_NAME, .-FUNC_NAME
diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c
index eaba9b70b1..6cfab2e4d3 100644
--- a/arch/sparc64/mm/hugetlbpage.c
+++ b/arch/sparc64/mm/hugetlbpage.c
@@ -175,7 +175,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
                 return -ENOMEM;
 
         if (flags & MAP_FIXED) {
-                if (prepare_hugepage_range(addr, len, pgoff))
+                if (prepare_hugepage_range(addr, len))
                         return -EINVAL;
                 return addr;
         }
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c
index 68c83ad04a..bbec752282 100644
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
@@ -143,22 +143,6 @@ unsigned char prom_get_idprom(char *idbuf, int num_bytes)
         return 0xff;
 }
 
-/* Install Linux trap table so PROM uses that instead of its own. */
-void prom_set_trap_table(unsigned long tba)
-{
-        p1275_cmd("SUNW,set-trap-table",
-                  (P1275_ARG(0, P1275_ARG_IN_64B) |
-                   P1275_INOUT(1, 0)), tba);
-}
-
-void prom_set_trap_table_sun4v(unsigned long tba, unsigned long mmfsa)
-{
-        p1275_cmd("SUNW,set-trap-table",
-                  (P1275_ARG(0, P1275_ARG_IN_64B) |
-                   P1275_ARG(1, P1275_ARG_IN_64B) |
-                   P1275_INOUT(2, 0)), tba, mmfsa);
-}
-
 int prom_get_mmu_ihandle(void)
 {
         int node, ret;
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index 8d7f7c1cb9..6c2be26f1d 100644
--- a/arch/um/include/kern_util.h
+++ b/arch/um/include/kern_util.h
@@ -117,7 +117,7 @@ extern void sigio_handler(int sig, union uml_pt_regs *regs);
 
 extern void copy_sc(union uml_pt_regs *regs, void *from);
 
-unsigned long to_irq_stack(int sig, unsigned long *mask_out);
+extern unsigned long to_irq_stack(unsigned long *mask_out);
 unsigned long from_irq_stack(int nested);
 
 #endif
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
index 24547741b2..4185090611 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@@ -71,11 +71,13 @@ SECTIONS
     *(.gnu.warning)
 
     . = ALIGN(4096);
-    __syscall_stub_start = .;
-    *(.__syscall_stub*)
-    __syscall_stub_end = .;
-    . = ALIGN(4096);
   } =0x90909090
+  . = ALIGN(4096);
+  .syscall_stub : {
+        __syscall_stub_start = .;
+        *(.__syscall_stub*)
+        __syscall_stub_end = .;
+  }
   .fini           : {
     KEEP (*(.fini))
   } =0x90909090
@@ -138,8 +140,8 @@ SECTIONS
   .got            : { *(.got.plt) *(.got) }
   _edata = .;
   PROVIDE (edata = .);
-  __bss_start = .;
   .bss            : {
+   __bss_start = .;
    *(.dynbss)
    *(.bss .bss.* .gnu.linkonce.b.*)
    *(COMMON)
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 9870febdbe..cf0dd9cf8c 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -518,13 +518,13 @@ int init_aio_irq(int irq, char *name, irq_handler_t handler)
 
 static unsigned long pending_mask;
 
-unsigned long to_irq_stack(int sig, unsigned long *mask_out)
+unsigned long to_irq_stack(unsigned long *mask_out)
 {
         struct thread_info *ti;
         unsigned long mask, old;
         int nested;
 
-        mask = xchg(&pending_mask, 1 << sig);
+        mask = xchg(&pending_mask, *mask_out);
         if(mask != 0){
                 /* If any interrupts come in at this point, we want to
                  * make sure that their bits aren't lost by our
@@ -534,7 +534,7 @@ unsigned long to_irq_stack(int sig, unsigned long *mask_out)
                  * and pending_mask contains a bit for each interrupt
                  * that came in.
                  */
-                old = 1 << sig;
+                old = *mask_out;
                 do {
                         old |= mask;
                         mask = xchg(&pending_mask, old);
@@ -550,6 +550,7 @@ unsigned long to_irq_stack(int sig, unsigned long *mask_out)
 
                 task = cpu_tasks[ti->cpu].task;
                 tti = task_thread_info(task);
+
                 *ti = *tti;
                 ti->real_thread = tti;
                 task->stack = ti;
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
index 307b937367..81acdc2434 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@@ -44,12 +44,13 @@ SECTIONS
     /* .gnu.warning sections are handled specially by elf32.em.  */
     *(.gnu.warning)
     *(.gnu.linkonce.t*)
+  }
 
-    . = ALIGN(4096);
-    __syscall_stub_start = .;
-    *(.__syscall_stub*)
-    __syscall_stub_end = .;
-    . = ALIGN(4096);
+  . = ALIGN(4096);
+  .syscall_stub : {
+        __syscall_stub_start = .;
+        *(.__syscall_stub*)
+        __syscall_stub_end = .;
   }
 
   #include "asm/common.lds.S"
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 6f92f732d2..c3ecc2a84e 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -320,7 +320,8 @@ int os_file_size(char *file, unsigned long long *size_out)
         }
 
         if(S_ISBLK(buf.ust_mode)){
-                int fd, blocks;
+                int fd;
+                long blocks;
 
                 fd = os_open_file(file, of_read(OPENFLAGS()), 0);
                 if(fd < 0){
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 18e5c8b67e..b98f7ea2d2 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -119,7 +119,7 @@ void (*handlers[_NSIG])(int sig, struct sigcontext *sc);
 
 void handle_signal(int sig, struct sigcontext *sc)
 {
-        unsigned long pending = 0;
+        unsigned long pending = 1UL << sig;
 
         do {
                 int nested, bail;
@@ -134,7 +134,7 @@ void handle_signal(int sig, struct sigcontext *sc)
                  * have to return, and the upper handler will deal
                  * with this interrupt.
                  */
-                bail = to_irq_stack(sig, &pending);
+                bail = to_irq_stack(&pending);
                 if(bail)
                         return;
 
diff --git a/arch/um/os-Linux/sys-x86_64/registers.c b/arch/um/os-Linux/sys-x86_64/registers.c
index e6fc2179d1..9467315b80 100644
--- a/arch/um/os-Linux/sys-x86_64/registers.c
+++ b/arch/um/os-Linux/sys-x86_64/registers.c
@@ -4,6 +4,7 @@
  */
 
 #include <errno.h>
+#include <sys/ptrace.h>
 #include <string.h>
 #include "ptrace_user.h"
 #include "uml-config.h"
@@ -17,6 +18,20 @@
 static unsigned long exec_regs[MAX_REG_NR];
 static unsigned long exec_fp_regs[HOST_FP_SIZE];
 
+int save_fp_registers(int pid, unsigned long *fp_regs)
+{
+        if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0)
+                return -errno;
+        return 0;
+}
+
+int restore_fp_registers(int pid, unsigned long *fp_regs)
+{
+        if(ptrace(PTRACE_SETFPREGS, pid, 0, fp_regs) < 0)
+                return -errno;
+        return 0;
+}
+
 void init_thread_registers(union uml_pt_regs *to)
 {
         memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs));
diff --git a/arch/um/sys-x86_64/ptrace.c b/arch/um/sys-x86_64/ptrace.c
index 55b66e09a9..1970d78aa5 100644
--- a/arch/um/sys-x86_64/ptrace.c
+++ b/arch/um/sys-x86_64/ptrace.c
@@ -156,12 +156,6 @@ int is_syscall(unsigned long addr)
         return(instr == 0x050f);
 }
 
-int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu )
-{
-        panic("dump_fpu");
-        return(1);
-}
-
 int get_fpregs(unsigned long buf, struct task_struct *child)
 {
         panic("get_fpregs");
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index ffa0364062..b4d9089a6a 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -60,14 +60,6 @@ config ZONE_DMA
         bool
         default y
 
-config QUICKLIST
-        bool
-        default y
-
-config NR_QUICK
-        int
-        default 2
-
 config ISA
         bool
 
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index e64f65c9d9..b091c5e355 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -201,7 +201,6 @@ CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
-CONFIG_SUSPEND_SMP=y
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 938278697e..18b2318109 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -38,6 +38,18 @@
         movq    %rax,R8(%rsp)
         .endm
 
+        .macro LOAD_ARGS32 offset
+        movl \offset(%rsp),%r11d
+        movl \offset+8(%rsp),%r10d
+        movl \offset+16(%rsp),%r9d
+        movl \offset+24(%rsp),%r8d
+        movl \offset+40(%rsp),%ecx
+        movl \offset+48(%rsp),%edx
+        movl \offset+56(%rsp),%esi
+        movl \offset+64(%rsp),%edi
+        movl \offset+72(%rsp),%eax
+        .endm
+        
         .macro CFI_STARTPROC32 simple
         CFI_STARTPROC   \simple
         CFI_UNDEFINED   r8
@@ -152,7 +164,7 @@ sysenter_tracesys:
         movq    $-ENOSYS,RAX(%rsp)      /* really needed? */
         movq    %rsp,%rdi        /* &pt_regs -> arg1 */
         call    syscall_trace_enter
-        LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
+        LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
         RESTORE_REST
         movl    %ebp, %ebp
         /* no need to do an access_ok check here because rbp has been
@@ -255,7 +267,7 @@ cstar_tracesys:
         movq $-ENOSYS,RAX(%rsp) /* really needed? */
         movq %rsp,%rdi        /* &pt_regs -> arg1 */
         call syscall_trace_enter
-        LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
+        LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
         RESTORE_REST
         movl RSP-ARGOFFSET(%rsp), %r8d
         /* no need to do an access_ok check here because r8 has been
@@ -334,7 +346,7 @@ ia32_tracesys:
         movq $-ENOSYS,RAX(%rsp) /* really needed? */
         movq %rsp,%rdi        /* &pt_regs -> arg1 */
         call syscall_trace_enter
-        LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
+        LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
         RESTORE_REST
         jmp ia32_do_syscall
 END(ia32_syscall)
diff --git a/arch/x86_64/kernel/acpi/wakeup.S b/arch/x86_64/kernel/acpi/wakeup.S
index 13f1480cbe..a06f2bcabe 100644
--- a/arch/x86_64/kernel/acpi/wakeup.S
+++ b/arch/x86_64/kernel/acpi/wakeup.S
@@ -81,7 +81,7 @@ wakeup_code:
         testl   $2, realmode_flags - wakeup_code
         jz      1f
         mov     video_mode - wakeup_code, %ax
-        call    mode_seta
+        call    mode_set
 1:
 
         movw    $0xb800, %ax
@@ -291,52 +291,31 @@ no_longmode:
 #define VIDEO_FIRST_V7 0x0900
 
 # Setting of user mode (AX=mode ID) => CF=success
+
+# For now, we only handle VESA modes (0x0200..0x03ff).  To handle other
+# modes, we should probably compile in the video code from the boot
+# directory.
 .code16
-mode_seta:
+mode_set:
         movw    %ax, %bx
-#if 0
-        cmpb    $0xff, %ah
-        jz      setalias
-
-        testb   $VIDEO_RECALC>>8, %ah
-        jnz     _setrec
-
-        cmpb    $VIDEO_FIRST_RESOLUTION>>8, %ah
-        jnc     setres
-        
-        cmpb    $VIDEO_FIRST_SPECIAL>>8, %ah
-        jz      setspc
-
-        cmpb    $VIDEO_FIRST_V7>>8, %ah
-        jz      setv7
-#endif
-        
-        cmpb    $VIDEO_FIRST_VESA>>8, %ah
-        jnc     check_vesaa
-#if 0   
-        orb     %ah, %ah
-        jz      setmenu
-#endif
-        
-        decb    %ah
-#       jz      setbios                           Add bios modes later
+        subb    $VIDEO_FIRST_VESA>>8, %bh
+        cmpb    $2, %bh
+        jb      check_vesa
 
-setbada:        clc
+setbad:
+        clc
         ret
 
-check_vesaa:
-        subb    $VIDEO_FIRST_VESA>>8, %bh
+check_vesa:
         orw     $0x4000, %bx                    # Use linear frame buffer
         movw    $0x4f02, %ax                    # VESA BIOS mode set call
         int     $0x10
         cmpw    $0x004f, %ax                    # AL=4f if implemented
-        jnz     _setbada                                # AH=0 if OK
+        jnz     setbad                          # AH=0 if OK
 
         stc
         ret
 
-_setbada: jmp setbada
-
 wakeup_stack_begin:     # Stack grows down
 
 .org    0xff0
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index f57f8b9019..966fa10624 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -397,14 +397,12 @@ static void clear_IO_APIC (void)
 int skip_ioapic_setup;
 int ioapic_force;
 
-/* dummy parsing: see setup.c */
-
-static int __init disable_ioapic_setup(char *str)
+static int __init parse_noapic(char *str)
 {
-        skip_ioapic_setup = 1;
+        disable_ioapic_setup();
         return 0;
 }
-early_param("noapic", disable_ioapic_setup);
+early_param("noapic", parse_noapic);
 
 /* Actually the next is obsolete, but keep it for paranoid reasons -AK */
 static int __init disable_timer_pin_setup(char *arg)
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 2842f50cbe..9895655545 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -208,7 +208,6 @@ void cpu_idle (void)
                         if (__get_cpu_var(cpu_idle_state))
                                 __get_cpu_var(cpu_idle_state) = 0;
 
-                        check_pgt_cache();
                         rmb();
                         idle = pm_idle;
                         if (!idle)
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index e83cc67155..eea3702427 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -232,10 +232,6 @@ static int putreg(struct task_struct *child,
 {
         unsigned long tmp; 
         
-        /* Some code in the 64bit emulation may not be 64bit clean.
-           Don't take any chances. */
-        if (test_tsk_thread_flag(child, TIF_IA32))
-                value &= 0xffffffff;
         switch (regno) {
                 case offsetof(struct user_regs_struct,fs):
                         if (value && (value & 3) != 3)
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 673a300b59..df4a82812a 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -241,7 +241,7 @@ void flush_tlb_mm (struct mm_struct * mm)
         }
         if (!cpus_empty(cpu_mask))
                 flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
-        check_pgt_cache();
+
         preempt_enable();
 }
 EXPORT_SYMBOL(flush_tlb_mm);
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 327c9f2fa6..54816adb8e 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -374,6 +374,13 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
         if (unlikely(in_atomic() || !mm))
                 goto bad_area_nosemaphore;
 
+        /*
+         * User-mode registers count as a user access even for any
+         * potential system fault or CPU buglet.
+         */
+        if (user_mode_vm(regs))
+                error_code |= PF_USER;
+
  again:
         /* When running in the kernel we expect faults to occur only to
          * addresses in user space.  All other faults represent errors in the
diff --git a/arch/x86_64/vdso/vclock_gettime.c b/arch/x86_64/vdso/vclock_gettime.c
index 17f6a00de7..5b54cdfb2b 100644
--- a/arch/x86_64/vdso/vclock_gettime.c
+++ b/arch/x86_64/vdso/vclock_gettime.c
@@ -34,10 +34,11 @@ static long vdso_fallback_gettime(long clock, struct timespec *ts)
 
 static inline long vgetns(void)
 {
+        long v;
         cycles_t (*vread)(void);
         vread = gtod->clock.vread;
-        return ((vread() - gtod->clock.cycle_last) * gtod->clock.mult) >>
-                gtod->clock.shift;
+        v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
+        return (v * gtod->clock.mult) >> gtod->clock.shift;
 }
 
 static noinline int do_realtime(struct timespec *ts)
diff --git a/arch/x86_64/vdso/voffset.h b/arch/x86_64/vdso/voffset.h
index 5304204911..4af67c7908 100644
--- a/arch/x86_64/vdso/voffset.h
+++ b/arch/x86_64/vdso/voffset.h
@@ -1 +1 @@
-#define VDSO_TEXT_OFFSET 0x500
+#define VDSO_TEXT_OFFSET 0x600
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 95f836db38..acf05be249 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -27,7 +27,12 @@ platform-$(CONFIG_XTENSA_PLATFORM_ISS)		:= iss
 PLATFORM = $(platform-y)
 export PLATFORM
 
-CFLAGS          += -pipe -mlongcalls
+# temporarily until string.h is fixed
+cflags-y += -ffreestanding
+
+cflags-y += -pipe -mlongcalls
+
+CFLAGS  += $(cflags-y)
 
 KBUILD_DEFCONFIG := iss_defconfig
 
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index 71f733c4f6..f582d6a24e 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := head.o vmlinux.lds
 
 obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o  \
          setup.o signal.o syscall.o time.o traps.o vectors.o platform.o  \
-         pci-dma.o
+         pci-dma.o init_task.o io.o
 
 ## windowspill.o
 
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index d0323cd6a2..d5ffe7b644 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -18,12 +18,13 @@
 #include <linux/stddef.h>
 #include <linux/thread_info.h>
 #include <linux/ptrace.h>
+#include <linux/mm.h>
+
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 
 #define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-#define BLANK() asm volatile("\n->" : : )
 
 int main(void)
 {
@@ -63,7 +64,6 @@ int main(void)
         DEFINE(PT_SIZE, sizeof(struct pt_regs));
         DEFINE(PT_AREG_END, offsetof (struct pt_regs, areg[XCHAL_NUM_AREGS]));
         DEFINE(PT_USER_SIZE, offsetof(struct pt_regs, areg[XCHAL_NUM_AREGS]));
-        BLANK();
 
         /* struct task_struct */
         DEFINE(TASK_PTRACE, offsetof (struct task_struct, ptrace));
@@ -73,27 +73,26 @@ int main(void)
         DEFINE(TASK_THREAD, offsetof (struct task_struct, thread));
         DEFINE(TASK_THREAD_INFO, offsetof (struct task_struct, stack));
         DEFINE(TASK_STRUCT_SIZE, sizeof (struct task_struct));
-        BLANK();
 
         /* struct thread_info (offset from start_struct) */
         DEFINE(THREAD_RA, offsetof (struct task_struct, thread.ra));
         DEFINE(THREAD_SP, offsetof (struct task_struct, thread.sp));
         DEFINE(THREAD_CP_SAVE, offsetof (struct task_struct, thread.cp_save));
         DEFINE(THREAD_CURRENT_DS, offsetof (struct task_struct, thread.current_ds));
-        BLANK();
 
         /* struct mm_struct */
         DEFINE(MM_USERS, offsetof(struct mm_struct, mm_users));
         DEFINE(MM_PGD, offsetof (struct mm_struct, pgd));
         DEFINE(MM_CONTEXT, offsetof (struct mm_struct, context));
-        BLANK();
-        DEFINE(PT_SINGLESTEP_BIT, PT_SINGLESTEP_BIT);
+
+        /* struct page */
+        DEFINE(PAGE_FLAGS, offsetof(struct page, flags));
 
         /* constants */
         DEFINE(_CLONE_VM, CLONE_VM);
         DEFINE(_CLONE_UNTRACED, CLONE_UNTRACED);
+        DEFINE(PG_ARCH_1, PG_arch_1);
 
         return 0;
 }
 
-
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 8dc7a2c26f..91a689eca4 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -7,7 +7,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2004-2005 by Tensilica Inc.
+ * Copyright (C) 2004-2007 by Tensilica Inc.
  *
  * Chris Zankel <chris@zankel.net>
  *
@@ -169,7 +169,7 @@ _user_exception:
          * We have to save all registers up to the first '1' from
          * the right, except the current frame (bit 0).
          * Assume a2 is:  001001000110001
-         * All regiser frames starting from the top fiel to the marked '1'
+         * All register frames starting from the top field to the marked '1'
          * must be saved.
          */
 
@@ -1572,10 +1572,12 @@ ENTRY(fast_second_level_miss)
         l32i    a0, a1, TASK_MM         # tsk->mm
         beqz    a0, 9f
 
-8:      rsr     a1, EXCVADDR            # fault address
-        _PGD_OFFSET(a0, a1, a1)
+
+        /* We deliberately destroy a3 that holds the exception table. */
+
+8:      rsr     a3, EXCVADDR            # fault address
+        _PGD_OFFSET(a0, a3, a1)
         l32i    a0, a0, 0               # read pmdval
-        //beqi  a0, _PAGE_USER, 2f
         beqz    a0, 2f
 
         /* Read ptevaddr and convert to top of page-table page.
@@ -1588,7 +1590,7 @@ ENTRY(fast_second_level_miss)
          * The messy computation for 'pteval' above really simplifies
          * into the following:
          *
-         * pteval = ((pmdval - PAGE_OFFSET) & PAGE_MASK) | PAGE_KERNEL
+         * pteval = ((pmdval - PAGE_OFFSET) & PAGE_MASK) | PAGE_DIRECTORY
          */
 
         movi    a1, -PAGE_OFFSET
@@ -1596,20 +1598,34 @@ ENTRY(fast_second_level_miss)
         extui   a1, a0, 0, PAGE_SHIFT   # ... & PAGE_MASK
         xor     a0, a0, a1
 
-
-        movi    a1, PAGE_DIRECTORY
+        movi    a1, _PAGE_DIRECTORY
         or      a0, a0, a1              # ... | PAGE_DIRECTORY
 
+        /*
+         * We utilize all three wired-ways (7-9) to hold pmd translations.
+         * Memory regions are mapped to the DTLBs according to bits 28 and 29.
+         * This allows to map the three most common regions to three different
+         * DTLBs:
+         *  0,1 -> way 7        program (0040.0000) and virtual (c000.0000)
+         *  2   -> way 8        shared libaries (2000.0000)
+         *  3   -> way 0        stack (3000.0000)
+         */
+
+        extui   a3, a3, 28, 2           # addr. bit 28 and 29   0,1,2,3
         rsr     a1, PTEVADDR
+        addx2   a3, a3, a3              # ->                    0,3,6,9
         srli    a1, a1, PAGE_SHIFT
+        extui   a3, a3, 2, 2            # ->                    0,0,1,2
         slli    a1, a1, PAGE_SHIFT      # ptevaddr & PAGE_MASK
-        addi    a1, a1, DTLB_WAY_PGD    # ... + way_number
+        addi    a3, a3, DTLB_WAY_PGD
+        add     a1, a1, a3              # ... + way_number
 
-        wdtlb   a0, a1
+3:      wdtlb   a0, a1
         dsync
 
         /* Exit critical section. */
 
+4:      movi    a3, exc_table           # restore a3
         movi    a0, 0
         s32i    a0, a3, EXC_TABLE_FIXUP
 
@@ -1636,8 +1652,76 @@ ENTRY(fast_second_level_miss)
 9:      l32i    a0, a1, TASK_ACTIVE_MM  # unlikely case mm == 0
         j       8b
 
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
+
+2:      /* Special case for cache aliasing.
+         * We (should) only get here if a clear_user_page, copy_user_page
+         * or the aliased cache flush functions got preemptively interrupted 
+         * by another task. Re-establish temporary mapping to the 
+         * TLBTEMP_BASE areas.
+         */
+
+        /* We shouldn't be in a double exception */
+
+        l32i    a0, a2, PT_DEPC
+        bgeui   a0, VALID_DOUBLE_EXCEPTION_ADDRESS, 2f
+
+        /* Make sure the exception originated in the special functions */
+
+        movi    a0, __tlbtemp_mapping_start
+        rsr     a3, EPC_1
+        bltu    a3, a0, 2f
+        movi    a0, __tlbtemp_mapping_end
+        bgeu    a3, a0, 2f
+
+        /* Check if excvaddr was in one of the TLBTEMP_BASE areas. */
+
+        movi    a3, TLBTEMP_BASE_1
+        rsr     a0, EXCVADDR
+        bltu    a0, a3, 2f
+
+        addi    a1, a0, -(2 << (DCACHE_ALIAS_ORDER + PAGE_SHIFT))
+        bgeu    a1, a3, 2f
+
+        /* Check if we have to restore an ITLB mapping. */
+
+        movi    a1, __tlbtemp_mapping_itlb
+        rsr     a3, EPC_1
+        sub     a3, a3, a1
+
+        /* Calculate VPN */
+
+        movi    a1, PAGE_MASK
+        and     a1, a1, a0
+
+        /* Jump for ITLB entry */
+
+        bgez    a3, 1f
+
+        /* We can use up to two TLBTEMP areas, one for src and one for dst. */
+
+        extui   a3, a0, PAGE_SHIFT + DCACHE_ALIAS_ORDER, 1
+        add     a1, a3, a1
+
+        /* PPN is in a6 for the first TLBTEMP area and in a7 for the second. */
+
+        mov     a0, a6
+        movnez  a0, a7, a3
+        j       3b
+
+        /* ITLB entry. We only use dst in a6. */
+
+1:      witlb   a6, a1
+        isync
+        j       4b
+
+
+#endif  // DCACHE_WAY_SIZE > PAGE_SIZE
+
+
 2:      /* Invalid PGD, default exception handling */
 
+        movi    a3, exc_table
         rsr     a1, DEPC
         xsr     a3, EXCSAVE_1
         s32i    a1, a2, PT_AREG2
@@ -1682,15 +1766,15 @@ ENTRY(fast_store_prohibited)
 8:      rsr     a1, EXCVADDR            # fault address
         _PGD_OFFSET(a0, a1, a4)
         l32i    a0, a0, 0
-        //beqi  a0, _PAGE_USER, 2f      # FIXME use _PAGE_INVALID
         beqz    a0, 2f
 
+        /* Note that we assume _PAGE_WRITABLE_BIT is only set if pte is valid.*/
+
         _PTE_OFFSET(a0, a1, a4)
         l32i    a4, a0, 0               # read pteval
-        movi    a1, _PAGE_VALID | _PAGE_RW
-        bnall   a4, a1, 2f
+        bbci.l  a4, _PAGE_WRITABLE_BIT, 2f
 
-        movi    a1, _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_WRENABLE
+        movi    a1, _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_HW_WRITE
         or      a4, a4, a1
         rsr     a1, EXCVADDR
         s32i    a4, a0, 0
@@ -1700,10 +1784,7 @@ ENTRY(fast_store_prohibited)
         dhwb    a0, 0
 #endif
         pdtlb   a0, a1
-        beqz    a0, 1f
-        idtlb   a0              // FIXME do we need this?
         wdtlb   a4, a0
-1:
 
         /* Exit critical section. */
 
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c
new file mode 100644
index 0000000000..021b4f46ff
--- /dev/null
+++ b/arch/xtensa/kernel/init_task.c
@@ -0,0 +1,38 @@
+/*
+ * arch/xtensa/kernel/init_task.c
+ *
+ * Xtensa Processor version.
+ *
+ * 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) 2007 Tensilica Inc.
+ *
+ * Chris Zankel <chris@zankel.net>
+ */
+
+#include <linux/mm.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/init_task.h>
+#include <linux/module.h>
+#include <linux/mqueue.h>
+
+#include <asm/uaccess.h>
+
+static struct fs_struct init_fs = INIT_FS;
+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);
+struct mm_struct init_mm = INIT_MM(init_mm);
+
+EXPORT_SYMBOL(init_mm);
+
+union thread_union init_thread_union
+        __attribute__((__section__(".data.init_task"))) =
+{ INIT_THREAD_INFO(init_task) };
+
+struct task_struct init_task = INIT_TASK(init_task);
+
+EXPORT_SYMBOL(init_task);
diff --git a/arch/xtensa/kernel/io.c b/arch/xtensa/kernel/io.c
new file mode 100644
index 0000000000..5b65269b1d
--- /dev/null
+++ b/arch/xtensa/kernel/io.c
@@ -0,0 +1,75 @@
+/*
+ * arch/xtensa/io.c
+ *
+ * IO primitives
+ *
+ * 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.
+ *
+ * Copied from sparc.
+ *
+ * Chris Zankel <chris@zankel.net>
+ *
+ */
+
+#include <asm/io.h>
+#include <asm/byteorder.h>
+
+void outsb(unsigned long addr, const void *src, unsigned long count) {
+        while (count) {
+                count -= 1;
+                writeb(*(const char *)src, addr);
+                src += 1;
+                addr += 1;
+        }
+}
+
+void outsw(unsigned long addr, const void *src, unsigned long count) {
+        while (count) {
+                count -= 2;
+                writew(*(const short *)src, addr);
+                src += 2;
+                addr += 2;
+        }
+}
+
+void outsl(unsigned long addr, const void *src, unsigned long count) {
+        while (count) {
+                count -= 4;
+                writel(*(const long *)src, addr);
+                src += 4;
+                addr += 4;
+        }
+}
+
+void insb(unsigned long addr, void *dst, unsigned long count) {
+        while (count) {
+                count -= 1;
+                *(unsigned char *)dst = readb(addr);
+                dst += 1;
+                addr += 1;
+        }
+}
+
+void insw(unsigned long addr, void *dst, unsigned long count) {
+        while (count) {
+                count -= 2;
+                *(unsigned short *)dst = readw(addr);
+                dst += 2;
+                addr += 2;
+        }
+}
+
+void insl(unsigned long addr, void *dst, unsigned long count) {
+        while (count) {
+                count -= 4;
+                /*
+                 * XXX I am sure we are in for an unaligned trap here.
+                 */
+                *(unsigned long *)dst = readl(addr);
+                dst += 4;
+                addr += 4;
+        }
+}
diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c
index 2ea1755a08..ddf14dcf2a 100644
--- a/arch/xtensa/kernel/module.c
+++ b/arch/xtensa/kernel/module.c
@@ -7,7 +7,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2006 Tensilica Inc.
  *
  * Chris Zankel <chris@zankel.net>
  *
@@ -22,57 +22,216 @@
 #include <linux/kernel.h>
 #include <linux/cache.h>
 
-LIST_HEAD(module_buf_list);
+#undef DEBUG_RELOCATE
 
 void *module_alloc(unsigned long size)
 {
-  panic("module_alloc not implemented");
+        if (size == 0)
+                return NULL;
+        return vmalloc(size);
 }
 
 void module_free(struct module *mod, void *module_region)
 {
-  panic("module_free not implemented");
+        vfree(module_region);
+        /* FIXME: If module_region == mod->init_region, trim exception
+           table entries. */
 }
 
 int module_frob_arch_sections(Elf32_Ehdr *hdr,
                               Elf32_Shdr *sechdrs,
                               char *secstrings,
-                              struct module *me)
+                              struct module *mod)
 {
-  panic("module_frob_arch_sections not implemented");
+        return 0;
+}
+
+static int
+decode_calln_opcode (unsigned char *location)
+{
+#ifdef __XTENSA_EB__
+        return (location[0] & 0xf0) == 0x50;
+#endif
+#ifdef __XTENSA_EL__
+        return (location[0] & 0xf) == 0x5;
+#endif
+}
+
+static int
+decode_l32r_opcode (unsigned char *location)
+{
+#ifdef __XTENSA_EB__
+        return (location[0] & 0xf0) == 0x10;
+#endif
+#ifdef __XTENSA_EL__
+        return (location[0] & 0xf) == 0x1;
+#endif
 }
 
 int apply_relocate(Elf32_Shdr *sechdrs,
                    const char *strtab,
                    unsigned int symindex,
                    unsigned int relsec,
-                   struct module *module)
+                   struct module *mod)
 {
-  panic ("apply_relocate not implemented");
+        printk(KERN_ERR "module %s: REL RELOCATION unsupported\n",
+               mod->name);
+        return -ENOEXEC;
+
 }
 
 int apply_relocate_add(Elf32_Shdr *sechdrs,
                        const char *strtab,
                        unsigned int symindex,
                        unsigned int relsec,
-                       struct module *module)
+                       struct module *mod)
 {
-  panic("apply_relocate_add not implemented");
+        unsigned int i;
+        Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr;
+        Elf32_Sym *sym;
+        unsigned char *location;
+        uint32_t value;
+
+#ifdef DEBUG_RELOCATE
+        printk("Applying relocate section %u to %u\n", relsec,
+               sechdrs[relsec].sh_info);
+#endif
+        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {
+                location = (char *)sechdrs[sechdrs[relsec].sh_info].sh_addr
+                        + rela[i].r_offset;
+                sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
+                        + ELF32_R_SYM(rela[i].r_info);
+                value = sym->st_value + rela[i].r_addend;
+
+                switch (ELF32_R_TYPE(rela[i].r_info)) {
+                case R_XTENSA_NONE:
+                case R_XTENSA_DIFF8:
+                case R_XTENSA_DIFF16:
+                case R_XTENSA_DIFF32:
+                case R_XTENSA_ASM_EXPAND:
+                        break;
+
+                case R_XTENSA_32:
+                case R_XTENSA_PLT:
+                        *(uint32_t *)location += value;
+                        break;
+
+                case R_XTENSA_SLOT0_OP:
+                        if (decode_calln_opcode(location)) {
+                                value -= ((unsigned long)location & -4) + 4;
+                                if ((value & 3) != 0 ||
+                                    ((value + (1 << 19)) >> 20) != 0) {
+                                        printk("%s: relocation out of range, "
+                                               "section %d reloc %d "
+                                               "sym '%s'\n",
+                                               mod->name, relsec, i,
+                                               strtab + sym->st_name);
+                                        return -ENOEXEC;
+                                }
+                                value = (signed int)value >> 2;
+#ifdef __XTENSA_EB__
+                                location[0] = ((location[0] & ~0x3) |
+                                            ((value >> 16) & 0x3));
+                                location[1] = (value >> 8) & 0xff;
+                                location[2] = value & 0xff;
+#endif
+#ifdef __XTENSA_EL__
+                                location[0] = ((location[0] & ~0xc0) |
+                                            ((value << 6) & 0xc0));
+                                location[1] = (value >> 2) & 0xff;
+                                location[2] = (value >> 10) & 0xff;
+#endif
+                        } else if (decode_l32r_opcode(location)) {
+                                value -= (((unsigned long)location + 3) & -4);
+                                if ((value & 3) != 0 ||
+                                    (signed int)value >> 18 != -1) {
+                                        printk("%s: relocation out of range, "
+                                               "section %d reloc %d "
+                                               "sym '%s'\n",
+                                               mod->name, relsec, i,
+                                               strtab + sym->st_name);
+                                        return -ENOEXEC;
+                                }
+                                value = (signed int)value >> 2;
+
+#ifdef __XTENSA_EB__
+                                location[1] = (value >> 8) & 0xff;
+                                location[2] = value & 0xff;
+#endif
+#ifdef __XTENSA_EL__
+                                location[1] = value & 0xff;
+                                location[2] = (value >> 8) & 0xff;
+#endif
+                        }
+                        /* FIXME: Ignore any other opcodes.  The Xtensa
+                           assembler currently assumes that the linker will
+                           always do relaxation and so all PC-relative
+                           operands need relocations.  (The assembler also
+                           writes out the tentative PC-relative values,
+                           assuming no link-time relaxation, so it is usually
+                           safe to ignore the relocations.)  If the
+                           assembler's "--no-link-relax" flag can be made to
+                           work, and if all kernel modules can be assembled
+                           with that flag, then unexpected relocations could
+                           be detected here.  */
+                        break;
+
+                case R_XTENSA_SLOT1_OP:
+                case R_XTENSA_SLOT2_OP:
+                case R_XTENSA_SLOT3_OP:
+                case R_XTENSA_SLOT4_OP:
+                case R_XTENSA_SLOT5_OP:
+                case R_XTENSA_SLOT6_OP:
+                case R_XTENSA_SLOT7_OP:
+                case R_XTENSA_SLOT8_OP:
+                case R_XTENSA_SLOT9_OP:
+                case R_XTENSA_SLOT10_OP:
+                case R_XTENSA_SLOT11_OP:
+                case R_XTENSA_SLOT12_OP:
+                case R_XTENSA_SLOT13_OP:
+                case R_XTENSA_SLOT14_OP:
+                        printk("%s: unexpected FLIX relocation: %u\n",
+                               mod->name,
+                               ELF32_R_TYPE(rela[i].r_info));
+                        return -ENOEXEC;
+
+                case R_XTENSA_SLOT0_ALT:
+                case R_XTENSA_SLOT1_ALT:
+                case R_XTENSA_SLOT2_ALT:
+                case R_XTENSA_SLOT3_ALT:
+                case R_XTENSA_SLOT4_ALT:
+                case R_XTENSA_SLOT5_ALT:
+                case R_XTENSA_SLOT6_ALT:
+                case R_XTENSA_SLOT7_ALT:
+                case R_XTENSA_SLOT8_ALT:
+                case R_XTENSA_SLOT9_ALT:
+                case R_XTENSA_SLOT10_ALT:
+                case R_XTENSA_SLOT11_ALT:
+                case R_XTENSA_SLOT12_ALT:
+                case R_XTENSA_SLOT13_ALT:
+                case R_XTENSA_SLOT14_ALT:
+                        printk("%s: unexpected ALT relocation: %u\n",
+                               mod->name,
+                               ELF32_R_TYPE(rela[i].r_info));
+                        return -ENOEXEC;
+
+                default:
+                        printk("%s: unexpected relocation: %u\n",
+                               mod->name,
+                               ELF32_R_TYPE(rela[i].r_info));
+                        return -ENOEXEC;
+                }
+        }
+        return 0;
 }
 
 int module_finalize(const Elf_Ehdr *hdr,
                     const Elf_Shdr *sechdrs,
-                    struct module *me)
+                    struct module *mod)
 {
-  panic ("module_finalize not implemented");
+        return 0;
 }
 
 void module_arch_cleanup(struct module *mod)
 {
-  panic("module_arch_cleanup not implemented");
-}
-
-struct bug_entry *module_find_bug(unsigned long bugaddr)
-{
-  panic("module_find_bug not implemented");
 }
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 77deae5290..b7c073484e 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -394,72 +394,3 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
         return ret;
 }
-
-/*
- * This probably belongs here rather than ioport.c because
- * we do not want this crud linked into SBus kernels.
- * Also, think for a moment about likes of floppy.c that
- * include architecture specific parts. They may want to redefine ins/outs.
- *
- * We do not use horrible macros here because we want to
- * advance pointer by sizeof(size).
- */
-void outsb(unsigned long addr, const void *src, unsigned long count) {
-        while (count) {
-                count -= 1;
-                writeb(*(const char *)src, addr);
-                src += 1;
-                addr += 1;
-        }
-}
-
-void outsw(unsigned long addr, const void *src, unsigned long count) {
-        while (count) {
-                count -= 2;
-                writew(*(const short *)src, addr);
-                src += 2;
-                addr += 2;
-        }
-}
-
-void outsl(unsigned long addr, const void *src, unsigned long count) {
-        while (count) {
-                count -= 4;
-                writel(*(const long *)src, addr);
-                src += 4;
-                addr += 4;
-        }
-}
-
-void insb(unsigned long addr, void *dst, unsigned long count) {
-        while (count) {
-                count -= 1;
-                *(unsigned char *)dst = readb(addr);
-                dst += 1;
-                addr += 1;
-        }
-}
-
-void insw(unsigned long addr, void *dst, unsigned long count) {
-        while (count) {
-                count -= 2;
-                *(unsigned short *)dst = readw(addr);
-                dst += 2;
-                addr += 2;
-        }
-}
-
-void insl(unsigned long addr, void *dst, unsigned long count) {
-        while (count) {
-                count -= 4;
-                /*
-                 * XXX I am sure we are in for an unaligned trap here.
-                 */
-                *(unsigned long *)dst = readl(addr);
-                dst += 4;
-                addr += 4;
-        }
-}
-
-
-
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index ce758bab95..f53d7bd9df 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -30,6 +30,7 @@
 #include <linux/init_task.h>
 #include <linux/module.h>
 #include <linux/mqueue.h>
+#include <linux/fs.h>
 
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
@@ -45,20 +46,6 @@
 
 extern void ret_from_fork(void);
 
-static struct fs_struct init_fs = INIT_FS;
-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);
-struct mm_struct init_mm = INIT_MM(init_mm);
-EXPORT_SYMBOL(init_mm);
-
-union thread_union init_thread_union
-        __attribute__((__section__(".data.init_task"))) =
-{ INIT_THREAD_INFO(init_task) };
-
-struct task_struct init_task = INIT_TASK(init_task);
-EXPORT_SYMBOL(init_task);
-
 struct task_struct *current_set[NR_CPUS] = {&init_task, };
 
 void (*pm_power_off)(void) = NULL;
diff --git a/arch/xtensa/kernel/semaphore.c b/arch/xtensa/kernel/semaphore.c
index d40f4b1b75..995c6410ae 100644
--- a/arch/xtensa/kernel/semaphore.c
+++ b/arch/xtensa/kernel/semaphore.c
@@ -100,7 +100,7 @@ static __inline__ int waking_non_zero_trylock(struct semaphore *sem)
         return ret;
 }
 
-spinlock_t semaphore_wake_lock;
+DEFINE_SPINLOCK(semaphore_wake_lock);
 
 /*
  * Semaphores are implemented using a two-way counter:
diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index fe3834bc1d..f3e16efcd4 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -93,3 +93,8 @@ asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg)
         return (long)ret;
 }
 
+asmlinkage long xtensa_fadvise64_64(int fd, int advice, unsigned long long offset, unsigned long long len)
+{
+        return sys_fadvise64_64(fd, offset, len, advice);
+}
+
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 22949be4a5..60d29fe0b1 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -32,12 +32,20 @@ EXPORT_SYMBOL(rtc_lock);
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 unsigned long ccount_per_jiffy;         /* per 1/HZ */
-unsigned long ccount_nsec;              /* nsec per ccount increment */
+unsigned long nsec_per_ccount;          /* nsec per ccount increment */
 #endif
 
-unsigned int last_ccount_stamp;
 static long last_rtc_update = 0;
 
+/*
+ * Scheduler clock - returns current tim in nanosec units.
+ */
+
+unsigned long long sched_clock(void)
+{
+        return (unsigned long long)jiffies * (1000000000 / HZ);
+}
+
 static irqreturn_t timer_interrupt(int irq, void *dev_id);
 static struct irqaction timer_irqaction = {
         .handler =      timer_interrupt,
@@ -69,7 +77,6 @@ void __init time_init(void)
 
         xtime.tv_nsec = 0;
         last_rtc_update = xtime.tv_sec = sec_n;
-        last_ccount_stamp = get_ccount();
 
         set_normalized_timespec(&wall_to_monotonic,
                 -xtime.tv_sec, -xtime.tv_nsec);
@@ -85,7 +92,7 @@ int do_settimeofday(struct timespec *tv)
 {
         time_t wtm_sec, sec = tv->tv_sec;
         long wtm_nsec, nsec = tv->tv_nsec;
-        unsigned long ccount;
+        unsigned long delta;
 
         if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
                 return -EINVAL;
@@ -97,8 +104,10 @@ int do_settimeofday(struct timespec *tv)
          * wall time.  Discover what correction gettimeofday() would have
          * made, and then undo it!
          */
-        ccount = get_ccount();
-        nsec -= (ccount - last_ccount_stamp) * CCOUNT_NSEC;
+
+        delta = CCOUNT_PER_JIFFY;
+        delta += get_ccount() - get_linux_timer();
+        nsec -= delta * NSEC_PER_CCOUNT;
 
         wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
         wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
@@ -117,17 +126,21 @@ EXPORT_SYMBOL(do_settimeofday);
 void do_gettimeofday(struct timeval *tv)
 {
         unsigned long flags;
-        unsigned long sec, usec, delta, seq;
+        unsigned long volatile sec, usec, delta, seq;
 
         do {
                 seq = read_seqbegin_irqsave(&xtime_lock, flags);
 
-                delta = get_ccount() - last_ccount_stamp;
                 sec = xtime.tv_sec;
                 usec = (xtime.tv_nsec / NSEC_PER_USEC);
+
+                delta = get_linux_timer() - get_ccount();
+
         } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
 
-        usec += (delta * CCOUNT_NSEC) / NSEC_PER_USEC;
+        usec += (((unsigned long) CCOUNT_PER_JIFFY - delta)
+                 * (unsigned long) NSEC_PER_CCOUNT) / NSEC_PER_USEC;
+
         for (; usec >= 1000000; sec++, usec -= 1000000)
                 ;
 
@@ -158,9 +171,12 @@ again:
 
                 write_seqlock(&xtime_lock);
 
-                last_ccount_stamp = next;
+                do_timer(1); /* Linux handler in kernel/timer.c */
+
+                /* Note that writing CCOMPARE clears the interrupt. */
+
                 next += CCOUNT_PER_JIFFY;
-                do_timer (1); /* Linux handler in kernel/timer.c */
+                set_linux_timer(next);
 
                 if (ntp_synced() &&
                     xtime.tv_sec - last_rtc_update >= 659 &&
@@ -175,19 +191,15 @@ again:
                 write_sequnlock(&xtime_lock);
         }
 
-        /* NOTE: writing CCOMPAREn clears the interrupt.  */
+        /* Allow platform to do something useful (Wdog). */
 
-        set_linux_timer (next);
+        platform_heartbeat();
 
         /* Make sure we didn't miss any tick... */
 
         if ((signed long)(get_ccount() - next) > 0)
                 goto again;
 
-        /* Allow platform to do something useful (Wdog). */
-
-        platform_heartbeat();
-
         return IRQ_HANDLED;
 }
 
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index c5e62f9d9f..8be99c777d 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -83,7 +83,7 @@ typedef struct {
         void* handler;
 } dispatch_init_table_t;
 
-dispatch_init_table_t __init dispatch_init_table[] = {
+static dispatch_init_table_t __initdata dispatch_init_table[] = {
 
 { EXCCAUSE_ILLEGAL_INSTRUCTION, 0,         do_illegal_instruction},
 { EXCCAUSE_SYSTEM_CALL,         KRNL,      fast_syscall_kernel },
@@ -305,7 +305,7 @@ do_debug(struct pt_regs *regs)
 
 #define set_handler(idx,handler) (exc_table[idx] = (unsigned long) (handler))
 
-void trap_init(void)
+void __init trap_init(void)
 {
         int i;
 
diff --git a/arch/xtensa/mm/Makefile b/arch/xtensa/mm/Makefile
index a5aed5932d..10aec22a8f 100644
--- a/arch/xtensa/mm/Makefile
+++ b/arch/xtensa/mm/Makefile
@@ -5,9 +5,5 @@
 # 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 definition is now in the main makefile...
 
-obj-y    := init.o fault.o tlb.o misc.o
-obj-m    :=
-obj-n    :=
-obj-     :=
+obj-y    := init.o fault.o tlb.o misc.o cache.o
diff --git a/arch/xtensa/mm/cache.c b/arch/xtensa/mm/cache.c
new file mode 100644
index 0000000000..9a1fa9478a
--- /dev/null
+++ b/arch/xtensa/mm/cache.c
@@ -0,0 +1,256 @@
+/*
+ * arch/xtensa/mm/cache.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) 2001-2006 Tensilica Inc.
+ *
+ * Chris Zankel <chris@zankel.net>
+ * Joe Taylor
+ * Marc Gauthier
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/ptrace.h>
+#include <linux/bootmem.h>
+#include <linux/swap.h>
+#include <linux/pagemap.h>
+
+#include <asm/pgtable.h>
+#include <asm/bootparam.h>
+#include <asm/mmu_context.h>
+#include <asm/tlb.h>
+#include <asm/tlbflush.h>
+#include <asm/page.h>
+#include <asm/pgalloc.h>
+#include <asm/pgtable.h>
+
+//#define printd(x...) printk(x)
+#define printd(x...) do { } while(0)
+
+/* 
+ * Note:
+ * The kernel provides one architecture bit PG_arch_1 in the page flags that 
+ * can be used for cache coherency.
+ *
+ * I$-D$ coherency.
+ *
+ * The Xtensa architecture doesn't keep the instruction cache coherent with
+ * the data cache. We use the architecture bit to indicate if the caches
+ * are coherent. The kernel clears this bit whenever a page is added to the
+ * page cache. At that time, the caches might not be in sync. We, therefore,
+ * define this flag as 'clean' if set.
+ *
+ * D-cache aliasing.
+ *
+ * With cache aliasing, we have to always flush the cache when pages are
+ * unmapped (see tlb_start_vma(). So, we use this flag to indicate a dirty
+ * page.
+ * 
+ *
+ *
+ */
+
+#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
+
+/*
+ * Any time the kernel writes to a user page cache page, or it is about to
+ * read from a page cache page this routine is called.
+ *
+ */
+
+void flush_dcache_page(struct page *page)
+{
+        struct address_space *mapping = page_mapping(page);
+
+        /*
+         * If we have a mapping but the page is not mapped to user-space
+         * yet, we simply mark this page dirty and defer flushing the 
+         * caches until update_mmu().
+         */
+
+        if (mapping && !mapping_mapped(mapping)) {
+                if (!test_bit(PG_arch_1, &page->flags))
+                        set_bit(PG_arch_1, &page->flags);
+                return;
+
+        } else {
+
+                unsigned long phys = page_to_phys(page);
+                unsigned long temp = page->index << PAGE_SHIFT;
+                unsigned long alias = !(DCACHE_ALIAS_EQ(temp, phys));
+                unsigned long virt;
+
+                /* 
+                 * Flush the page in kernel space and user space.
+                 * Note that we can omit that step if aliasing is not
+                 * an issue, but we do have to synchronize I$ and D$
+                 * if we have a mapping.
+                 */
+
+                if (!alias && !mapping)
+                        return;
+
+                __flush_invalidate_dcache_page((long)page_address(page));
+
+                virt = TLBTEMP_BASE_1 + (temp & DCACHE_ALIAS_MASK);
+
+                if (alias)
+                        __flush_invalidate_dcache_page_alias(virt, phys);
+
+                if (mapping)
+                        __invalidate_icache_page_alias(virt, phys);
+        }
+
+        /* There shouldn't be an entry in the cache for this page anymore. */
+}
+
+
+/*
+ * For now, flush the whole cache. FIXME??
+ */
+
+void flush_cache_range(struct vm_area_struct* vma, 
+                       unsigned long start, unsigned long end)
+{
+        __flush_invalidate_dcache_all();
+        __invalidate_icache_all();
+}
+
+/* 
+ * Remove any entry in the cache for this page. 
+ *
+ * Note that this function is only called for user pages, so use the
+ * alias versions of the cache flush functions.
+ */
+
+void flush_cache_page(struct vm_area_struct* vma, unsigned long address,
+                      unsigned long pfn)
+{
+        /* Note that we have to use the 'alias' address to avoid multi-hit */
+
+        unsigned long phys = page_to_phys(pfn_to_page(pfn));
+        unsigned long virt = TLBTEMP_BASE_1 + (address & DCACHE_ALIAS_MASK);
+
+        __flush_invalidate_dcache_page_alias(virt, phys);
+        __invalidate_icache_page_alias(virt, phys);
+}
+
+#endif
+
+void
+update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t pte)
+{
+        unsigned long pfn = pte_pfn(pte);
+        struct page *page;
+
+        if (!pfn_valid(pfn))
+                return;
+
+        page = pfn_to_page(pfn);
+
+        /* Invalidate old entry in TLBs */
+
+        invalidate_itlb_mapping(addr);
+        invalidate_dtlb_mapping(addr);
+
+#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
+
+        if (!PageReserved(page) && test_bit(PG_arch_1, &page->flags)) {
+
+                unsigned long vaddr = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK);
+                unsigned long paddr = (unsigned long) page_address(page);
+                unsigned long phys = page_to_phys(page);
+
+                __flush_invalidate_dcache_page(paddr);
+
+                __flush_invalidate_dcache_page_alias(vaddr, phys);
+                __invalidate_icache_page_alias(vaddr, phys);
+
+                clear_bit(PG_arch_1, &page->flags);
+        }
+#else
+        if (!PageReserved(page) && !test_bit(PG_arch_1, &page->flags)
+            && (vma->vm_flags & VM_EXEC) != 0) {
+                unsigned long vaddr = addr & PAGE_MASK;
+                __flush_dcache_page(vaddr);
+                __invalidate_icache_page(vaddr);
+                set_bit(PG_arch_1, &page->flags);
+        }
+#endif
+}
+
+/*
+ * access_process_vm() has called get_user_pages(), which has done a
+ * flush_dcache_page() on the page.
+ */
+
+#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
+
+void copy_to_user_page(struct vm_area_struct *vma, struct page *page, 
+                unsigned long vaddr, void *dst, const void *src,
+                unsigned long len)
+{
+        unsigned long phys = page_to_phys(page);
+        unsigned long alias = !(DCACHE_ALIAS_EQ(vaddr, phys));
+
+        /* Flush and invalidate user page if aliased. */
+
+        if (alias) {
+                unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
+                __flush_invalidate_dcache_page_alias(temp, phys);
+        }
+
+        /* Copy data */
+        
+        memcpy(dst, src, len);
+
+        /*
+         * Flush and invalidate kernel page if aliased and synchronize 
+         * data and instruction caches for executable pages. 
+         */
+
+        if (alias) {
+                unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
+
+                __flush_invalidate_dcache_range((unsigned long) dst, len);
+                if ((vma->vm_flags & VM_EXEC) != 0) {
+                        __invalidate_icache_page_alias(temp, phys);
+                }
+
+        } else if ((vma->vm_flags & VM_EXEC) != 0) {
+                __flush_dcache_range((unsigned long)dst,len);
+                __invalidate_icache_range((unsigned long) dst, len);
+        }
+}
+
+extern void copy_from_user_page(struct vm_area_struct *vma, struct page *page,
+                unsigned long vaddr, void *dst, const void *src,
+                unsigned long len)
+{
+        unsigned long phys = page_to_phys(page);
+        unsigned long alias = !(DCACHE_ALIAS_EQ(vaddr, phys));
+
+        /*
+         * Flush user page if aliased. 
+         * (Note: a simply flush would be sufficient) 
+         */
+
+        if (alias) {
+                unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
+                __flush_invalidate_dcache_page_alias(temp, phys);
+        }
+
+        memcpy(dst, src, len);
+}
+
+#endif
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 16004067ad..45d28f217c 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -24,6 +24,8 @@
 unsigned long asid_cache = ASID_USER_FIRST;
 void bad_page_fault(struct pt_regs*, unsigned long, int);
 
+#undef DEBUG_PAGE_FAULT
+
 /*
  * This routine handles page faults.  It determines the address,
  * and the problem, and then passes it off to one of the appropriate
@@ -64,7 +66,7 @@ void do_page_fault(struct pt_regs *regs)
                     exccause == EXCCAUSE_ITLB_MISS ||
                     exccause == EXCCAUSE_FETCH_CACHE_ATTRIBUTE) ? 1 : 0;
 
-#if 0
+#ifdef DEBUG_PAGE_FAULT
         printk("[%s:%d:%08x:%d:%08x:%s%s]\n", current->comm, current->pid,
                address, exccause, regs->pc, is_write? "w":"", is_exec? "x":"");
 #endif
@@ -219,7 +221,7 @@ bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
 
         /* Are we prepared to handle this kernel fault?  */
         if ((entry = search_exception_tables(regs->pc)) != NULL) {
-#if 1
+#ifdef DEBUG_PAGE_FAULT
                 printk(KERN_DEBUG "%s: Exception at pc=%#010lx (%lx)\n",
                                 current->comm, regs->pc, entry->fixup);
 #endif
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 8415c76f11..b3086f34a8 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -15,40 +15,24 @@
  * Kevin Chea
  */
 
-#include <linux/init.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/ptrace.h>
 #include <linux/bootmem.h>
 #include <linux/swap.h>
+#include <linux/mman.h>
+#include <linux/nodemask.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
 
 #include <asm/pgtable.h>
 #include <asm/bootparam.h>
 #include <asm/mmu_context.h>
 #include <asm/tlb.h>
-#include <asm/tlbflush.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-
 
-#define DEBUG 0
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-//static DEFINE_SPINLOCK(tlb_lock);
-
-/*
- * This flag is used to indicate that the page was mapped and modified in
- * kernel space, so the cache is probably dirty at that address.
- * If cache aliasing is enabled and the page color mismatches, update_mmu_cache
- * synchronizes the caches if this bit is set.
- */
-
-#define PG_cache_clean PG_arch_1
 
 /* References to section boundaries */
 
@@ -323,228 +307,22 @@ void show_mem(void)
         printk("%d free pages\n", free);
 }
 
-/* ------------------------------------------------------------------------- */
-
-#if (DCACHE_WAY_SIZE > PAGE_SIZE)
-
-/*
- * With cache aliasing, the page color of the page in kernel space and user
- * space might mismatch. We temporarily map the page to a different virtual
- * address with the same color and clear the page there.
- */
-
-void clear_user_page(void *kaddr, unsigned long vaddr, struct page* page)
-{
-
-        /*  There shouldn't be any entries for this page. */
-
-        __flush_invalidate_dcache_page_phys(__pa(page_address(page)));
-
-        if (!PAGE_COLOR_EQ(vaddr, kaddr)) {
-                unsigned long v, p;
-
-                /* Temporarily map page to DTLB_WAY_DCACHE_ALIAS0. */
-
-                spin_lock(&tlb_lock);
-
-                p = (unsigned long)pte_val((mk_pte(page,PAGE_KERNEL)));
-                kaddr = (void*)PAGE_COLOR_MAP0(vaddr);
-                v = (unsigned long)kaddr | DTLB_WAY_DCACHE_ALIAS0;
-                __asm__ __volatile__("wdtlb %0,%1; dsync" : :"a" (p), "a" (v));
-
-                clear_page(kaddr);
-
-                spin_unlock(&tlb_lock);
-        } else {
-                clear_page(kaddr);
-        }
-
-        /* We need to make sure that i$ and d$ are coherent. */
-
-        clear_bit(PG_cache_clean, &page->flags);
-}
-
-/*
- * With cache aliasing, we have to make sure that the page color of the page
- * in kernel space matches that of the virtual user address before we read
- * the page. If the page color differ, we create a temporary DTLB entry with
- * the corrent page color and use this 'temporary' address as the source.
- * We then use the same approach as in clear_user_page and copy the data
- * to the kernel space and clear the PG_cache_clean bit to synchronize caches
- * later.
- *
- * Note:
- * Instead of using another 'way' for the temporary DTLB entry, we could
- * probably use the same entry that points to the kernel address (after
- * saving the original value and restoring it when we are done).
- */
+struct kmem_cache *pgtable_cache __read_mostly;
 
-void copy_user_page(void* to, void* from, unsigned long vaddr,
-                    struct page* to_page)
+static void pgd_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
 {
-        /* There shouldn't be any entries for the new page. */
-
-        __flush_invalidate_dcache_page_phys(__pa(page_address(to_page)));
-
-        spin_lock(&tlb_lock);
-
-        if (!PAGE_COLOR_EQ(vaddr, from)) {
-                unsigned long v, p, t;
-
-                __asm__ __volatile__ ("pdtlb %1,%2; rdtlb1 %0,%1"
-                                      : "=a"(p), "=a"(t) : "a"(from));
-                from = (void*)PAGE_COLOR_MAP0(vaddr);
-                v = (unsigned long)from | DTLB_WAY_DCACHE_ALIAS0;
-                __asm__ __volatile__ ("wdtlb %0,%1; dsync" ::"a" (p), "a" (v));
-        }
-
-        if (!PAGE_COLOR_EQ(vaddr, to)) {
-                unsigned long v, p;
-
-                p = (unsigned long)pte_val((mk_pte(to_page,PAGE_KERNEL)));
-                to = (void*)PAGE_COLOR_MAP1(vaddr);
-                v = (unsigned long)to | DTLB_WAY_DCACHE_ALIAS1;
-                __asm__ __volatile__ ("wdtlb %0,%1; dsync" ::"a" (p), "a" (v));
-        }
-        copy_page(to, from);
-
-        spin_unlock(&tlb_lock);
-
-        /* We need to make sure that i$ and d$ are coherent. */
-
-        clear_bit(PG_cache_clean, &to_page->flags);
-}
-
-
-
-/*
- * Any time the kernel writes to a user page cache page, or it is about to
- * read from a page cache page this routine is called.
- *
- * Note:
- * The kernel currently only provides one architecture bit in the page
- * flags that we use for I$/D$ coherency. Maybe, in future, we can
- * use a sepearte bit for deferred dcache aliasing:
- * If the page is not mapped yet, we only need to set a flag,
- * if mapped, we need to invalidate the page.
- */
-// FIXME: we probably need this for WB caches not only for Page Coloring..
-
-void flush_dcache_page(struct page *page)
-{
-        unsigned long addr = __pa(page_address(page));
-        struct address_space *mapping = page_mapping(page);
-
-        __flush_invalidate_dcache_page_phys(addr);
-
-        if (!test_bit(PG_cache_clean, &page->flags))
-                return;
-
-        /* If this page hasn't been mapped, yet, handle I$/D$ coherency later.*/
-#if 0
-        if (mapping && !mapping_mapped(mapping))
-                clear_bit(PG_cache_clean, &page->flags);
-        else
-#endif
-                __invalidate_icache_page_phys(addr);
-}
-
-void flush_cache_range(struct vm_area_struct* vma, unsigned long s,
-                       unsigned long e)
-{
-        __flush_invalidate_cache_all();
-}
-
-void flush_cache_page(struct vm_area_struct* vma, unsigned long address,
-                      unsigned long pfn)
-{
-        struct page *page = pfn_to_page(pfn);
-
-        /* Remove any entry for the old mapping. */
-
-        if (current->active_mm == vma->vm_mm) {
-                unsigned long addr = __pa(page_address(page));
-                __flush_invalidate_dcache_page_phys(addr);
-                if ((vma->vm_flags & VM_EXEC) != 0)
-                        __invalidate_icache_page_phys(addr);
-        } else {
-                BUG();
-        }
-}
-
-#endif  /* (DCACHE_WAY_SIZE > PAGE_SIZE) */
-
-
-pte_t* pte_alloc_one_kernel (struct mm_struct* mm, unsigned long addr)
-{
-        pte_t* pte = (pte_t*)__get_free_pages(GFP_KERNEL|__GFP_REPEAT, 0);
-        if (likely(pte)) {
-                pte_t* ptep = (pte_t*)(pte_val(*pte) + PAGE_OFFSET);
-                int i;
-                for (i = 0; i < 1024; i++, ptep++)
-                        pte_clear(mm, addr, ptep);
-        }
-        return pte;
-}
-
-struct page* pte_alloc_one(struct mm_struct *mm, unsigned long addr)
-{
-        struct page *page;
-
-        page = alloc_pages(GFP_KERNEL | __GFP_REPEAT, 0);
-
-        if (likely(page)) {
-                pte_t* ptep = kmap_atomic(page, KM_USER0);
-                int i;
+        pte_t* ptep = (pte_t*)addr;
+        int i;
 
-                for (i = 0; i < 1024; i++, ptep++)
-                        pte_clear(mm, addr, ptep);
+        for (i = 0; i < 1024; i++, ptep++)
+                pte_clear(NULL, 0, ptep);
 
-                kunmap_atomic(ptep, KM_USER0);
-        }
-        return page;
 }
 
-
-/*
- * Handle D$/I$ coherency.
- *
- * Note:
- * We only have one architecture bit for the page flags, so we cannot handle
- * cache aliasing, yet.
- */
-
-void
-update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t pte)
+void __init pgtable_cache_init(void)
 {
-        unsigned long pfn = pte_pfn(pte);
-        struct page *page;
-        unsigned long vaddr = addr & PAGE_MASK;
-
-        if (!pfn_valid(pfn))
-                return;
-
-        page = pfn_to_page(pfn);
-
-        invalidate_itlb_mapping(addr);
-        invalidate_dtlb_mapping(addr);
-
-        /* We have a new mapping. Use it. */
-
-        write_dtlb_entry(pte, dtlb_probe(addr));
-
-        /* If the processor can execute from this page, synchronize D$/I$. */
-
-        if ((vma->vm_flags & VM_EXEC) != 0) {
-
-                write_itlb_entry(pte, itlb_probe(addr));
-
-                /* Synchronize caches, if not clean. */
-
-                if (!test_and_set_bit(PG_cache_clean, &page->flags)) {
-                        __flush_dcache_page(vaddr);
-                        __invalidate_icache_page(vaddr);
-                }
-        }
+        pgtable_cache = kmem_cache_create("pgd",
+                        PAGE_SIZE, PAGE_SIZE,
+                        SLAB_HWCACHE_ALIGN,
+                        pgd_ctor);
 }
-
diff --git a/arch/xtensa/mm/misc.S b/arch/xtensa/mm/misc.S
index ae085332c6..e1f880368e 100644
--- a/arch/xtensa/mm/misc.S
+++ b/arch/xtensa/mm/misc.S
@@ -7,29 +7,33 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2007 Tensilica Inc.
  *
  * Chris Zankel <chris@zankel.net>
  */
 
-/* Note: we might want to implement some of the loops as zero-overhead-loops,
- *       where applicable and if supported by the processor.
- */
 
 #include <linux/linkage.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/asmmacro.h>
 #include <asm/cacheasm.h>
+#include <asm/tlbflush.h>
+
 
-/* clear_page (page) */
+/*
+ * clear_page and clear_user_page are the same for non-cache-aliased configs.
+ *
+ * clear_page (unsigned long page)
+ *                    a2
+ */
 
 ENTRY(clear_page)
         entry   a1, 16
-        addi    a4, a2, PAGE_SIZE
-        movi    a3, 0
 
-1:      s32i    a3, a2, 0
+        movi    a3, 0
+        __loopi a2, a7, PAGE_SIZE, 32
+        s32i    a3, a2, 0
         s32i    a3, a2, 4
         s32i    a3, a2, 8
         s32i    a3, a2, 12
@@ -37,42 +41,277 @@ ENTRY(clear_page)
         s32i    a3, a2, 20
         s32i    a3, a2, 24
         s32i    a3, a2, 28
-        addi    a2, a2, 32
-        blt     a2, a4, 1b
+        __endla a2, a7, 32
 
         retw
 
 /*
+ * copy_page and copy_user_page are the same for non-cache-aliased configs.
+ *
  * copy_page (void *to, void *from)
- *                  a2        a3
+ *               a2          a3
  */
 
 ENTRY(copy_page)
         entry   a1, 16
-        addi    a4, a2, PAGE_SIZE
-
-1:      l32i    a5, a3, 0
-        l32i    a6, a3, 4
-        l32i    a7, a3, 8
-        s32i    a5, a2, 0
-        s32i    a6, a2, 4
-        s32i    a7, a2, 8
-        l32i    a5, a3, 12
-        l32i    a6, a3, 16
-        l32i    a7, a3, 20
-        s32i    a5, a2, 12
-        s32i    a6, a2, 16
-        s32i    a7, a2, 20
-        l32i    a5, a3, 24
-        l32i    a6, a3, 28
-        s32i    a5, a2, 24
-        s32i    a6, a2, 28
-        addi    a2, a2, 32
-        addi    a3, a3, 32
-        blt     a2, a4, 1b
 
+        __loopi a2, a4, PAGE_SIZE, 32
+
+        l32i    a8, a3, 0
+        l32i    a9, a3, 4
+        s32i    a8, a2, 0
+        s32i    a9, a2, 4
+
+        l32i    a8, a3, 8
+        l32i    a9, a3, 12
+        s32i    a8, a2, 8
+        s32i    a9, a2, 12
+
+        l32i    a8, a3, 16
+        l32i    a9, a3, 20
+        s32i    a8, a2, 16
+        s32i    a9, a2, 20
+
+        l32i    a8, a3, 24
+        l32i    a9, a3, 28
+        s32i    a8, a2, 24
+        s32i    a9, a2, 28
+
+        addi    a2, a2, 32
+        addi    a3, a3, 32
+
+        __endl  a2, a4
+
+        retw
+
+/*
+ * If we have to deal with cache aliasing, we use temporary memory mappings
+ * to ensure that the source and destination pages have the same color as
+ * the virtual address. We use way 0 and 1 for temporary mappings in such cases.
+ *
+ * The temporary DTLB entries shouldn't be flushed by interrupts, but are
+ * flushed by preemptive task switches. Special code in the 
+ * fast_second_level_miss handler re-established the temporary mapping. 
+ * It requires that the PPNs for the destination and source addresses are
+ * in a6, and a7, respectively.
+ */
+
+/* TLB miss exceptions are treated special in the following region */
+
+ENTRY(__tlbtemp_mapping_start)
+
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
+
+/*
+ * clear_user_page (void *addr, unsigned long vaddr, struct page *page)
+ *                     a2              a3                 a4
+ */
+
+ENTRY(clear_user_page)
+        entry   a1, 32
+
+        /* Mark page dirty and determine alias. */
+
+        movi    a7, (1 << PG_ARCH_1)
+        l32i    a5, a4, PAGE_FLAGS
+        xor     a6, a2, a3
+        extui   a3, a3, PAGE_SHIFT, DCACHE_ALIAS_ORDER
+        extui   a6, a6, PAGE_SHIFT, DCACHE_ALIAS_ORDER
+        or      a5, a5, a7
+        slli    a3, a3, PAGE_SHIFT
+        s32i    a5, a4, PAGE_FLAGS
+
+        /* Skip setting up a temporary DTLB if not aliased. */
+
+        beqz    a6, 1f
+
+        /* Invalidate kernel page. */
+
+        mov     a10, a2
+        call8   __invalidate_dcache_page
+
+        /* Setup a temporary DTLB with the color of the VPN */
+
+        movi    a4, -PAGE_OFFSET + (PAGE_KERNEL | _PAGE_HW_WRITE)
+        movi    a5, TLBTEMP_BASE_1                      # virt
+        add     a6, a2, a4                              # ppn
+        add     a2, a5, a3                              # add 'color'
+
+        wdtlb   a6, a2
+        dsync
+
+1:      movi    a3, 0
+        __loopi a2, a7, PAGE_SIZE, 32
+        s32i    a3, a2, 0
+        s32i    a3, a2, 4
+        s32i    a3, a2, 8
+        s32i    a3, a2, 12
+        s32i    a3, a2, 16
+        s32i    a3, a2, 20
+        s32i    a3, a2, 24
+        s32i    a3, a2, 28
+        __endla a2, a7, 32
+
+        bnez    a6, 1f
+        retw
+
+        /* We need to invalidate the temporary idtlb entry, if any. */
+
+1:      addi    a2, a2, -PAGE_SIZE
+        idtlb   a2
+        dsync
+
+        retw
+
+/*
+ * copy_page_user (void *to, void *from, unsigned long vaddr, struct page *page)
+ *                    a2          a3            a4                  a5
+ */
+
+ENTRY(copy_user_page)
+
+        entry   a1, 32 
+
+        /* Mark page dirty and determine alias for destination. */
+
+        movi    a8, (1 << PG_ARCH_1)
+        l32i    a9, a5, PAGE_FLAGS
+        xor     a6, a2, a4
+        xor     a7, a3, a4
+        extui   a4, a4, PAGE_SHIFT, DCACHE_ALIAS_ORDER
+        extui   a6, a6, PAGE_SHIFT, DCACHE_ALIAS_ORDER
+        extui   a7, a7, PAGE_SHIFT, DCACHE_ALIAS_ORDER
+        or      a9, a9, a8
+        slli    a4, a4, PAGE_SHIFT
+        s32i    a9, a5, PAGE_FLAGS
+        movi    a5, -PAGE_OFFSET + (PAGE_KERNEL | _PAGE_HW_WRITE)
+
+        beqz    a6, 1f
+
+        /* Invalidate dcache */
+
+        mov     a10, a2
+        call8   __invalidate_dcache_page
+
+        /* Setup a temporary DTLB with a matching color. */
+
+        movi    a8, TLBTEMP_BASE_1                      # base
+        add     a6, a2, a5                              # ppn
+        add     a2, a8, a4                              # add 'color'
+
+        wdtlb   a6, a2
+        dsync
+
+        /* Skip setting up a temporary DTLB for destination if not aliased. */
+
+1:      beqz    a7, 1f
+
+        /* Setup a temporary DTLB with a matching color. */
+
+        movi    a8, TLBTEMP_BASE_2                      # base
+        add     a7, a3, a5                              # ppn
+        add     a3, a8, a4
+        addi    a8, a3, 1                               # way1
+
+        wdtlb   a7, a8
+        dsync
+
+1:      __loopi a2, a4, PAGE_SIZE, 32
+
+        l32i    a8, a3, 0
+        l32i    a9, a3, 4
+        s32i    a8, a2, 0
+        s32i    a9, a2, 4
+
+        l32i    a8, a3, 8
+        l32i    a9, a3, 12
+        s32i    a8, a2, 8
+        s32i    a9, a2, 12
+
+        l32i    a8, a3, 16
+        l32i    a9, a3, 20
+        s32i    a8, a2, 16
+        s32i    a9, a2, 20
+
+        l32i    a8, a3, 24
+        l32i    a9, a3, 28
+        s32i    a8, a2, 24
+        s32i    a9, a2, 28
+
+        addi    a2, a2, 32
+        addi    a3, a3, 32
+
+        __endl  a2, a4
+
+        /* We need to invalidate any temporary mapping! */
+
+        bnez    a6, 1f
+        bnez    a7, 2f
+        retw
+
+1:      addi    a2, a2, -PAGE_SIZE
+        idtlb   a2
+        dsync
+        bnez    a7, 2f
+        retw
+
+2:      addi    a3, a3, -PAGE_SIZE+1
+        idtlb   a3
+        dsync
+
+        retw
+
+#endif
+
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
+
+/*
+ * void __flush_invalidate_dcache_page_alias (addr, phys)
+ *                                             a2    a3
+ */
+
+ENTRY(__flush_invalidate_dcache_page_alias)
+        entry   sp, 16
+
+        movi    a7, 0                   # required for exception handler
+        addi    a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE)
+        mov     a4, a2
+        wdtlb   a6, a2
+        dsync
+
+        ___flush_invalidate_dcache_page a2 a3
+
+        idtlb   a4
+        dsync
+
+        retw
+
+#endif
+
+ENTRY(__tlbtemp_mapping_itlb)
+
+#if (ICACHE_WAY_SIZE > PAGE_SIZE)
+        
+ENTRY(__invalidate_icache_page_alias)
+        entry   sp, 16
+
+        addi    a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE)
+        mov     a4, a2
+        witlb   a6, a2
+        isync
+
+        ___invalidate_icache_page a2 a3
+
+        iitlb   a4
+        isync
         retw
 
+#endif
+
+/* End of special treatment in tlb miss exception */
+
+ENTRY(__tlbtemp_mapping_end)
+
 /*
  * void __invalidate_icache_page(ulong start)
  */
@@ -121,8 +360,6 @@ ENTRY(__flush_dcache_page)
         dsync
         retw
 
-
-
 /*
  * void __invalidate_icache_range(ulong start, ulong size)
  */
@@ -168,7 +405,6 @@ ENTRY(__invalidate_dcache_range)
 
         ___invalidate_dcache_range a2 a3 a4
 
-
         retw
 
 /*
diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c
index 2f4f20ffe6..854677d0c3 100644
--- a/arch/xtensa/platform-iss/console.c
+++ b/arch/xtensa/platform-iss/console.c
@@ -20,7 +20,6 @@
 #include <linux/param.h>
 #include <linux/serial.h>
 #include <linux/serialP.h>
-#include <linux/console.h>
 
 #include <asm/uaccess.h>
 #include <asm/irq.h>
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index a15845c164..ed39313c40 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1075,12 +1075,6 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)
                  */
                 return;
 
-        if (unlikely(!__test_and_clear_bit(tag, bqt->tag_map))) {
-                printk(KERN_ERR "%s: attempt to clear non-busy tag (%d)\n",
-                       __FUNCTION__, tag);
-                return;
-        }
-
         list_del_init(&rq->queuelist);
         rq->cmd_flags &= ~REQ_QUEUED;
         rq->tag = -1;
@@ -1090,6 +1084,19 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)
                        __FUNCTION__, tag);
 
         bqt->tag_index[tag] = NULL;
+
+        /*
+         * We use test_and_clear_bit's memory ordering properties here.
+         * The tag_map bit acts as a lock for tag_index[bit], so we need
+         * a barrer before clearing the bit (precisely: release semantics).
+         * Could use clear_bit_unlock when it is merged.
+         */
+        if (unlikely(!test_and_clear_bit(tag, bqt->tag_map))) {
+                printk(KERN_ERR "%s: attempt to clear non-busy tag (%d)\n",
+                       __FUNCTION__, tag);
+                return;
+        }
+
         bqt->busy--;
 }
 
@@ -1136,6 +1143,10 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)
                         return 1;
 
         } while (test_and_set_bit(tag, bqt->tag_map));
+        /*
+         * We rely on test_and_set_bit providing lock memory ordering semantics
+         * (could use test_and_set_bit_lock when it is merged).
+         */
 
         rq->cmd_flags |= REQ_QUEUED;
         rq->tag = tag;
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c
index 035007145e..bc18cbb8ea 100644
--- a/crypto/async_tx/async_tx.c
+++ b/crypto/async_tx/async_tx.c
@@ -80,6 +80,7 @@ dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
 {
         enum dma_status status;
         struct dma_async_tx_descriptor *iter;
+        struct dma_async_tx_descriptor *parent;
 
         if (!tx)
                 return DMA_SUCCESS;
@@ -87,8 +88,15 @@ dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
         /* poll through the dependency chain, return when tx is complete */
         do {
                 iter = tx;
-                while (iter->cookie == -EBUSY)
-                        iter = iter->parent;
+
+                /* find the root of the unsubmitted dependency chain */
+                while (iter->cookie == -EBUSY) {
+                        parent = iter->parent;
+                        if (parent && parent->cookie == -EBUSY)
+                                iter = iter->parent;
+                        else
+                                break;
+                }
 
                 status = dma_sync_wait(iter->chan, iter->cookie);
         } while (status == DMA_IN_PROGRESS || (iter != tx));
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 7755834b88..d8f8ec3202 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -59,11 +59,13 @@ static inline void blkcipher_unmap_dst(struct blkcipher_walk *walk)
         scatterwalk_unmap(walk->dst.virt.addr, 1);
 }
 
+/* Get a spot of the specified length that does not straddle a page.
+ * The caller needs to ensure that there is enough space for this operation.
+ */
 static inline u8 *blkcipher_get_spot(u8 *start, unsigned int len)
 {
-        if (offset_in_page(start + len) < len)
-                return (u8 *)((unsigned long)(start + len) & PAGE_MASK);
-        return start;
+        u8 *end_page = (u8 *)(((unsigned long)(start + len - 1)) & PAGE_MASK);
+        return start > end_page ? start : end_page;
 }
 
 static inline unsigned int blkcipher_done_slow(struct crypto_blkcipher *tfm,
@@ -155,7 +157,8 @@ static inline int blkcipher_next_slow(struct blkcipher_desc *desc,
         if (walk->buffer)
                 goto ok;
 
-        n = bsize * 2 + (alignmask & ~(crypto_tfm_ctx_alignment() - 1));
+        n = bsize * 3 - (alignmask + 1) +
+            (alignmask & ~(crypto_tfm_ctx_alignment() - 1));
         walk->buffer = kmalloc(n, GFP_ATOMIC);
         if (!walk->buffer)
                 return blkcipher_walk_done(desc, walk, -ENOMEM);
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index f1372de4ce..4875f0149e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -68,6 +68,24 @@ config ACPI_PROCFS
 
           Say N to delete /proc/acpi/ files that have moved to /sys/
 
+config ACPI_PROC_EVENT
+        bool "Deprecated /proc/acpi/event support"
+        depends on PROC_FS
+        default y
+        ---help---
+          A user-space daemon, acpi, typically read /proc/acpi/event
+          and handled all ACPI sub-system generated events.
+
+          These events are now delivered to user-space via
+          either the input layer, or as netlink events.
+
+          This build option enables the old code for legacy
+          user-space implementation.  After some time, this will
+          be moved under CONFIG_ACPI_PROCFS, and then deleted.
+
+          Say Y here to retain the old behaviour.  Say N if your
+          user-space is newer than kernel 2.6.23 (September 2007).
+
 config ACPI_AC
         tristate "AC Adapter"
         depends on X86
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index d8b3509352..26d70702b3 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -204,7 +204,10 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
         case ACPI_NOTIFY_BUS_CHECK:
         case ACPI_NOTIFY_DEVICE_CHECK:
                 acpi_ac_get_state(ac);
-                acpi_bus_generate_event(device, event, (u32) ac->state);
+                acpi_bus_generate_proc_event(device, event, (u32) ac->state);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event,
+                                                  (u32) ac->state);
                 break;
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 86fd142f4b..d915fec9bf 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1069,7 +1069,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
                 hotk->brightness = (event & ~((u32) BR_DOWN));
         }
 
-        acpi_bus_generate_event(hotk->device, event,
+        acpi_bus_generate_proc_event(hotk->device, event,
                                 hotk->event_count[event % 128]++);
 
         return;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index d7b499fe0c..9b2c0f74f8 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -113,7 +113,7 @@ struct acpi_battery_info {
         acpi_string oem_info;
 };
 
-enum acpi_battery_files {
+enum acpi_battery_files{
         ACPI_BATTERY_INFO = 0,
         ACPI_BATTERY_STATE,
         ACPI_BATTERY_ALARM,
@@ -129,14 +129,13 @@ struct acpi_battery_flags {
 };
 
 struct acpi_battery {
+        struct mutex mutex;
         struct acpi_device *device;
         struct acpi_battery_flags flags;
         struct acpi_buffer bif_data;
         struct acpi_buffer bst_data;
-        struct mutex lock;
         unsigned long alarm;
         unsigned long update_time[ACPI_BATTERY_NUMFILES];
-
 };
 
 inline int acpi_battery_present(struct acpi_battery *battery)
@@ -236,10 +235,10 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
                 return 0;
 
         /* Evaluate _BIF */
-        mutex_lock(&battery->lock);
-        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BIF",
-                                      NULL, &buffer);
-        mutex_unlock(&battery->lock);
+
+        status =
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL,
+                                 &buffer);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
                 return -ENODEV;
@@ -286,10 +285,10 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
                 return 0;
 
         /* Evaluate _BST */
-        mutex_lock(&battery->lock);
-        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BST",
-                                      NULL, &buffer);
-        mutex_unlock(&battery->lock);
+
+        status =
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL,
+                                 &buffer);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
                 return -ENODEV;
@@ -337,10 +336,9 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery,
 
         arg0.integer.value = alarm;
 
-        mutex_lock(&battery->lock);
-        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",
+        status =
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",
                                  &arg_list, NULL);
-        mutex_unlock(&battery->lock);
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
@@ -660,6 +658,8 @@ acpi_battery_write_alarm(struct file *file,
         if (!battery || (count > sizeof(alarm_string) - 1))
                 return -EINVAL;
 
+        mutex_lock(&battery->mutex);
+
         result = acpi_battery_update(battery, 1, &update_result);
         if (result) {
                 result = -ENODEV;
@@ -688,7 +688,9 @@ acpi_battery_write_alarm(struct file *file,
         acpi_battery_check_result(battery, result);
 
         if (!result)
-                return count;
+                result = count;
+
+        mutex_unlock(&battery->mutex);
 
         return result;
 }
@@ -712,6 +714,8 @@ static int acpi_battery_read(int fid, struct seq_file *seq)
         int update_result = ACPI_BATTERY_NONE_UPDATE;
         int update = 0;
 
+        mutex_lock(&battery->mutex);
+
         update = (get_seconds() - battery->update_time[fid] >= update_time);
         update = (update | battery->flags.update[fid]);
 
@@ -729,6 +733,7 @@ static int acpi_battery_read(int fid, struct seq_file *seq)
         result = acpi_read_funcs[fid].print(seq, result);
         acpi_battery_check_result(battery, result);
         battery->flags.update[fid] = result;
+        mutex_unlock(&battery->mutex);
         return result;
 }
 
@@ -867,8 +872,11 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
         case ACPI_NOTIFY_DEVICE_CHECK:
                 device = battery->device;
                 acpi_battery_notify_update(battery);
-                acpi_bus_generate_event(device, event,
+                acpi_bus_generate_proc_event(device, event,
                                         acpi_battery_present(battery));
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event,
+                                                  acpi_battery_present(battery));
                 break;
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -892,7 +900,10 @@ static int acpi_battery_add(struct acpi_device *device)
         if (!battery)
                 return -ENOMEM;
 
-        mutex_init(&battery->lock);
+        mutex_init(&battery->mutex);
+
+        mutex_lock(&battery->mutex);
+
         battery->device = device;
         strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
@@ -928,6 +939,7 @@ static int acpi_battery_add(struct acpi_device *device)
                 kfree(battery);
         }
 
+        mutex_unlock(&battery->mutex);
 
         return result;
 }
@@ -942,6 +954,8 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
 
         battery = acpi_driver_data(device);
 
+        mutex_lock(&battery->mutex);
+
         status = acpi_remove_notify_handler(device->handle,
                                             ACPI_ALL_NOTIFY,
                                             acpi_battery_notify);
@@ -952,7 +966,9 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
 
         kfree(battery->bst_data.pointer);
 
-        mutex_destroy(&battery->lock);
+        mutex_unlock(&battery->mutex);
+
+        mutex_destroy(&battery->mutex);
 
         kfree(battery);
 
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 6b2658c962..9ba778a2b4 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -276,6 +276,7 @@ EXPORT_SYMBOL(acpi_bus_set_power);
                                 Event Management
    -------------------------------------------------------------------------- */
 
+#ifdef CONFIG_ACPI_PROC_EVENT
 static DEFINE_SPINLOCK(acpi_bus_event_lock);
 
 LIST_HEAD(acpi_bus_event_list);
@@ -283,7 +284,7 @@ DECLARE_WAIT_QUEUE_HEAD(acpi_bus_event_queue);
 
 extern int event_is_open;
 
-int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
+int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
 {
         struct acpi_bus_event *event = NULL;
         unsigned long flags = 0;
@@ -292,10 +293,6 @@ int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
         if (!device)
                 return -EINVAL;
 
-        if (acpi_bus_generate_genetlink_event(device, type, data))
-                printk(KERN_WARNING PREFIX
-                        "Failed to generate an ACPI event via genetlink!\n");
-
         /* drop event on the floor if no one's listening */
         if (!event_is_open)
                 return 0;
@@ -318,7 +315,7 @@ int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
         return 0;
 }
 
-EXPORT_SYMBOL(acpi_bus_generate_event);
+EXPORT_SYMBOL(acpi_bus_generate_proc_event);
 
 int acpi_bus_receive_event(struct acpi_bus_event *event)
 {
@@ -364,6 +361,7 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)
 }
 
 EXPORT_SYMBOL(acpi_bus_receive_event);
+#endif  /* CONFIG_ACPI_PROC_EVENT */
 
 /* --------------------------------------------------------------------------
                              Notification Handling
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 540581338e..2e79a3395e 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -284,7 +284,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
                 }
                 input_sync(input);
 
-                acpi_bus_generate_event(button->device, event,
+                acpi_bus_generate_proc_event(button->device, event,
                                         ++button->pushed);
                 break;
         default:
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 56bee9e065..3f7935ab0c 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -696,14 +696,6 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
         return AE_CTRL_TERMINATE;
 }
 
-static void ec_remove_handlers(struct acpi_ec *ec)
-{
-        acpi_remove_address_space_handler(ec->handle,
-                                          ACPI_ADR_SPACE_EC,
-                                          &acpi_ec_space_handler);
-        acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-}
-
 static int acpi_ec_add(struct acpi_device *device)
 {
         struct acpi_ec *ec = NULL;
@@ -727,13 +719,16 @@ static int acpi_ec_add(struct acpi_device *device)
         /* Check if we found the boot EC */
         if (boot_ec) {
                 if (boot_ec->gpe == ec->gpe) {
-                        ec_remove_handlers(boot_ec);
-                        mutex_destroy(&boot_ec->lock);
-                        kfree(boot_ec);
-                        first_ec = boot_ec = NULL;
+                        /* We might have incorrect info for GL at boot time */
+                        mutex_lock(&boot_ec->lock);
+                        boot_ec->global_lock = ec->global_lock;
+                        /* Copy handlers from new ec into boot ec */
+                        list_splice(&ec->list, &boot_ec->list);
+                        mutex_unlock(&boot_ec->lock);
+                        kfree(ec);
+                        ec = boot_ec;
                 }
-        }
-        if (!first_ec)
+        } else
                 first_ec = ec;
         ec->handle = device->handle;
         acpi_driver_data(device) = ec;
@@ -762,6 +757,9 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
         if (ec == first_ec)
                 first_ec = NULL;
 
+        /* Don't touch boot EC */
+        if (boot_ec != ec)
+                kfree(ec);
         return 0;
 }
 
@@ -825,7 +823,9 @@ static int acpi_ec_start(struct acpi_device *device)
         if (!ec)
                 return -EINVAL;
 
-        ret = ec_install_handlers(ec);
+        /* Boot EC is already working */
+        if (ec != boot_ec)
+                ret = ec_install_handlers(ec);
 
         /* EC is fully operational, allow queries */
         atomic_set(&ec->query_pending, 0);
@@ -835,6 +835,7 @@ static int acpi_ec_start(struct acpi_device *device)
 
 static int acpi_ec_stop(struct acpi_device *device, int type)
 {
+        acpi_status status;
         struct acpi_ec *ec;
 
         if (!device)
@@ -843,7 +844,21 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
         ec = acpi_driver_data(device);
         if (!ec)
                 return -EINVAL;
-        ec_remove_handlers(ec);
+
+        /* Don't touch boot EC */
+        if (ec == boot_ec)
+                return 0;
+
+        status = acpi_remove_address_space_handler(ec->handle,
+                                                   ACPI_ADR_SPACE_EC,
+                                                   &acpi_ec_space_handler);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+
+        status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+
         return 0;
 }
 
@@ -871,7 +886,8 @@ int __init acpi_ec_ecdt_probe(void)
                 printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
                 status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
                                                 boot_ec, NULL);
-                if (ACPI_FAILURE(status))
+                /* Check that acpi_get_devices actually find something */
+                if (ACPI_FAILURE(status) || !boot_ec->handle)
                         goto error;
         }
 
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 95637a4ff7..5c95863f8f 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -17,6 +17,7 @@
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("event");
 
+#ifdef CONFIG_ACPI_PROC_EVENT
 /* Global vars for handling event proc entry */
 static DEFINE_SPINLOCK(acpi_system_event_lock);
 int event_is_open = 0;
@@ -106,6 +107,7 @@ static const struct file_operations acpi_system_event_ops = {
         .release = acpi_system_close_event,
         .poll = acpi_system_poll_event,
 };
+#endif  /* CONFIG_ACPI_PROC_EVENT */
 
 #ifdef CONFIG_NET
 static unsigned int acpi_event_seqnum;
@@ -147,7 +149,8 @@ static struct genl_multicast_group acpi_event_mcgrp = {
         .name = ACPI_GENL_MCAST_GROUP_NAME,
 };
 
-int acpi_bus_generate_genetlink_event(struct acpi_device *device,
+int acpi_bus_generate_netlink_event(const char *device_class,
+                                      const char *bus_id,
                                       u8 type, int data)
 {
         struct sk_buff *skb;
@@ -191,8 +194,8 @@ int acpi_bus_generate_genetlink_event(struct acpi_device *device,
 
         memset(event, 0, sizeof(struct acpi_genl_event));
 
-        strcpy(event->device_class, device->pnp.device_class);
-        strcpy(event->bus_id, device->dev.bus_id);
+        strcpy(event->device_class, device_class);
+        strcpy(event->bus_id, bus_id);
         event->type = type;
         event->data = data;
 
@@ -211,6 +214,8 @@ int acpi_bus_generate_genetlink_event(struct acpi_device *device,
         return 0;
 }
 
+EXPORT_SYMBOL(acpi_bus_generate_netlink_event);
+
 static int acpi_event_genetlink_init(void)
 {
         int result;
@@ -228,12 +233,15 @@ static int acpi_event_genetlink_init(void)
 }
 
 #else
-int acpi_bus_generate_genetlink_event(struct acpi_device *device, u8 type,
-                                      int data)
+int acpi_bus_generate_netlink_event(const char *device_class,
+                                      const char *bus_id,
+                                      u8 type, int data)
 {
         return 0;
 }
 
+EXPORT_SYMBOL(acpi_bus_generate_netlink_event);
+
 static int acpi_event_genetlink_init(void)
 {
         return -ENODEV;
@@ -242,7 +250,9 @@ static int acpi_event_genetlink_init(void)
 
 static int __init acpi_event_init(void)
 {
+#ifdef CONFIG_ACPI_PROC_EVENT
         struct proc_dir_entry *entry;
+#endif
         int error = 0;
 
         if (acpi_disabled)
@@ -254,12 +264,14 @@ static int __init acpi_event_init(void)
                 printk(KERN_WARNING PREFIX
                        "Failed to create genetlink family for ACPI event\n");
 
+#ifdef CONFIG_ACPI_PROC_EVENT
         /* 'event' [R] */
         entry = create_proc_entry("event", S_IRUSR, acpi_root_dir);
         if (entry)
                 entry->proc_fops = &acpi_system_event_ops;
         else
                 return -ENODEV;
+#endif
 
         return 0;
 }
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 76c525dc59..cf69c0040a 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -576,13 +576,10 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
                 ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
         }
 
-        status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
-        }
-        /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
-
         /*
+         * GPEs must be enabled before _WAK is called as GPEs
+         * might get fired there
+         *
          * Restore the GPEs:
          * 1) Disable/Clear all GPEs
          * 2) Enable all runtime GPEs
@@ -591,13 +588,19 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
-        acpi_gbl_system_awake_and_running = TRUE;
-
         status = acpi_hw_enable_all_runtime_gpes();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
+        status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
+        }
+        /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
+
+        acpi_gbl_system_awake_and_running = TRUE;
+
         /* Enable power button */
 
         (void)
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index ab65b2c256..f39fbc6b92 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
  ******************************************************************************/
 
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
                  acpi_walk_callback user_function,
                  void *context, void **return_value)
 {
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 498422343f..9f11dc296c 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -102,6 +102,8 @@ static struct acpi_driver acpi_processor_driver = {
                 .add = acpi_processor_add,
                 .remove = acpi_processor_remove,
                 .start = acpi_processor_start,
+                .suspend = acpi_processor_suspend,
+                .resume = acpi_processor_resume,
                 },
 };
 
@@ -698,16 +700,23 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
         switch (event) {
         case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:
                 acpi_processor_ppc_has_changed(pr);
-                acpi_bus_generate_event(device, event,
+                acpi_bus_generate_proc_event(device, event,
                                         pr->performance_platform_limit);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event,
+                                                  pr->performance_platform_limit);
                 break;
         case ACPI_PROCESSOR_NOTIFY_POWER:
                 acpi_processor_cst_has_changed(pr);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event, 0);
                 break;
         case ACPI_PROCESSOR_NOTIFY_THROTTLING:
                 acpi_processor_tstate_has_changed(pr);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event, 0);
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Unsupported event [0x%x]\n", event));
@@ -717,6 +726,25 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
         return;
 }
 
+static int acpi_cpu_soft_notify(struct notifier_block *nfb,
+                unsigned long action, void *hcpu)
+{
+        unsigned int cpu = (unsigned long)hcpu;
+        struct acpi_processor *pr = processors[cpu];
+
+        if (action == CPU_ONLINE && pr) {
+                acpi_processor_ppc_has_changed(pr);
+                acpi_processor_cst_has_changed(pr);
+                acpi_processor_tstate_has_changed(pr);
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block acpi_cpu_notifier =
+{
+            .notifier_call = acpi_cpu_soft_notify,
+};
+
 static int acpi_processor_add(struct acpi_device *device)
 {
         struct acpi_processor *pr = NULL;
@@ -980,6 +1008,7 @@ void acpi_processor_install_hotplug_notify(void)
                             ACPI_UINT32_MAX,
                             processor_walk_namespace_cb, &action, NULL);
 #endif
+        register_hotcpu_notifier(&acpi_cpu_notifier);
 }
 
 static
@@ -992,6 +1021,7 @@ void acpi_processor_uninstall_hotplug_notify(void)
                             ACPI_UINT32_MAX,
                             processor_walk_namespace_cb, &action, NULL);
 #endif
+        unregister_hotcpu_notifier(&acpi_cpu_notifier);
 }
 
 /*
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index a8634a0655..f18261368e 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -63,6 +63,7 @@
 ACPI_MODULE_NAME("processor_idle");
 #define ACPI_PROCESSOR_FILE_POWER       "power"
 #define US_TO_PM_TIMER_TICKS(t)         ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
+#define PM_TIMER_TICK_NS                (1000000000ULL/PM_TIMER_FREQUENCY)
 #define C2_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
 #define C3_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
 static void (*pm_idle_save) (void) __read_mostly;
@@ -324,6 +325,23 @@ static void acpi_state_timer_broadcast(struct acpi_processor *pr,
 
 #endif
 
+/*
+ * Suspend / resume control
+ */
+static int acpi_idle_suspend;
+
+int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
+{
+        acpi_idle_suspend = 1;
+        return 0;
+}
+
+int acpi_processor_resume(struct acpi_device * device)
+{
+        acpi_idle_suspend = 0;
+        return 0;
+}
+
 static void acpi_processor_idle(void)
 {
         struct acpi_processor *pr = NULL;
@@ -354,7 +372,7 @@ static void acpi_processor_idle(void)
         }
 
         cx = pr->power.state;
-        if (!cx) {
+        if (!cx || acpi_idle_suspend) {
                 if (pm_idle_save)
                         pm_idle_save();
                 else
@@ -462,6 +480,9 @@ static void acpi_processor_idle(void)
                  * TBD: Can't get time duration while in C1, as resumes
                  *      go to an ISR rather than here.  Need to instrument
                  *      base interrupt handler.
+                 *
+                 * Note: the TSC better not stop in C1, sched_clock() will
+                 *       skew otherwise.
                  */
                 sleep_ticks = 0xFFFFFFFF;
                 break;
@@ -469,6 +490,8 @@ static void acpi_processor_idle(void)
         case ACPI_STATE_C2:
                 /* Get start time (ticks) */
                 t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+                /* Tell the scheduler that we are going deep-idle: */
+                sched_clock_idle_sleep_event();
                 /* Invoke C2 */
                 acpi_state_timer_broadcast(pr, cx, 1);
                 acpi_cstate_enter(cx);
@@ -479,17 +502,22 @@ static void acpi_processor_idle(void)
                 /* TSC halts in C2, so notify users */
                 mark_tsc_unstable("possible TSC halt in C2");
 #endif
+                /* Compute time (ticks) that we were actually asleep */
+                sleep_ticks = ticks_elapsed(t1, t2);
+
+                /* Tell the scheduler how much we idled: */
+                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+
                 /* Re-enable interrupts */
                 local_irq_enable();
+                /* Do not account our idle-switching overhead: */
+                sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
+
                 current_thread_info()->status |= TS_POLLING;
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks =
-                    ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD;
                 acpi_state_timer_broadcast(pr, cx, 0);
                 break;
 
         case ACPI_STATE_C3:
-
                 /*
                  * disable bus master
                  * bm_check implies we need ARB_DIS
@@ -518,6 +546,8 @@ static void acpi_processor_idle(void)
                 t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
                 /* Invoke C3 */
                 acpi_state_timer_broadcast(pr, cx, 1);
+                /* Tell the scheduler that we are going deep-idle: */
+                sched_clock_idle_sleep_event();
                 acpi_cstate_enter(cx);
                 /* Get end time (ticks) */
                 t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
@@ -531,12 +561,17 @@ static void acpi_processor_idle(void)
                 /* TSC halts in C3, so notify users */
                 mark_tsc_unstable("TSC halts in C3");
 #endif
+                /* Compute time (ticks) that we were actually asleep */
+                sleep_ticks = ticks_elapsed(t1, t2);
+                /* Tell the scheduler how much we idled: */
+                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
+
                 /* Re-enable interrupts */
                 local_irq_enable();
+                /* Do not account our idle-switching overhead: */
+                sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
+
                 current_thread_info()->status |= TS_POLLING;
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks =
-                    ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD;
                 acpi_state_timer_broadcast(pr, cx, 0);
                 break;
 
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 82c3a55001..a578986e32 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -440,11 +440,12 @@ static int acpi_sbs_generate_event(struct acpi_device *device,
         strcpy(acpi_device_bid(device), bid);
         strcpy(acpi_device_class(device), class);
 
-        result = acpi_bus_generate_event(device, event, state);
+        result = acpi_bus_generate_proc_event(device, event, state);
 
         strcpy(acpi_device_bid(device), bid_saved);
         strcpy(acpi_device_class(device), class_saved);
 
+        acpi_bus_generate_netlink_event(class, bid, event, state);
         return result;
 }
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index be74347d13..64620d6687 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -35,8 +35,9 @@ struct acpi_device_bus_id{
  * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
  * char *modalias: "acpi:IBM0001:ACPI0001"
 */
-int create_modalias(struct acpi_device *acpi_dev, char *modalias, int size){
-
+static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
+                           int size)
+{
         int len;
 
         if (!acpi_dev->flags.hardware_id)
diff --git a/drivers/acpi/sleep/Makefile b/drivers/acpi/sleep/Makefile
index 195a4f69c0..f1fb888c2d 100644
--- a/drivers/acpi/sleep/Makefile
+++ b/drivers/acpi/sleep/Makefile
@@ -1,5 +1,5 @@
-obj-y                                   := poweroff.o wakeup.o
-obj-$(CONFIG_ACPI_SLEEP)                += main.o
+obj-y                                   := wakeup.o
+obj-y                                   += main.o
 obj-$(CONFIG_ACPI_SLEEP)                += proc.o
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index e8cff5dd4c..2cbb9aabd0 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -15,13 +15,39 @@
 #include <linux/dmi.h>
 #include <linux/device.h>
 #include <linux/suspend.h>
+
+#include <asm/io.h>
+
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include "sleep.h"
 
 u8 sleep_states[ACPI_S_STATE_COUNT];
 
+#ifdef CONFIG_PM_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+#endif
+
+int acpi_sleep_prepare(u32 acpi_state)
+{
+#ifdef CONFIG_ACPI_SLEEP
+        /* do we have a wakeup address for S2 and S3? */
+        if (acpi_state == ACPI_STATE_S3) {
+                if (!acpi_wakeup_address) {
+                        return -EFAULT;
+                }
+                acpi_set_firmware_waking_vector((acpi_physical_address)
+                                                virt_to_phys((void *)
+                                                             acpi_wakeup_address));
+
+        }
+        ACPI_FLUSH_CPU_CACHE();
+        acpi_enable_wakeup_device_prep(acpi_state);
+#endif
+        acpi_gpe_sleep_prepare(acpi_state);
+        acpi_enter_sleep_state_prep(acpi_state);
+        return 0;
+}
 
 #ifdef CONFIG_SUSPEND
 static struct pm_ops acpi_pm_ops;
@@ -275,6 +301,7 @@ int acpi_suspend(u32 acpi_state)
         return -EINVAL;
 }
 
+#ifdef CONFIG_PM_SLEEP
 /**
  *      acpi_pm_device_sleep_state - return preferred power state of ACPI device
  *              in the system sleep state given by %acpi_target_sleep_state
@@ -305,7 +332,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
         unsigned long d_min, d_max;
 
         if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-                printk(KERN_ERR "ACPI handle has no context!\n");
+                printk(KERN_DEBUG "ACPI handle has no context!\n");
                 return -ENODEV;
         }
 
@@ -349,6 +376,21 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
                 *d_min_p = d_min;
         return d_max;
 }
+#endif
+
+static void acpi_power_off_prepare(void)
+{
+        /* Prepare to power off the system */
+        acpi_sleep_prepare(ACPI_STATE_S5);
+}
+
+static void acpi_power_off(void)
+{
+        /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
+        printk("%s called\n", __FUNCTION__);
+        local_irq_disable();
+        acpi_enter_sleep_state(ACPI_STATE_S5);
+}
 
 int __init acpi_sleep_init(void)
 {
@@ -363,16 +405,17 @@ int __init acpi_sleep_init(void)
         if (acpi_disabled)
                 return 0;
 
+        sleep_states[ACPI_STATE_S0] = 1;
+        printk(KERN_INFO PREFIX "(supports S0");
+
 #ifdef CONFIG_SUSPEND
-        printk(KERN_INFO PREFIX "(supports");
-        for (i = ACPI_STATE_S0; i < ACPI_STATE_S4; i++) {
+        for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++) {
                 status = acpi_get_sleep_type_data(i, &type_a, &type_b);
                 if (ACPI_SUCCESS(status)) {
                         sleep_states[i] = 1;
                         printk(" S%d", i);
                 }
         }
-        printk(")\n");
 
         pm_set_ops(&acpi_pm_ops);
 #endif
@@ -382,10 +425,16 @@ int __init acpi_sleep_init(void)
         if (ACPI_SUCCESS(status)) {
                 hibernation_set_ops(&acpi_hibernation_ops);
                 sleep_states[ACPI_STATE_S4] = 1;
+                printk(" S4");
         }
-#else
-        sleep_states[ACPI_STATE_S4] = 0;
 #endif
-
+        status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
+        if (ACPI_SUCCESS(status)) {
+                sleep_states[ACPI_STATE_S5] = 1;
+                printk(" S5");
+                pm_power_off_prepare = acpi_power_off_prepare;
+                pm_power_off = acpi_power_off;
+        }
+        printk(")\n");
         return 0;
 }
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
deleted file mode 100644
index 39e40d56b0..0000000000
--- a/drivers/acpi/sleep/poweroff.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * poweroff.c - ACPI handler for powering off the system.
- *
- * AKA S5, but it is independent of whether or not the kernel supports
- * any other sleep support in the system.
- *
- * Copyright (c) 2005 Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
- *
- * This file is released under the GPLv2.
- */
-
-#include <linux/pm.h>
-#include <linux/init.h>
-#include <acpi/acpi_bus.h>
-#include <linux/sysdev.h>
-#include <asm/io.h>
-#include "sleep.h"
-
-int acpi_sleep_prepare(u32 acpi_state)
-{
-#ifdef CONFIG_ACPI_SLEEP
-        /* do we have a wakeup address for S2 and S3? */
-        if (acpi_state == ACPI_STATE_S3) {
-                if (!acpi_wakeup_address) {
-                        return -EFAULT;
-                }
-                acpi_set_firmware_waking_vector((acpi_physical_address)
-                                                virt_to_phys((void *)
-                                                             acpi_wakeup_address));
-
-        }
-        ACPI_FLUSH_CPU_CACHE();
-        acpi_enable_wakeup_device_prep(acpi_state);
-#endif
-        acpi_gpe_sleep_prepare(acpi_state);
-        acpi_enter_sleep_state_prep(acpi_state);
-        return 0;
-}
-
-#ifdef CONFIG_PM
-
-static void acpi_power_off_prepare(void)
-{
-        /* Prepare to power off the system */
-        acpi_sleep_prepare(ACPI_STATE_S5);
-}
-
-static void acpi_power_off(void)
-{
-        /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
-        printk("%s called\n", __FUNCTION__);
-        local_irq_disable();
-        /* Some SMP machines only can poweroff in boot CPU */
-        acpi_enter_sleep_state(ACPI_STATE_S5);
-}
-
-static int acpi_poweroff_init(void)
-{
-        if (!acpi_disabled) {
-                u8 type_a, type_b;
-                acpi_status status;
-
-                status =
-                    acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
-                if (ACPI_SUCCESS(status)) {
-                        pm_power_off_prepare = acpi_power_off_prepare;
-                        pm_power_off = acpi_power_off;
-                }
-        }
-        return 0;
-}
-
-late_initcall(acpi_poweroff_init);
-
-#endif                          /* CONFIG_PM */
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 66b62b0d36..3839efd5ea 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -23,7 +23,7 @@
  */
 
 ACPI_MODULE_NAME("sleep")
-#ifdef  CONFIG_ACPI_PROCFS_SLEEP
+#ifdef  CONFIG_ACPI_PROCFS
 static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset)
 {
         int i;
@@ -76,7 +76,7 @@ acpi_system_write_sleep(struct file *file,
       Done:
         return error ? error : count;
 }
-#endif                          /* CONFIG_ACPI_PROCFS_SLEEP */
+#endif                          /* CONFIG_ACPI_PROCFS */
 
 #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86)
 /* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
@@ -471,7 +471,7 @@ static const struct file_operations acpi_system_wakeup_device_fops = {
         .release = single_release,
 };
 
-#ifdef  CONFIG_ACPI_PROCFS_SLEEP
+#ifdef  CONFIG_ACPI_PROCFS
 static const struct file_operations acpi_system_sleep_fops = {
         .open = acpi_system_sleep_open_fs,
         .read = seq_read,
@@ -479,7 +479,7 @@ static const struct file_operations acpi_system_sleep_fops = {
         .llseek = seq_lseek,
         .release = single_release,
 };
-#endif                          /* CONFIG_ACPI_PROCFS_SLEEP */
+#endif                          /* CONFIG_ACPI_PROCFS */
 
 #ifdef  HAVE_ACPI_LEGACY_ALARM
 static const struct file_operations acpi_system_alarm_fops = {
@@ -506,7 +506,7 @@ static int __init acpi_sleep_proc_init(void)
         if (acpi_disabled)
                 return 0;
 
-#ifdef  CONFIG_ACPI_PROCFS_SLEEP
+#ifdef  CONFIG_ACPI_PROCFS
         /* 'sleep' [R/W] */
         entry =
             create_proc_entry("sleep", S_IFREG | S_IRUGO | S_IWUSR,
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 1da64b4518..8cc9492ffb 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -51,6 +51,65 @@ ACPI_MODULE_NAME("tbutils")
 static acpi_physical_address
 acpi_tb_get_root_table_entry(u8 * table_entry,
                              acpi_native_uint table_entry_size);
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_check_xsdt
+ *
+ * PARAMETERS:  address                    - Pointer to the XSDT
+ *
+ * RETURN:      status
+ *              AE_OK - XSDT is okay
+ *              AE_NO_MEMORY - can't map XSDT
+ *              AE_INVALID_TABLE_LENGTH - invalid table length
+ *              AE_NULL_ENTRY - XSDT has NULL entry
+ *
+ * DESCRIPTION: validate XSDT
+******************************************************************************/
+
+static acpi_status
+acpi_tb_check_xsdt(acpi_physical_address address)
+{
+        struct acpi_table_header *table;
+        u32 length;
+        u64 xsdt_entry_address;
+        u8 *table_entry;
+        u32 table_count;
+        int i;
+
+        table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
+        if (!table)
+                return AE_NO_MEMORY;
+
+        length = table->length;
+        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
+        if (length < sizeof(struct acpi_table_header))
+                return AE_INVALID_TABLE_LENGTH;
+
+        table = acpi_os_map_memory(address, length);
+        if (!table)
+                return AE_NO_MEMORY;
+
+        /* Calculate the number of tables described in XSDT */
+        table_count =
+                (u32) ((table->length -
+                sizeof(struct acpi_table_header)) / sizeof(u64));
+        table_entry =
+                ACPI_CAST_PTR(u8, table) + sizeof(struct acpi_table_header);
+        for (i = 0; i < table_count; i++) {
+                ACPI_MOVE_64_TO_64(&xsdt_entry_address, table_entry);
+                if (!xsdt_entry_address) {
+                        /* XSDT has NULL entry */
+                        break;
+                }
+                table_entry += sizeof(u64);
+        }
+        acpi_os_unmap_memory(table, length);
+
+        if (i < table_count)
+                return AE_NULL_ENTRY;
+        else
+                return AE_OK;
+}
 
 /*******************************************************************************
  *
@@ -341,6 +400,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
         u32 table_count;
         struct acpi_table_header *table;
         acpi_physical_address address;
+        acpi_physical_address rsdt_address;
         u32 length;
         u8 *table_entry;
         acpi_status status;
@@ -369,6 +429,8 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
                  */
                 address = (acpi_physical_address) rsdp->xsdt_physical_address;
                 table_entry_size = sizeof(u64);
+                rsdt_address = (acpi_physical_address)
+                                        rsdp->rsdt_physical_address;
         } else {
                 /* Root table is an RSDT (32-bit physical addresses) */
 
@@ -382,6 +444,15 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
          */
         acpi_os_unmap_memory(rsdp, sizeof(struct acpi_table_rsdp));
 
+        if (table_entry_size == sizeof(u64)) {
+                if (acpi_tb_check_xsdt(address) == AE_NULL_ENTRY) {
+                        /* XSDT has NULL entry, RSDT is used */
+                        address = rsdt_address;
+                        table_entry_size = sizeof(u32);
+                        ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry,"
+                                        "using RSDT"));
+                }
+        }
         /* Map the RSDT/XSDT table header to get the full table length */
 
         table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 1e06159fd9..bc6d5866ef 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -77,23 +77,27 @@ MODULE_LICENSE("GPL");
 
 static int act;
 module_param(act, int, 0644);
-MODULE_PARM_DESC(act, "Disable or override all lowest active trip points.\n");
+MODULE_PARM_DESC(act, "Disable or override all lowest active trip points.");
+
+static int crt;
+module_param(crt, int, 0644);
+MODULE_PARM_DESC(crt, "Disable or lower all critical trip points.");
 
 static int tzp;
 module_param(tzp, int, 0444);
-MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n");
+MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.");
 
 static int nocrt;
 module_param(nocrt, int, 0);
-MODULE_PARM_DESC(nocrt, "Set to disable action on ACPI thermal zone critical and hot trips.\n");
+MODULE_PARM_DESC(nocrt, "Set to take no action upon ACPI thermal zone critical trips points.");
 
 static int off;
 module_param(off, int, 0);
-MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.\n");
+MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.");
 
 static int psv;
 module_param(psv, int, 0644);
-MODULE_PARM_DESC(psv, "Disable or override all passive trip points.\n");
+MODULE_PARM_DESC(psv, "Disable or override all passive trip points.");
 
 static int acpi_thermal_add(struct acpi_device *device);
 static int acpi_thermal_remove(struct acpi_device *device, int type);
@@ -340,6 +344,20 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
                                   tz->trips.critical.temperature));
         }
 
+        if (tz->trips.critical.flags.valid == 1) {
+                if (crt == -1) {
+                        tz->trips.critical.flags.valid = 0;
+                } else if (crt > 0) {
+                        unsigned long crt_k = CELSIUS_TO_KELVIN(crt);
+
+                        /*
+                         * Allow override to lower critical threshold
+                         */
+                        if (crt_k < tz->trips.critical.temperature)
+                                tz->trips.critical.temperature = crt_k;
+                }
+        }
+
         /* Critical Sleep (optional) */
 
         status =
@@ -485,8 +503,12 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
         printk(KERN_EMERG
                "Critical temperature reached (%ld C), shutting down.\n",
                KELVIN_TO_CELSIUS(tz->temperature));
-        acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL,
+        acpi_bus_generate_proc_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL,
                                 tz->trips.critical.flags.enabled);
+        acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
+                                          tz->device->dev.bus_id,
+                                          ACPI_THERMAL_NOTIFY_CRITICAL,
+                                          tz->trips.critical.flags.enabled);
 
         orderly_poweroff(true);
 
@@ -504,8 +526,12 @@ static int acpi_thermal_hot(struct acpi_thermal *tz)
         } else if (tz->trips.hot.flags.enabled)
                 tz->trips.hot.flags.enabled = 0;
 
-        acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_HOT,
+        acpi_bus_generate_proc_event(tz->device, ACPI_THERMAL_NOTIFY_HOT,
                                 tz->trips.hot.flags.enabled);
+        acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
+                                          tz->device->dev.bus_id,
+                                          ACPI_THERMAL_NOTIFY_HOT,
+                                          tz->trips.hot.flags.enabled);
 
         /* TBD: Call user-mode "sleep(S4)" function */
 
@@ -1067,9 +1093,9 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
                 entry->owner = THIS_MODULE;
         }
 
-        /* 'trip_points' [R/W] */
+        /* 'trip_points' [R] */
         entry = create_proc_entry(ACPI_THERMAL_FILE_TRIP_POINTS,
-                                  S_IFREG | S_IRUGO | S_IWUSR,
+                                  S_IRUGO,
                                   acpi_device_dir(device));
         if (!entry)
                 return -ENODEV;
@@ -1149,12 +1175,16 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
         case ACPI_THERMAL_NOTIFY_THRESHOLDS:
                 acpi_thermal_get_trip_points(tz);
                 acpi_thermal_check(tz);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event, 0);
                 break;
         case ACPI_THERMAL_NOTIFY_DEVICES:
                 if (tz->flags.devices)
                         acpi_thermal_get_devices(tz);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event, 0);
                 break;
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -1339,6 +1369,13 @@ static int thermal_act(struct dmi_system_id *d) {
         }
         return 0;
 }
+static int thermal_nocrt(struct dmi_system_id *d) {
+
+        printk(KERN_NOTICE "ACPI: %s detected: "
+                "disabling all critical thermal trip point actions.\n", d->ident);
+        nocrt = 1;
+        return 0;
+}
 static int thermal_tzp(struct dmi_system_id *d) {
 
         if (tzp == 0) {
@@ -1387,6 +1424,14 @@ static struct dmi_system_id thermal_dmi_table[] __initdata = {
                 DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
                 },
         },
+        {
+         .callback = thermal_nocrt,
+         .ident = "Gigabyte GA-7ZX",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."),
+                DMI_MATCH(DMI_BOARD_NAME, "7ZX"),
+                },
+        },
         {}
 };
 #endif /* CONFIG_DMI */
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 1621655d6e..93ea8290b4 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -126,6 +126,7 @@ const char *acpi_format_exception(acpi_status status)
                             "Unknown exception code: 0x%8.8X", status));
 
                 exception = "UNKNOWN_STATUS_CODE";
+                dump_stack();
         }
 
         return (ACPI_CAST_PTR(const char, exception));
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index d987019419..d05891f162 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -31,7 +31,7 @@
 #include <linux/list.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-
+#include <linux/input.h>
 #include <linux/backlight.h>
 #include <linux/video_output.h>
 #include <asm/uaccess.h>
@@ -138,6 +138,8 @@ struct acpi_video_bus {
         struct semaphore sem;
         struct list_head video_device_list;
         struct proc_dir_entry *dir;
+        struct input_dev *input;
+        char phys[32];  /* for input device */
 };
 
 struct acpi_video_device_flags {
@@ -415,7 +417,6 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
         arg0.integer.value = level;
         status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
 
-        printk(KERN_DEBUG "set_level status: %x\n", status);
         return status;
 }
 
@@ -1752,7 +1753,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
 
 static int acpi_video_bus_start_devices(struct acpi_video_bus *video)
 {
-        return acpi_video_bus_DOS(video, 1, 0);
+        return acpi_video_bus_DOS(video, 0, 0);
 }
 
 static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
@@ -1764,6 +1765,9 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
 {
         struct acpi_video_bus *video = data;
         struct acpi_device *device = NULL;
+        struct input_dev *input;
+        int keycode;
+
 
         printk("video bus notify\n");
 
@@ -1771,11 +1775,13 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
                 return;
 
         device = video->device;
+        input = video->input;
 
         switch (event) {
         case ACPI_VIDEO_NOTIFY_SWITCH:  /* User requested a switch,
                                          * most likely via hotkey. */
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_SWITCHVIDEOMODE;
                 break;
 
         case ACPI_VIDEO_NOTIFY_PROBE:   /* User plugged in or removed a video
@@ -1783,22 +1789,38 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
                 acpi_video_device_enumerate(video);
                 acpi_video_device_rebind(video);
                 acpi_video_switch_output(video, event);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_SWITCHVIDEOMODE;
                 break;
 
         case ACPI_VIDEO_NOTIFY_CYCLE:   /* Cycle Display output hotkey pressed. */
+                acpi_video_switch_output(video, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_SWITCHVIDEOMODE;
+                break;
         case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT:     /* Next Display output hotkey pressed. */
+                acpi_video_switch_output(video, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_VIDEO_NEXT;
+                break;
         case ACPI_VIDEO_NOTIFY_PREV_OUTPUT:     /* previous Display output hotkey pressed. */
                 acpi_video_switch_output(video, event);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_VIDEO_PREV;
                 break;
 
         default:
+                keycode = KEY_UNKNOWN;
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Unsupported event [0x%x]\n", event));
                 break;
         }
 
+        input_report_key(input, keycode, 1);
+        input_sync(input);
+        input_report_key(input, keycode, 0);
+        input_sync(input);
+
         return;
 }
 
@@ -1806,38 +1828,65 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
 {
         struct acpi_video_device *video_device = data;
         struct acpi_device *device = NULL;
+        struct acpi_video_bus *bus;
+        struct input_dev *input;
+        int keycode;
 
         if (!video_device)
                 return;
 
         device = video_device->dev;
+        bus = video_device->video;
+        input = bus->input;
 
         switch (event) {
-        case ACPI_VIDEO_NOTIFY_SWITCH:  /* change in status (cycle output device) */
-        case ACPI_VIDEO_NOTIFY_PROBE:   /* change in status (output device status) */
-                acpi_bus_generate_event(device, event, 0);
-                break;
         case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:        /* Cycle brightness */
+                acpi_video_switch_brightness(video_device, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_BRIGHTNESS_CYCLE;
+                break;
         case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:  /* Increase brightness */
+                acpi_video_switch_brightness(video_device, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_BRIGHTNESSUP;
+                break;
         case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:  /* Decrease brightness */
+                acpi_video_switch_brightness(video_device, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_BRIGHTNESSDOWN;
+                break;
         case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */
+                acpi_video_switch_brightness(video_device, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_BRIGHTNESS_ZERO;
+                break;
         case ACPI_VIDEO_NOTIFY_DISPLAY_OFF:     /* display device off */
                 acpi_video_switch_brightness(video_device, event);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_DISPLAY_OFF;
                 break;
         default:
+                keycode = KEY_UNKNOWN;
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Unsupported event [0x%x]\n", event));
                 break;
         }
+
+        input_report_key(input, keycode, 1);
+        input_sync(input);
+        input_report_key(input, keycode, 0);
+        input_sync(input);
+
         return;
 }
 
+static int instance;
 static int acpi_video_bus_add(struct acpi_device *device)
 {
         int result = 0;
         acpi_status status = 0;
         struct acpi_video_bus *video = NULL;
+        struct input_dev *input;
 
 
         if (!device)
@@ -1847,6 +1896,13 @@ static int acpi_video_bus_add(struct acpi_device *device)
         if (!video)
                 return -ENOMEM;
 
+        /* a hack to fix the duplicate name "VID" problem on T61 */
+        if (!strcmp(device->pnp.bus_id, "VID")) {
+                if (instance)
+                        device->pnp.bus_id[3] = '0' + instance;
+                instance ++;
+        }
+
         video->device = device;
         strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
         strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
@@ -1881,6 +1937,39 @@ static int acpi_video_bus_add(struct acpi_device *device)
                 goto end;
         }
 
+
+        video->input = input = input_allocate_device();
+
+        snprintf(video->phys, sizeof(video->phys),
+                "%s/video/input0", acpi_device_hid(video->device));
+
+        input->name = acpi_device_name(video->device);
+        input->phys = video->phys;
+        input->id.bustype = BUS_HOST;
+        input->id.product = 0x06;
+        input->evbit[0] = BIT(EV_KEY);
+        set_bit(KEY_SWITCHVIDEOMODE, input->keybit);
+        set_bit(KEY_VIDEO_NEXT, input->keybit);
+        set_bit(KEY_VIDEO_PREV, input->keybit);
+        set_bit(KEY_BRIGHTNESS_CYCLE, input->keybit);
+        set_bit(KEY_BRIGHTNESSUP, input->keybit);
+        set_bit(KEY_BRIGHTNESSDOWN, input->keybit);
+        set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);
+        set_bit(KEY_DISPLAY_OFF, input->keybit);
+        set_bit(KEY_UNKNOWN, input->keybit);
+        result = input_register_device(input);
+        if (result) {
+                acpi_remove_notify_handler(video->device->handle,
+                                                ACPI_DEVICE_NOTIFY,
+                                                acpi_video_bus_notify);
+                acpi_video_bus_stop_devices(video);
+                acpi_video_bus_put_devices(video);
+                kfree(video->attached_array);
+                acpi_video_bus_remove_fs(device);
+                goto end;
+        }
+
+
         printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",
                ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
                video->flags.multihead ? "yes" : "no",
@@ -1914,6 +2003,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
         acpi_video_bus_put_devices(video);
         acpi_video_bus_remove_fs(device);
 
+        input_unregister_device(video->input);
         kfree(video->attached_array);
         kfree(video);
 
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 06f212ff2b..c16820325d 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -418,10 +418,12 @@ static const struct pci_device_id ahci_pci_tbl[] = {
 
         /* ATI */
         { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
-        { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 IDE */
-        { PCI_VDEVICE(ATI, 0x4391), board_ahci_sb600 }, /* ATI SB700 AHCI */
-        { PCI_VDEVICE(ATI, 0x4392), board_ahci_sb600 }, /* ATI SB700 nraid5 */
-        { PCI_VDEVICE(ATI, 0x4393), board_ahci_sb600 }, /* ATI SB700 raid5 */
+        { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700/800 */
+        { PCI_VDEVICE(ATI, 0x4391), board_ahci_sb600 }, /* ATI SB700/800 */
+        { PCI_VDEVICE(ATI, 0x4392), board_ahci_sb600 }, /* ATI SB700/800 */
+        { PCI_VDEVICE(ATI, 0x4393), board_ahci_sb600 }, /* ATI SB700/800 */
+        { PCI_VDEVICE(ATI, 0x4394), board_ahci_sb600 }, /* ATI SB700/800 */
+        { PCI_VDEVICE(ATI, 0x4395), board_ahci_sb600 }, /* ATI SB700/800 */
 
         /* VIA */
         { PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 430fcf4f9e..9454669547 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "ata_generic"
-#define DRV_VERSION "0.2.12"
+#define DRV_VERSION "0.2.13"
 
 /*
  *      A generic parallel ATA driver using libata
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 071d274afa..6996eb5b75 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -94,7 +94,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME        "ata_piix"
-#define DRV_VERSION     "2.11"
+#define DRV_VERSION     "2.12"
 
 enum {
         PIIX_IOCFG              = 0x54, /* IDE I/O configuration register */
@@ -130,6 +130,7 @@ enum {
         ich6m_sata_ahci         = 8,
         ich8_sata_ahci          = 9,
         piix_pata_mwdma         = 10,   /* PIIX3 MWDMA only */
+        tolapai_sata_ahci       = 11,
 
         /* constants for mapping table */
         P0                      = 0,  /* port 0 */
@@ -253,6 +254,8 @@ static const struct pci_device_id piix_pci_tbl[] = {
         { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
         /* SATA Controller IDE (ICH9M) */
         { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
+        /* SATA Controller IDE (Tolapai) */
+        { 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
 
         { }     /* terminate list */
 };
@@ -441,12 +444,25 @@ static const struct piix_map_db ich8_map_db = {
         },
 };
 
+static const struct piix_map_db tolapai_map_db = {
+        .mask = 0x3,
+        .port_enable = 0x3,
+        .map = {
+                /* PM   PS   SM   SS       MAP */
+                {  P0,  NA,  P1,  NA }, /* 00b */
+                {  RV,  RV,  RV,  RV }, /* 01b */
+                {  RV,  RV,  RV,  RV }, /* 10b */
+                {  RV,  RV,  RV,  RV },
+        },
+};
+
 static const struct piix_map_db *piix_map_db_table[] = {
         [ich5_sata]             = &ich5_map_db,
         [ich6_sata]             = &ich6_map_db,
         [ich6_sata_ahci]        = &ich6_map_db,
         [ich6m_sata_ahci]       = &ich6m_map_db,
         [ich8_sata_ahci]        = &ich8_map_db,
+        [tolapai_sata_ahci]     = &tolapai_map_db,
 };
 
 static struct ata_port_info piix_port_info[] = {
@@ -560,6 +576,17 @@ static struct ata_port_info piix_port_info[] = {
                 .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
                 .port_ops       = &piix_pata_ops,
         },
+
+        /* tolapai_sata_ahci: 11: */
+        {
+                .sht            = &piix_sht,
+                .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SCR |
+                                  PIIX_FLAG_AHCI,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = ATA_UDMA6,
+                .port_ops       = &piix_sata_ops,
+        },
 };
 
 static struct pci_bits piix_enable_bits[] = {
@@ -894,6 +921,13 @@ static int piix_broken_suspend(void)
 {
         static struct dmi_system_id sysids[] = {
                 {
+                        .ident = "TECRA M3",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M3"),
+                        },
+                },
+                {
                         .ident = "TECRA M5",
                         .matches = {
                                 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -908,6 +942,13 @@ static int piix_broken_suspend(void)
                         },
                 },
                 {
+                        .ident = "Satellite U200",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U200"),
+                        },
+                },
+                {
                         .ident = "Satellite U205",
                         .matches = {
                                 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -921,7 +962,8 @@ static int piix_broken_suspend(void)
                                 DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),
                         },
                 },
-                { }
+
+                { }     /* terminate list */
         };
         static const char *oemstrs[] = {
                 "Tecra M3,",
@@ -1139,6 +1181,41 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev,
         hpriv->map = map;
 }
 
+static void piix_iocfg_bit18_quirk(struct pci_dev *pdev)
+{
+        static struct dmi_system_id sysids[] = {
+                {
+                        /* Clevo M570U sets IOCFG bit 18 if the cdrom
+                         * isn't used to boot the system which
+                         * disables the channel.
+                         */
+                        .ident = "M570U",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "Clevo Co."),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "M570U"),
+                        },
+                },
+
+                { }     /* terminate list */
+        };
+        u32 iocfg;
+
+        if (!dmi_check_system(sysids))
+                return;
+
+        /* The datasheet says that bit 18 is NOOP but certain systems
+         * seem to use it to disable a channel.  Clear the bit on the
+         * affected systems.
+         */
+        pci_read_config_dword(pdev, PIIX_IOCFG, &iocfg);
+        if (iocfg & (1 << 18)) {
+                dev_printk(KERN_INFO, &pdev->dev,
+                           "applying IOCFG bit18 quirk\n");
+                iocfg &= ~(1 << 18);
+                pci_write_config_dword(pdev, PIIX_IOCFG, iocfg);
+        }
+}
+
 /**
  *      piix_init_one - Register PIIX ATA PCI device with kernel services
  *      @pdev: PCI device to register
@@ -1200,6 +1277,9 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                               piix_map_db_table[ent->driver_data]);
         }
 
+        /* apply IOCFG bit18 quirk */
+        piix_iocfg_bit18_quirk(pdev);
+
         /* On ICH5, some BIOSen disable the interrupt using the
          * PCI_COMMAND_INTX_DISABLE bit added in PCI 2.3.
          * On ICH6, this bit has the same effect, but only when
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 99d4fbffb0..772be09b46 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1911,8 +1911,9 @@ int ata_dev_configure(struct ata_device *dev)
                                         dev->flags |= ATA_DFLAG_FLUSH_EXT;
                         }
 
-                        if (ata_id_hpa_enabled(dev->id))
-                                dev->n_sectors = ata_hpa_resize(dev);
+                        if (!(dev->horkage & ATA_HORKAGE_BROKEN_HPA) &&
+                            ata_id_hpa_enabled(dev->id))
+                                dev->n_sectors = ata_hpa_resize(dev);
 
                         /* config NCQ */
                         ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));
@@ -3700,11 +3701,16 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int readid_flags)
                 goto fail;
 
         /* verify n_sectors hasn't changed */
-        if (dev->class == ATA_DEV_ATA && dev->n_sectors != n_sectors) {
+        if (dev->class == ATA_DEV_ATA && n_sectors &&
+            dev->n_sectors != n_sectors) {
                 ata_dev_printk(dev, KERN_INFO, "n_sectors mismatch "
                                "%llu != %llu\n",
                                (unsigned long long)n_sectors,
                                (unsigned long long)dev->n_sectors);
+
+                /* restore original n_sectors */
+                dev->n_sectors = n_sectors;
+
                 rc = -ENODEV;
                 goto fail;
         }
@@ -3772,6 +3778,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "Maxtor 6L250S0",     "BANC1G10",     ATA_HORKAGE_NONCQ },
         { "Maxtor 6B200M0",     "BANC1BM0",     ATA_HORKAGE_NONCQ },
         { "Maxtor 6B200M0",     "BANC1B10",     ATA_HORKAGE_NONCQ },
+        { "Maxtor 7B250S0",     "BANC1B70",     ATA_HORKAGE_NONCQ, },
+        { "Maxtor 7B300S0",     "BANC1B70",     ATA_HORKAGE_NONCQ },
+        { "Maxtor 7V300F0",     "VA111630",     ATA_HORKAGE_NONCQ },
         { "HITACHI HDS7250SASUN500G 0621KTAWSD", "K2AOAJ0AHITACHI",
          ATA_HORKAGE_NONCQ },
         /* NCQ hard hangs device under heavier load, needs hard power cycle */
@@ -3788,9 +3797,14 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "WDC WD740ADFD-00NLR1", NULL,         ATA_HORKAGE_NONCQ, },
         { "FUJITSU MHV2080BH",  "00840028",     ATA_HORKAGE_NONCQ, },
         { "ST9160821AS",        "3.CLF",        ATA_HORKAGE_NONCQ, },
+        { "ST3160812AS",        "3.AD",         ATA_HORKAGE_NONCQ, },
         { "SAMSUNG HD401LJ",    "ZZ100-15",     ATA_HORKAGE_NONCQ, },
 
-        /* Devices with NCQ limits */
+        /* devices which puke on READ_NATIVE_MAX */
+        { "HDS724040KLSA80",    "KFAOA20N",     ATA_HORKAGE_BROKEN_HPA, },
+        { "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_HORKAGE_BROKEN_HPA },
+        { "WDC WD2500JD-00HBB0", "WD-WMAL71490727", ATA_HORKAGE_BROKEN_HPA },
+        { "MAXTOR 6L080L4",     "A93.0500",     ATA_HORKAGE_BROKEN_HPA },
 
         /* End Marker */
         { }
@@ -3980,6 +3994,11 @@ static unsigned int ata_dev_init_params(struct ata_device *dev,
         tf.device |= (heads - 1) & 0x0f; /* max head = num. of heads - 1 */
 
         err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
+        /* A clean abort indicates an original or just out of spec drive
+           and we should continue as we issue the setup based on the
+           drive reported working geometry */
+        if (err_mask == AC_ERR_DEV && (tf.feature & ATA_ABORTED))
+                err_mask = 0;
 
         DPRINTK("EXIT, err_mask=%x\n", err_mask);
         return err_mask;
@@ -6020,6 +6039,7 @@ void ata_dev_init(struct ata_device *dev)
          */
         spin_lock_irqsave(ap->lock, flags);
         dev->flags &= ~ATA_DFLAG_INIT_MASK;
+        dev->horkage = 0;
         spin_unlock_irqrestore(ap->lock, flags);
 
         memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0,
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 1cce2198ba..8023167bbb 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -297,7 +297,7 @@ void ata_bmdma_start (struct ata_queued_cmd *qc)
         dmactl = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
         iowrite8(dmactl | ATA_DMA_START, ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
 
-        /* Strictly, one may wish to issue a readb() here, to
+        /* Strictly, one may wish to issue an ioread8() here, to
          * flush the mmio write.  However, control also passes
          * to the hardware at this point, and it will interrupt
          * us when we are to resume control.  So, in effect,
@@ -307,6 +307,9 @@ void ata_bmdma_start (struct ata_queued_cmd *qc)
          * is expected, so I think it is best to not add a readb()
          * without first all the MMIO ATA cards/mobos.
          * Or maybe I'm just being paranoid.
+         *
+         * FIXME: The posting of this write means I/O starts are
+         * unneccessarily delayed for MMIO
          */
 }
 
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index e8a28e94fe..71bdc3b318 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -34,7 +34,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME "pata_ali"
-#define DRV_VERSION "0.7.4"
+#define DRV_VERSION "0.7.5"
 
 /*
  *      Cable special cases
@@ -48,6 +48,13 @@ static struct dmi_system_id cable_dmi_table[] = {
                         DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"),
                 },
         },
+        {
+                .ident = "Toshiba Satelite S1800-814",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index b09facad63..04048fcf63 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_amd"
-#define DRV_VERSION "0.3.8"
+#define DRV_VERSION "0.3.9"
 
 /**
  *      timing_setup            -       shared timing computation and load
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 80509be49e..86f85a2cab 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -22,7 +22,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_atiixp"
-#define DRV_VERSION "0.4.5"
+#define DRV_VERSION "0.4.6"
 
 enum {
         ATIIXP_IDE_PIO_TIMING   = 0x40,
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 7dc76e71bd..e2459088cd 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_cs5520"
-#define DRV_VERSION     "0.6.5"
+#define DRV_VERSION     "0.6.6"
 
 struct pio_clocks
 {
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 68f150a1e2..c6066aa43e 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -35,7 +35,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME        "pata_cs5530"
-#define DRV_VERSION     "0.7.3"
+#define DRV_VERSION     "0.7.4"
 
 static void __iomem *cs5530_port_base(struct ata_port *ap)
 {
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 91a396fa5b..9e553c5420 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -17,7 +17,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_isapnp"
-#define DRV_VERSION "0.2.1"
+#define DRV_VERSION "0.2.2"
 
 static struct scsi_host_template isapnp_sht = {
         .module                 = THIS_MODULE,
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 430673be1d..5d8b91e70e 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -80,7 +80,7 @@
 
 
 #define DRV_NAME "pata_it821x"
-#define DRV_VERSION "0.3.7"
+#define DRV_VERSION "0.3.8"
 
 struct it821x_dev
 {
@@ -533,6 +533,10 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc)
         struct ata_port *ap = qc->ap;
         struct it821x_dev *itdev = ap->private_data;
 
+        /* Only use dma for transfers to/from the media. */
+        if (qc->nbytes < 2048)
+                return -EOPNOTSUPP;
+
         /* No ATAPI DMA in smart mode */
         if (itdev->smart)
                 return -EOPNOTSUPP;
@@ -587,7 +591,7 @@ static int it821x_port_start(struct ata_port *ap)
         itdev->want[1][1] = ATA_ANY;
         itdev->last_device = -1;
 
-        if (pdev->revision == 0x11) {
+        if (pdev->revision == 0x10) {
                 itdev->timing10 = 1;
                 /* Need to disable ATAPI DMA for this case */
                 if (!itdev->smart)
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 4ca7fd6118..5dea3584c6 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -189,6 +189,9 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
         data->cs0 = devm_ioremap(&pdev->dev, cs0->start, 0x1000);
         data->cs1 = devm_ioremap(&pdev->dev, cs1->start, 0x1000);
 
+        if (!data->cs0 || !data->cs1)
+                return -ENOMEM;
+
         irq = platform_get_irq(pdev, 0);
         if (irq)
                 set_irq_type(irq, IRQT_RISING);
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 87594c04d3..b45506f1ef 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -44,10 +44,10 @@ static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline)
                 return -ENOMEM;
         printk("BAR5:");
         for(i = 0; i <= 0x0F; i++)
-                printk("%02X:%02X ", i, readb(barp + i));
+                printk("%02X:%02X ", i, ioread8(barp + i));
         printk("\n");
 
-        devices = readl(barp + 0x0C);
+        devices = ioread32(barp + 0x0C);
         pci_iounmap(pdev, barp);
 
         if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
@@ -192,6 +192,8 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 
 static const struct pci_device_id marvell_pci_tbl[] = {
         { PCI_DEVICE(0x11AB, 0x6101), },
+        { PCI_DEVICE(0x11AB, 0x6121), },
+        { PCI_DEVICE(0x11AB, 0x6123), },
         { PCI_DEVICE(0x11AB, 0x6145), },
         { }     /* terminate list */
 };
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 182e83c904..099f4cdc4c 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -24,7 +24,7 @@
 
 
 #define DRV_NAME        "mpc52xx_ata"
-#define DRV_VERSION     "0.1.0ac2"
+#define DRV_VERSION     "0.1.2"
 
 
 /* Private structures used by the driver */
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 6da23feed0..0f2b027624 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -42,7 +42,7 @@
 
 
 #define DRV_NAME "pata_pcmcia"
-#define DRV_VERSION "0.3.1"
+#define DRV_VERSION "0.3.2"
 
 /*
  *      Private data structure to glue stuff together
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 69a5aa4949..bb64a986e8 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -35,7 +35,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_pdc2027x"
-#define DRV_VERSION     "0.9"
+#define DRV_VERSION     "1.0"
 #undef PDC_DEBUG
 
 #ifdef PDC_DEBUG
@@ -563,13 +563,13 @@ static long pdc_read_counter(struct ata_host *host)
         u32 bccrl, bccrh, bccrlv, bccrhv;
 
 retry:
-        bccrl = readl(mmio_base + PDC_BYTE_COUNT) & 0xffff;
-        bccrh = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0xffff;
+        bccrl = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff;
+        bccrh = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff;
         rmb();
 
         /* Read the counter values again for verification */
-        bccrlv = readl(mmio_base + PDC_BYTE_COUNT) & 0xffff;
-        bccrhv = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0xffff;
+        bccrlv = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff;
+        bccrhv = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff;
         rmb();
 
         counter = (bccrh << 15) | bccrl;
@@ -692,16 +692,16 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
         struct timeval start_time, end_time;
         long pll_clock, usec_elapsed;
 
-        /* Read current counter value */
-        start_count = pdc_read_counter(host);
-        do_gettimeofday(&start_time);
-
         /* Start the test mode */
         scr = readl(mmio_base + PDC_SYS_CTL);
         PDPRINTK("scr[%X]\n", scr);
         writel(scr | (0x01 << 14), mmio_base + PDC_SYS_CTL);
         readl(mmio_base + PDC_SYS_CTL); /* flush */
 
+        /* Read current counter value */
+        start_count = pdc_read_counter(host);
+        do_gettimeofday(&start_time);
+
         /* Let the counter run for 100 ms. */
         mdelay(100);
 
@@ -719,7 +719,7 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
         usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 +
                 (end_time.tv_usec - start_time.tv_usec);
 
-        pll_clock = (start_count - end_count) / 100 *
+        pll_clock = ((start_count - end_count) & 0x3fffffff) / 100 *
                 (100000000 / usec_elapsed);
 
         PDPRINTK("start[%ld] end[%ld] \n", start_count, end_count);
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index a909f793ff..5086d03f2d 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -22,7 +22,7 @@
 #include <linux/pata_platform.h>
 
 #define DRV_NAME "pata_platform"
-#define DRV_VERSION "1.0"
+#define DRV_VERSION "1.1"
 
 static int pio_mask = 1;
 
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index b8b2d11e41..5edf67b1f3 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -40,7 +40,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sc1200"
-#define DRV_VERSION     "0.2.5"
+#define DRV_VERSION     "0.2.6"
 
 #define SC1200_REV_A    0x00
 #define SC1200_REV_B1   0x01
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 36cdbd2b0b..2d048ef25a 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -43,7 +43,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME                "pata_scc"
-#define DRV_VERSION             "0.2"
+#define DRV_VERSION             "0.3"
 
 #define PCI_DEVICE_ID_TOSHIBA_SCC_ATA           0x01b4
 
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 89691541fe..0faf99c8f1 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_serverworks"
-#define DRV_VERSION "0.4.1"
+#define DRV_VERSION "0.4.2"
 
 #define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
 #define SVWKS_CSB6_REVISION     0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index b0cd52d6e3..40395804a6 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -33,7 +33,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_sil680"
-#define DRV_VERSION "0.4.6"
+#define DRV_VERSION "0.4.7"
 
 #define SIL680_MMIO_BAR         5
 
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 66bd0e83ac..cce2834b2b 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -54,6 +54,7 @@ struct sis_laptop {
 static const struct sis_laptop sis_laptop[] = {
         /* devid, subvendor, subdev */
         { 0x5513, 0x1043, 0x1107 },     /* ASUS A6K */
+        { 0x5513, 0x1734, 0x105F },     /* FSC Amilo A1630 */
         /* end marker */
         { 0, }
 };
@@ -374,8 +375,9 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev)
         int drive_pci = sis_old_port_base(adev);
         u16 timing;
 
+        /* MWDMA 0-2 and UDMA 0-5 */
         const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
-        const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000};
+        const u16 udma_bits[]  = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000, 0x8000 };
 
         pci_read_config_word(pdev, drive_pci, &timing);
 
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 8c2813aa6c..c0f43bb259 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_sl82c105"
-#define DRV_VERSION "0.3.1"
+#define DRV_VERSION "0.3.2"
 
 enum {
         /*
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index f645fe22cd..636c4f1a0b 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -63,7 +63,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME "pata_via"
-#define DRV_VERSION "0.3.1"
+#define DRV_VERSION "0.3.2"
 
 /*
  *      The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx
@@ -97,6 +97,7 @@ static const struct via_isa_bridge {
         u8 rev_max;
         u16 flags;
 } via_isa_bridges[] = {
+        { "vx800",      PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
@@ -144,6 +145,9 @@ static int via_cable_override(struct pci_dev *pdev)
         /* Systems by DMI */
         if (dmi_check_system(cable_dmi_table))
                 return 1;
+        /* Arima W730-K8/Targa Visionary 811/... */
+        if (pdev->subsystem_vendor == 0x161F && pdev->subsystem_device == 0x2032)
+                return 1;
         return 0;
 }
 
@@ -240,7 +244,6 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
         int ut;
         int offset = 3 - (2*ap->port_no) - adev->devno;
 
-
         /* Calculate the timing values we require */
         ata_timing_compute(adev, mode, &t, T, UT);
 
@@ -287,9 +290,17 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
                         ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
                         break;
         }
+
         /* Set UDMA unless device is not UDMA capable */
-        if (udma_type)
-                pci_write_config_byte(pdev, 0x50 + offset, ut);
+        if (udma_type) {
+                u8 cable80_status;
+
+                /* Get 80-wire cable detection bit */
+                pci_read_config_byte(pdev, 0x50 + offset, &cable80_status);
+                cable80_status &= 0x10;
+
+                pci_write_config_byte(pdev, 0x50 + offset, ut | cable80_status);
+        }
 }
 
 static void via_set_piomode(struct ata_port *ap, struct ata_device *adev)
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index bec1de594d..5c79271401 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -44,7 +44,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pdc_adma"
-#define DRV_VERSION     "0.06"
+#define DRV_VERSION     "1.0"
 
 /* macro to calculate base address for ATA regs */
 #define ADMA_ATA_REGS(base,port_no)     ((base) + ((port_no) * 0x40))
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index a9c948d760..fdbed8ecdf 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -28,7 +28,7 @@
 #include <scsi/scsi_device.h>
 
 #define DRV_NAME        "sata_inic162x"
-#define DRV_VERSION     "0.2"
+#define DRV_VERSION     "0.3"
 
 enum {
         MMIO_BAR                = 5,
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 3acf65e75e..cb7dec97fe 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -72,7 +72,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_mv"
-#define DRV_VERSION     "0.81"
+#define DRV_VERSION     "1.0"
 
 enum {
         /* BAR's are enumerated in terms of pci_resource_start() terms */
@@ -313,7 +313,10 @@ enum {
 #define IS_GEN_IIE(hpriv) ((hpriv)->hp_flags & MV_HP_GEN_IIE)
 
 enum {
-        MV_DMA_BOUNDARY         = 0xffffffffU,
+        /* DMA boundary 0xffff is required by the s/g splitting
+         * we need on /length/ in mv_fill-sg().
+         */
+        MV_DMA_BOUNDARY         = 0xffffU,
 
         /* mask of register bits containing lower 32 bits
          * of EDMA request queue DMA address
@@ -448,7 +451,7 @@ static struct scsi_host_template mv5_sht = {
         .queuecommand           = ata_scsi_queuecmd,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
-        .sg_tablesize           = MV_MAX_SG_CT,
+        .sg_tablesize           = MV_MAX_SG_CT / 2,
         .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
         .emulated               = ATA_SHT_EMULATED,
         .use_clustering         = 1,
@@ -466,7 +469,7 @@ static struct scsi_host_template mv6_sht = {
         .queuecommand           = ata_scsi_queuecmd,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
-        .sg_tablesize           = MV_MAX_SG_CT,
+        .sg_tablesize           = MV_MAX_SG_CT / 2,
         .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
         .emulated               = ATA_SHT_EMULATED,
         .use_clustering         = 1,
@@ -1139,15 +1142,27 @@ static unsigned int mv_fill_sg(struct ata_queued_cmd *qc)
                 dma_addr_t addr = sg_dma_address(sg);
                 u32 sg_len = sg_dma_len(sg);
 
-                mv_sg->addr = cpu_to_le32(addr & 0xffffffff);
-                mv_sg->addr_hi = cpu_to_le32((addr >> 16) >> 16);
-                mv_sg->flags_size = cpu_to_le32(sg_len & 0xffff);
+                while (sg_len) {
+                        u32 offset = addr & 0xffff;
+                        u32 len = sg_len;
+
+                        if ((offset + sg_len > 0x10000))
+                                len = 0x10000 - offset;
+
+                        mv_sg->addr = cpu_to_le32(addr & 0xffffffff);
+                        mv_sg->addr_hi = cpu_to_le32((addr >> 16) >> 16);
+                        mv_sg->flags_size = cpu_to_le32(len);
 
-                if (ata_sg_is_last(sg, qc))
-                        mv_sg->flags_size |= cpu_to_le32(EPRD_FLAG_END_OF_TBL);
+                        sg_len -= len;
+                        addr += len;
+
+                        if (!sg_len && ata_sg_is_last(sg, qc))
+                                mv_sg->flags_size |= cpu_to_le32(EPRD_FLAG_END_OF_TBL);
+
+                        mv_sg++;
+                        n_sg++;
+                }
 
-                mv_sg++;
-                n_sg++;
         }
 
         return n_sg;
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 0b58c4df6f..40dc731398 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -49,7 +49,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME                        "sata_nv"
-#define DRV_VERSION                     "3.4"
+#define DRV_VERSION                     "3.5"
 
 #define NV_ADMA_DMA_BOUNDARY            0xffffffffUL
 
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index d39ebc23c4..25698cf0dc 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -45,7 +45,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_promise"
-#define DRV_VERSION     "2.09"
+#define DRV_VERSION     "2.10"
 
 enum {
         PDC_MAX_PORTS           = 4,
@@ -328,8 +328,8 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = {
 
         { PCI_VDEVICE(PROMISE, 0x3318), board_20319 },
         { PCI_VDEVICE(PROMISE, 0x3319), board_20319 },
-        { PCI_VDEVICE(PROMISE, 0x3515), board_20319 },
-        { PCI_VDEVICE(PROMISE, 0x3519), board_20319 },
+        { PCI_VDEVICE(PROMISE, 0x3515), board_40518 },
+        { PCI_VDEVICE(PROMISE, 0x3519), board_40518 },
         { PCI_VDEVICE(PROMISE, 0x3d17), board_40518 },
         { PCI_VDEVICE(PROMISE, 0x3d18), board_40518 },
 
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index c8f9242e7f..5e1dfdda69 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -39,7 +39,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_qstor"
-#define DRV_VERSION     "0.08"
+#define DRV_VERSION     "0.09"
 
 enum {
         QS_MMIO_BAR             = 4,
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index db67637589..8c72e714b4 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_sil"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 
 enum {
         SIL_MMIO_BAR            = 5,
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 46fbbe7f12..233e886933 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -30,7 +30,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_sil24"
-#define DRV_VERSION     "0.9"
+#define DRV_VERSION     "1.0"
 
 /*
  * Port request block (PRB) 32 bytes
@@ -888,6 +888,16 @@ static inline void sil24_host_intr(struct ata_port *ap)
         u32 slot_stat, qc_active;
         int rc;
 
+        /* If PCIX_IRQ_WOC, there's an inherent race window between
+         * clearing IRQ pending status and reading PORT_SLOT_STAT
+         * which may cause spurious interrupts afterwards.  This is
+         * unavoidable and much better than losing interrupts which
+         * happens if IRQ pending is cleared after reading
+         * PORT_SLOT_STAT.
+         */
+        if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
+                writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
+
         slot_stat = readl(port + PORT_SLOT_STAT);
 
         if (unlikely(slot_stat & HOST_SSTAT_ATTN)) {
@@ -895,9 +905,6 @@ static inline void sil24_host_intr(struct ata_port *ap)
                 return;
         }
 
-        if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
-                writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
-
         qc_active = slot_stat & ~HOST_SSTAT_ATTN;
         rc = ata_qc_complete_multiple(ap, qc_active, sil24_finish_qc);
         if (rc > 0)
@@ -910,7 +917,8 @@ static inline void sil24_host_intr(struct ata_port *ap)
                 return;
         }
 
-        if (ata_ratelimit())
+        /* spurious interrupts are expected if PCIX_IRQ_WOC */
+        if (!(ap->flags & SIL24_FLAG_PCIX_IRQ_WOC) && ata_ratelimit())
                 ata_port_printk(ap, KERN_INFO, "spurious interrupt "
                         "(slot_stat 0x%x active_tag %d sactive 0x%x)\n",
                         slot_stat, ap->active_tag, ap->sactive);
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 31a2f55aae..41c1d6e8f1 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -43,7 +43,7 @@
 #include "sis.h"
 
 #define DRV_NAME        "sata_sis"
-#define DRV_VERSION     "0.8"
+#define DRV_VERSION     "1.0"
 
 enum {
         sis_180                 = 0,
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 92e8770750..d9678e7bc3 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -53,7 +53,7 @@
 #endif /* CONFIG_PPC_OF */
 
 #define DRV_NAME        "sata_svw"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 
 enum {
         /* ap->flags bits */
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 5193bd8647..97aefdd87b 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -92,7 +92,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_sx4"
-#define DRV_VERSION     "0.11"
+#define DRV_VERSION     "0.12"
 
 
 enum {
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 78c28512f0..e6b8b45279 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -36,7 +36,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_uli"
-#define DRV_VERSION     "1.2"
+#define DRV_VERSION     "1.3"
 
 enum {
         uli_5289                = 0,
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 86b7bfc173..57fd30de8f 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_via"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 
 enum board_ids_enum {
         vt6420,
@@ -371,7 +371,7 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 };
-        pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]);
+        pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]);
 }
 
 static const unsigned int svia_bar_sizes[] = {
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 24344d0d05..1920915dfa 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -47,7 +47,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_vsc"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 
 enum {
         VSC_MMIO_BAR                    = 0,
diff --git a/drivers/base/core.c b/drivers/base/core.c
index e6738bcbe5..ec86d6fc23 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -284,6 +284,7 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
 
         /* let the kset specific function add its keys */
         pos = data;
+        memset(envp, 0, sizeof(envp));
         retval = kset->uevent_ops->uevent(kset, &dev->kobj,
                                           envp, ARRAY_SIZE(envp),
                                           pos, PAGE_SIZE);
@@ -585,9 +586,13 @@ void device_initialize(struct device *dev)
 static struct kobject * get_device_parent(struct device *dev,
                                           struct device *parent)
 {
-        /* Set the parent to the class, not the parent device */
-        /* this keeps sysfs from having a symlink to make old udevs happy */
-        if (dev->class)
+        /*
+         * Set the parent to the class, not the parent device
+         * for topmost devices in class hierarchy.
+         * This keeps sysfs from having a symlink to make old
+         * udevs happy
+         */
+        if (dev->class && (!parent || parent->class != dev->class))
                 return &dev->class->subsys.kobj;
         else if (parent)
                 return &parent->kobj;
@@ -679,14 +684,26 @@ static int device_add_class_symlinks(struct device *dev)
                         goto out_subsys;
         }
         if (dev->parent) {
-                error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
-                                          "device");
-                if (error)
-                        goto out_busid;
 #ifdef CONFIG_SYSFS_DEPRECATED
                 {
-                        char * class_name = make_class_name(dev->class->name,
-                                                                &dev->kobj);
+                        struct device *parent = dev->parent;
+                        char *class_name;
+
+                        /*
+                         * In old sysfs stacked class devices had 'device'
+                         * link pointing to real device instead of parent
+                         */
+                        while (parent->class && !parent->bus && parent->parent)
+                                parent = parent->parent;
+
+                        error = sysfs_create_link(&dev->kobj,
+                                                  &parent->kobj,
+                                                  "device");
+                        if (error)
+                                goto out_busid;
+
+                        class_name = make_class_name(dev->class->name,
+                                                        &dev->kobj);
                         if (class_name)
                                 error = sysfs_create_link(&dev->parent->kobj,
                                                         &dev->kobj, class_name);
@@ -694,6 +711,11 @@ static int device_add_class_symlinks(struct device *dev)
                         if (error)
                                 goto out_device;
                 }
+#else
+                error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
+                                          "device");
+                if (error)
+                        goto out_busid;
 #endif
         }
         return 0;
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 92bf868ca0..84d6aa500e 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -17,8 +17,8 @@
 */
 
 
-#define DAC960_DriverVersion                    "2.5.48"
-#define DAC960_DriverDate                       "14 May 2006"
+#define DAC960_DriverVersion                    "2.5.49"
+#define DAC960_DriverDate                       "21 Aug 2007"
 
 
 #include <linux/module.h>
@@ -31,6 +31,7 @@
 #include <linux/genhd.h>
 #include <linux/hdreg.h>
 #include <linux/blkpg.h>
+#include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
@@ -1165,9 +1166,9 @@ static bool DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T
   int i;
 
   
-  if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V1_PciDmaMask))
+  if (pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
         return DAC960_Failure(Controller, "DMA mask out of range");
-  Controller->BounceBufferLimit = DAC690_V1_PciDmaMask;
+  Controller->BounceBufferLimit = DMA_32BIT_MASK;
 
   if ((hw_type == DAC960_PD_Controller) || (hw_type == DAC960_P_Controller)) {
     CommandMailboxesSize =  0;
@@ -1368,9 +1369,12 @@ static bool DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T
   dma_addr_t    CommandMailboxDMA;
   DAC960_V2_CommandStatus_T CommandStatus;
 
-  if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V2_PciDmaMask))
-        return DAC960_Failure(Controller, "DMA mask out of range");
-  Controller->BounceBufferLimit = DAC690_V2_PciDmaMask;
+        if (!pci_set_dma_mask(Controller->PCIDevice, DMA_64BIT_MASK))
+                Controller->BounceBufferLimit = DMA_64BIT_MASK;
+        else if (!pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
+                Controller->BounceBufferLimit = DMA_32BIT_MASK;
+        else
+                return DAC960_Failure(Controller, "DMA mask out of range");
 
   /* This is a temporary dma mapping, used only in the scope of this function */
   CommandMailbox = pci_alloc_consistent(PCI_Device,
diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h
index f5e2436c39..85fa9bb637 100644
--- a/drivers/block/DAC960.h
+++ b/drivers/block/DAC960.h
@@ -61,13 +61,6 @@
 #define DAC960_V2_MaxPhysicalDevices            272
 
 /*
-  Define the pci dma mask supported by DAC960 V1 and V2 Firmware Controlers
- */
-
-#define DAC690_V1_PciDmaMask    0xffffffff
-#define DAC690_V2_PciDmaMask    0xffffffffffffffffULL
-
-/*
   Define a 32/64 bit I/O Address data type.
 */
 
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 4dff49256a..317a790c15 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -417,7 +417,7 @@ static int __send_request(struct request *req)
         desc->req_id = port->req_id;
         desc->operation = op;
         if (port->vdisk_type == VD_DISK_TYPE_DISK) {
-                desc->slice = 2;
+                desc->slice = 0xff;
         } else {
                 desc->slice = 0;
         }
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 59b054810e..98a9cdeaff 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -691,15 +691,18 @@ static void hci_usb_rx_complete(struct urb *urb)
                                         urb->iso_frame_desc[i].offset,
                                         urb->iso_frame_desc[i].actual_length);
         
-                        if (!urb->iso_frame_desc[i].status)
+                        if (!urb->iso_frame_desc[i].status) {
+                                husb->hdev->stat.byte_rx += urb->iso_frame_desc[i].actual_length;
                                 hci_recv_fragment(husb->hdev, _urb->type, 
                                         urb->transfer_buffer + urb->iso_frame_desc[i].offset,
                                         urb->iso_frame_desc[i].actual_length);
+                        }
                 }
 #else
                 ;
 #endif
         } else {
+                husb->hdev->stat.byte_rx += count;
                 err = hci_recv_fragment(husb->hdev, _urb->type, urb->transfer_buffer, count);
                 if (err < 0) { 
                         BT_ERR("%s corrupted packet: type %d count %d",
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 67ee3d4b28..79245714f0 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1032,6 +1032,10 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
         check_disk_change(ip->i_bdev);
         return 0;
 err_release:
+        if (CDROM_CAN(CDC_LOCK) && cdi->options & CDO_LOCK) {
+                cdi->ops->lock_door(cdi, 0);
+                cdinfo(CD_OPEN, "door unlocked.\n");
+        }
         cdi->ops->release(cdi);
 err:
         cdi->use_count--;
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d68ddbe70f..c78ff26647 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -129,7 +129,7 @@ $(obj)/defkeymap.o:  $(obj)/defkeymap.c
 
 ifdef GENERATE_KEYMAP
 
-$(obj)/defkeymap.c $(obj)/%.c: $(src)/%.map
+$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
         loadkeys --mktable $< > $@.tmp
         sed -e 's/^static *//' $@.tmp > $@
         rm $@.tmp
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 35ab1a9f8e..8955e7ff75 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -176,7 +176,7 @@ struct agp_bridge_data {
 #define I830_GMCH_MEM_MASK              0x1
 #define I830_GMCH_MEM_64M               0x1
 #define I830_GMCH_MEM_128M              0
-#define I830_GMCH_GMS_MASK              0xF0
+#define I830_GMCH_GMS_MASK              0x70
 #define I830_GMCH_GMS_DISABLED          0x00
 #define I830_GMCH_GMS_LOCAL             0x10
 #define I830_GMCH_GMS_STOLEN_512        0x20
@@ -190,6 +190,7 @@ struct agp_bridge_data {
 #define INTEL_I830_ERRSTS       0x92
 
 /* Intel 855GM/852GM registers */
+#define I855_GMCH_GMS_MASK              0xF0
 #define I855_GMCH_GMS_STOLEN_0M         0x0
 #define I855_GMCH_GMS_STOLEN_1M         (0x1 << 4)
 #define I855_GMCH_GMS_STOLEN_4M         (0x2 << 4)
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index df0ddf14b8..f60bca70d1 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -223,6 +223,8 @@ static int amd_irongate_configure(void)
         pci_read_config_dword(agp_bridge->dev, AMD_MMBASE, &temp);
         temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
         amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
+        if (!amd_irongate_private.registers)
+                return -ENOMEM;
 
         /* Write out the address of the gatt table */
         writel(agp_bridge->gatt_bus_addr, amd_irongate_private.registers+AMD_ATTBASE);
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index da7513d7b4..2d46b713c8 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -213,6 +213,9 @@ static int ati_configure(void)
         temp = (temp & 0xfffff000);
         ati_generic_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
 
+        if (!ati_generic_private.registers)
+                return -ENOMEM;
+
         if (is_r200())
                 pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 0x20000);
         else
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index df8da72628..d78cd09186 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -375,6 +375,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
         if (!r->start && r->end) {
                 if (pci_assign_resource(pdev, 0)) {
                         printk(KERN_ERR PFX "could not assign resource 0\n");
+                        agp_put_bridge(bridge);
                         return -ENODEV;
                 }
         }
@@ -386,6 +387,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
         */
         if (pci_enable_device(pdev)) {
                 printk(KERN_ERR PFX "Unable to Enable PCI device\n");
+                agp_put_bridge(bridge);
                 return -ENODEV;
         }
 
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index bcdb149c81..313a133a11 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -221,6 +221,7 @@ hp_zx1_lba_init (u64 hpa)
         if (cap != PCI_CAP_ID_AGP) {
                 printk(KERN_ERR PFX "Invalid capability ID 0x%02x at 0x%x\n",
                        cap, hp->lba_cap_offset);
+                iounmap(hp->lba_regs);
                 return -ENODEV;
         }
 
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index 53354bf83a..75d2aca635 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -249,6 +249,10 @@ static int i460_create_gatt_table (struct agp_bridge_data *bridge)
         num_entries = A_SIZE_8(temp)->num_entries;
 
         i460.gatt = ioremap(INTEL_I460_ATTBASE, PAGE_SIZE << page_order);
+        if (!i460.gatt) {
+                printk(KERN_ERR PFX "ioremap failed\n");
+                return -ENOMEM;
+        }
 
         /* These are no good, the should be removed from the agp_bridge strucure... */
         agp_bridge->gatt_table_real = NULL;
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 294cdbf4d4..141ca176c3 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -506,7 +506,7 @@ static void intel_i830_init_gtt_entries(void)
                         break;
                 }
         } else {
-                switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
+                switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
                 case I855_GMCH_GMS_STOLEN_1M:
                         gtt_entries = MB(1) - KB(size);
                         break;
@@ -914,6 +914,7 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
         struct aper_size_info_fixed *size;
         int num_entries;
         u32 temp, temp2;
+        int gtt_map_size = 256 * 1024;
 
         size = agp_bridge->current_size;
         page_order = size->page_order;
@@ -923,15 +924,19 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
         pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp);
         pci_read_config_dword(intel_private.pcidev, I915_PTEADDR,&temp2);
 
-        intel_private.gtt = ioremap(temp2, 256 * 1024);
+        if (IS_G33)
+            gtt_map_size = 1024 * 1024; /* 1M on G33 */
+        intel_private.gtt = ioremap(temp2, gtt_map_size);
         if (!intel_private.gtt)
                 return -ENOMEM;
 
         temp &= 0xfff80000;
 
         intel_private.registers = ioremap(temp,128 * 4096);
-        if (!intel_private.registers)
+        if (!intel_private.registers) {
+                iounmap(intel_private.gtt);
                 return -ENOMEM;
+        }
 
         temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;
         global_cache_flush();   /* FIXME: ? */
@@ -985,13 +990,15 @@ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge)
        temp &= 0xfff00000;
        intel_private.gtt = ioremap((temp + (512 * 1024)) , 512 * 1024);
 
-       if (!intel_private.gtt)
-               return -ENOMEM;
+        if (!intel_private.gtt)
+                return -ENOMEM;
 
 
        intel_private.registers = ioremap(temp,128 * 4096);
-       if (!intel_private.registers)
-               return -ENOMEM;
+       if (!intel_private.registers) {
+                iounmap(intel_private.gtt);
+                return -ENOMEM;
+        }
 
        temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;
        global_cache_flush();   /* FIXME: ? */
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 6cd7373dcd..225ed2a53d 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -157,6 +157,9 @@ static int nvidia_configure(void)
         nvidia_private.aperture =
                 (volatile u32 __iomem *) ioremap(apbase, 33 * PAGE_SIZE);
 
+        if (!nvidia_private.aperture)
+                return -ENOMEM;
+
         return 0;
 }
 
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 9aaf401a89..0ecc54d327 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -399,6 +399,11 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
                 .device_id  = PCI_DEVICE_ID_VIA_P4M890,
                 .chipset_name   = "P4M890",
         },
+        /* P4M900 */
+        {
+                .device_id  = PCI_DEVICE_ID_VIA_VT3364,
+                .chipset_name   = "P4M900",
+        },
         { }, /* dummy final entry, always present */
 };
 
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 923174c54a..c115b39b85 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -177,8 +177,14 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset,
                                                      MTRR_TYPE_WRCOMB, 1);
                         }
                 }
-                if (map->type == _DRM_REGISTERS)
+                if (map->type == _DRM_REGISTERS) {
                         map->handle = ioremap(map->offset, map->size);
+                        if (!map->handle) {
+                                drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+                                return -ENOMEM;
+                        }
+                }
+                                
                 break;
         case _DRM_SHM:
                 list = drm_find_matching_map(dev, map);
@@ -479,11 +485,6 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
                 return -EINVAL;
         }
 
-        if (!map) {
-                mutex_unlock(&dev->struct_mutex);
-                return -EINVAL;
-        }
-
         /* Register and framebuffer maps are permanent */
         if ((map->type == _DRM_REGISTERS) || (map->type == _DRM_FRAME_BUFFER)) {
                 mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 737088bd07..28b98733be 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -210,6 +210,12 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define I915REG_INT_MASK_R      0x020a8
 #define I915REG_INT_ENABLE_R    0x020a0
 
+#define I915REG_PIPEASTAT       0x70024
+#define I915REG_PIPEBSTAT       0x71024
+
+#define I915_VBLANK_INTERRUPT_ENABLE    (1UL<<17)
+#define I915_VBLANK_CLEAR               (1UL<<1)
+
 #define SRX_INDEX               0x3c4
 #define SRX_DATA                0x3c5
 #define SR01                    1
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index 4b4b2ce898..bb8e9e9c82 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -214,6 +214,10 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
         struct drm_device *dev = (struct drm_device *) arg;
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
         u16 temp;
+        u32 pipea_stats, pipeb_stats;
+
+        pipea_stats = I915_READ(I915REG_PIPEASTAT);
+        pipeb_stats = I915_READ(I915REG_PIPEBSTAT);
 
         temp = I915_READ16(I915REG_INT_IDENTITY_R);
 
@@ -225,6 +229,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                 return IRQ_NONE;
 
         I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
+        (void) I915_READ16(I915REG_INT_IDENTITY_R);
+        DRM_READMEMORYBARRIER();
 
         dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
 
@@ -252,6 +258,12 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 
                 if (dev_priv->swaps_pending > 0)
                         drm_locked_tasklet(dev, i915_vblank_tasklet);
+                I915_WRITE(I915REG_PIPEASTAT,
+                        pipea_stats|I915_VBLANK_INTERRUPT_ENABLE|
+                        I915_VBLANK_CLEAR);
+                I915_WRITE(I915REG_PIPEBSTAT,
+                        pipeb_stats|I915_VBLANK_INTERRUPT_ENABLE|
+                        I915_VBLANK_CLEAR);
         }
 
         return IRQ_HANDLED;
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
index 832de1d9ba..3dd1ed3d1b 100644
--- a/drivers/char/drm/via_dmablit.c
+++ b/drivers/char/drm/via_dmablit.c
@@ -560,7 +560,7 @@ via_init_dmablit(struct drm_device *dev)
                 blitq->head = 0;
                 blitq->cur = 0;
                 blitq->serviced = 0;
-                blitq->num_free = VIA_NUM_BLIT_SLOTS;
+                blitq->num_free = VIA_NUM_BLIT_SLOTS - 1;
                 blitq->num_outstanding = 0;
                 blitq->is_active = 0;
                 blitq->aborting = 0;
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 77bf4aa217..4c16778e3f 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -62,6 +62,8 @@
 
 static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
 
+/* This clocksource driver currently only works on ia64 */
+#ifdef CONFIG_IA64
 static void __iomem *hpet_mctr;
 
 static cycle_t read_hpet(void)
@@ -79,6 +81,7 @@ static struct clocksource clocksource_hpet = {
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 static struct clocksource *hpet_clocksource;
+#endif
 
 /* A lock for concurrent access by app and isr hpet activity. */
 static DEFINE_SPINLOCK(hpet_lock);
@@ -909,6 +912,8 @@ int hpet_alloc(struct hpet_data *hdp)
 
         hpetp->hp_delta = hpet_calibrate(hpetp);
 
+/* This clocksource driver currently only works on ia64 */
+#ifdef CONFIG_IA64
         if (!hpet_clocksource) {
                 hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;
                 CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr);
@@ -918,6 +923,7 @@ int hpet_alloc(struct hpet_data *hdp)
                 hpetp->hp_clocksource = &clocksource_hpet;
                 hpet_clocksource = &clocksource_hpet;
         }
+#endif
 
         return 0;
 }
@@ -940,14 +946,14 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                         printk(KERN_DEBUG "%s: 0x%lx is busy\n",
                                 __FUNCTION__, hdp->hd_phys_address);
                         iounmap(hdp->hd_address);
-                        return -EBUSY;
+                        return AE_ALREADY_EXISTS;
                 }
         } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
                 struct acpi_resource_fixed_memory32 *fixmem32;
 
                 fixmem32 = &res->data.fixed_memory32;
                 if (!fixmem32)
-                        return -EINVAL;
+                        return AE_NO_MEMORY;
 
                 hdp->hd_phys_address = fixmem32->address;
                 hdp->hd_address = ioremap(fixmem32->address,
@@ -957,7 +963,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                         printk(KERN_DEBUG "%s: 0x%lx is busy\n",
                                 __FUNCTION__, hdp->hd_phys_address);
                         iounmap(hdp->hd_address);
-                        return -EBUSY;
+                        return AE_ALREADY_EXISTS;
                 }
         } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
                 struct acpi_resource_extended_irq *irqp;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 9b07f78510..dd441ff4af 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2215,7 +2215,8 @@ static int ipmi_pci_resume(struct pci_dev *pdev)
 
 static struct pci_device_id ipmi_pci_devices[] = {
         { PCI_DEVICE(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID) },
-        { PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE_MASK) }
+        { PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE_MASK) },
+        { 0, }
 };
 MODULE_DEVICE_TABLE(pci, ipmi_pci_devices);
 
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 1f0962616e..4fe9206f84 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -25,7 +25,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <linux/delay.h>
 
 #include "lcd.h"
 
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index c08a4152ee..04ac155d3a 100644
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -67,7 +67,7 @@
 /*
  * Page types allocated by the device.
  */
-enum {
+enum mspec_page_type {
         MSPEC_FETCHOP = 1,
         MSPEC_CACHED,
         MSPEC_UNCACHED
@@ -83,15 +83,25 @@ static int is_sn2;
  * One of these structures is allocated when an mspec region is mmaped. The
  * structure is pointed to by the vma->vm_private_data field in the vma struct.
  * This structure is used to record the addresses of the mspec pages.
+ * This structure is shared by all vma's that are split off from the
+ * original vma when split_vma()'s are done.
+ *
+ * The refcnt is incremented atomically because mm->mmap_sem does not
+ * protect in fork case where multiple tasks share the vma_data.
  */
 struct vma_data {
         atomic_t refcnt;        /* Number of vmas sharing the data. */
-        spinlock_t lock;        /* Serialize access to the vma. */
+        spinlock_t lock;        /* Serialize access to this structure. */
         int count;              /* Number of pages allocated. */
-        int type;               /* Type of pages allocated. */
+        enum mspec_page_type type; /* Type of pages allocated. */
+        int flags;              /* See VMD_xxx below. */
+        unsigned long vm_start; /* Original (unsplit) base. */
+        unsigned long vm_end;   /* Original (unsplit) end. */
         unsigned long maddr[0]; /* Array of MSPEC addresses. */
 };
 
+#define VMD_VMALLOCED 0x1       /* vmalloc'd rather than kmalloc'd */
+
 /* used on shub2 to clear FOP cache in the HUB */
 static unsigned long scratch_page[MAX_NUMNODES];
 #define SH2_AMO_CACHE_ENTRIES   4
@@ -129,8 +139,8 @@ mspec_zero_block(unsigned long addr, int len)
  * mspec_open
  *
  * Called when a device mapping is created by a means other than mmap
- * (via fork, etc.).  Increments the reference count on the underlying
- * mspec data so it is not freed prematurely.
+ * (via fork, munmap, etc.).  Increments the reference count on the
+ * underlying mspec data so it is not freed prematurely.
  */
 static void
 mspec_open(struct vm_area_struct *vma)
@@ -145,43 +155,43 @@ mspec_open(struct vm_area_struct *vma)
  * mspec_close
  *
  * Called when unmapping a device mapping. Frees all mspec pages
- * belonging to the vma.
+ * belonging to all the vma's sharing this vma_data structure.
  */
 static void
 mspec_close(struct vm_area_struct *vma)
 {
         struct vma_data *vdata;
-        int i, pages, result, vdata_size;
+        int index, last_index;
+        unsigned long my_page;
 
         vdata = vma->vm_private_data;
+
         if (!atomic_dec_and_test(&vdata->refcnt))
                 return;
 
-        pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-        vdata_size = sizeof(struct vma_data) + pages * sizeof(long);
-        for (i = 0; i < pages; i++) {
-                if (vdata->maddr[i] == 0)
+        last_index = (vdata->vm_end - vdata->vm_start) >> PAGE_SHIFT;
+        for (index = 0; index < last_index; index++) {
+                if (vdata->maddr[index] == 0)
                         continue;
                 /*
                  * Clear the page before sticking it back
                  * into the pool.
                  */
-                result = mspec_zero_block(vdata->maddr[i], PAGE_SIZE);
-                if (!result)
-                        uncached_free_page(vdata->maddr[i]);
+                my_page = vdata->maddr[index];
+                vdata->maddr[index] = 0;
+                if (!mspec_zero_block(my_page, PAGE_SIZE))
+                        uncached_free_page(my_page);
                 else
                         printk(KERN_WARNING "mspec_close(): "
-                               "failed to zero page %i\n",
-                               result);
+                               "failed to zero page %ld\n", my_page);
         }
 
-        if (vdata_size <= PAGE_SIZE)
-                kfree(vdata);
-        else
+        if (vdata->flags & VMD_VMALLOCED)
                 vfree(vdata);
+        else
+                kfree(vdata);
 }
 
-
 /*
  * mspec_nopfn
  *
@@ -195,7 +205,8 @@ mspec_nopfn(struct vm_area_struct *vma, unsigned long address)
         int index;
         struct vma_data *vdata = vma->vm_private_data;
 
-        index = (address - vma->vm_start) >> PAGE_SHIFT;
+        BUG_ON(address < vdata->vm_start || address >= vdata->vm_end);
+        index = (address - vdata->vm_start) >> PAGE_SHIFT;
         maddr = (volatile unsigned long) vdata->maddr[index];
         if (maddr == 0) {
                 maddr = uncached_alloc_page(numa_node_id());
@@ -237,10 +248,11 @@ static struct vm_operations_struct mspec_vm_ops = {
  * underlying pages.
  */
 static int
-mspec_mmap(struct file *file, struct vm_area_struct *vma, int type)
+mspec_mmap(struct file *file, struct vm_area_struct *vma,
+                                        enum mspec_page_type type)
 {
         struct vma_data *vdata;
-        int pages, vdata_size;
+        int pages, vdata_size, flags = 0;
 
         if (vma->vm_pgoff != 0)
                 return -EINVAL;
@@ -255,12 +267,17 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma, int type)
         vdata_size = sizeof(struct vma_data) + pages * sizeof(long);
         if (vdata_size <= PAGE_SIZE)
                 vdata = kmalloc(vdata_size, GFP_KERNEL);
-        else
+        else {
                 vdata = vmalloc(vdata_size);
+                flags = VMD_VMALLOCED;
+        }
         if (!vdata)
                 return -ENOMEM;
         memset(vdata, 0, vdata_size);
 
+        vdata->vm_start = vma->vm_start;
+        vdata->vm_end = vma->vm_end;
+        vdata->flags = flags;
         vdata->type = type;
         spin_lock_init(&vdata->lock);
         vdata->refcnt = ATOMIC_INIT(1);
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 397c714cf2..af274e5a25 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1550,11 +1550,13 @@ __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
          *      As close as possible to RFC 793, which
          *      suggests using a 250 kHz clock.
          *      Further reading shows this assumes 2 Mb/s networks.
-         *      For 10 Gb/s Ethernet, a 1 GHz clock is appropriate.
-         *      That's funny, Linux has one built in!  Use it!
-         *      (Networks are faster now - should this be increased?)
+         *      For 10 Mb/s Ethernet, a 1 MHz clock is appropriate.
+         *      For 10 Gb/s Ethernet, a 1 GHz clock should be ok, but
+         *      we also need to limit the resolution so that the u32 seq
+         *      overlaps less than one time per MSL (2 minutes).
+         *      Choosing a clock of 64 ns period is OK. (period of 274 s)
          */
-        seq += ktime_get_real().tv64;
+        seq += ktime_get_real().tv64 >> 6;
 #if 0
         printk("init_seq(%lx, %lx, %d, %d) = %d\n",
                saddr, daddr, sport, dport, seq);
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index aeec67e272..859858561a 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -875,7 +875,7 @@ found:
 
 #ifdef CONFIG_ACPI
         if (sonypi_acpi_device)
-                acpi_bus_generate_event(sonypi_acpi_device, 1, event);
+                acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event);
 #endif
 
         kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event));
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 51ea93cab6..9c867cf6de 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2063,8 +2063,7 @@ static int init_dev(struct tty_driver *driver, int idx,
         }
 
         if (!*tp_loc) {
-                tp = (struct ktermios *) kmalloc(sizeof(struct ktermios),
-                                                GFP_KERNEL);
+                tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
                 if (!tp)
                         goto free_mem_out;
                 *tp = driver->init_termios;
@@ -2094,8 +2093,7 @@ static int init_dev(struct tty_driver *driver, int idx,
                 }
 
                 if (!*o_tp_loc) {
-                        o_tp = (struct ktermios *)
-                                kmalloc(sizeof(struct ktermios), GFP_KERNEL);
+                        o_tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
                         if (!o_tp)
                                 goto free_mem_out;
                         *o_tp = driver->other->init_termios;
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 3423e9ee64..3ee73cf64b 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -795,6 +795,7 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file,
                         if (L_ICANON(tty))
                                 retval = inq_canon(tty);
                         return put_user(retval, (unsigned int __user *) arg);
+#ifndef TCGETS2
                 case TIOCGLCKTRMIOS:
                         if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios_locked))
                                 return -EFAULT;
@@ -806,6 +807,19 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file,
                         if (user_termios_to_kernel_termios(real_tty->termios_locked, (struct termios __user *) arg))
                                 return -EFAULT;
                         return 0;
+#else
+                case TIOCGLCKTRMIOS:
+                        if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios_locked))
+                                return -EFAULT;
+                        return 0;
+
+                case TIOCSLCKTRMIOS:
+                        if (!capable(CAP_SYS_ADMIN))
+                                return -EPERM;
+                        if (user_termios_to_kernel_termios_1(real_tty->termios_locked, (struct termios __user *) arg))
+                                return -EFAULT;
+                        return 0;
+#endif
 
                 case TIOCPKT:
                 {
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index c6f6f42097..7a61a2a9aa 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -770,6 +770,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 /*
                  * Switching-from response
                  */
+                acquire_console_sem();
                 if (vc->vt_newvt >= 0) {
                         if (arg == 0)
                                 /*
@@ -784,7 +785,6 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                  * complete the switch.
                                  */
                                 int newvt;
-                                acquire_console_sem();
                                 newvt = vc->vt_newvt;
                                 vc->vt_newvt = -1;
                                 i = vc_allocate(newvt);
@@ -798,7 +798,6 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                  * other console switches..
                                  */
                                 complete_change_console(vc_cons[newvt].d);
-                                release_console_sem();
                         }
                 }
 
@@ -810,9 +809,12 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         /*
                          * If it's just an ACK, ignore it
                          */
-                        if (arg != VT_ACKACQ)
+                        if (arg != VT_ACKACQ) {
+                                release_console_sem();
                                 return -EINVAL;
+                        }
                 }
+                release_console_sem();
 
                 return 0;
 
@@ -1030,7 +1032,7 @@ static DECLARE_WAIT_QUEUE_HEAD(vt_activate_queue);
 
 /*
  * Sleeps until a vt is activated, or the task is interrupted. Returns
- * 0 if activation, -EINTR if interrupted.
+ * 0 if activation, -EINTR if interrupted by a signal handler.
  */
 int vt_waitactive(int vt)
 {
@@ -1055,7 +1057,7 @@ int vt_waitactive(int vt)
                         break;
                 }
                 release_console_sem();
-                retval = -EINTR;
+                retval = -ERESTARTNOHAND;
                 if (signal_pending(current))
                         break;
                 schedule();
@@ -1208,15 +1210,18 @@ void change_console(struct vc_data *new_vc)
                 /*
                  * Send the signal as privileged - kill_pid() will
                  * tell us if the process has gone or something else
-                 * is awry
+                 * is awry.
+                 *
+                 * We need to set vt_newvt *before* sending the signal or we
+                 * have a race.
                  */
+                vc->vt_newvt = new_vc->vc_num;
                 if (kill_pid(vc->vt_pid, vc->vt_mode.relsig, 1) == 0) {
                         /*
                          * It worked. Mark the vt to switch to and
                          * return. The process needs to send us a
                          * VT_RELDISP ioctl to complete the switch.
                          */
-                        vc->vt_newvt = new_vc->vc_num;
                         return;
                 }
 
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 2d1f17865b..41b18c5a31 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -191,17 +191,12 @@ static int ioat_dma_alloc_chan_resources(struct dma_chan *chan)
         int i;
         LIST_HEAD(tmp_list);
 
-        /*
-         * In-use bit automatically set by reading chanctrl
-         * If 0, we got it, if 1, someone else did
-         */
-        chanctrl = readw(ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
-        if (chanctrl & IOAT_CHANCTRL_CHANNEL_IN_USE)
-                return -EBUSY;
+        /* have we already been set up? */
+        if (!list_empty(&ioat_chan->free_desc))
+                return INITIAL_IOAT_DESC_COUNT;
 
         /* Setup register to interrupt and write completion status on error */
-        chanctrl = IOAT_CHANCTRL_CHANNEL_IN_USE |
-                IOAT_CHANCTRL_ERR_INT_EN |
+        chanctrl = IOAT_CHANCTRL_ERR_INT_EN |
                 IOAT_CHANCTRL_ANY_ERR_ABORT_EN |
                 IOAT_CHANCTRL_ERR_COMPLETION_EN;
         writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
@@ -282,11 +277,6 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan)
                         in_use_descs - 1);
 
         ioat_chan->last_completion = ioat_chan->completion_addr = 0;
-
-        /* Tell hw the chan is free */
-        chanctrl = readw(ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
-        chanctrl &= ~IOAT_CHANCTRL_CHANNEL_IN_USE;
-        writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
 }
 
 static struct dma_async_tx_descriptor *
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index 3bba224cb5..6eb434749c 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -967,7 +967,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
         if (!force_function_unhide && !(stat8 & (1 << 5))) {
                 printk(KERN_INFO "Contact your BIOS vendor to see if the "
                         "E752x error registers can be safely un-hidden\n");
-                return -ENOMEM;
+                return -ENODEV;
         }
         stat8 |= (1 << 5);
         pci_write_config_byte(pdev, E752X_DEVPRES1, stat8);
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 4e6bad15c4..e80af67664 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -75,7 +75,7 @@ extern int edac_debug_level;
 #define edac_debug_printk(level, fmt, arg...)                            \
         do {                                                             \
                 if (level <= edac_debug_level)                           \
-                        edac_printk(KERN_EMERG, EDAC_DEBUG, fmt, ##arg); \
+                        edac_printk(KERN_DEBUG, EDAC_DEBUG, fmt, ##arg); \
         } while(0)
 
 #define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ )
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index d011a76f8e..fe9e768cfb 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -11,7 +11,8 @@ config FIREWIRE
           This is the "Juju" FireWire stack, a new alternative implementation
           designed for robustness and simplicity.  You can build either this
           stack, or the classic stack (the ieee1394 driver, ohci1394 etc.)
-          or both.
+          or both.  Please read http://wiki.linux1394.org/JujuMigration before
+          you enable the new stack.
 
           To compile this driver as a module, say M here: the module will be
           called firewire-core.  It functionally replaces ieee1394, raw1394,
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 0aeab3218b..3e9719948a 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -510,9 +510,11 @@ fw_core_remove_card(struct fw_card *card)
         /* Set up the dummy driver. */
         card->driver = &dummy_driver;
 
-        fw_flush_transactions(card);
-
         fw_destroy_nodes(card);
+        flush_scheduled_work();
+
+        fw_flush_transactions(card);
+        del_timer_sync(&card->flush_timer);
 
         fw_card_put(card);
 }
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 7e427b4c74..e14c1ca781 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1945,10 +1945,8 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 return err;
         }
         err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
-        if (err) {
-                fw_error("pci_set_power_state failed\n");
-                return err;
-        }
+        if (err)
+                fw_error("pci_set_power_state failed with %d\n", err);
 
         return 0;
 }
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index ba816ef6de..238730f75d 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -159,6 +159,7 @@ struct sbp2_pointer {
 
 struct sbp2_orb {
         struct fw_transaction t;
+        struct kref kref;
         dma_addr_t request_bus;
         int rcode;
         struct sbp2_pointer pointer;
@@ -280,6 +281,14 @@ static const struct {
 };
 
 static void
+free_orb(struct kref *kref)
+{
+        struct sbp2_orb *orb = container_of(kref, struct sbp2_orb, kref);
+
+        kfree(orb);
+}
+
+static void
 sbp2_status_write(struct fw_card *card, struct fw_request *request,
                   int tcode, int destination, int source,
                   int generation, int speed,
@@ -312,8 +321,8 @@ sbp2_status_write(struct fw_card *card, struct fw_request *request,
         spin_lock_irqsave(&card->lock, flags);
         list_for_each_entry(orb, &sd->orb_list, link) {
                 if (STATUS_GET_ORB_HIGH(status) == 0 &&
-                    STATUS_GET_ORB_LOW(status) == orb->request_bus &&
-                    orb->rcode == RCODE_COMPLETE) {
+                    STATUS_GET_ORB_LOW(status) == orb->request_bus) {
+                        orb->rcode = RCODE_COMPLETE;
                         list_del(&orb->link);
                         break;
                 }
@@ -325,6 +334,8 @@ sbp2_status_write(struct fw_card *card, struct fw_request *request,
         else
                 fw_error("status write for unknown orb\n");
 
+        kref_put(&orb->kref, free_orb);
+
         fw_send_response(card, request, RCODE_COMPLETE);
 }
 
@@ -335,13 +346,27 @@ complete_transaction(struct fw_card *card, int rcode,
         struct sbp2_orb *orb = data;
         unsigned long flags;
 
-        orb->rcode = rcode;
-        if (rcode != RCODE_COMPLETE) {
-                spin_lock_irqsave(&card->lock, flags);
+        /*
+         * This is a little tricky.  We can get the status write for
+         * the orb before we get this callback.  The status write
+         * handler above will assume the orb pointer transaction was
+         * successful and set the rcode to RCODE_COMPLETE for the orb.
+         * So this callback only sets the rcode if it hasn't already
+         * been set and only does the cleanup if the transaction
+         * failed and we didn't already get a status write.
+         */
+        spin_lock_irqsave(&card->lock, flags);
+
+        if (orb->rcode == -1)
+                orb->rcode = rcode;
+        if (orb->rcode != RCODE_COMPLETE) {
                 list_del(&orb->link);
-                spin_unlock_irqrestore(&card->lock, flags);
                 orb->callback(orb, NULL);
         }
+
+        spin_unlock_irqrestore(&card->lock, flags);
+
+        kref_put(&orb->kref, free_orb);
 }
 
 static void
@@ -360,6 +385,10 @@ sbp2_send_orb(struct sbp2_orb *orb, struct fw_unit *unit,
         list_add_tail(&orb->link, &sd->orb_list);
         spin_unlock_irqrestore(&device->card->lock, flags);
 
+        /* Take a ref for the orb list and for the transaction callback. */
+        kref_get(&orb->kref);
+        kref_get(&orb->kref);
+
         fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST,
                         node_id, generation, device->max_speed, offset,
                         &orb->pointer, sizeof(orb->pointer),
@@ -416,6 +445,7 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
         if (orb == NULL)
                 return -ENOMEM;
 
+        kref_init(&orb->base.kref);
         orb->response_bus =
                 dma_map_single(device->card->device, &orb->response,
                                sizeof(orb->response), DMA_FROM_DEVICE);
@@ -490,7 +520,7 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
         if (response)
                 fw_memcpy_from_be32(response,
                                     orb->response, sizeof(orb->response));
-        kfree(orb);
+        kref_put(&orb->base.kref, free_orb);
 
         return retval;
 }
@@ -886,7 +916,6 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
 
         orb->cmd->result = result;
         orb->done(orb->cmd);
-        kfree(orb);
 }
 
 static int sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
@@ -1005,6 +1034,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
 
         /* Initialize rcode to something not RCODE_COMPLETE. */
         orb->base.rcode = -1;
+        kref_init(&orb->base.kref);
 
         orb->unit = unit;
         orb->done = done;
@@ -1051,10 +1081,11 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
         sbp2_send_orb(&orb->base, unit, sd->node_id, sd->generation,
                       sd->command_block_agent_address + SBP2_ORB_POINTER);
 
+        kref_put(&orb->base.kref, free_orb);
         return 0;
 
  fail_mapping:
-        kfree(orb);
+        kref_put(&orb->base.kref, free_orb);
  fail_alloc:
         return SCSI_MLQUEUE_HOST_BUSY;
 }
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 565c4e679b..6eea3476b9 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -882,7 +882,7 @@ static int __init lm78_isa_device_add(unsigned short address)
 {
         struct resource res = {
                 .start  = address,
-                .end    = address + LM78_EXTENT,
+                .end    = address + LM78_EXTENT - 1,
                 .name   = "lm78",
                 .flags  = IORESOURCE_IO,
         };
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index c95909cc1d..dcc941a5aa 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1746,7 +1746,7 @@ w83781d_isa_device_add(unsigned short address)
 {
         struct resource res = {
                 .start  = address,
-                .end    = address + W83781D_EXTENT,
+                .end    = address + W83781D_EXTENT - 1,
                 .name   = "w83781d",
                 .flags  = IORESOURCE_IO,
         };
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 8a5f5825bb..7f0a0a62cf 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -357,13 +357,29 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
         return wrcount;
 }
 
+static int acknak(struct i2c_adapter *i2c_adap, int is_ack)
+{
+        struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
+
+        /* assert: sda is high */
+        if (is_ack)             /* send ack */
+                setsda(adap, 0);
+        udelay((adap->udelay + 1) / 2);
+        if (sclhi(adap) < 0) {  /* timeout */
+                dev_err(&i2c_adap->dev, "readbytes: ack/nak timeout\n");
+                return -ETIMEDOUT;
+        }
+        scllo(adap);
+        return 0;
+}
+
 static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
 {
         int inval;
         int rdcount=0;          /* counts bytes read */
-        struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
         unsigned char *temp = msg->buf;
         int count = msg->len;
+        const unsigned flags = msg->flags;
 
         while (count > 0) {
                 inval = i2c_inb(i2c_adap);
@@ -377,28 +393,12 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                 temp++;
                 count--;
 
-                if (msg->flags & I2C_M_NO_RD_ACK) {
-                        bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x\n",
-                                inval);
-                        continue;
-                }
-
-                /* assert: sda is high */
-                if (count)              /* send ack */
-                        setsda(adap, 0);
-                udelay((adap->udelay + 1) / 2);
-                bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x %s\n", inval,
-                        count ? "A" : "NA");
-                if (sclhi(adap)<0) {    /* timeout */
-                        dev_err(&i2c_adap->dev, "readbytes: timeout at ack\n");
-                        return -ETIMEDOUT;
-                };
-                scllo(adap);
-
                 /* Some SMBus transactions require that we receive the
                    transaction length as the first read byte. */
-                if (rdcount == 1 && (msg->flags & I2C_M_RECV_LEN)) {
+                if (rdcount == 1 && (flags & I2C_M_RECV_LEN)) {
                         if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) {
+                                if (!(flags & I2C_M_NO_RD_ACK))
+                                        acknak(i2c_adap, 0);
                                 dev_err(&i2c_adap->dev, "readbytes: invalid "
                                         "block length (%d)\n", inval);
                                 return -EREMOTEIO;
@@ -409,6 +409,18 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                         count += inval;
                         msg->len += inval;
                 }
+
+                bit_dbg(2, &i2c_adap->dev, "readbytes: 0x%02x %s\n",
+                        inval,
+                        (flags & I2C_M_NO_RD_ACK)
+                                ? "(no ack/nak)"
+                                : (count ? "A" : "NA"));
+
+                if (!(flags & I2C_M_NO_RD_ACK)) {
+                        inval = acknak(i2c_adap, count);
+                        if (inval < 0)
+                                return inval;
+                }
         }
         return rdcount;
 }
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 1842f523c2..9f3a4cd0b0 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -208,6 +208,7 @@ config I2C_PIIX4
             ATI IXP400
             ATI SB600
             ATI SB700
+            ATI SB800
             Serverworks OSB4
             Serverworks CSB5
             Serverworks CSB6
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 025f19423f..44e1cd21bb 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -147,7 +147,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev)
          * The reason to do so is to avoid sysfs names that only make
          * sense when there are multiple adapters.
          */
-        adap->nr = pdev->id >= 0 ? pdev->id : 0;
+        adap->nr = (pdev->id != -1) ? pdev->id : 0;
         ret = i2c_bit_add_numbered_bus(adap);
         if (ret)
                 goto err_add_bus;
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index debc76cd21..167e4137ee 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -23,7 +23,7 @@
    Supports:
         Intel PIIX4, 440MX
         Serverworks OSB4, CSB5, CSB6, HT-1000
-        ATI IXP200, IXP300, IXP400, SB600, SB700
+        ATI IXP200, IXP300, IXP400, SB600, SB700, SB800
         SMSC Victory66
 
    Note: we assume there can only be one device, with one SMBus interface.
@@ -397,9 +397,7 @@ static struct pci_device_id piix4_ids[] = {
           .driver_data = 0 },
         { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS),
           .driver_data = 0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SMBUS),
-          .driver_data = 0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SMBUS),
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS),
           .driver_data = 0 },
         { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4),
           .driver_data = 0 },
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 9d6b790d43..bb5466b27b 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -926,7 +926,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
          * The reason to do so is to avoid sysfs names that only make
          * sense when there are multiple adapters.
          */
-        i2c->adap.nr = dev->id >= 0 ? dev->id : 0;
+        i2c->adap.nr = dev->id != -1 ? dev->id : 0;
 
         ret = i2c_add_numbered_adapter(&i2c->adap);
         if (ret < 0) {
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 7adb61bad6..4200251ff6 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -781,7 +781,7 @@ endif
 
 config BLK_DEV_IDE_PMAC
         bool "Builtin PowerMac IDE support"
-        depends on PPC_PMAC && IDE=y
+        depends on PPC_PMAC && IDE=y && BLK_DEV_IDE=y
         help
           This driver provides support for the built-in IDE controller on
           most of the recent Apple Power Macintoshes and PowerBooks.
@@ -946,7 +946,7 @@ config BLK_DEV_Q40IDE
 
 config BLK_DEV_MPC8xx_IDE
         bool "MPC8xx IDE support"
-        depends on 8xx && IDE=y && BLK_DEV_IDE=y
+        depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
         select IDE_GENERIC
         help
           This option provides support for IDE on Motorola MPC8xx Systems.
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index eba1adbc1b..4754769eda 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -487,6 +487,7 @@ static inline int idedisk_supports_lba48(const struct hd_driveid *id)
  */
 static const struct drive_list_entry hpa_list[] = {
         { "ST340823A",  NULL },
+        { "ST320413A",  NULL },
         { NULL,         NULL }
 };
 
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index f4cd2700ca..646a54e233 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -615,8 +615,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)
         if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
                 goto no_80w;
 
-        /* Check for SATA but only if we are ATA5 or higher */
-        if (id->hw_config == 0 && (id->major_rev_num & 0x7FE0))
+        if (ide_dev_is_sata(id))
                 return 1;
 
         /*
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 025689de50..11ecb61800 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -596,6 +596,13 @@ static struct dmi_system_id cable_dmi_table[] = {
                         DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"),
                 },
         },
+        {
+                .ident = "Toshiba Satellite S1800-814",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 2cd74c345a..39f1c89f7c 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/hpt366.c               Version 1.10    Jun 29, 2007
+ * linux/drivers/ide/pci/hpt366.c               Version 1.12    Aug 19, 2007
  *
  * Copyright (C) 1999-2003              Andre Hedrick <andre@linux-ide.org>
  * Portions Copyright (C) 2001          Sun Microsystems, Inc.
@@ -68,7 +68,8 @@
  *   HPT37x chip family; save space by introducing the separate transfer mode
  *   table in which the mode lookup is done
  * - use f_CNT value saved by  the HighPoint BIOS as reading it directly gives
- *   the wrong PCI frequency since DPLL has already been calibrated by BIOS
+ *   the wrong PCI frequency since DPLL has already been calibrated by BIOS;
+ *   read it only from the function 0 of HPT374 chips
  * - fix the hotswap code:  it caused RESET- to glitch when tristating the bus,
  *   and for HPT36x the obsolete HDIO_TRISTATE_HWIF handler was called instead
  * - pass to init_chipset() handlers a copy of the IDE PCI device structure as
@@ -113,6 +114,7 @@
  *   unify HPT36x/37x timing setup code and the speedproc handlers by joining
  *   the register setting lists into the table indexed by the clock selected
  * - set the correct hwif->ultra_mask for each individual chip
+ * - add UltraDMA mode filtering for the HPT37[24] based SATA cards
  *      Sergei Shtylyov, <sshtylyov@ru.mvista.com> or <source@mvista.com>
  */
 
@@ -517,42 +519,44 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
 }
 
 /*
- *      Note for the future; the SATA hpt37x we must set
- *      either PIO or UDMA modes 0,4,5
+ * The Marvell bridge chips used on the HighPoint SATA cards do not seem
+ * to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes...
  */
 
 static u8 hpt3xx_udma_filter(ide_drive_t *drive)
 {
-        struct hpt_info *info   = pci_get_drvdata(HWIF(drive)->pci_dev);
-        u8 mask;
+        ide_hwif_t *hwif        = HWIF(drive);
+        struct hpt_info *info   = pci_get_drvdata(hwif->pci_dev);
+        u8 mask                 = hwif->ultra_mask;
 
         switch (info->chip_type) {
-        case HPT370A:
-                if (!HPT370_ALLOW_ATA100_5 ||
-                    check_in_drive_list(drive, bad_ata100_5))
-                        return 0x1f;
-                else
-                        return 0x3f;
-        case HPT370:
-                if (!HPT370_ALLOW_ATA100_5 ||
-                    check_in_drive_list(drive, bad_ata100_5))
-                        mask = 0x1f;
-                else
-                        mask = 0x3f;
-                break;
         case HPT36x:
                 if (!HPT366_ALLOW_ATA66_4 ||
                     check_in_drive_list(drive, bad_ata66_4))
-                        mask = 0x0f;
-                else
-                        mask = 0x1f;
+                        mask = ATA_UDMA3;
 
                 if (!HPT366_ALLOW_ATA66_3 ||
                     check_in_drive_list(drive, bad_ata66_3))
-                        mask = 0x07;
+                        mask = ATA_UDMA2;
+                break;
+        case HPT370:
+                if (!HPT370_ALLOW_ATA100_5 ||
+                    check_in_drive_list(drive, bad_ata100_5))
+                        mask = ATA_UDMA4;
                 break;
+        case HPT370A:
+                if (!HPT370_ALLOW_ATA100_5 ||
+                    check_in_drive_list(drive, bad_ata100_5))
+                        return ATA_UDMA4;
+        case HPT372 :
+        case HPT372A:
+        case HPT372N:
+        case HPT374 :
+                if (ide_dev_is_sata(drive->id))
+                        mask &= ~0x0e;
+                /* Fall thru */
         default:
-                return 0x7f;
+                return mask;
         }
 
         return check_in_drive_list(drive, bad_ata33) ? 0x00 : mask;
@@ -981,6 +985,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
         struct hpt_info *info   = kmalloc(sizeof(struct hpt_info), GFP_KERNEL);
         unsigned long io_base   = pci_resource_start(dev, 4);
         u8 pci_clk,  dpll_clk   = 0;    /* PCI and DPLL clock in MHz */
+        u8 chip_type;
         enum ata_clock  clock;
 
         if (info == NULL) {
@@ -992,7 +997,8 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
          * Copy everything from a static "template" structure
          * to just allocated per-chip hpt_info structure.
          */
-        *info = *(struct hpt_info *)pci_get_drvdata(dev);
+        memcpy(info, pci_get_drvdata(dev), sizeof(struct hpt_info));
+        chip_type = info->chip_type;
 
         pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4));
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78);
@@ -1002,7 +1008,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
         /*
          * First, try to estimate the PCI clock frequency...
          */
-        if (info->chip_type >= HPT370) {
+        if (chip_type >= HPT370) {
                 u8  scr1  = 0;
                 u16 f_cnt = 0;
                 u32 temp  = 0;
@@ -1016,7 +1022,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
                  * HighPoint does this for HPT372A.
                  * NOTE: This register is only writeable via I/O space.
                  */
-                if (info->chip_type == HPT372A)
+                if (chip_type == HPT372A)
                         outb(0x0e, io_base + 0x9c);
 
                 /*
@@ -1034,13 +1040,28 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
                  * First try reading the register in which the HighPoint BIOS
                  * saves f_CNT value before  reprogramming the DPLL from its
                  * default setting (which differs for the various chips).
-                 * NOTE: This register is only accessible via I/O space.
                  *
-                 * In case the signature check fails, we'll have to resort to
-                 * reading the f_CNT register itself in hopes that nobody has
-                 * touched the DPLL yet...
+                 * NOTE: This register is only accessible via I/O space;
+                 * HPT374 BIOS only saves it for the function 0, so we have to
+                 * always read it from there -- no need to check the result of
+                 * pci_get_slot() for the function 0 as the whole device has
+                 * been already "pinned" (via function 1) in init_setup_hpt374()
+                 */
+                if (chip_type == HPT374 && (PCI_FUNC(dev->devfn) & 1)) {
+                        struct pci_dev  *dev1 = pci_get_slot(dev->bus,
+                                                             dev->devfn - 1);
+                        unsigned long io_base = pci_resource_start(dev1, 4);
+
+                        temp =  inl(io_base + 0x90);
+                        pci_dev_put(dev1);
+                } else
+                        temp =  inl(io_base + 0x90);
+
+                /*
+                 * In case the signature check fails, we'll have to
+                 * resort to reading the f_CNT register itself in hopes
+                 * that nobody has touched the DPLL yet...
                  */
-                temp = inl(io_base + 0x90);
                 if ((temp & 0xFFFFF000) != 0xABCDE000) {
                         int i;
 
@@ -1120,7 +1141,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
          * We also  don't like using  the DPLL because this causes glitches
          * on PRST-/SRST- when the state engine gets reset...
          */
-        if (info->chip_type >= HPT374 || info->settings[clock] == NULL) {
+        if (chip_type >= HPT374 || info->settings[clock] == NULL) {
                 u16 f_low, delta = pci_clk < 50 ? 2 : 4;
                 int adjust;
 
@@ -1190,7 +1211,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
         /* Point to this chip's own instance of the hpt_info structure. */
         pci_set_drvdata(dev, info);
 
-        if (info->chip_type >= HPT370) {
+        if (chip_type >= HPT370) {
                 u8  mcr1, mcr4;
 
                 /*
@@ -1209,7 +1230,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
          * the MISC. register to stretch the UltraDMA Tss timing.
          * NOTE: This register is only writeable via I/O space.
          */
-        if (info->chip_type == HPT371N && clock == ATA_CLOCK_66MHZ)
+        if (chip_type == HPT371N && clock == ATA_CLOCK_66MHZ)
 
                 outb(inb(io_base + 0x9c) | 0x04, io_base + 0x9c);
 
@@ -1218,25 +1239,24 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
 
 static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
 {
-        struct pci_dev  *dev            = hwif->pci_dev;
-        struct hpt_info *info           = pci_get_drvdata(dev);
-        int serialize                   = HPT_SERIALIZE_IO;
-        u8  scr1 = 0, ata66             = hwif->channel ? 0x01 : 0x02;
-        u8  chip_type                   = info->chip_type;
-        u8  new_mcr, old_mcr            = 0;
+        struct pci_dev  *dev    = hwif->pci_dev;
+        struct hpt_info *info   = pci_get_drvdata(dev);
+        int serialize           = HPT_SERIALIZE_IO;
+        u8  scr1 = 0, ata66     = hwif->channel ? 0x01 : 0x02;
+        u8  chip_type           = info->chip_type;
+        u8  new_mcr, old_mcr    = 0;
 
         /* Cache the channel's MISC. control registers' offset */
-        hwif->select_data               = hwif->channel ? 0x54 : 0x50;
+        hwif->select_data       = hwif->channel ? 0x54 : 0x50;
 
-        hwif->tuneproc                  = &hpt3xx_tune_drive;
-        hwif->speedproc                 = &hpt3xx_tune_chipset;
-        hwif->quirkproc                 = &hpt3xx_quirkproc;
-        hwif->intrproc                  = &hpt3xx_intrproc;
-        hwif->maskproc                  = &hpt3xx_maskproc;
-        hwif->busproc                   = &hpt3xx_busproc;
+        hwif->tuneproc          = &hpt3xx_tune_drive;
+        hwif->speedproc         = &hpt3xx_tune_chipset;
+        hwif->quirkproc         = &hpt3xx_quirkproc;
+        hwif->intrproc          = &hpt3xx_intrproc;
+        hwif->maskproc          = &hpt3xx_maskproc;
+        hwif->busproc           = &hpt3xx_busproc;
 
-        if (chip_type <= HPT370A)
-                hwif->udma_filter       = &hpt3xx_udma_filter;
+        hwif->udma_filter       = &hpt3xx_udma_filter;
 
         /*
          * HPT3xxN chips have some complications:
@@ -1486,19 +1506,19 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
                 d->host_flags |= IDE_HFLAG_SINGLE;
                 d->enablebits[0].mask = d->enablebits[0].val = 0x10;
 
-                d->udma_mask = HPT366_ALLOW_ATA66_3 ?
-                              (HPT366_ALLOW_ATA66_4 ? 0x1f : 0x0f) : 0x07;
+                d->udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ?
+                               ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2;
                 break;
         case 3:
         case 4:
-                d->udma_mask = HPT370_ALLOW_ATA100_5 ? 0x3f : 0x1f;
+                d->udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4;
                 break;
         default:
                 rev = 6;
                 /* fall thru */
         case 5:
         case 6:
-                d->udma_mask = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f;
+                d->udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5;
                 break;
         }
 
@@ -1559,7 +1579,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f,
+                .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
@@ -1571,7 +1591,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = HPT302_ALLOW_ATA133_6 ? 0x7f : 0x3f,
+                .udma_mask      = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
@@ -1583,7 +1603,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = HPT371_ALLOW_ATA133_6 ? 0x7f : 0x3f,
+                .udma_mask      = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
@@ -1595,7 +1615,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = 0x3f,
+                .udma_mask      = ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
@@ -1607,7 +1627,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f,
+                .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index f6db2f37ef..7b0e479c35 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -9,7 +9,7 @@
  *  Split from:
  *  linux/drivers/ide/pdc202xx.c        Version 0.35    Mar. 30, 2002
  *  Copyright (C) 1998-2002             Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2005-2006             MontaVista Software, Inc.
+ *  Copyright (C) 2005-2007             MontaVista Software, Inc.
  *  Portions Copyright (C) 1999 Promise Technology, Inc.
  *  Author: Frank Tiernan (frankt@promise.com)
  *  Released under terms of General Public License
@@ -341,7 +341,7 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base)
          */
         usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 +
                 (end_time.tv_usec - start_time.tv_usec);
-        pll_input = ((start_count - end_count) & 0x3ffffff) / 10 *
+        pll_input = ((start_count - end_count) & 0x3fffffff) / 10 *
                 (10000000 / usec_elapsed);
 
         DBG("start[%ld] end[%ld]\n", start_count, end_count);
@@ -535,7 +535,7 @@ static int __devinit init_setup_pdc20270(struct pci_dev *dev,
             (dev->bus->self->device == PCI_DEVICE_ID_DEC_21150)) {
                 if (PCI_SLOT(dev->devfn) & 2)
                         return -ENODEV;
-                d->extra = 0;
+
                 while ((findev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) {
                         if ((findev->vendor == dev->vendor) &&
                             (findev->device == dev->device) &&
@@ -544,7 +544,8 @@ static int __devinit init_setup_pdc20270(struct pci_dev *dev,
                                         findev->irq = dev->irq;
                                 }
                                 ret = ide_setup_pci_devices(dev, findev, d);
-                                pci_dev_put(findev);
+                                if (ret < 0)
+                                        pci_dev_put(findev);
                                 return ret;
                         }
                 }
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 581316f958..a7be7795e6 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -1,6 +1,6 @@
 /*
  *
- * Version 3.46
+ * Version 3.47
  *
  * VIA IDE driver for Linux. Supported southbridges:
  *
@@ -74,6 +74,7 @@ static struct via_isa_bridge {
         u8 udma_mask;
         u8 flags;
 } via_isa_bridges[] = {
+        { "vx800",      PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
@@ -429,19 +430,26 @@ static struct dmi_system_id cable_dmi_table[] = {
         { }
 };
 
-static int via_cable_override(void)
+static int via_cable_override(struct pci_dev *pdev)
 {
         /* Systems by DMI */
         if (dmi_check_system(cable_dmi_table))
                 return 1;
+
+        /* Arima W730-K8/Targa Visionary 811/... */
+        if (pdev->subsystem_vendor == 0x161F &&
+            pdev->subsystem_device == 0x2032)
+                return 1;
+
         return 0;
 }
 
 static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
 {
-        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
+        struct pci_dev *pdev = hwif->pci_dev;
+        struct via82cxxx_dev *vdev = pci_get_drvdata(pdev);
 
-        if (via_cable_override())
+        if (via_cable_override(pdev))
                 return ATA_CBL_PATA40_SHORT;
 
         if ((vdev->via_80w >> hwif->channel) & 1)
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 8859fe2f5a..dab79afa9b 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -32,7 +32,6 @@
 #include <asm/mpc8xx.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
-#include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/ide.h>
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 4b13cd9a02..2fb047b898 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1546,6 +1546,7 @@ static struct pci_device_id pmac_ide_pci_match[] = {
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID2_ATA,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {},
 };
 
 static struct pci_driver pmac_ide_pci_driver = {
@@ -1802,9 +1803,7 @@ pmac_ide_dma_check(ide_drive_t *drive)
 {
         struct hd_driveid *id = drive->id;
         ide_hwif_t *hwif = HWIF(drive);
-        pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)hwif->hwif_data;
         int enable = 1;
-        int map;
         drive->using_dma = 0;
         
         if (drive->media == ide_floppy)
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 30e596c0f1..1129f8c308 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -816,19 +816,15 @@ static int __init ide_scan_pcidev(struct pci_dev *dev)
         struct list_head *l;
         struct pci_driver *d;
         
-        list_for_each(l, &ide_pci_drivers)
-        {
+        list_for_each(l, &ide_pci_drivers) {
                 d = list_entry(l, struct pci_driver, node);
-                if(d->id_table)
-                {
-                        const struct pci_device_id *id = pci_match_id(d->id_table, dev);
-                        if(id != NULL)
-                        {
-                                if(d->probe(dev, id) >= 0)
-                                {
-                                        dev->driver = d;
-                                        return 1;
-                                }
+                if (d->id_table) {
+                        const struct pci_device_id *id = pci_match_id(d->id_table,
+                                                                      dev);
+                        if (id != NULL && d->probe(dev, id) >= 0) {
+                                dev->driver = d;
+                                pci_dev_get(dev);
+                                return 1;
                         }
                 }
         }
@@ -851,15 +847,13 @@ void __init ide_scan_pcibus (int scan_direction)
         struct list_head *l, *n;
 
         pre_init = 0;
-        if (!scan_direction) {
-                while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        if (!scan_direction)
+                while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
                         ide_scan_pcidev(dev);
-                }
-        } else {
-                while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        else
+                while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID, dev))
+                       != NULL)
                         ide_scan_pcidev(dev);
-                }
-        }
         
         /*
          *      Hand the drivers over to the PCI layer now we
@@ -869,12 +863,9 @@ void __init ide_scan_pcibus (int scan_direction)
         list_for_each_safe(l, n, &ide_pci_drivers) {
                 list_del(l);
                 d = list_entry(l, struct pci_driver, node);
-                if (__pci_register_driver(d, d->driver.owner,
-                                        d->driver.mod_name)) {
-                        printk(KERN_ERR "%s: failed to register driver "
-                                        "for %s\n", __FUNCTION__,
-                                         d->driver.mod_name);
-                }
+                if (__pci_register_driver(d, d->driver.owner, d->driver.mod_name))
+                        printk(KERN_ERR "%s: failed to register driver for %s\n",
+                               __FUNCTION__, d->driver.mod_name);
         }
 }
 #endif
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index ee45259573..98fd985a32 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -1273,7 +1273,7 @@ static void __exit ieee1394_cleanup(void)
         unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
 }
 
-fs_initcall(ieee1394_init); /* same as ohci1394 */
+module_init(ieee1394_init);
 module_exit(ieee1394_cleanup);
 
 /* Exported symbols */
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 5667c8102e..372c5c16eb 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3537,7 +3537,5 @@ static int __init ohci1394_init(void)
         return pci_register_driver(&ohci1394_pci_driver);
 }
 
-/* Register before most other device drivers.
- * Useful for remote debugging via physical DMA, e.g. using firescope. */
-fs_initcall(ohci1394_init);
+module_init(ohci1394_init);
 module_exit(ohci1394_cleanup);
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 47dbe8f17e..a81ba8fca0 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -513,9 +513,9 @@ static int sbp2util_create_command_orb_pool(struct sbp2_lu *lu)
         return 0;
 }
 
-static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu)
+static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu,
+                                             struct hpsb_host *host)
 {
-        struct hpsb_host *host = lu->hi->host;
         struct list_head *lh, *next;
         struct sbp2_command_info *cmd;
         unsigned long flags;
@@ -922,15 +922,16 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
 
         if (!lu)
                 return;
-
         hi = lu->hi;
+        if (!hi)
+                goto no_hi;
 
         if (lu->shost) {
                 scsi_remove_host(lu->shost);
                 scsi_host_put(lu->shost);
         }
         flush_scheduled_work();
-        sbp2util_remove_command_orb_pool(lu);
+        sbp2util_remove_command_orb_pool(lu, hi->host);
 
         list_del(&lu->lu_list);
 
@@ -971,9 +972,8 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
 
         lu->ud->device.driver_data = NULL;
 
-        if (hi)
-                module_put(hi->host->driver->owner);
-
+        module_put(hi->host->driver->owner);
+no_hi:
         kfree(lu);
 }
 
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 1518b41482..beb2a38146 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -916,7 +916,7 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p)
         PDBG("%s opening rnic dev %s\n", __FUNCTION__, rdev_p->dev_name);
         memset(&rdev_p->ctrl_qp, 0, sizeof(rdev_p->ctrl_qp));
         if (!rdev_p->t3cdev_p)
-                rdev_p->t3cdev_p = T3CDEV(netdev_p);
+                rdev_p->t3cdev_p = dev2t3cdev(netdev_p);
         rdev_p->t3cdev_p->ulp = (void *) rdev_p;
         err = rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_GET_PARAMS,
                                          &(rdev_p->rnic_info));
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c
index fc19ef9fd9..cf22472d94 100644
--- a/drivers/infiniband/hw/ehca/ehca_hca.c
+++ b/drivers/infiniband/hw/ehca/ehca_hca.c
@@ -93,9 +93,13 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props)
         props->max_pd          = min_t(int, rblock->max_pd, INT_MAX);
         props->max_ah          = min_t(int, rblock->max_ah, INT_MAX);
         props->max_fmr         = min_t(int, rblock->max_mr, INT_MAX);
-        props->max_srq         = 0;
-        props->max_srq_wr      = 0;
-        props->max_srq_sge     = 0;
+
+        if (EHCA_BMASK_GET(HCA_CAP_SRQ, shca->hca_cap)) {
+                props->max_srq         = props->max_qp;
+                props->max_srq_wr      = props->max_qp_wr;
+                props->max_srq_sge     = 3;
+        }
+
         props->max_pkeys       = 16;
         props->local_ca_ack_delay
                 = rblock->local_ca_ack_delay;
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index ee06d8bd73..a925ea5244 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -175,41 +175,55 @@ error_data1:
 
 }
 
-static void qp_event_callback(struct ehca_shca *shca, u64 eqe,
-                              enum ib_event_type event_type, int fatal)
+static void dispatch_qp_event(struct ehca_shca *shca, struct ehca_qp *qp,
+                              enum ib_event_type event_type)
 {
         struct ib_event event;
-        struct ehca_qp *qp;
-        u32 token = EHCA_BMASK_GET(EQE_QP_TOKEN, eqe);
-
-        read_lock(&ehca_qp_idr_lock);
-        qp = idr_find(&ehca_qp_idr, token);
-        read_unlock(&ehca_qp_idr_lock);
-
-
-        if (!qp)
-                return;
-
-        if (fatal)
-                ehca_error_data(shca, qp, qp->ipz_qp_handle.handle);
 
         event.device = &shca->ib_device;
+        event.event = event_type;
 
         if (qp->ext_type == EQPT_SRQ) {
                 if (!qp->ib_srq.event_handler)
                         return;
 
-                event.event = fatal ? IB_EVENT_SRQ_ERR : event_type;
                 event.element.srq = &qp->ib_srq;
                 qp->ib_srq.event_handler(&event, qp->ib_srq.srq_context);
         } else {
                 if (!qp->ib_qp.event_handler)
                         return;
 
-                event.event = event_type;
                 event.element.qp = &qp->ib_qp;
                 qp->ib_qp.event_handler(&event, qp->ib_qp.qp_context);
         }
+}
+
+static void qp_event_callback(struct ehca_shca *shca, u64 eqe,
+                              enum ib_event_type event_type, int fatal)
+{
+        struct ehca_qp *qp;
+        u32 token = EHCA_BMASK_GET(EQE_QP_TOKEN, eqe);
+
+        read_lock(&ehca_qp_idr_lock);
+        qp = idr_find(&ehca_qp_idr, token);
+        read_unlock(&ehca_qp_idr_lock);
+
+        if (!qp)
+                return;
+
+        if (fatal)
+                ehca_error_data(shca, qp, qp->ipz_qp_handle.handle);
+
+        dispatch_qp_event(shca, qp, fatal && qp->ext_type == EQPT_SRQ ?
+                          IB_EVENT_SRQ_ERR : event_type);
+
+        /*
+         * eHCA only processes one WQE at a time for SRQ base QPs,
+         * so the last WQE has been processed as soon as the QP enters
+         * error state.
+         */
+        if (fatal && qp->ext_type == EQPT_SRQBASE)
+                dispatch_qp_event(shca, qp, IB_EVENT_QP_LAST_WQE_REACHED);
 
         return;
 }
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index b178cba963..84d435a5ee 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -600,10 +600,12 @@ static struct ehca_qp *internal_create_qp(
 
         if (EHCA_BMASK_GET(HCA_CAP_MINI_QP, shca->hca_cap)
             && !(context && udata)) { /* no small QP support in userspace ATM */
-                ehca_determine_small_queue(
-                        &parms.squeue, max_send_sge, is_llqp);
-                ehca_determine_small_queue(
-                        &parms.rqueue, max_recv_sge, is_llqp);
+                if (HAS_SQ(my_qp))
+                        ehca_determine_small_queue(
+                                &parms.squeue, max_send_sge, is_llqp);
+                if (HAS_RQ(my_qp))
+                        ehca_determine_small_queue(
+                                &parms.rqueue, max_recv_sge, is_llqp);
                 parms.qp_storage =
                         (parms.squeue.is_small || parms.rqueue.is_small);
         }
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index a090c679c3..29bd476fbd 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -172,7 +172,7 @@ static void free_small_queue_page(struct ipz_queue *queue, struct ehca_pd *pd)
         unsigned long bit;
         int free_page = 0;
 
-        bit = ((unsigned long)queue->queue_pages[0] & PAGE_MASK)
+        bit = ((unsigned long)queue->queue_pages[0] & ~PAGE_MASK)
                 >> (order + 9);
 
         mutex_lock(&pd->lock);
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index ba0428d872..85c51bdc36 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1211,12 +1211,42 @@ static void set_datagram_seg(struct mlx4_wqe_datagram_seg *dseg,
         dseg->qkey = cpu_to_be32(wr->wr.ud.remote_qkey);
 }
 
-static void set_data_seg(struct mlx4_wqe_data_seg *dseg,
-                         struct ib_sge *sg)
+static void set_mlx_icrc_seg(void *dseg)
+{
+        u32 *t = dseg;
+        struct mlx4_wqe_inline_seg *iseg = dseg;
+
+        t[1] = 0;
+
+        /*
+         * Need a barrier here before writing the byte_count field to
+         * make sure that all the data is visible before the
+         * byte_count field is set.  Otherwise, if the segment begins
+         * a new cacheline, the HCA prefetcher could grab the 64-byte
+         * chunk and get a valid (!= * 0xffffffff) byte count but
+         * stale data, and end up sending the wrong data.
+         */
+        wmb();
+
+        iseg->byte_count = cpu_to_be32((1 << 31) | 4);
+}
+
+static void set_data_seg(struct mlx4_wqe_data_seg *dseg, struct ib_sge *sg)
 {
-        dseg->byte_count = cpu_to_be32(sg->length);
         dseg->lkey       = cpu_to_be32(sg->lkey);
         dseg->addr       = cpu_to_be64(sg->addr);
+
+        /*
+         * Need a barrier here before writing the byte_count field to
+         * make sure that all the data is visible before the
+         * byte_count field is set.  Otherwise, if the segment begins
+         * a new cacheline, the HCA prefetcher could grab the 64-byte
+         * chunk and get a valid (!= * 0xffffffff) byte count but
+         * stale data, and end up sending the wrong data.
+         */
+        wmb();
+
+        dseg->byte_count = cpu_to_be32(sg->length);
 }
 
 int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
@@ -1225,6 +1255,7 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
         struct mlx4_ib_qp *qp = to_mqp(ibqp);
         void *wqe;
         struct mlx4_wqe_ctrl_seg *ctrl;
+        struct mlx4_wqe_data_seg *dseg;
         unsigned long flags;
         int nreq;
         int err = 0;
@@ -1324,22 +1355,27 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                         break;
                 }
 
-                for (i = 0; i < wr->num_sge; ++i) {
-                        set_data_seg(wqe, wr->sg_list + i);
+                /*
+                 * Write data segments in reverse order, so as to
+                 * overwrite cacheline stamp last within each
+                 * cacheline.  This avoids issues with WQE
+                 * prefetching.
+                 */
 
-                        wqe  += sizeof (struct mlx4_wqe_data_seg);
-                        size += sizeof (struct mlx4_wqe_data_seg) / 16;
-                }
+                dseg = wqe;
+                dseg += wr->num_sge - 1;
+                size += wr->num_sge * (sizeof (struct mlx4_wqe_data_seg) / 16);
 
                 /* Add one more inline data segment for ICRC for MLX sends */
-                if (qp->ibqp.qp_type == IB_QPT_SMI || qp->ibqp.qp_type == IB_QPT_GSI) {
-                        ((struct mlx4_wqe_inline_seg *) wqe)->byte_count =
-                                cpu_to_be32((1 << 31) | 4);
-                        ((u32 *) wqe)[1] = 0;
-                        wqe  += sizeof (struct mlx4_wqe_data_seg);
+                if (unlikely(qp->ibqp.qp_type == IB_QPT_SMI ||
+                             qp->ibqp.qp_type == IB_QPT_GSI)) {
+                        set_mlx_icrc_seg(dseg + 1);
                         size += sizeof (struct mlx4_wqe_data_seg) / 16;
                 }
 
+                for (i = wr->num_sge - 1; i >= 0; --i, --dseg)
+                        set_data_seg(dseg, wr->sg_list + i);
+
                 ctrl->fence_size = (wr->send_flags & IB_SEND_FENCE ?
                                     MLX4_WQE_CTRL_FENCE : 0) | size;
 
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index e2abe18e57..7c662ee594 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -277,7 +277,7 @@ config JOYSTICK_XPAD_FF
 
 config JOYSTICK_XPAD_LEDS
         bool "LED Support for Xbox360 controller 'BigX' LED"
-        depends on LEDS_CLASS && JOYSTICK_XPAD
+        depends on JOYSTICK_XPAD && (LEDS_CLASS=y || LEDS_CLASS=JOYSTICK_XPAD)
         ---help---
           This option enables support for the LED which surrounds the Big X on
           XBox 360 controller.
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index 3154ccd740..45c4939ced 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -246,13 +246,12 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
 
 int iforce_get_id_packet(struct iforce *iforce, char *packet)
 {
-        int status;
-
         switch (iforce->bus) {
 
-        case IFORCE_USB:
-
+        case IFORCE_USB: {
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
+                int status;
+
                 iforce->cr.bRequest = packet[0];
                 iforce->ctrl->dev = iforce->usbdev;
 
@@ -273,6 +272,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
 #else
                 dbg("iforce_get_id_packet: iforce->bus = USB!");
 #endif
+                }
                 break;
 
         case IFORCE_232:
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 739212252b..f0b22b8b27 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -22,7 +22,6 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
-#include <linux/irq.h>
 #include <linux/gpio_keys.h>
 
 #include <asm/gpio.h>
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index 2bea1b2c63..a1804bfdbb 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -328,6 +328,7 @@ static void atp_complete(struct urb* urb)
 {
         int x, y, x_z, y_z, x_f, y_f;
         int retval, i, j;
+        int key;
         struct atp *dev = urb->context;
 
         switch (urb->status) {
@@ -468,6 +469,7 @@ static void atp_complete(struct urb* urb)
                               ATP_XFACT, &x_z, &x_f);
         y = atp_calculate_abs(dev->xy_acc + ATP_XSENSORS, ATP_YSENSORS,
                               ATP_YFACT, &y_z, &y_f);
+        key = dev->data[dev->datalen - 1] & 1;
 
         if (x && y) {
                 if (dev->x_old != -1) {
@@ -505,7 +507,7 @@ static void atp_complete(struct urb* urb)
                    the first touch unless reinitialised. Do so if it's been
                    idle for a while in order to avoid waking the kernel up
                    several hundred times a second */
-                if (atp_is_geyser_3(dev)) {
+                if (!key && atp_is_geyser_3(dev)) {
                         dev->idlecount++;
                         if (dev->idlecount == 10) {
                                 dev->valid = 0;
@@ -514,7 +516,7 @@ static void atp_complete(struct urb* urb)
                 }
         }
 
-        input_report_key(dev->input, BTN_LEFT, dev->data[dev->datalen - 1] & 1);
+        input_report_key(dev->input, BTN_LEFT, key);
         input_sync(dev->input);
 
 exit:
diff --git a/drivers/input/mouse/touchkit_ps2.h b/drivers/input/mouse/touchkit_ps2.h
index 61e9dfd841..8a0dd3574a 100644
--- a/drivers/input/mouse/touchkit_ps2.h
+++ b/drivers/input/mouse/touchkit_ps2.h
@@ -15,7 +15,8 @@
 #ifdef CONFIG_MOUSE_PS2_TOUCHKIT
 int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties);
 #else
-inline int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
+static inline int touchkit_ps2_detect(struct psmouse *psmouse,
+                                      int set_properties)
 {
         return -ENOSYS;
 }
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 74f14e0977..3e99df6be0 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -340,8 +340,8 @@ static int __init gscps2_probe(struct parisc_device *dev)
         if (dev->id.sversion == 0x96)
                 hpa += GSC_DINO_OFFSET;
 
-        ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL);
-        serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        ps2port = kzalloc(sizeof(struct gscps2port), GFP_KERNEL);
+        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!ps2port || !serio) {
                 ret = -ENOMEM;
                 goto fail_nomem;
@@ -349,8 +349,6 @@ static int __init gscps2_probe(struct parisc_device *dev)
 
         dev_set_drvdata(&dev->dev, ps2port);
 
-        memset(ps2port, 0, sizeof(struct gscps2port));
-        memset(serio, 0, sizeof(struct serio));
         ps2port->port = serio;
         ps2port->padev = dev;
         ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4);
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 702a526cf4..f8fe421480 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -211,6 +211,16 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                 },
         },
         {
+                /*
+                 * Like DV4017EA does not raise AUXERR for errors on MUX ports.
+                 */
+                .ident = "HP Pavilion DV4270ca",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"),
+                },
+        },
+        {
                 .ident = "Toshiba P10",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 3888dc307e..c2eea2767e 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -512,6 +512,7 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
 {
         unsigned long flags;
         unsigned char str, data;
+        int ret = 0;
 
         spin_lock_irqsave(&i8042_lock, flags);
         str = i8042_read_status();
@@ -520,10 +521,11 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
                 if (i8042_irq_being_tested &&
                     data == 0xa5 && (str & I8042_STR_AUXDATA))
                         complete(&i8042_aux_irq_delivered);
+                ret = 1;
         }
         spin_unlock_irqrestore(&i8042_lock, flags);
 
-        return IRQ_HANDLED;
+        return IRQ_RETVAL(ret);
 }
 
 /*
@@ -1038,7 +1040,7 @@ static void __devinit i8042_register_ports(void)
         }
 }
 
-static void __devinit i8042_unregister_ports(void)
+static void __devexit i8042_unregister_ports(void)
 {
         int i;
 
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index b407028ffc..741f6c6f1e 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -767,7 +767,7 @@ static int usbtouch_probe(struct usb_interface *intf,
                          le16_to_cpu(udev->descriptor.idProduct));
 
         usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys));
-        strlcpy(usbtouch->phys, "/input0", sizeof(usbtouch->phys));
+        strlcat(usbtouch->phys, "/input0", sizeof(usbtouch->phys));
 
         input_dev->name = usbtouch->name;
         input_dev->phys = usbtouch->phys;
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index 90a23795db..02d9918705 100644
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -341,7 +341,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
          * Allocate space for the dictionary. This may be more than one page in
          * length.
          */
-        db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict));
+        db->dict = vmalloc(hsize * sizeof(struct bsd_dict));
         if (!db->dict) {
                 bsd_free (db);
                 return NULL;
@@ -354,8 +354,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
         if (!decomp)
                 db->lens = NULL;
         else {
-                db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *
-                        sizeof (db->lens[0]));
+                db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));
                 if (!db->lens) {
                         bsd_free (db);
                         return (NULL);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index c97330b198..4910bca526 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1135,7 +1135,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
                         if (count > dev->drv[drvidx]->stavail)
                                 count = dev->drv[drvidx]->stavail;
                         len = dev->drv[drvidx]->interface->readstat(buf, count,
-                                                drvidx, isdn_minor2chan(minor));
+                                drvidx, isdn_minor2chan(minor - ISDN_MINOR_CTRL));
                         if (len < 0) {
                                 retval = len;
                                 goto out;
@@ -1207,7 +1207,8 @@ isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off
                  */
                 if (dev->drv[drvidx]->interface->writecmd)
                         retval = dev->drv[drvidx]->interface->
-                                writecmd(buf, count, drvidx, isdn_minor2chan(minor));
+                                writecmd(buf, count, drvidx,
+                                isdn_minor2chan(minor - ISDN_MINOR_CTRL));
                 else
                         retval = count;
                 goto out;
@@ -2291,7 +2292,7 @@ static int __init isdn_init(void)
         int i;
         char tmprev[50];
 
-        if (!(dev = (isdn_dev *) vmalloc(sizeof(isdn_dev)))) {
+        if (!(dev = vmalloc(sizeof(isdn_dev)))) {
                 printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");
                 return -EIO;
         }
diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig
index 7b64fd4aa2..0a419a0de6 100644
--- a/drivers/kvm/Kconfig
+++ b/drivers/kvm/Kconfig
@@ -6,7 +6,8 @@ menuconfig VIRTUALIZATION
         depends on X86
         default y
         ---help---
-          Say Y here to get to see options for virtualization guest drivers.
+          Say Y here to get to see options for using your Linux host to run other
+          operating systems inside virtual machines (guests).
           This option alone does not add any kernel code.
 
           If you say N, all options in this submenu will be skipped and disabled.
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 3ac9cbce33..336be86c6f 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -619,7 +619,7 @@ unsigned long segment_base(u16 selector);
 void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
                        const u8 *old, const u8 *new, int bytes);
 int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva);
-void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
+void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
 int kvm_mmu_load(struct kvm_vcpu *vcpu);
 void kvm_mmu_unload(struct kvm_vcpu *vcpu);
 
@@ -628,11 +628,15 @@ int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run);
 static inline int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva,
                                      u32 error_code)
 {
-        if (unlikely(vcpu->kvm->n_free_mmu_pages < KVM_MIN_FREE_MMU_PAGES))
-                kvm_mmu_free_some_pages(vcpu);
         return vcpu->mmu.page_fault(vcpu, gva, error_code);
 }
 
+static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
+{
+        if (unlikely(vcpu->kvm->n_free_mmu_pages < KVM_MIN_FREE_MMU_PAGES))
+                __kvm_mmu_free_some_pages(vcpu);
+}
+
 static inline int kvm_mmu_reload(struct kvm_vcpu *vcpu)
 {
         if (likely(vcpu->mmu.root_hpa != INVALID_PAGE))
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 1a87ba9d51..23965aa5ee 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -273,12 +273,14 @@ static int mmu_topup_memory_caches(struct kvm_vcpu *vcpu)
         int r;
 
         r = __mmu_topup_memory_caches(vcpu, GFP_NOWAIT);
+        kvm_mmu_free_some_pages(vcpu);
         if (r < 0) {
                 spin_unlock(&vcpu->kvm->lock);
                 kvm_arch_ops->vcpu_put(vcpu);
                 r = __mmu_topup_memory_caches(vcpu, GFP_KERNEL);
                 kvm_arch_ops->vcpu_load(vcpu);
                 spin_lock(&vcpu->kvm->lock);
+                kvm_mmu_free_some_pages(vcpu);
         }
         return r;
 }
@@ -1208,7 +1210,7 @@ int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva)
         return kvm_mmu_unprotect_page(vcpu, gpa >> PAGE_SHIFT);
 }
 
-void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
+void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
 {
         while (vcpu->kvm->n_free_mmu_pages < KVM_REFILL_PAGES) {
                 struct kvm_mmu_page *page;
@@ -1218,7 +1220,6 @@ void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
                 kvm_mmu_zap_page(vcpu->kvm, page);
         }
 }
-EXPORT_SYMBOL_GPL(kvm_mmu_free_some_pages);
 
 static void free_mmu_pages(struct kvm_vcpu *vcpu)
 {
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index fd6925f416..41e2250613 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
         tristate "Linux hypervisor example code"
-        depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE
+        depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE && FUTEX
         select LGUEST_GUEST
         select HVC_DRIVER
         ---help---
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c
index 49aa55577d..39731232d8 100644
--- a/drivers/lguest/interrupts_and_traps.c
+++ b/drivers/lguest/interrupts_and_traps.c
@@ -270,8 +270,11 @@ void pin_stack_pages(struct lguest *lg)
         /* Depending on the CONFIG_4KSTACKS option, the Guest can have one or
          * two pages of stack space. */
         for (i = 0; i < lg->stack_pages; i++)
-                /* The stack grows *upwards*, hence the subtraction */
-                pin_page(lg, lg->esp1 - i * PAGE_SIZE);
+                /* The stack grows *upwards*, so the address we're given is the
+                 * start of the page after the kernel stack.  Subtract one to
+                 * get back onto the first stack page, and keep subtracting to
+                 * get to the rest of the stack pages. */
+                pin_page(lg, lg->esp1 - 1 - i * PAGE_SIZE);
 }
 
 /* Direct traps also mean that we need to know whenever the Guest wants to use
diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c
index 6e135ac083..ee1c6d05c3 100644
--- a/drivers/lguest/lguest.c
+++ b/drivers/lguest/lguest.c
@@ -964,11 +964,12 @@ __init void lguest_init(void *boot)
 {
         /* Copy boot parameters first: the Launcher put the physical location
          * in %esi, and head.S converted that to a virtual address and handed
-         * it to us. */
-        memcpy(&boot_params, boot, PARAM_SIZE);
+         * it to us.  We use "__memcpy" because "memcpy" sometimes tries to do
+         * tricky things to go faster, and we're not ready for that. */
+        __memcpy(&boot_params, boot, PARAM_SIZE);
         /* The boot parameters also tell us where the command-line is: save
          * that, too. */
-        memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr),
+        __memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr),
                COMMAND_LINE_SIZE);
 
         /* We're under lguest, paravirt is enabled, and we're running at
diff --git a/drivers/lguest/lguest_asm.S b/drivers/lguest/lguest_asm.S
index f182c6a362..1ddcd5cd20 100644
--- a/drivers/lguest/lguest_asm.S
+++ b/drivers/lguest/lguest_asm.S
@@ -22,8 +22,9 @@
         jmp lguest_init
 
 /*G:055 We create a macro which puts the assembler code between lgstart_ and
- * lgend_ markers.  These templates end up in the .init.text section, so they
- * are discarded after boot. */
+ * lgend_ markers.  These templates are put in the .text section: they can't be
+ * discarded after boot as we may need to patch modules, too. */
+.text
 #define LGUEST_PATCH(name, insns...)                    \
         lgstart_##name: insns; lgend_##name:;           \
         .globl lgstart_##name; .globl lgend_##name
@@ -34,7 +35,6 @@ LGUEST_PATCH(popf, movl %eax, lguest_data+LGUEST_DATA_irq_enabled)
 LGUEST_PATCH(pushf, movl lguest_data+LGUEST_DATA_irq_enabled, %eax)
 /*:*/
 
-.text
 /* These demark the EIP range where host should never deliver interrupts. */
 .global lguest_noirq_start
 .global lguest_noirq_end
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index bc77c5e2ca..5c742a5260 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -89,7 +89,7 @@ static int sleepy_trackpad;
 static int autopoll_devs;
 int __adb_probe_sync;
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
 static struct pmu_sleep_notifier adb_sleep_notifier = {
         adb_notify_sleep,
@@ -313,7 +313,7 @@ int __init adb_init(void)
                 printk(KERN_WARNING "Warning: no ADB interface detected\n");
                 adb_controller = NULL;
         } else {
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
                 pmu_register_sleep_notifier(&adb_sleep_notifier);
 #endif /* CONFIG_PM */
 #ifdef CONFIG_PPC
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 157080b3b4..04f3973e38 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -152,10 +152,10 @@ static spinlock_t pmu_lock;
 static u8 pmu_intr_mask;
 static int pmu_version;
 static int drop_interrupts;
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 static int option_lid_wakeup = 1;
-#endif /* CONFIG_PM && CONFIG_PPC32 */
-#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
+#if (defined(CONFIG_PM_SLEEP)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
 static int sleep_in_progress;
 #endif
 static unsigned long async_req_locks;
@@ -875,7 +875,7 @@ proc_read_options(char *page, char **start, off_t off,
 {
         char *p = page;
 
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
         if (pmu_kind == PMU_KEYLARGO_BASED &&
             pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                 p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
@@ -916,7 +916,7 @@ proc_write_options(struct file *file, const char __user *buffer,
         *(val++) = 0;
         while(*val == ' ')
                 val++;
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
         if (pmu_kind == PMU_KEYLARGO_BASED &&
             pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                 if (!strcmp(label, "lid_wakeup"))
@@ -1738,7 +1738,7 @@ pmu_present(void)
         return via != 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 
 static LIST_HEAD(sleep_notifiers);
 
@@ -1769,9 +1769,9 @@ pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* n)
         return 0;
 }
 EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
 
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 
 /* Sleep is broadcast last-to-first */
 static void broadcast_sleep(int when)
@@ -2390,7 +2390,7 @@ powerbook_sleep_3400(void)
         return 0;
 }
 
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 
 /*
  * Support for /dev/pmu device
@@ -2573,7 +2573,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
         int error = -EINVAL;
 
         switch (cmd) {
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
         case PMU_IOC_SLEEP:
                 if (!capable(CAP_SYS_ADMIN))
                         return -EACCES;
@@ -2601,7 +2601,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
                         return put_user(0, argp);
                 else
                         return put_user(1, argp);
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 
 #ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
         /* Compatibility ioctl's for backlight */
@@ -2757,7 +2757,7 @@ pmu_polled_request(struct adb_request *req)
  * to do suspend-to-disk.
  */
 
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 
 int pmu_sys_suspended;
 
@@ -2792,7 +2792,7 @@ static int pmu_sys_resume(struct sys_device *sysdev)
         return 0;
 }
 
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 
 static struct sysdev_class pmu_sysclass = {
         set_kset_name("pmu"),
@@ -2803,10 +2803,10 @@ static struct sys_device device_pmu = {
 };
 
 static struct sysdev_driver driver_pmu = {
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
         .suspend        = &pmu_sys_suspend,
         .resume         = &pmu_sys_resume,
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 };
 
 static int __init init_pmu_sysfs(void)
@@ -2841,10 +2841,10 @@ EXPORT_SYMBOL(pmu_wait_complete);
 EXPORT_SYMBOL(pmu_suspend);
 EXPORT_SYMBOL(pmu_resume);
 EXPORT_SYMBOL(pmu_unlock);
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 EXPORT_SYMBOL(pmu_enable_irled);
 EXPORT_SYMBOL(pmu_battery_count);
 EXPORT_SYMBOL(pmu_batteries);
 EXPORT_SYMBOL(pmu_power_flags);
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 531d4d17d0..34a8c60a25 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -263,7 +263,7 @@ config DM_MULTIPATH_EMC
 
 config DM_MULTIPATH_RDAC
         tristate "LSI/Engenio RDAC multipath support (EXPERIMENTAL)"
-        depends on DM_MULTIPATH && BLK_DEV_DM && EXPERIMENTAL
+        depends on DM_MULTIPATH && BLK_DEV_DM && SCSI && EXPERIMENTAL
         ---help---
           Multipath support for LSI/Engenio RDAC.
 
diff --git a/drivers/md/dm-bio-list.h b/drivers/md/dm-bio-list.h
index 16ee3b018b..3f7b827649 100644
--- a/drivers/md/dm-bio-list.h
+++ b/drivers/md/dm-bio-list.h
@@ -9,6 +9,8 @@
 
 #include <linux/bio.h>
 
+#ifdef CONFIG_BLOCK
+
 struct bio_list {
         struct bio *head;
         struct bio *tail;
@@ -106,4 +108,5 @@ static inline struct bio *bio_list_get(struct bio_list *bl)
         return bio;
 }
 
+#endif /* CONFIG_BLOCK */
 #endif
diff --git a/drivers/md/dm-mpath-rdac.c b/drivers/md/dm-mpath-rdac.c
index 8b776b8cb7..16b1613457 100644
--- a/drivers/md/dm-mpath-rdac.c
+++ b/drivers/md/dm-mpath-rdac.c
@@ -292,7 +292,7 @@ static struct request *get_rdac_req(struct rdac_handler *h,
         rq->end_io_data = h;
         rq->timeout = h->timeout;
         rq->cmd_type = REQ_TYPE_BLOCK_PC;
-        rq->cmd_flags = REQ_FAILFAST | REQ_NOMERGE;
+        rq->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
         return rq;
 }
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2aff4be35d..f96dea975f 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -514,7 +514,7 @@ static void ops_complete_biofill(void *stripe_head_ref)
         struct stripe_head *sh = stripe_head_ref;
         struct bio *return_bi = NULL;
         raid5_conf_t *conf = sh->raid_conf;
-        int i, more_to_read = 0;
+        int i;
 
         pr_debug("%s: stripe %llu\n", __FUNCTION__,
                 (unsigned long long)sh->sector);
@@ -522,16 +522,14 @@ static void ops_complete_biofill(void *stripe_head_ref)
         /* clear completed biofills */
         for (i = sh->disks; i--; ) {
                 struct r5dev *dev = &sh->dev[i];
-                /* check if this stripe has new incoming reads */
-                if (dev->toread)
-                        more_to_read++;
 
                 /* acknowledge completion of a biofill operation */
-                /* and check if we need to reply to a read request
-                */
-                if (test_bit(R5_Wantfill, &dev->flags) && !dev->toread) {
+                /* and check if we need to reply to a read request,
+                 * new R5_Wantfill requests are held off until
+                 * !test_bit(STRIPE_OP_BIOFILL, &sh->ops.pending)
+                 */
+                if (test_and_clear_bit(R5_Wantfill, &dev->flags)) {
                         struct bio *rbi, *rbi2;
-                        clear_bit(R5_Wantfill, &dev->flags);
 
                         /* The access to dev->read is outside of the
                          * spin_lock_irq(&conf->device_lock), but is protected
@@ -558,8 +556,7 @@ static void ops_complete_biofill(void *stripe_head_ref)
 
         return_io(return_bi);
 
-        if (more_to_read)
-                set_bit(STRIPE_HANDLE, &sh->state);
+        set_bit(STRIPE_HANDLE, &sh->state);
         release_stripe(sh);
 }
 
@@ -2541,7 +2538,7 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh,
         struct dma_async_tx_descriptor *tx = NULL;
         clear_bit(STRIPE_EXPAND_SOURCE, &sh->state);
         for (i = 0; i < sh->disks; i++)
-                if (i != sh->pd_idx && (r6s && i != r6s->qd_idx)) {
+                if (i != sh->pd_idx && (!r6s || i != r6s->qd_idx)) {
                         int dd_idx, pd_idx, j;
                         struct stripe_head *sh2;
 
@@ -2574,7 +2571,8 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh,
                         set_bit(R5_UPTODATE, &sh2->dev[dd_idx].flags);
                         for (j = 0; j < conf->raid_disks; j++)
                                 if (j != sh2->pd_idx &&
-                                    (r6s && j != r6s->qd_idx) &&
+                                    (!r6s || j != raid6_next_disk(sh2->pd_idx,
+                                                                 sh2->disks)) &&
                                     !test_bit(R5_Expanded, &sh2->dev[j].flags))
                                         break;
                         if (j == conf->raid_disks) {
@@ -2583,12 +2581,12 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh,
                         }
                         release_stripe(sh2);
 
-                        /* done submitting copies, wait for them to complete */
-                        if (i + 1 >= sh->disks) {
-                                async_tx_ack(tx);
-                                dma_wait_for_async_tx(tx);
-                        }
                 }
+        /* done submitting copies, wait for them to complete */
+        if (tx) {
+                async_tx_ack(tx);
+                dma_wait_for_async_tx(tx);
+        }
 }
 
 /*
@@ -2855,7 +2853,7 @@ static void handle_stripe5(struct stripe_head *sh)
                 sh->disks = conf->raid_disks;
                 sh->pd_idx = stripe_to_pdidx(sh->sector, conf,
                         conf->raid_disks);
-                s.locked += handle_write_operations5(sh, 0, 1);
+                s.locked += handle_write_operations5(sh, 1, 1);
         } else if (s.expanded &&
                 !test_bit(STRIPE_OP_POSTXOR, &sh->ops.pending)) {
                 clear_bit(STRIPE_EXPAND_READY, &sh->state);
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index 02a0ea6e1c..6bf858a436 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -135,6 +135,13 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs
         struct flexcop_device *fc = i2c_get_adapdata(i2c_adap);
         int i, ret = 0;
 
+        /* Some drivers use 1 byte or 0 byte reads as probes, which this
+         * driver doesn't support.  These probes will always fail, so this
+         * hack makes them always succeed.  If one knew how, it would of
+         * course be better to actually do the read.  */
+        if (num == 1 && msgs[0].flags == I2C_M_RD && msgs[0].len <= 1)
+                return 1;
+
         if (mutex_lock_interruptible(&fc->i2c_mutex))
                 return -ERESTARTSYS;
 
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index acf026342e..bdd797071c 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -800,7 +800,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
 }
 
 
-static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
+static void dvb_net_sec(struct net_device *dev, const u8 *pkt, int
+pkt_len)
 {
         u8 *eth;
         struct sk_buff *skb;
@@ -902,7 +903,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
          * we rely on the DVB API definition where exactly one complete
          * section is delivered in buffer1
          */
-        dvb_net_sec (dev, (u8*) buffer1, buffer1_len);
+        dvb_net_sec (dev, buffer1, buffer1_len);
         return 0;
 }
 
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 317a2a3f9c..da7a6b591a 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -580,7 +580,7 @@ struct cx8802_dev * cx8802_get_device(struct inode *inode)
 
         list_for_each(list,&cx8802_devlist) {
                 h = list_entry(list, struct cx8802_dev, devlist);
-                if (h->mpeg_dev->minor == minor)
+                if (h->mpeg_dev && h->mpeg_dev->minor == minor)
                         return h;
         }
 
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 2c7b158ce7..40307f3f6f 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1772,6 +1772,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         if (dev->alt_max_pkt_size == NULL) {
                 em28xx_errdev("out of memory!\n");
                 em28xx_devused&=~(1<<nr);
+                kfree(dev);
                 return -ENOMEM;
         }
 
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 5dd519caf8..66ea3cbc36 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -190,7 +190,9 @@ static void ivtv_update_pgm_info(struct ivtv *itv)
                 int idx = (itv->pgm_info_write_idx + i) % itv->pgm_info_num;
                 struct v4l2_enc_idx_entry *e = itv->pgm_info + idx;
                 u32 addr = itv->pgm_info_offset + 4 + idx * 24;
-                const int mapping[] = { V4L2_ENC_IDX_FRAME_P, V4L2_ENC_IDX_FRAME_I, V4L2_ENC_IDX_FRAME_B, 0 };
+                const int mapping[8] = { -1, V4L2_ENC_IDX_FRAME_I, V4L2_ENC_IDX_FRAME_P, -1,
+                        V4L2_ENC_IDX_FRAME_B, -1, -1, -1 };
+                                        // 1=I, 2=P, 4=B
 
                 e->offset = read_enc(addr + 4) + ((u64)read_enc(addr + 8) << 32);
                 if (e->offset > itv->mpg_data_received) {
@@ -199,7 +201,7 @@ static void ivtv_update_pgm_info(struct ivtv *itv)
                 e->offset += itv->vbi_data_inserted;
                 e->length = read_enc(addr);
                 e->pts = read_enc(addr + 16) + ((u64)(read_enc(addr + 20) & 1) << 32);
-                e->flags = mapping[read_enc(addr + 12) & 3];
+                e->flags = mapping[read_enc(addr + 12) & 7];
                 i++;
         }
         itv->pgm_info_write_idx = (itv->pgm_info_write_idx + i) % itv->pgm_info_num;
@@ -752,9 +754,11 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
                 ivtv_yuv_close(itv);
         }
         if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_YUV)
-            itv->output_mode = OUT_NONE;
+                itv->output_mode = OUT_NONE;
+        else if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_UDMA_YUV)
+                itv->output_mode = OUT_NONE;
         else if (s->type == IVTV_DEC_STREAM_TYPE_MPG && itv->output_mode == OUT_MPG)
-            itv->output_mode = OUT_NONE;
+                itv->output_mode = OUT_NONE;
 
         itv->speed = 0;
         clear_bit(IVTV_F_I_DEC_PAUSED, &itv->i_flags);
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 5977a79619..dfe0aedc60 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1099,14 +1099,21 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 
         case VIDIOC_G_ENC_INDEX: {
                 struct v4l2_enc_idx *idx = arg;
+                struct v4l2_enc_idx_entry *e = idx->entry;
+                int entries;
                 int i;
 
-                idx->entries = (itv->pgm_info_write_idx + IVTV_MAX_PGM_INDEX - itv->pgm_info_read_idx) %
+                entries = (itv->pgm_info_write_idx + IVTV_MAX_PGM_INDEX - itv->pgm_info_read_idx) %
                                         IVTV_MAX_PGM_INDEX;
-                if (idx->entries > V4L2_ENC_IDX_ENTRIES)
-                        idx->entries = V4L2_ENC_IDX_ENTRIES;
-                for (i = 0; i < idx->entries; i++) {
-                        idx->entry[i] = itv->pgm_info[(itv->pgm_info_read_idx + i) % IVTV_MAX_PGM_INDEX];
+                if (entries > V4L2_ENC_IDX_ENTRIES)
+                        entries = V4L2_ENC_IDX_ENTRIES;
+                idx->entries = 0;
+                for (i = 0; i < entries; i++) {
+                        *e = itv->pgm_info[(itv->pgm_info_read_idx + i) % IVTV_MAX_PGM_INDEX];
+                        if ((e->flags & V4L2_ENC_IDX_FRAME_MASK) <= V4L2_ENC_IDX_FRAME_B) {
+                                idx->entries++;
+                                e++;
+                        }
                 }
                 itv->pgm_info_read_idx = (itv->pgm_info_read_idx + idx->entries) % IVTV_MAX_PGM_INDEX;
                 break;
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 9c0e8d18c2..931b274bff 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1196,12 +1196,19 @@ static int pwc_video_open(struct inode *inode, struct file *file)
         return 0;
 }
 
+
+static void pwc_cleanup(struct pwc_device *pdev)
+{
+        pwc_remove_sysfs_files(pdev->vdev);
+        video_unregister_device(pdev->vdev);
+}
+
 /* Note that all cleanup is done in the reverse order as in _open */
 static int pwc_video_close(struct inode *inode, struct file *file)
 {
         struct video_device *vdev = file->private_data;
         struct pwc_device *pdev;
-        int i;
+        int i, hint;
 
         PWC_DEBUG_OPEN(">> video_close called(vdev = 0x%p).\n", vdev);
 
@@ -1224,8 +1231,9 @@ static int pwc_video_close(struct inode *inode, struct file *file)
         pwc_isoc_cleanup(pdev);
         pwc_free_buffers(pdev);
 
+        lock_kernel();
         /* Turn off LEDS and power down camera, but only when not unplugged */
-        if (pdev->error_status != EPIPE) {
+        if (!pdev->unplugged) {
                 /* Turn LEDs off */
                 if (pwc_set_leds(pdev, 0, 0) < 0)
                         PWC_DEBUG_MODULE("Failed to set LED on/off time.\n");
@@ -1234,9 +1242,19 @@ static int pwc_video_close(struct inode *inode, struct file *file)
                         if (i < 0)
                                 PWC_ERROR("Failed to power down camera (%d)\n", i);
                 }
+                pdev->vopen--;
+                PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", pdev->vopen);
+        } else {
+                pwc_cleanup(pdev);
+                /* Free memory (don't set pdev to 0 just yet) */
+                kfree(pdev);
+                /* search device_hint[] table if we occupy a slot, by any chance */
+                for (hint = 0; hint < MAX_DEV_HINTS; hint++)
+                        if (device_hint[hint].pdev == pdev)
+                                device_hint[hint].pdev = NULL;
         }
-        pdev->vopen--;
-        PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", pdev->vopen);
+        unlock_kernel();
+
         return 0;
 }
 
@@ -1791,21 +1809,21 @@ static void usb_pwc_disconnect(struct usb_interface *intf)
         /* Alert waiting processes */
         wake_up_interruptible(&pdev->frameq);
         /* Wait until device is closed */
-        while (pdev->vopen)
-                schedule();
-        /* Device is now closed, so we can safely unregister it */
-        PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n");
-        pwc_remove_sysfs_files(pdev->vdev);
-        video_unregister_device(pdev->vdev);
-
-        /* Free memory (don't set pdev to 0 just yet) */
-        kfree(pdev);
+        if(pdev->vopen) {
+                pdev->unplugged = 1;
+        } else {
+                /* Device is closed, so we can safely unregister it */
+                PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n");
+                pwc_cleanup(pdev);
+                /* Free memory (don't set pdev to 0 just yet) */
+                kfree(pdev);
 
 disconnect_out:
-        /* search device_hint[] table if we occupy a slot, by any chance */
-        for (hint = 0; hint < MAX_DEV_HINTS; hint++)
-                if (device_hint[hint].pdev == pdev)
-                        device_hint[hint].pdev = NULL;
+                /* search device_hint[] table if we occupy a slot, by any chance */
+                for (hint = 0; hint < MAX_DEV_HINTS; hint++)
+                        if (device_hint[hint].pdev == pdev)
+                                device_hint[hint].pdev = NULL;
+        }
 
         unlock_kernel();
 }
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index 910a04f539..8e8e5b27e7 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -193,6 +193,7 @@ struct pwc_device
    char vsnapshot;              /* snapshot mode */
    char vsync;                  /* used by isoc handler */
    char vmirror;                /* for ToUCaM series */
+        char unplugged;
 
    int cmd_len;
    unsigned char cmd_buf[13];
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 8ec83bd700..25ec168108 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1537,18 +1537,18 @@ struct saa7134_board saa7134_boards[] = {
                 },{
                         .name = name_comp1,
                         .vmux = 0,
-                        .amux = LINE2,
-                        .gpio = 0x00,
+                        .amux = LINE1,
+                        .gpio = 0x02,
                 },{
                         .name = name_comp2,
                         .vmux = 3,
-                        .amux = LINE2,
-                        .gpio = 0x00,
+                        .amux = LINE1,
+                        .gpio = 0x02,
                 },{
                         .name = name_svideo,
                         .vmux = 8,
-                        .amux = LINE2,
-                        .gpio = 0x00,
+                        .amux = LINE1,
+                        .gpio = 0x02,
                 }},
                 .radio = {
                         .name = name_radio,
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 8615a6081a..b4018cce32 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -130,7 +130,7 @@ static int saa7191_write_reg(struct i2c_client *client, u8 reg,
 
 /* the first byte of data must be the first subaddress number (register) */
 static int saa7191_write_block(struct i2c_client *client,
-                               u8 length, u8 *data)
+                               u8 length, const u8 *data)
 {
         int i;
         int ret;
@@ -592,7 +592,7 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
         if (err)
                 goto out_free_decoder;
 
-        err = saa7191_write_block(client, sizeof(initseq), (u8 *)initseq);
+        err = saa7191_write_block(client, sizeof(initseq), initseq);
         if (err) {
                 printk(KERN_ERR "SAA7191 initialization failed\n");
                 goto out_detach_client;
diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c
index 380564cd33..f09eb10273 100644
--- a/drivers/media/video/usbvision/usbvision-cards.c
+++ b/drivers/media/video/usbvision/usbvision-cards.c
@@ -1081,6 +1081,7 @@ struct usb_device_id usbvision_table [] = {
         { USB_DEVICE(0x2304, 0x0301), .driver_info=PINNA_LINX_VD_IN_CAB_PAL },
         { USB_DEVICE(0x2304, 0x0419), .driver_info=PINNA_PCTV_BUNGEE_PAL_FM },
         { USB_DEVICE(0x2400, 0x4200), .driver_info=HPG_WINTV },
+        { },    /* terminate list */
 };
 
 MODULE_DEVICE_TABLE (usb, usbvision_table);
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index e3371f9722..0cb006f294 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1387,7 +1387,6 @@ static const struct file_operations usbvision_fops = {
         .ioctl          = video_ioctl2,
         .llseek         = no_llseek,
 /*      .poll          = video_poll, */
-        .mmap          = usbvision_v4l2_mmap,
         .compat_ioctl  = v4l_compat_ioctl32,
 };
 static struct video_device usbvision_video_template = {
@@ -1413,7 +1412,7 @@ static struct video_device usbvision_video_template = {
         .vidioc_s_input       = vidioc_s_input,
         .vidioc_queryctrl     = vidioc_queryctrl,
         .vidioc_g_audio       = vidioc_g_audio,
-        .vidioc_g_audio       = vidioc_s_audio,
+        .vidioc_s_audio       = vidioc_s_audio,
         .vidioc_g_ctrl        = vidioc_g_ctrl,
         .vidioc_s_ctrl        = vidioc_s_ctrl,
         .vidioc_streamon      = vidioc_streamon,
@@ -1459,7 +1458,7 @@ static struct video_device usbvision_radio_template=
         .vidioc_s_input       = vidioc_s_input,
         .vidioc_queryctrl     = vidioc_queryctrl,
         .vidioc_g_audio       = vidioc_g_audio,
-        .vidioc_g_audio       = vidioc_s_audio,
+        .vidioc_s_audio       = vidioc_s_audio,
         .vidioc_g_ctrl        = vidioc_g_ctrl,
         .vidioc_s_ctrl        = vidioc_s_ctrl,
         .vidioc_g_tuner       = vidioc_g_tuner,
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a26655881e..73e248fb2f 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -202,25 +202,5 @@ config THINKPAD_ACPI_BAY
 
           If you are not sure, say Y here.
 
-config THINKPAD_ACPI_INPUT_ENABLED
-        bool "Enable input layer support by default"
-        depends on THINKPAD_ACPI
-        default n
-        ---help---
-          This option enables thinkpad-acpi hot key handling over the input
-          layer at driver load time.  When it is unset, the driver does not
-          enable hot key handling by default, and also starts up with a mostly
-          empty keymap.
-
-          This option should be enabled if you have a new enough HAL or other
-          userspace support that properly handles the thinkpad-acpi event
-          device.  It auto-tunes the hot key support to those reported by the
-          firmware and enables it automatically.
-
-          If unsure, say N here to retain the old behaviour of ibm-acpi, and
-          thinkpad-acpi up to kernel 2.6.21: userspace will have to enable and
-          set up the thinkpad-acpi hot key handling using the sysfs interace
-          after loading the driver.
-
 
 endif # MISC_DEVICES
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index d0fc4fd212..7dce318df1 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -732,7 +732,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
                 lcd_blank(FB_BLANK_POWERDOWN);
         }
 
-        acpi_bus_generate_event(hotk->device, event,
+        acpi_bus_generate_proc_event(hotk->device, event,
                                 hotk->event_count[event % 128]++);
 
         return;
@@ -1072,7 +1072,8 @@ static void asus_backlight_exit(void)
 }
 
 #define  ASUS_LED_UNREGISTER(object)                            \
-        led_classdev_unregister(&object##_led)
+        if (object##_led.dev)                                   \
+                led_classdev_unregister(&object##_led)
 
 static void asus_led_exit(void)
 {
diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c
index 932a415197..349be934db 100644
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/misc/msi-laptop.c
@@ -353,7 +353,7 @@ static int __init msi_init(void)
         if (IS_ERR(msibl_device))
                 return PTR_ERR(msibl_device);
 
-        msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1,
+        msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;
 
         ret = platform_driver_register(&msipf_driver);
         if (ret)
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 91da6880ae..d38ddce592 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -856,6 +856,15 @@ static struct dmi_system_id sony_nc_ids[] = {
                         },
                 },
                 {
+                        .ident = "Sony Vaio FZ Series",
+                        .callback = sony_nc_C_enable,
+                        .driver_data = sony_C_events,
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ"),
+                        },
+                },
+                {
                         .ident = "Sony Vaio C Series",
                         .callback = sony_nc_C_enable,
                         .driver_data = sony_C_events,
@@ -904,7 +913,7 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
 
         dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);
         sony_laptop_report_input_event(ev);
-        acpi_bus_generate_event(sony_nc_acpi_device, 1, ev);
+        acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev);
 }
 
 static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
@@ -2292,7 +2301,7 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
 
 found:
         sony_laptop_report_input_event(device_event);
-        acpi_bus_generate_event(spic_dev.acpi_dev, 1, device_event);
+        acpi_bus_generate_proc_event(spic_dev.acpi_dev, 1, device_event);
         sonypi_compat_report_event(device_event);
 
         return IRQ_HANDLED;
@@ -2308,8 +2317,6 @@ static int sony_pic_remove(struct acpi_device *device, int type)
         struct sony_pic_ioport *io, *tmp_io;
         struct sony_pic_irq *irq, *tmp_irq;
 
-        sonypi_compat_exit();
-
         if (sony_pic_disable(device)) {
                 printk(KERN_ERR DRV_PFX "Couldn't disable device.\n");
                 return -ENXIO;
@@ -2319,6 +2326,8 @@ static int sony_pic_remove(struct acpi_device *device, int type)
         release_region(spic_dev.cur_ioport->io.minimum,
                         spic_dev.cur_ioport->io.address_length);
 
+        sonypi_compat_exit();
+
         sony_laptop_remove_input();
 
         /* pf attrs */
@@ -2384,6 +2393,9 @@ static int sony_pic_add(struct acpi_device *device)
                 goto err_free_resources;
         }
 
+        if (sonypi_compat_init())
+                goto err_remove_input;
+
         /* request io port */
         list_for_each_entry(io, &spic_dev.ioports, list) {
                 if (request_region(io->io.minimum, io->io.address_length,
@@ -2398,7 +2410,7 @@ static int sony_pic_add(struct acpi_device *device)
         if (!spic_dev.cur_ioport) {
                 printk(KERN_ERR DRV_PFX "Failed to request_region.\n");
                 result = -ENODEV;
-                goto err_remove_input;
+                goto err_remove_compat;
         }
 
         /* request IRQ */
@@ -2438,9 +2450,6 @@ static int sony_pic_add(struct acpi_device *device)
         if (result)
                 goto err_remove_pf;
 
-        if (sonypi_compat_init())
-                goto err_remove_pf;
-
         return 0;
 
 err_remove_pf:
@@ -2456,6 +2465,9 @@ err_release_region:
         release_region(spic_dev.cur_ioport->io.minimum,
                         spic_dev.cur_ioport->io.address_length);
 
+err_remove_compat:
+        sonypi_compat_exit();
+
 err_remove_input:
         sony_laptop_remove_input();
 
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index f6cd34a3db..0222bbaf7b 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -21,7 +21,7 @@
  *  02110-1301, USA.
  */
 
-#define IBM_VERSION "0.15"
+#define IBM_VERSION "0.16"
 #define TPACPI_SYSFS_VERSION 0x010000
 
 /*
@@ -906,9 +906,26 @@ static ssize_t hotkey_radio_sw_show(struct device *dev,
 static struct device_attribute dev_attr_hotkey_radio_sw =
         __ATTR(hotkey_radio_sw, S_IRUGO, hotkey_radio_sw_show, NULL);
 
+/* sysfs hotkey report_mode -------------------------------------------- */
+static ssize_t hotkey_report_mode_show(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+                (hotkey_report_mode != 0) ? hotkey_report_mode : 1);
+}
+
+static struct device_attribute dev_attr_hotkey_report_mode =
+        __ATTR(hotkey_report_mode, S_IRUGO, hotkey_report_mode_show, NULL);
+
 /* --------------------------------------------------------------------- */
 
-static struct attribute *hotkey_mask_attributes[] = {
+static struct attribute *hotkey_attributes[] __initdata = {
+        &dev_attr_hotkey_enable.attr,
+        &dev_attr_hotkey_report_mode.attr,
+};
+
+static struct attribute *hotkey_mask_attributes[] __initdata = {
         &dev_attr_hotkey_mask.attr,
         &dev_attr_hotkey_bios_enabled.attr,
         &dev_attr_hotkey_bios_mask.attr,
@@ -987,11 +1004,12 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                 str_supported(tp_features.hotkey));
 
         if (tp_features.hotkey) {
-                hotkey_dev_attributes = create_attr_set(7, NULL);
+                hotkey_dev_attributes = create_attr_set(8, NULL);
                 if (!hotkey_dev_attributes)
                         return -ENOMEM;
-                res = add_to_attr_set(hotkey_dev_attributes,
-                                &dev_attr_hotkey_enable.attr);
+                res = add_many_to_attr_set(hotkey_dev_attributes,
+                                hotkey_attributes,
+                                ARRAY_SIZE(hotkey_attributes));
                 if (res)
                         return res;
 
@@ -1055,11 +1073,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                                 TPACPI_HOTKEY_MAP_SIZE);
                 }
 
-#ifndef CONFIG_THINKPAD_ACPI_INPUT_ENABLED
-                for (i = 0; i < 12; i++)
-                        hotkey_keycode_map[i] = KEY_UNKNOWN;
-#endif /* ! CONFIG_THINKPAD_ACPI_INPUT_ENABLED */
-
                 set_bit(EV_KEY, tpacpi_inputdev->evbit);
                 set_bit(EV_MSC, tpacpi_inputdev->evbit);
                 set_bit(MSC_SCAN, tpacpi_inputdev->mscbit);
@@ -1081,14 +1094,17 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                         set_bit(SW_RADIO, tpacpi_inputdev->swbit);
                 }
 
-#ifdef CONFIG_THINKPAD_ACPI_INPUT_ENABLED
                 dbg_printk(TPACPI_DBG_INIT,
                                 "enabling hot key handling\n");
                 res = hotkey_set(1, (hotkey_all_mask & ~hotkey_reserved_mask)
                                         | hotkey_orig_mask);
                 if (res)
                         return res;
-#endif /* CONFIG_THINKPAD_ACPI_INPUT_ENABLED */
+
+                dbg_printk(TPACPI_DBG_INIT,
+                                "legacy hot key reporting over procfs %s\n",
+                                (hotkey_report_mode < 2) ?
+                                        "enabled" : "disabled");
         }
 
         return (tp_features.hotkey)? 0 : 1;
@@ -1142,58 +1158,65 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
 {
         u32 hkey;
         unsigned int keycode, scancode;
-        int sendacpi = 1;
+        int send_acpi_ev = 0;
 
         if (event == 0x80 && acpi_evalf(hkey_handle, &hkey, "MHKP", "d")) {
-                if (tpacpi_inputdev->users > 0) {
-                        switch (hkey >> 12) {
-                        case 1:
-                                /* 0x1000-0x1FFF: key presses */
-                                scancode = hkey & 0xfff;
-                                if (scancode > 0 && scancode < 0x21) {
-                                        scancode--;
-                                        keycode = hotkey_keycode_map[scancode];
-                                        tpacpi_input_send_key(scancode, keycode);
-                                        sendacpi = (keycode == KEY_RESERVED
-                                                || keycode == KEY_UNKNOWN);
-                                } else {
-                                        printk(IBM_ERR
-                                               "hotkey 0x%04x out of range for keyboard map\n",
-                                               hkey);
-                                }
-                                break;
-                        case 5:
-                                /* 0x5000-0x5FFF: LID */
-                                /* we don't handle it through this path, just
-                                 * eat up known LID events */
-                                if (hkey != 0x5001 && hkey != 0x5002) {
-                                        printk(IBM_ERR
-                                                "unknown LID-related hotkey event: 0x%04x\n",
-                                                hkey);
-                                }
+                switch (hkey >> 12) {
+                case 1:
+                        /* 0x1000-0x1FFF: key presses */
+                        scancode = hkey & 0xfff;
+                        if (scancode > 0 && scancode < 0x21) {
+                                scancode--;
+                                keycode = hotkey_keycode_map[scancode];
+                                tpacpi_input_send_key(scancode, keycode);
+                        } else {
+                                printk(IBM_ERR
+                                       "hotkey 0x%04x out of range for keyboard map\n",
+                                       hkey);
+                                send_acpi_ev = 1;
+                        }
+                        break;
+                case 5:
+                        /* 0x5000-0x5FFF: LID */
+                        /* we don't handle it through this path, just
+                         * eat up known LID events */
+                        if (hkey != 0x5001 && hkey != 0x5002) {
+                                printk(IBM_ERR
+                                        "unknown LID-related hotkey event: 0x%04x\n",
+                                        hkey);
+                                send_acpi_ev = 1;
+                        }
+                        break;
+                case 7:
+                        /* 0x7000-0x7FFF: misc */
+                        if (tp_features.hotkey_wlsw && hkey == 0x7000) {
+                                tpacpi_input_send_radiosw();
                                 break;
-                        case 7:
-                                /* 0x7000-0x7FFF: misc */
-                                if (tp_features.hotkey_wlsw && hkey == 0x7000) {
-                                                tpacpi_input_send_radiosw();
-                                                sendacpi = 0;
-                                        break;
-                                }
-                                /* fallthrough to default */
-                        default:
-                                /* case 2: dock-related */
-                                /*      0x2305 - T43 waking up due to bay lever eject while aslept */
-                                /* case 3: ultra-bay related. maybe bay in dock? */
-                                /*      0x3003 - T43 after wake up by bay lever eject (0x2305) */
-                                printk(IBM_NOTICE "unhandled hotkey event 0x%04x\n", hkey);
                         }
+                        /* fallthrough to default */
+                default:
+                        /* case 2: dock-related */
+                        /*      0x2305 - T43 waking up due to bay lever eject while aslept */
+                        /* case 3: ultra-bay related. maybe bay in dock? */
+                        /*      0x3003 - T43 after wake up by bay lever eject (0x2305) */
+                        printk(IBM_NOTICE "unhandled HKEY event 0x%04x\n", hkey);
+                        send_acpi_ev = 1;
                 }
-
-                if (sendacpi)
-                        acpi_bus_generate_event(ibm->acpi->device, event, hkey);
         } else {
                 printk(IBM_ERR "unknown hotkey notification event %d\n", event);
-                acpi_bus_generate_event(ibm->acpi->device, event, 0);
+                hkey = 0;
+                send_acpi_ev = 1;
+        }
+
+        /* Legacy events */
+        if (send_acpi_ev || hotkey_report_mode < 2)
+                acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey);
+
+        /* netlink events */
+        if (send_acpi_ev) {
+                acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
+                                                ibm->acpi->device->dev.bus_id,
+                                                event, hkey);
         }
 }
 
@@ -2162,22 +2185,27 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
         int docked = dock_docked();
         int pci = ibm->acpi->hid && ibm->acpi->device &&
                 acpi_match_device_ids(ibm->acpi->device, ibm_pci_device_ids);
+        int data;
 
         if (event == 1 && !pci) /* 570 */
-                acpi_bus_generate_event(ibm->acpi->device, event, 1);   /* button */
+                data = 1;       /* button */
         else if (event == 1 && pci)     /* 570 */
-                acpi_bus_generate_event(ibm->acpi->device, event, 3);   /* dock */
+                data = 3;       /* dock */
         else if (event == 3 && docked)
-                acpi_bus_generate_event(ibm->acpi->device, event, 1);   /* button */
+                data = 1;       /* button */
         else if (event == 3 && !docked)
-                acpi_bus_generate_event(ibm->acpi->device, event, 2);   /* undock */
+                data = 2;       /* undock */
         else if (event == 0 && docked)
-                acpi_bus_generate_event(ibm->acpi->device, event, 3);   /* dock */
+                data = 3;       /* dock */
         else {
                 printk(IBM_ERR "unknown dock event %d, status %d\n",
                        event, _sta(dock_handle));
-                acpi_bus_generate_event(ibm->acpi->device, event, 0);   /* unknown */
+                data = 0;       /* unknown */
         }
+        acpi_bus_generate_proc_event(ibm->acpi->device, event, data);
+        acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
+                                          ibm->acpi->device->dev.bus_id,
+                                          event, data);
 }
 
 static int dock_read(char *p)
@@ -2275,7 +2303,10 @@ static int __init bay_init(struct ibm_init_struct *iibm)
 
 static void bay_notify(struct ibm_struct *ibm, u32 event)
 {
-        acpi_bus_generate_event(ibm->acpi->device, event, 0);
+        acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);
+        acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
+                                          ibm->acpi->device->dev.bus_id,
+                                          event, 0);
 }
 
 #define bay_occupied(b) (_sta(b##_handle) & 1)
@@ -4615,6 +4646,9 @@ module_param_named(fan_control, fan_control_allowed, bool, 0);
 static int brightness_mode;
 module_param_named(brightness_mode, brightness_mode, int, 0);
 
+static unsigned int hotkey_report_mode;
+module_param(hotkey_report_mode, uint, 0);
+
 #define IBM_PARAM(feature) \
         module_param_call(feature, set_ibm_param, NULL, NULL, 0)
 
@@ -4640,6 +4674,10 @@ static int __init thinkpad_acpi_module_init(void)
 {
         int ret, i;
 
+        /* Parameter checking */
+        if (hotkey_report_mode > 2)
+                return -EINVAL;
+
         /* Driver-level probe */
 
         get_thinkpad_model_data(&thinkpad_id);
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index eee8809a50..082a1cbc16 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -181,6 +181,7 @@ static void tpacpi_remove_driver_attributes(struct device_driver *drv);
 static int experimental;
 static u32 dbg_level;
 static int force_load;
+static unsigned int hotkey_report_mode;
 
 static int thinkpad_acpi_module_init(void);
 static void thinkpad_acpi_module_exit(void);
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index fe0e785ed7..817a79462b 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -186,12 +186,10 @@ struct mmc_card *mmc_alloc_card(struct mmc_host *host)
 {
         struct mmc_card *card;
 
-        card = kmalloc(sizeof(struct mmc_card), GFP_KERNEL);
+        card = kzalloc(sizeof(struct mmc_card), GFP_KERNEL);
         if (!card)
                 return ERR_PTR(-ENOMEM);
 
-        memset(card, 0, sizeof(struct mmc_card));
-
         card->host = host;
 
         device_initialize(&card->dev);
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 6a7e298496..2c7ce8f43a 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -58,12 +58,10 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
 {
         struct mmc_host *host;
 
-        host = kmalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL);
+        host = kzalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL);
         if (!host)
                 return NULL;
 
-        memset(host, 0, sizeof(struct mmc_host) + extra);
-
         host->parent = dev;
         host->class_dev.parent = dev;
         host->class_dev.class = &mmc_host_class;
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index bfebd2fa7a..955ea60583 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -941,7 +941,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev)
 
         host = mmc_priv(mmc);
 
-        if (host->present != -1) {
+        if (host->board->det_pin) {
                 device_init_wakeup(&pdev->dev, 0);
                 free_irq(host->board->det_pin, host);
                 cancel_delayed_work(&host->mmc->detect);
@@ -972,7 +972,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
         struct at91mci_host *host = mmc_priv(mmc);
         int ret = 0;
 
-        if (device_may_wakeup(&pdev->dev))
+        if (host->board->det_pin && device_may_wakeup(&pdev->dev))
                 enable_irq_wake(host->board->det_pin);
 
         if (mmc)
@@ -987,7 +987,7 @@ static int at91_mci_resume(struct platform_device *pdev)
         struct at91mci_host *host = mmc_priv(mmc);
         int ret = 0;
 
-        if (device_may_wakeup(&pdev->dev))
+        if (host->board->det_pin && device_may_wakeup(&pdev->dev))
                 disable_irq_wake(host->board->det_pin);
 
         if (mmc)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index f2bc87ac24..20a7d89e01 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -385,6 +385,9 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
         BUG_ON(data->blksz > host->mmc->max_blk_size);
         BUG_ON(data->blocks > 65535);
 
+        host->data = data;
+        host->data_early = 0;
+
         /* timeout in us */
         target_timeout = data->timeout_ns / 1000 +
                 data->timeout_clks / host->clock;
@@ -443,11 +446,11 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
 {
         u16 mode;
 
-        WARN_ON(host->data);
-
         if (data == NULL)
                 return;
 
+        WARN_ON(!host->data);
+
         mode = SDHCI_TRNS_BLK_CNT_EN;
         if (data->blocks > 1)
                 mode |= SDHCI_TRNS_MULTI;
@@ -477,8 +480,8 @@ static void sdhci_finish_data(struct sdhci_host *host)
         /*
          * Controller doesn't count down when in single block mode.
          */
-        if ((data->blocks == 1) && (data->error == MMC_ERR_NONE))
-                blocks = 0;
+        if (data->blocks == 1)
+                blocks = (data->error == MMC_ERR_NONE) ? 0 : 1;
         else
                 blocks = readw(host->ioaddr + SDHCI_BLOCK_COUNT);
         data->bytes_xfered = data->blksz * (data->blocks - blocks);
@@ -600,9 +603,10 @@ static void sdhci_finish_command(struct sdhci_host *host)
 
         host->cmd->error = MMC_ERR_NONE;
 
-        if (host->cmd->data)
-                host->data = host->cmd->data;
-        else
+        if (host->data && host->data_early)
+                sdhci_finish_data(host);
+
+        if (!host->cmd->data)
                 tasklet_schedule(&host->finish_tasklet);
 
         host->cmd = NULL;
@@ -929,9 +933,9 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask)
         BUG_ON(intmask == 0);
 
         if (!host->cmd) {
-                printk(KERN_ERR "%s: Got command interrupt even though no "
-                        "command operation was in progress.\n",
-                        mmc_hostname(host->mmc));
+                printk(KERN_ERR "%s: Got command interrupt 0x%08x even "
+                        "though no command operation was in progress.\n",
+                        mmc_hostname(host->mmc), (unsigned)intmask);
                 sdhci_dumpregs(host);
                 return;
         }
@@ -961,9 +965,9 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
                 if (intmask & SDHCI_INT_DATA_END)
                         return;
 
-                printk(KERN_ERR "%s: Got data interrupt even though no "
-                        "data operation was in progress.\n",
-                        mmc_hostname(host->mmc));
+                printk(KERN_ERR "%s: Got data interrupt 0x%08x even "
+                        "though no data operation was in progress.\n",
+                        mmc_hostname(host->mmc), (unsigned)intmask);
                 sdhci_dumpregs(host);
 
                 return;
@@ -991,8 +995,18 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
                         writel(readl(host->ioaddr + SDHCI_DMA_ADDRESS),
                                 host->ioaddr + SDHCI_DMA_ADDRESS);
 
-                if (intmask & SDHCI_INT_DATA_END)
-                        sdhci_finish_data(host);
+                if (intmask & SDHCI_INT_DATA_END) {
+                        if (host->cmd) {
+                                /*
+                                 * Data managed to finish before the
+                                 * command completed. Make sure we do
+                                 * things in the proper order.
+                                 */
+                                host->data_early = 1;
+                        } else {
+                                sdhci_finish_data(host);
+                        }
+                }
         }
 }
 
@@ -1347,12 +1361,11 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
          */
         mmc->max_blk_size = (caps & SDHCI_MAX_BLOCK_MASK) >> SDHCI_MAX_BLOCK_SHIFT;
         if (mmc->max_blk_size >= 3) {
-                printk(KERN_ERR "%s: Invalid maximum block size.\n",
+                printk(KERN_WARNING "%s: Invalid maximum block size, assuming 512\n",
                         host->slot_descr);
-                ret = -ENODEV;
-                goto unmap;
-        }
-        mmc->max_blk_size = 512 << mmc->max_blk_size;
+                mmc->max_blk_size = 512;
+        } else
+                mmc->max_blk_size = 512 << mmc->max_blk_size;
 
         /*
          * Maximum block count.
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index d157776c11..e28987d6d2 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -182,6 +182,7 @@ struct sdhci_host {
         struct mmc_request      *mrq;           /* Current request */
         struct mmc_command      *cmd;           /* Current command */
         struct mmc_data         *data;          /* Current data request */
+        int                     data_early:1;   /* Data finished before cmd */
 
         struct scatterlist      *cur_sg;        /* We're working on this */
         int                     num_sg;         /* Entries left */
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index aca3319712..9b430f20b6 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -70,6 +70,8 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags,
         DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n",
               mtd->index, mtd->name);
 
+        sb->s_flags = flags;
+
         ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
         if (ret < 0) {
                 up_write(&sb->s_umount);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5b9e17bf17..c5519250ef 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2177,7 +2177,7 @@ config SKGE
           with better performance and more complete ethtool support.
 
           It does not support the link failover and network management 
-          features available in the hardware.
+          features that "portable" vendor supplied sk98lin driver does.
 
           This driver supports adapters based on the original Yukon chipset:
           Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
@@ -2215,6 +2215,93 @@ config SKY2_DEBUG
 
          If unsure, say N.
 
+config SK98LIN
+        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support (DEPRECATED)"
+        depends on PCI
+        ---help---
+          Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
+          compliant Gigabit Ethernet Adapter.
+
+          This driver supports the original Yukon chipset. This driver is
+          deprecated and will be removed from the kernel in the near future,
+          it has been replaced by the skge driver. skge is cleaner and
+          seems to work better.
+
+          This driver does not support the newer Yukon2 chipset. A separate
+          driver, sky2, is provided to support Yukon2-based adapters.
+
+          The following adapters are supported by this driver:
+            - 3Com 3C940 Gigabit LOM Ethernet Adapter
+            - 3Com 3C941 Gigabit LOM Ethernet Adapter
+            - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
+            - Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
+            - Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
+            - Allied Telesyn AT-2970SX/2SC Gigabit Ethernet Adapter
+            - Allied Telesyn AT-2970TX Gigabit Ethernet Adapter
+            - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
+            - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
+            - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
+            - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
+            - 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 88E8050 Gigabit LOM Ethernet Adapter (Intel)
+            - Marvell RDK-8001 Adapter
+            - Marvell RDK-8002 Adapter
+            - Marvell RDK-8003 Adapter
+            - Marvell RDK-8004 Adapter
+            - Marvell RDK-8006 Adapter
+            - Marvell RDK-8007 Adapter
+            - Marvell RDK-8008 Adapter
+            - Marvell RDK-8009 Adapter
+            - Marvell RDK-8010 Adapter
+            - Marvell RDK-8011 Adapter
+            - Marvell RDK-8012 Adapter
+            - Marvell RDK-8052 Adapter
+            - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
+            - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
+            - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
+            - SK-9521 10/100/1000Base-T Adapter
+            - SK-9521 V2.0 10/100/1000Base-T Adapter
+            - SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T)
+            - SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter
+            - SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link)
+            - SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX)
+            - SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter
+            - SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link)
+            - SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX)
+            - SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter
+            - SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link)
+            - SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter
+            - SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition)
+            - SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
+            - SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link)
+            - SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)
+            - SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
+            - SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)
+            - SMC EZ Card 1000 (SMC9452TXV.2)
+          
+          The adapters support Jumbo Frames.
+          The dual link adapters support link-failover and dual port features.
+          Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support 
+          the scatter-gather functionality with sendfile(). Please refer to 
+          <file:Documentation/networking/sk98lin.txt> for more information about
+          optional driver parameters.
+          Questions concerning this driver may be addressed to:
+              <linux@syskonnect.de>
+          
+          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 <file:Documentation/kbuild/modules.txt>. The module will
+          be called sk98lin. This is recommended.
+
 config VIA_VELOCITY
         tristate "VIA Velocity support"
         depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e684212fd8..9c928a8458 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -66,6 +66,7 @@ ps3_gelic-objs += ps3_gelic_net.o
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKGE) += skge.o
 obj-$(CONFIG_SKY2) += sky2.o
+obj-$(CONFIG_SK98LIN) += sk98lin/
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_VIA_RHINE) += via-rhine.o
 obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 3c1984ecf3..f23e13c8f9 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -2203,21 +2203,20 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         struct net_device *netdev;
         struct atl1_adapter *adapter;
         static int cards_found = 0;
-        bool pci_using_64 = true;
         int err;
 
         err = pci_enable_device(pdev);
         if (err)
                 return err;
 
-        err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        /*
+         * 64-bit DMA currently has data corruption problems, so let's just
+         * use 32-bit DMA for now.  This is a big hack that is probably wrong.
+         */
+        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
         if (err) {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-                if (err) {
-                        dev_err(&pdev->dev, "no usable DMA configuration\n");
-                        goto err_dma;
-                }
-                pci_using_64 = false;
+                dev_err(&pdev->dev, "no usable DMA configuration\n");
+                goto err_dma;
         }
         /* Mark all PCI regions associated with PCI device
          * pdev as being reserved by owner atl1_driver_name
@@ -2282,7 +2281,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
 
         netdev->ethtool_ops = &atl1_ethtool_ops;
         adapter->bd_number = cards_found;
-        adapter->pci_using_64 = pci_using_64;
 
         /* setup the private structure */
         err = atl1_sw_init(adapter);
@@ -2299,9 +2297,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
          */
         /* netdev->features |= NETIF_F_TSO; */
 
-        if (pci_using_64)
-                netdev->features |= NETIF_F_HIGHDMA;
-
         netdev->features |= NETIF_F_LLTX;
 
         /*
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 24e7f9ab3f..66eed22cbd 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -54,8 +54,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.6.4"
-#define DRV_MODULE_RELDATE      "August 3, 2007"
+#define DRV_MODULE_VERSION      "1.6.5"
+#define DRV_MODULE_RELDATE      "September 20, 2007"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -3934,11 +3934,13 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
                 /* Chip reset. */
                 REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
 
+                /* Reading back any register after chip reset will hang the
+                 * bus on 5706 A0 and A1.  The msleep below provides plenty
+                 * of margin for write posting.
+                 */
                 if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
-                    (CHIP_ID(bp) == CHIP_ID_5706_A1)) {
-                        current->state = TASK_UNINTERRUPTIBLE;
-                        schedule_timeout(HZ / 50);
-                }
+                    (CHIP_ID(bp) == CHIP_ID_5706_A1))
+                        msleep(20);
 
                 /* Reset takes approximate 30 usec */
                 for (i = 0; i < 10; i++) {
@@ -6725,7 +6727,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         } else if (CHIP_NUM(bp) == CHIP_NUM_5706 ||
                    CHIP_NUM(bp) == CHIP_NUM_5708)
                 bp->phy_flags |= PHY_CRC_FIX_FLAG;
-        else if (CHIP_ID(bp) == CHIP_ID_5709_A0)
+        else if (CHIP_ID(bp) == CHIP_ID_5709_A0 ||
+                 CHIP_ID(bp) == CHIP_ID_5709_A1)
                 bp->phy_flags |= PHY_DIS_EARLY_DAC_FLAG;
 
         if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||
diff --git a/drivers/net/bsd_comp.c b/drivers/net/bsd_comp.c
index 202d4a4ef7..88edb98669 100644
--- a/drivers/net/bsd_comp.c
+++ b/drivers/net/bsd_comp.c
@@ -406,8 +406,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
  * Allocate space for the dictionary. This may be more than one page in
  * length.
  */
-    db->dict = (struct bsd_dict *) vmalloc (hsize *
-                                            sizeof (struct bsd_dict));
+    db->dict = vmalloc(hsize * sizeof(struct bsd_dict));
     if (!db->dict)
       {
         bsd_free (db);
@@ -426,8 +425,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
  */
     else
       {
-        db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *
-                                               sizeof (db->lens[0]));
+        db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));
         if (!db->lens)
           {
             bsd_free (db);
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index ab72563b81..20e887de25 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -50,7 +50,9 @@ typedef irqreturn_t(*intr_handler_t) (int, void *);
 
 struct vlan_group;
 
+struct adapter;
 struct port_info {
+        struct adapter *adapter;
         struct vlan_group *vlan_grp;
         const struct port_type_info *port_type;
         u8 port_id;
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 1637800450..2129210a67 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -679,7 +679,8 @@ const struct adapter_info *t3_get_adapter_info(unsigned int board_id);
 int t3_seeprom_read(struct adapter *adapter, u32 addr, u32 *data);
 int t3_seeprom_write(struct adapter *adapter, u32 addr, u32 data);
 int t3_seeprom_wp(struct adapter *adapter, int enable);
-int t3_check_tpsram_version(struct adapter *adapter);
+int t3_get_tp_version(struct adapter *adapter, u32 *vers);
+int t3_check_tpsram_version(struct adapter *adapter, int *must_load);
 int t3_check_tpsram(struct adapter *adapter, u8 *tp_ram, unsigned int size);
 int t3_set_proto_sram(struct adapter *adap, u8 *data);
 int t3_read_flash(struct adapter *adapter, unsigned int addr,
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index dc5d26988b..5ab319cfe5 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -358,11 +358,14 @@ static int init_dummy_netdevs(struct adapter *adap)
 
                 for (j = 0; j < pi->nqsets - 1; j++) {
                         if (!adap->dummy_netdev[dummy_idx]) {
-                                nd = alloc_netdev(0, "", ether_setup);
+                                struct port_info *p;
+
+                                nd = alloc_netdev(sizeof(*p), "", ether_setup);
                                 if (!nd)
                                         goto free_all;
 
-                                nd->priv = adap;
+                                p = netdev_priv(nd);
+                                p->adapter = adap;
                                 nd->weight = 64;
                                 set_bit(__LINK_STATE_START, &nd->state);
                                 adap->dummy_netdev[dummy_idx] = nd;
@@ -482,7 +485,8 @@ static ssize_t attr_store(struct device *d, struct device_attribute *attr,
 #define CXGB3_SHOW(name, val_expr) \
 static ssize_t format_##name(struct net_device *dev, char *buf) \
 { \
-        struct adapter *adap = dev->priv; \
+        struct port_info *pi = netdev_priv(dev); \
+        struct adapter *adap = pi->adapter; \
         return sprintf(buf, "%u\n", val_expr); \
 } \
 static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
@@ -493,7 +497,8 @@ static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
 
 static ssize_t set_nfilters(struct net_device *dev, unsigned int val)
 {
-        struct adapter *adap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
         int min_tids = is_offload(adap) ? MC5_MIN_TIDS : 0;
 
         if (adap->flags & FULL_INIT_DONE)
@@ -515,7 +520,8 @@ static ssize_t store_nfilters(struct device *d, struct device_attribute *attr,
 
 static ssize_t set_nservers(struct net_device *dev, unsigned int val)
 {
-        struct adapter *adap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
 
         if (adap->flags & FULL_INIT_DONE)
                 return -EBUSY;
@@ -556,9 +562,10 @@ static struct attribute_group cxgb3_attr_group = {.attrs = cxgb3_attrs };
 static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr,
                             char *buf, int sched)
 {
-        ssize_t len;
+        struct port_info *pi = netdev_priv(to_net_dev(d));
+        struct adapter *adap = pi->adapter;
         unsigned int v, addr, bpt, cpt;
-        struct adapter *adap = to_net_dev(d)->priv;
+        ssize_t len;
 
         addr = A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2;
         rtnl_lock();
@@ -581,10 +588,11 @@ static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr,
 static ssize_t tm_attr_store(struct device *d, struct device_attribute *attr,
                              const char *buf, size_t len, int sched)
 {
+        struct port_info *pi = netdev_priv(to_net_dev(d));
+        struct adapter *adap = pi->adapter;
+        unsigned int val;
         char *endp;
         ssize_t ret;
-        unsigned int val;
-        struct adapter *adap = to_net_dev(d)->priv;
 
         if (!capable(CAP_NET_ADMIN))
                 return -EPERM;
@@ -721,6 +729,7 @@ static void bind_qsets(struct adapter *adap)
 }
 
 #define FW_FNAME "t3fw-%d.%d.%d.bin"
+#define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin"
 
 static int upgrade_fw(struct adapter *adap)
 {
@@ -739,6 +748,71 @@ static int upgrade_fw(struct adapter *adap)
         }
         ret = t3_load_fw(adap, fw->data, fw->size);
         release_firmware(fw);
+
+        if (ret == 0)
+                dev_info(dev, "successful upgrade to firmware %d.%d.%d\n",
+                         FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO);
+        else
+                dev_err(dev, "failed to upgrade to firmware %d.%d.%d\n",
+                        FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO);
+        
+        return ret;
+}
+
+static inline char t3rev2char(struct adapter *adapter)
+{
+        char rev = 0;
+
+        switch(adapter->params.rev) {
+        case T3_REV_B:
+        case T3_REV_B2:
+                rev = 'b';
+                break;
+        }
+        return rev;
+}
+
+int update_tpsram(struct adapter *adap)
+{
+        const struct firmware *tpsram;
+        char buf[64];
+        struct device *dev = &adap->pdev->dev;
+        int ret;
+        char rev;
+        
+        rev = t3rev2char(adap);
+        if (!rev)
+                return 0;
+
+        snprintf(buf, sizeof(buf), TPSRAM_NAME, rev,
+                 TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+
+        ret = request_firmware(&tpsram, buf, dev);
+        if (ret < 0) {
+                dev_err(dev, "could not load TP SRAM: unable to load %s\n",
+                        buf);
+                return ret;
+        }
+        
+        ret = t3_check_tpsram(adap, tpsram->data, tpsram->size);
+        if (ret)
+                goto release_tpsram;    
+
+        ret = t3_set_proto_sram(adap, tpsram->data);
+        if (ret == 0)
+                dev_info(dev,
+                         "successful update of protocol engine "
+                         "to %d.%d.%d\n",
+                         TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+        else
+                dev_err(dev, "failed to update of protocol engine %d.%d.%d\n",
+                        TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+        if (ret)
+                dev_err(dev, "loading protocol SRAM failed\n");
+
+release_tpsram:
+        release_firmware(tpsram);
+        
         return ret;
 }
 
@@ -755,6 +829,7 @@ static int upgrade_fw(struct adapter *adap)
 static int cxgb_up(struct adapter *adap)
 {
         int err = 0;
+        int must_load;
 
         if (!(adap->flags & FULL_INIT_DONE)) {
                 err = t3_check_fw_version(adap);
@@ -763,6 +838,13 @@ static int cxgb_up(struct adapter *adap)
                 if (err)
                         goto out;
 
+                err = t3_check_tpsram_version(adap, &must_load);
+                if (err == -EINVAL) {
+                        err = update_tpsram(adap);
+                        if (err && must_load)
+                                goto out;
+                }
+
                 err = init_dummy_netdevs(adap);
                 if (err)
                         goto out;
@@ -858,8 +940,9 @@ static void schedule_chk_task(struct adapter *adap)
 
 static int offload_open(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
-        struct t3cdev *tdev = T3CDEV(dev);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        struct t3cdev *tdev = dev2t3cdev(dev);
         int adap_up = adapter->open_device_map & PORT_MASK;
         int err = 0;
 
@@ -924,10 +1007,10 @@ static int offload_close(struct t3cdev *tdev)
 
 static int cxgb_open(struct net_device *dev)
 {
-        int err;
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         int other_ports = adapter->open_device_map & PORT_MASK;
+        int err;
 
         if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0)
                 return err;
@@ -951,17 +1034,17 @@ static int cxgb_open(struct net_device *dev)
 
 static int cxgb_close(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
-        struct port_info *p = netdev_priv(dev);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
 
-        t3_port_intr_disable(adapter, p->port_id);
+        t3_port_intr_disable(adapter, pi->port_id);
         netif_stop_queue(dev);
-        p->phy.ops->power_down(&p->phy, 1);
+        pi->phy.ops->power_down(&pi->phy, 1);
         netif_carrier_off(dev);
-        t3_mac_disable(&p->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
+        t3_mac_disable(&pi->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
 
         spin_lock(&adapter->work_lock); /* sync with update task */
-        clear_bit(p->port_id, &adapter->open_device_map);
+        clear_bit(pi->port_id, &adapter->open_device_map);
         spin_unlock(&adapter->work_lock);
 
         if (!(adapter->open_device_map & PORT_MASK))
@@ -976,13 +1059,13 @@ static int cxgb_close(struct net_device *dev)
 
 static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
-        struct port_info *p = netdev_priv(dev);
-        struct net_device_stats *ns = &p->netstats;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        struct net_device_stats *ns = &pi->netstats;
         const struct mac_stats *pstats;
 
         spin_lock(&adapter->stats_lock);
-        pstats = t3_mac_update_stats(&p->mac);
+        pstats = t3_mac_update_stats(&pi->mac);
         spin_unlock(&adapter->stats_lock);
 
         ns->tx_bytes = pstats->tx_octets;
@@ -1015,14 +1098,16 @@ static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
 
 static u32 get_msglevel(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
 
         return adapter->msg_enable;
 }
 
 static void set_msglevel(struct net_device *dev, u32 val)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
 
         adapter->msg_enable = val;
 }
@@ -1096,10 +1181,13 @@ static int get_eeprom_len(struct net_device *dev)
 
 static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         u32 fw_vers = 0;
-        struct adapter *adapter = dev->priv;
+        u32 tp_vers = 0;
 
         t3_get_fw_version(adapter, &fw_vers);
+        t3_get_tp_version(adapter, &tp_vers);
 
         strcpy(info->driver, DRV_NAME);
         strcpy(info->version, DRV_VERSION);
@@ -1108,11 +1196,14 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
                 strcpy(info->fw_version, "N/A");
         else {
                 snprintf(info->fw_version, sizeof(info->fw_version),
-                         "%s %u.%u.%u",
+                         "%s %u.%u.%u TP %u.%u.%u",
                          G_FW_VERSION_TYPE(fw_vers) ? "T" : "N",
                          G_FW_VERSION_MAJOR(fw_vers),
                          G_FW_VERSION_MINOR(fw_vers),
-                         G_FW_VERSION_MICRO(fw_vers));
+                         G_FW_VERSION_MICRO(fw_vers),
+                         G_TP_VERSION_MAJOR(tp_vers),
+                         G_TP_VERSION_MINOR(tp_vers),
+                         G_TP_VERSION_MICRO(tp_vers));
         }
 }
 
@@ -1136,8 +1227,8 @@ static unsigned long collect_sge_port_stats(struct adapter *adapter,
 static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
                       u64 *data)
 {
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         const struct mac_stats *s;
 
         spin_lock(&adapter->stats_lock);
@@ -1205,7 +1296,8 @@ static inline void reg_block_dump(struct adapter *ap, void *buf,
 static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                      void *buf)
 {
-        struct adapter *ap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *ap = pi->adapter;
 
         /*
          * Version scheme:
@@ -1246,8 +1338,9 @@ static int restart_autoneg(struct net_device *dev)
 
 static int cxgb3_phys_id(struct net_device *dev, u32 data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         int i;
-        struct adapter *adapter = dev->priv;
 
         if (data == 0)
                 data = 2;
@@ -1408,8 +1501,8 @@ static int set_rx_csum(struct net_device *dev, u32 data)
 
 static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 {
-        const struct adapter *adapter = dev->priv;
-        const struct port_info *pi = netdev_priv(dev);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         const struct qset_params *q = &adapter->params.sge.qset[pi->first_qset];
 
         e->rx_max_pending = MAX_RX_BUFFERS;
@@ -1425,10 +1518,10 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 
 static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 {
-        int i;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct qset_params *q;
-        struct adapter *adapter = dev->priv;
-        const struct port_info *pi = netdev_priv(dev);
+        int i;
 
         if (e->rx_pending > MAX_RX_BUFFERS ||
             e->rx_jumbo_pending > MAX_RX_JUMBO_BUFFERS ||
@@ -1457,7 +1550,8 @@ static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 
 static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct qset_params *qsp = &adapter->params.sge.qset[0];
         struct sge_qset *qs = &adapter->sge.qs[0];
 
@@ -1471,7 +1565,8 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 
 static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct qset_params *q = adapter->params.sge.qset;
 
         c->rx_coalesce_usecs = q->coalesce_usecs;
@@ -1481,8 +1576,9 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
                       u8 * data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         int i, err = 0;
-        struct adapter *adapter = dev->priv;
 
         u8 *buf = kmalloc(EEPROMSIZE, GFP_KERNEL);
         if (!buf)
@@ -1501,10 +1597,11 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
 static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                       u8 * data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        u32 aligned_offset, aligned_len, *p;
         u8 *buf;
         int err = 0;
-        u32 aligned_offset, aligned_len, *p;
-        struct adapter *adapter = dev->priv;
 
         if (eeprom->magic != EEPROM_MAGIC)
                 return -EINVAL;
@@ -1592,9 +1689,10 @@ static int in_range(int val, int lo, int hi)
 
 static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 {
-        int ret;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         u32 cmd;
-        struct adapter *adapter = dev->priv;
+        int ret;
 
         if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
                 return -EFAULT;
@@ -1923,10 +2021,10 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 
 static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
-        int ret, mmd;
-        struct adapter *adapter = dev->priv;
-        struct port_info *pi = netdev_priv(dev);
         struct mii_ioctl_data *data = if_mii(req);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        int ret, mmd;
 
         switch (cmd) {
         case SIOCGMIIPHY:
@@ -1994,9 +2092,9 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
 static int cxgb_change_mtu(struct net_device *dev, int new_mtu)
 {
-        int ret;
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        int ret;
 
         if (new_mtu < 81)       /* accommodate SACK */
                 return -EINVAL;
@@ -2013,8 +2111,8 @@ static int cxgb_change_mtu(struct net_device *dev, int new_mtu)
 
 static int cxgb_set_mac_addr(struct net_device *dev, void *p)
 {
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct sockaddr *addr = p;
 
         if (!is_valid_ether_addr(addr->sa_data))
@@ -2050,8 +2148,8 @@ static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p)
 
 static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 {
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
 
         pi->vlan_grp = grp;
         if (adapter->params.rev > 0)
@@ -2070,8 +2168,8 @@ static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void cxgb_netpoll(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         int qidx;
 
         for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) {
@@ -2088,42 +2186,6 @@ static void cxgb_netpoll(struct net_device *dev)
 }
 #endif
 
-#define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin"
-int update_tpsram(struct adapter *adap)
-{
-        const struct firmware *tpsram;
-        char buf[64];
-        struct device *dev = &adap->pdev->dev;
-        int ret;
-        char rev;
-        
-        rev = adap->params.rev == T3_REV_B2 ? 'b' : 'a';
-
-        snprintf(buf, sizeof(buf), TPSRAM_NAME, rev,
-                 TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
-
-        ret = request_firmware(&tpsram, buf, dev);
-        if (ret < 0) {
-                dev_err(dev, "could not load TP SRAM: unable to load %s\n",
-                        buf);
-                return ret;
-        }
-        
-        ret = t3_check_tpsram(adap, tpsram->data, tpsram->size);
-        if (ret)
-                goto release_tpsram;    
-
-        ret = t3_set_proto_sram(adap, tpsram->data);
-        if (ret)
-                dev_err(dev, "loading protocol SRAM failed\n");
-
-release_tpsram:
-        release_firmware(tpsram);
-        
-        return ret;
-}
-
-
 /*
  * Periodic accumulation of MAC statistics.
  */
@@ -2433,6 +2495,7 @@ static int __devinit init_one(struct pci_dev *pdev,
 
                 adapter->port[i] = netdev;
                 pi = netdev_priv(netdev);
+                pi->adapter = adapter;
                 pi->rx_csum_offload = 1;
                 pi->nqsets = 1;
                 pi->first_qset = i;
@@ -2442,7 +2505,6 @@ static int __devinit init_one(struct pci_dev *pdev,
                 netdev->irq = pdev->irq;
                 netdev->mem_start = mmio_start;
                 netdev->mem_end = mmio_start + mmio_len - 1;
-                netdev->priv = adapter;
                 netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
                 netdev->features |= NETIF_F_LLTX;
                 if (pci_using_dac)
@@ -2467,18 +2529,11 @@ static int __devinit init_one(struct pci_dev *pdev,
                 SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
         }
 
-        pci_set_drvdata(pdev, adapter->port[0]);
+        pci_set_drvdata(pdev, adapter);
         if (t3_prep_adapter(adapter, ai, 1) < 0) {
                 err = -ENODEV;
                 goto out_free_dev;
         }
-
-        err = t3_check_tpsram_version(adapter);
-        if (err == -EINVAL)
-                err = update_tpsram(adapter);
-
-        if (err)
-                goto out_free_dev;
                 
         /*
          * The card is now ready to go.  If any errors occur during device
@@ -2547,11 +2602,10 @@ out_release_regions:
 
 static void __devexit remove_one(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata(pdev);
+        struct adapter *adapter = pci_get_drvdata(pdev);
 
-        if (dev) {
+        if (adapter) {
                 int i;
-                struct adapter *adapter = dev->priv;
 
                 t3_sge_stop(adapter);
                 sysfs_remove_group(&adapter->port[0]->dev.kobj,
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index e620ed4c3f..bdff7baeb5 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -593,6 +593,16 @@ int cxgb3_alloc_stid(struct t3cdev *tdev, struct cxgb3_client *client,
 
 EXPORT_SYMBOL(cxgb3_alloc_stid);
 
+/* Get the t3cdev associated with a net_device */
+struct t3cdev *dev2t3cdev(struct net_device *dev)
+{
+        const struct port_info *pi = netdev_priv(dev);
+
+        return (struct t3cdev *)pi->adapter;
+}
+
+EXPORT_SYMBOL(dev2t3cdev);
+
 static int do_smt_write_rpl(struct t3cdev *dev, struct sk_buff *skb)
 {
         struct cpl_smt_write_rpl *rpl = cplhdr(skb);
@@ -925,7 +935,7 @@ void cxgb_neigh_update(struct neighbour *neigh)
         struct net_device *dev = neigh->dev;
 
         if (dev && (is_offloading(dev))) {
-                struct t3cdev *tdev = T3CDEV(dev);
+                struct t3cdev *tdev = dev2t3cdev(dev);
 
                 BUG_ON(!tdev);
                 t3_l2t_update(tdev, neigh);
@@ -973,9 +983,9 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
                        "device ignored.\n", __FUNCTION__);
                 return;
         }
-        tdev = T3CDEV(olddev);
+        tdev = dev2t3cdev(olddev);
         BUG_ON(!tdev);
-        if (tdev != T3CDEV(newdev)) {
+        if (tdev != dev2t3cdev(newdev)) {
                 printk(KERN_WARNING "%s: Redirect to different "
                        "offload device ignored.\n", __FUNCTION__);
                 return;
diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/cxgb3/cxgb3_offload.h
index f15446a32e..7a379138b5 100644
--- a/drivers/net/cxgb3/cxgb3_offload.h
+++ b/drivers/net/cxgb3/cxgb3_offload.h
@@ -51,6 +51,8 @@ void cxgb3_offload_deactivate(struct adapter *adapter);
 
 void cxgb3_set_dummy_ops(struct t3cdev *dev);
 
+struct t3cdev *dev2t3cdev(struct net_device *dev);
+
 /*
  * Client registration.  Users of T3 driver must register themselves.
  * The T3 driver will call the add function of every client for each T3
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index a2cfd68ac7..58a5f60521 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1073,7 +1073,7 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         unsigned int ndesc, pidx, credits, gen, compl;
         const struct port_info *pi = netdev_priv(dev);
-        struct adapter *adap = dev->priv;
+        struct adapter *adap = pi->adapter;
         struct sge_qset *qs = dev2qset(dev);
         struct sge_txq *q = &qs->txq[TXQ_ETH];
 
@@ -1326,7 +1326,8 @@ static void restart_ctrlq(unsigned long data)
         struct sk_buff *skb;
         struct sge_qset *qs = (struct sge_qset *)data;
         struct sge_txq *q = &qs->txq[TXQ_CTRL];
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
 
         spin_lock(&q->lock);
       again:reclaim_completed_tx_imm(q);
@@ -1531,7 +1532,8 @@ static void restart_offloadq(unsigned long data)
         struct sk_buff *skb;
         struct sge_qset *qs = (struct sge_qset *)data;
         struct sge_txq *q = &qs->txq[TXQ_OFLD];
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
 
         spin_lock(&q->lock);
       again:reclaim_completed_tx(adap, q);
@@ -1675,7 +1677,8 @@ static inline void deliver_partial_bundle(struct t3cdev *tdev,
  */
 static int ofld_poll(struct net_device *dev, int *budget)
 {
-        struct adapter *adapter = dev->priv;
+        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct sge_qset *qs = dev2qset(dev);
         struct sge_rspq *q = &qs->rspq;
         int work_done, limit = min(*budget, dev->quota), avail = limit;
@@ -2075,7 +2078,8 @@ static inline int is_pure_response(const struct rsp_desc *r)
  */
 static int napi_rx_handler(struct net_device *dev, int *budget)
 {
-        struct adapter *adap = dev->priv;
+        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
         struct sge_qset *qs = dev2qset(dev);
         int effective_budget = min(*budget, dev->quota);
 
@@ -2205,7 +2209,8 @@ static inline int handle_responses(struct adapter *adap, struct sge_rspq *q)
 irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
 {
         struct sge_qset *qs = cookie;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
         struct sge_rspq *q = &qs->rspq;
 
         spin_lock(&q->lock);
@@ -2224,7 +2229,8 @@ irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
 irqreturn_t t3_sge_intr_msix_napi(int irq, void *cookie)
 {
         struct sge_qset *qs = cookie;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
         struct sge_rspq *q = &qs->rspq;
 
         spin_lock(&q->lock);
@@ -2508,7 +2514,8 @@ static void sge_timer_cb(unsigned long data)
 {
         spinlock_t *lock;
         struct sge_qset *qs = (struct sge_qset *)data;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
 
         if (spin_trylock(&qs->txq[TXQ_ETH].lock)) {
                 reclaim_completed_tx(adap, &qs->txq[TXQ_ETH]);
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index dd3149d94b..b02d15daf5 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -848,16 +848,15 @@ static int t3_write_flash(struct adapter *adapter, unsigned int addr,
 }
 
 /**
- *      t3_check_tpsram_version - read the tp sram version
+ *      t3_get_tp_version - read the tp sram version
  *      @adapter: the adapter
+ *      @vers: where to place the version
  *
- *      Reads the protocol sram version from serial eeprom.
+ *      Reads the protocol sram version from sram.
  */
-int t3_check_tpsram_version(struct adapter *adapter)
+int t3_get_tp_version(struct adapter *adapter, u32 *vers)
 {
         int ret;
-        u32 vers;
-        unsigned int major, minor;
 
         /* Get version loaded in SRAM */
         t3_write_reg(adapter, A_TP_EMBED_OP_FIELD0, 0);
@@ -866,7 +865,32 @@ int t3_check_tpsram_version(struct adapter *adapter)
         if (ret)
                 return ret;
         
-        vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1);
+        *vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1);
+
+        return 0;
+}
+
+/**
+ *      t3_check_tpsram_version - read the tp sram version
+ *      @adapter: the adapter
+ *      @must_load: set to 1 if loading a new microcode image is required
+ *
+ *      Reads the protocol sram version from flash.
+ */
+int t3_check_tpsram_version(struct adapter *adapter, int *must_load)
+{
+        int ret;
+        u32 vers;
+        unsigned int major, minor;
+
+        if (adapter->params.rev == T3_REV_A)
+                return 0;
+
+        *must_load = 1;
+
+        ret = t3_get_tp_version(adapter, &vers);
+        if (ret)
+                return ret;
 
         major = G_TP_VERSION_MAJOR(vers);
         minor = G_TP_VERSION_MINOR(vers);
@@ -874,6 +898,16 @@ int t3_check_tpsram_version(struct adapter *adapter)
         if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) 
                 return 0;
 
+        if (major != TP_VERSION_MAJOR)
+                CH_ERR(adapter, "found wrong TP version (%u.%u), "
+                       "driver needs version %d.%d\n", major, minor,
+                       TP_VERSION_MAJOR, TP_VERSION_MINOR);
+        else {
+                *must_load = 0;
+                CH_ERR(adapter, "found wrong TP version (%u.%u), "
+                       "driver compiled for version %d.%d\n", major, minor,
+                       TP_VERSION_MAJOR, TP_VERSION_MINOR);
+        }
         return -EINVAL;
 }
 
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h
index fa4099bc04..77fcc1a498 100644
--- a/drivers/net/cxgb3/t3cdev.h
+++ b/drivers/net/cxgb3/t3cdev.h
@@ -42,9 +42,6 @@
 
 #define T3CNAMSIZ 16
 
-/* Get the t3cdev associated with a net_device */
-#define T3CDEV(netdev) (struct t3cdev *)(netdev->priv)
-
 struct cxgb3_client;
 
 enum t3ctype {
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index c3de81bf09..738aa59065 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -700,6 +700,7 @@ dm9000_init_dm9000(struct net_device *dev)
 static int
 dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
+        unsigned long flags;
         board_info_t *db = (board_info_t *) dev->priv;
 
         PRINTK3("dm9000_start_xmit\n");
@@ -707,10 +708,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (db->tx_pkt_cnt > 1)
                 return 1;
 
-        netif_stop_queue(dev);
-
-        /* Disable all interrupts */
-        iow(db, DM9000_IMR, IMR_PAR);
+        spin_lock_irqsave(&db->lock, flags);
 
         /* Move data to DM9000 TX RAM */
         writeb(DM9000_MWCMD, db->io_addr);
@@ -718,12 +716,9 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
         (db->outblk)(db->io_data, skb->data, skb->len);
         db->stats.tx_bytes += skb->len;
 
+        db->tx_pkt_cnt++;
         /* TX control: First packet immediately send, second packet queue */
-        if (db->tx_pkt_cnt == 0) {
-
-                /* First Packet */
-                db->tx_pkt_cnt++;
-
+        if (db->tx_pkt_cnt == 1) {
                 /* Set TX length to DM9000 */
                 iow(db, DM9000_TXPLL, skb->len & 0xff);
                 iow(db, DM9000_TXPLH, (skb->len >> 8) & 0xff);
@@ -732,23 +727,17 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 iow(db, DM9000_TCR, TCR_TXREQ); /* Cleared after TX complete */
 
                 dev->trans_start = jiffies;     /* save the time stamp */
-
         } else {
                 /* Second packet */
-                db->tx_pkt_cnt++;
                 db->queue_pkt_len = skb->len;
+                netif_stop_queue(dev);
         }
 
+        spin_unlock_irqrestore(&db->lock, flags);
+
         /* free this SKB */
         dev_kfree_skb(skb);
 
-        /* Re-enable resource check */
-        if (db->tx_pkt_cnt == 1)
-                netif_wake_queue(dev);
-
-        /* Re-enable interrupt */
-        iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
-
         return 0;
 }
 
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 4c3785c9d4..9ecc3adcf6 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1726,6 +1726,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol
         case E1000_DEV_ID_82571EB_QUAD_COPPER:
         case E1000_DEV_ID_82571EB_QUAD_FIBER:
         case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
+        case E1000_DEV_ID_82571PT_QUAD_COPPER:
         case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
                 /* quad port adapters only support WoL on port A */
                 if (!adapter->quad_port_a) {
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index ba120f7fb0..8604adbe35 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -387,6 +387,7 @@ e1000_set_mac_type(struct e1000_hw *hw)
         case E1000_DEV_ID_82571EB_SERDES_DUAL:
         case E1000_DEV_ID_82571EB_SERDES_QUAD:
         case E1000_DEV_ID_82571EB_QUAD_COPPER:
+        case E1000_DEV_ID_82571PT_QUAD_COPPER:
         case E1000_DEV_ID_82571EB_QUAD_FIBER:
         case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
                 hw->mac_type = e1000_82571;
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index fe8714655c..07f0ea7367 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -475,6 +475,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);
 #define E1000_DEV_ID_82571EB_FIBER       0x105F
 #define E1000_DEV_ID_82571EB_SERDES      0x1060
 #define E1000_DEV_ID_82571EB_QUAD_COPPER 0x10A4
+#define E1000_DEV_ID_82571PT_QUAD_COPPER 0x10D5
 #define E1000_DEV_ID_82571EB_QUAD_FIBER  0x10A5
 #define E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE  0x10BC
 #define E1000_DEV_ID_82571EB_SERDES_DUAL 0x10D9
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4a225950fb..e7c8951f47 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -108,6 +108,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
         INTEL_E1000_ETHERNET_DEVICE(0x10BC),
         INTEL_E1000_ETHERNET_DEVICE(0x10C4),
         INTEL_E1000_ETHERNET_DEVICE(0x10C5),
+        INTEL_E1000_ETHERNET_DEVICE(0x10D5),
         INTEL_E1000_ETHERNET_DEVICE(0x10D9),
         INTEL_E1000_ETHERNET_DEVICE(0x10DA),
         /* required last entry */
@@ -1101,6 +1102,7 @@ e1000_probe(struct pci_dev *pdev,
         case E1000_DEV_ID_82571EB_QUAD_COPPER:
         case E1000_DEV_ID_82571EB_QUAD_FIBER:
         case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
+        case E1000_DEV_ID_82571PT_QUAD_COPPER:
                 /* if quad port adapter, disable WoL on all but port A */
                 if (global_quad_port_a != 0)
                         adapter->eeprom_wol = 0;
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index d67f97bfa3..8d58be56f4 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0073"
+#define DRV_VERSION     "EHEA_0074"
 
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
@@ -402,6 +402,8 @@ struct ehea_mc_list {
 
 #define EHEA_PORT_UP 1
 #define EHEA_PORT_DOWN 0
+#define EHEA_PHY_LINK_UP 1
+#define EHEA_PHY_LINK_DOWN 0
 #define EHEA_MAX_PORT_RES 16
 struct ehea_port {
         struct ehea_adapter *adapter;    /* adapter that owns this port */
@@ -427,6 +429,7 @@ struct ehea_port {
         u32 msg_enable;
         u32 sig_comp_iv;
         u32 state;
+        u8 phy_link;
         u8 full_duplex;
         u8 autoneg;
         u8 num_def_qps;
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 9756211e83..717b12984d 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -53,17 +53,21 @@ static int rq3_entries = EHEA_DEF_ENTRIES_RQ3;
 static int sq_entries = EHEA_DEF_ENTRIES_SQ;
 static int use_mcs = 0;
 static int num_tx_qps = EHEA_NUM_TX_QP;
+static int prop_carrier_state = 0;
 
 module_param(msg_level, int, 0);
 module_param(rq1_entries, int, 0);
 module_param(rq2_entries, int, 0);
 module_param(rq3_entries, int, 0);
 module_param(sq_entries, int, 0);
+module_param(prop_carrier_state, int, 0);
 module_param(use_mcs, int, 0);
 module_param(num_tx_qps, int, 0);
 
 MODULE_PARM_DESC(num_tx_qps, "Number of TX-QPS");
 MODULE_PARM_DESC(msg_level, "msg_level");
+MODULE_PARM_DESC(prop_carrier_state, "Propagate carrier state of physical "
+                 "port to stack. 1:yes, 0:no.  Default = 0 ");
 MODULE_PARM_DESC(rq3_entries, "Number of entries for Receive Queue 3 "
                  "[2^x - 1], x = [6..14]. Default = "
                  __MODULE_STRING(EHEA_DEF_ENTRIES_RQ3) ")");
@@ -76,7 +80,7 @@ MODULE_PARM_DESC(rq1_entries, "Number of entries for Receive Queue 1 "
 MODULE_PARM_DESC(sq_entries, " Number of entries for the Send Queue  "
                  "[2^x - 1], x = [6..14]. Default = "
                  __MODULE_STRING(EHEA_DEF_ENTRIES_SQ) ")");
-MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 1 ");
+MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 0 ");
 
 static int port_name_cnt = 0;
 static LIST_HEAD(adapter_list);
@@ -467,7 +471,7 @@ static struct ehea_cqe *ehea_proc_rwqes(struct net_device *dev,
                         else
                                 netif_receive_skb(skb);
 
-                        dev->last_rx = jiffies;
+                        port->netdev->last_rx = jiffies;
                 } else {
                         pr->p_stats.poll_receive_errors++;
                         port_reset = ehea_treat_poll_error(pr, rq, cqe,
@@ -814,7 +818,9 @@ int ehea_set_portspeed(struct ehea_port *port, u32 port_speed)
                         ehea_error("Failed setting port speed");
                 }
         }
-        netif_carrier_on(port->netdev);
+        if (!prop_carrier_state || (port->phy_link == EHEA_PHY_LINK_UP))
+                netif_carrier_on(port->netdev);
+
         kfree(cb4);
 out:
         return ret;
@@ -869,13 +875,19 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
                         }
 
                 if (EHEA_BMASK_GET(NEQE_EXTSWITCH_PORT_UP, eqe)) {
+                        port->phy_link = EHEA_PHY_LINK_UP;
                         if (netif_msg_link(port))
                                 ehea_info("%s: Physical port up",
                                           port->netdev->name);
+                        if (prop_carrier_state)
+                                netif_carrier_on(port->netdev);
                 } else {
+                        port->phy_link = EHEA_PHY_LINK_DOWN;
                         if (netif_msg_link(port))
                                 ehea_info("%s: Physical port down",
                                           port->netdev->name);
+                        if (prop_carrier_state)
+                                netif_carrier_off(port->netdev);
                 }
 
                 if (EHEA_BMASK_GET(NEQE_EXTSWITCH_PRIMARY, eqe))
@@ -2490,7 +2502,7 @@ static ssize_t ehea_show_port_id(struct device *dev,
                                  struct device_attribute *attr, char *buf)
 {
         struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
-        return sprintf(buf, "0x%X", port->logical_port_id);
+        return sprintf(buf, "%d", port->logical_port_id);
 }
 
 static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id,
@@ -2781,7 +2793,7 @@ static ssize_t ehea_probe_port(struct device *dev,
 
         u32 logical_port_id;
 
-        sscanf(buf, "%X", &logical_port_id);
+        sscanf(buf, "%d", &logical_port_id);
 
         port = ehea_get_port(adapter, logical_port_id);
 
@@ -2834,7 +2846,7 @@ static ssize_t ehea_remove_port(struct device *dev,
         int i;
         u32 logical_port_id;
 
-        sscanf(buf, "%X", &logical_port_id);
+        sscanf(buf, "%d", &logical_port_id);
 
         port = ehea_get_port(adapter, logical_port_id);
 
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index a36fa6c23f..c82e245960 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -235,6 +235,8 @@ int ehea_destroy_cq(struct ehea_cq *cq)
         if (!cq)
                 return 0;
 
+        hcp_epas_dtor(&cq->epas);
+
         if ((hret = ehea_destroy_cq_res(cq, NORMAL_FREE)) == H_R_STATE) {
                 ehea_error_data(cq->adapter, cq->fw_handle);
                 hret = ehea_destroy_cq_res(cq, FORCE_FREE);
@@ -361,6 +363,8 @@ int ehea_destroy_eq(struct ehea_eq *eq)
         if (!eq)
                 return 0;
 
+        hcp_epas_dtor(&eq->epas);
+
         if ((hret = ehea_destroy_eq_res(eq, NORMAL_FREE)) == H_R_STATE) {
                 ehea_error_data(eq->adapter, eq->fw_handle);
                 hret = ehea_destroy_eq_res(eq, FORCE_FREE);
@@ -541,6 +545,8 @@ int ehea_destroy_qp(struct ehea_qp *qp)
         if (!qp)
                 return 0;
 
+        hcp_epas_dtor(&qp->epas);
+
         if ((hret = ehea_destroy_qp_res(qp, NORMAL_FREE)) == H_R_STATE) {
                 ehea_error_data(qp->adapter, qp->fw_handle);
                 hret = ehea_destroy_qp_res(qp, FORCE_FREE);
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index a93700e566..102218c4a9 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -391,7 +391,7 @@ static int __eql_insert_slave(slave_queue_t *queue, slave_t *slave)
                 slave_t *duplicate_slave = NULL;
 
                 duplicate_slave = __eql_find_slave_dev(queue, slave->dev);
-                if (duplicate_slave != 0)
+                if (duplicate_slave)
                         eql_kill_one_slave(queue, duplicate_slave);
 
                 list_add(&slave->list, &queue->all_slaves);
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 10f4e3b551..1938d6dfc8 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -552,7 +552,7 @@ union ring_type {
 #define PHY_OUI_MARVELL 0x5043
 #define PHY_OUI_CICADA  0x03f1
 #define PHY_OUI_VITESSE 0x01c1
-#define PHY_OUI_REALTEK 0x01c1
+#define PHY_OUI_REALTEK 0x0732
 #define PHYID1_OUI_MASK 0x03ff
 #define PHYID1_OUI_SHFT 6
 #define PHYID2_OUI_MASK 0xfc00
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 3ca1e8ece5..0834ef0edd 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -48,6 +48,7 @@
 #ifdef CONFIG_SERIAL_8250
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
+#include <linux/serial_reg.h>
 #endif
 
 #include <linux/netdevice.h>
@@ -1151,13 +1152,41 @@ static int ioc3_is_menet(struct pci_dev *pdev)
  * Also look in ip27-pci.c:pci_fixup_ioc3() for some comments on working
  * around ioc3 oddities in this respect.
  *
- * The IOC3 serials use a 22MHz clock rate with an additional divider by 3.
+ * The IOC3 serials use a 22MHz clock rate with an additional divider which
+ * can be programmed in the SCR register if the DLAB bit is set.
+ *
+ * Register to interrupt zero because we share the interrupt with
+ * the serial driver which we don't properly support yet.
+ *
+ * Can't use UPF_IOREMAP as the whole of IOC3 resources have already been
+ * registered.
  */
+static void __devinit ioc3_8250_register(struct ioc3_uartregs __iomem *uart)
+{
+#define COSMISC_CONSTANT 6
+
+        struct uart_port port = {
+                .irq            = 0,
+                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 0,
+                .uartclk        = (22000000 << 1) / COSMISC_CONSTANT,
+
+                .membase        = (unsigned char __iomem *) uart,
+                .mapbase        = (unsigned long) uart,
+        };
+        unsigned char lcr;
+
+        lcr = uart->iu_lcr;
+        uart->iu_lcr = lcr | UART_LCR_DLAB;
+        uart->iu_scr = COSMISC_CONSTANT,
+        uart->iu_lcr = lcr;
+        uart->iu_lcr;
+        serial8250_register_port(&port);
+}
 
 static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
 {
-        struct uart_port port;
-
         /*
          * We need to recognice and treat the fourth MENET serial as it
          * does not have an SuperIO chip attached to it, therefore attempting
@@ -1171,24 +1200,35 @@ static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
                 return;
 
         /*
-         * Register to interrupt zero because we share the interrupt with
-         * the serial driver which we don't properly support yet.
-         *
-         * Can't use UPF_IOREMAP as the whole of IOC3 resources have already
-         * been registered.
+         * Switch IOC3 to PIO mode.  It probably already was but let's be
+         * paranoid
          */
-        memset(&port, 0, sizeof(port));
-        port.irq      = 0;
-        port.flags    = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
-        port.iotype   = UPIO_MEM;
-        port.regshift = 0;
-        port.uartclk  = 22000000 / 3;
-
-        port.membase  = (unsigned char *) &ioc3->sregs.uarta;
-        serial8250_register_port(&port);
-
-        port.membase  = (unsigned char *) &ioc3->sregs.uartb;
-        serial8250_register_port(&port);
+        ioc3->gpcr_s = GPCR_UARTA_MODESEL | GPCR_UARTB_MODESEL;
+        ioc3->gpcr_s;
+        ioc3->gppr_6 = 0;
+        ioc3->gppr_6;
+        ioc3->gppr_7 = 0;
+        ioc3->gppr_7;
+        ioc3->sscr_a = ioc3->sscr_a & ~SSCR_DMA_EN;
+        ioc3->sscr_a;
+        ioc3->sscr_b = ioc3->sscr_b & ~SSCR_DMA_EN;
+        ioc3->sscr_b;
+        /* Disable all SA/B interrupts except for SA/B_INT in SIO_IEC. */
+        ioc3->sio_iec &= ~ (SIO_IR_SA_TX_MT | SIO_IR_SA_RX_FULL |
+                            SIO_IR_SA_RX_HIGH | SIO_IR_SA_RX_TIMER |
+                            SIO_IR_SA_DELTA_DCD | SIO_IR_SA_DELTA_CTS |
+                            SIO_IR_SA_TX_EXPLICIT | SIO_IR_SA_MEMERR);
+        ioc3->sio_iec |= SIO_IR_SA_INT;
+        ioc3->sscr_a = 0;
+        ioc3->sio_iec &= ~ (SIO_IR_SB_TX_MT | SIO_IR_SB_RX_FULL |
+                            SIO_IR_SB_RX_HIGH | SIO_IR_SB_RX_TIMER |
+                            SIO_IR_SB_DELTA_DCD | SIO_IR_SB_DELTA_CTS |
+                            SIO_IR_SB_TX_EXPLICIT | SIO_IR_SB_MEMERR);
+        ioc3->sio_iec |= SIO_IR_SB_INT;
+        ioc3->sscr_b = 0;
+
+        ioc3_8250_register(&ioc3->sregs.uarta);
+        ioc3_8250_register(&ioc3->sregs.uartb);
 }
 #endif
 
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index bdd5c979be..4e5101a45c 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -509,12 +509,12 @@ static int kingsun_probe(struct usb_interface *intf,
         spin_lock_init(&kingsun->lock);
 
         /* Allocate input buffer */
-        kingsun->in_buf = (__u8 *)kmalloc(kingsun->max_rx, GFP_KERNEL);
+        kingsun->in_buf = kmalloc(kingsun->max_rx, GFP_KERNEL);
         if (!kingsun->in_buf)
                 goto free_mem;
 
         /* Allocate output buffer */
-        kingsun->out_buf = (__u8 *)kmalloc(KINGSUN_FIFO_SIZE, GFP_KERNEL);
+        kingsun->out_buf = kmalloc(KINGSUN_FIFO_SIZE, GFP_KERNEL);
         if (!kingsun->out_buf)
                 goto free_mem;
 
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 92b403bf38..32bed6bc6c 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -405,7 +405,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
                                 priv->stats.rx_length_errors++;
                                 skb = priv->rx_skbs[priv->rx_write];
                         } else {
-                                skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC | GFP_DMA);
+                                skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC);
                                 if (!skb) {
                                         /* Ouch! No memory! Drop packet on the floor */
                                         DPRINTK("No mem: dropping packet\n");
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 1799eee88d..315335671f 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -534,7 +534,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
         }
 
         /* PHY status changed */
-        if (eth_int_cause_ext & ETH_INT_CAUSE_PHY) {
+        if (eth_int_cause_ext & (ETH_INT_CAUSE_PHY | ETH_INT_CAUSE_STATE)) {
                 struct ethtool_cmd cmd;
 
                 if (mii_link_ok(&mp->mii)) {
@@ -1222,7 +1222,7 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
         spin_lock_irqsave(&mp->lock, flags);
 
         eth_tx_submit_descs_for_skb(mp, skb);
-        stats->tx_bytes = skb->len;
+        stats->tx_bytes += skb->len;
         stats->tx_packets++;
         dev->trans_start = jiffies;
 
@@ -1357,7 +1357,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 #endif
 
         dev->watchdog_timeo = 2 * HZ;
-        dev->tx_queue_len = mp->tx_ring_size;
         dev->base_addr = 0;
         dev->change_mtu = mv643xx_eth_change_mtu;
         dev->do_ioctl = mv643xx_eth_do_ioctl;
@@ -2768,8 +2767,6 @@ static const struct ethtool_ops mv643xx_ethtool_ops = {
         .get_stats_count        = mv643xx_get_stats_count,
         .get_ethtool_stats      = mv643xx_get_ethtool_stats,
         .get_strings            = mv643xx_get_strings,
-        .get_stats_count        = mv643xx_get_stats_count,
-        .get_ethtool_stats      = mv643xx_get_ethtool_stats,
         .nway_reset             = mv643xx_eth_nway_restart,
 };
 
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h
index 82f8c0cbfb..565b96696a 100644
--- a/drivers/net/mv643xx_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -64,7 +64,9 @@
 #define ETH_INT_CAUSE_TX_ERROR  (ETH_TX_QUEUES_ENABLED << 8)
 #define ETH_INT_CAUSE_TX        (ETH_INT_CAUSE_TX_DONE | ETH_INT_CAUSE_TX_ERROR)
 #define ETH_INT_CAUSE_PHY       0x00010000
-#define ETH_INT_UNMASK_ALL_EXT  (ETH_INT_CAUSE_TX | ETH_INT_CAUSE_PHY)
+#define ETH_INT_CAUSE_STATE     0x00100000
+#define ETH_INT_UNMASK_ALL_EXT  (ETH_INT_CAUSE_TX | ETH_INT_CAUSE_PHY | \
+                                        ETH_INT_CAUSE_STATE)
 
 #define ETH_INT_MASK_ALL        0x00000000
 #define ETH_INT_MASK_ALL_EXT    0x00000000
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index ae9bb7b7fd..556962f961 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -72,7 +72,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
 
-#define MYRI10GE_VERSION_STR "1.3.1-1.248"
+#define MYRI10GE_VERSION_STR "1.3.2-1.269"
 
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -2514,26 +2514,20 @@ static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
 {
         struct pci_dev *pdev = mgp->pdev;
         struct device *dev = &pdev->dev;
-        int cap, status;
-        u16 val;
+        int status;
 
         mgp->tx.boundary = 4096;
         /*
          * Verify the max read request size was set to 4KB
          * before trying the test with 4KB.
          */
-        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-        if (cap < 64) {
-                dev_err(dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
-                goto abort;
-        }
-        status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
-        if (status != 0) {
+        status = pcie_get_readrq(pdev);
+        if (status < 0) {
                 dev_err(dev, "Couldn't read max read req size: %d\n", status);
                 goto abort;
         }
-        if ((val & (5 << 12)) != (5 << 12)) {
-                dev_warn(dev, "Max Read Request size != 4096 (0x%x)\n", val);
+        if (status != 4096) {
+                dev_warn(dev, "Max Read Request size != 4096 (%d)\n", status);
                 mgp->tx.boundary = 2048;
         }
         /*
@@ -2850,9 +2844,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         size_t bytes;
         int i;
         int status = -ENXIO;
-        int cap;
         int dac_enabled;
-        u16 val;
 
         netdev = alloc_etherdev(sizeof(*mgp));
         if (netdev == NULL) {
@@ -2884,19 +2876,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
             = pci_find_capability(pdev, PCI_CAP_ID_VNDR);
 
         /* Set our max read request to 4KB */
-        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-        if (cap < 64) {
-                dev_err(&pdev->dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
-                goto abort_with_netdev;
-        }
-        status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
-        if (status != 0) {
-                dev_err(&pdev->dev, "Error %d reading PCI_EXP_DEVCTL\n",
-                        status);
-                goto abort_with_netdev;
-        }
-        val = (val & ~PCI_EXP_DEVCTL_READRQ) | (5 << 12);
-        status = pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, val);
+        status = pcie_set_readrq(pdev, 4096);
         if (status != 0) {
                 dev_err(&pdev->dev, "Error %d writing PCI_EXP_DEVCTL\n",
                         status);
@@ -3114,9 +3094,12 @@ static void myri10ge_remove(struct pci_dev *pdev)
 }
 
 #define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E      0x0008
+#define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9    0x0009
 
 static struct pci_device_id myri10ge_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E)},
+        {PCI_DEVICE
+         (PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9)},
         {0},
 };
 
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 3276866b17..d72f8f8fcb 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -649,9 +649,11 @@ enum {
 #define PCIX_INT_VECTOR         (0x10100)
 #define PCIX_INT_MASK           (0x10104)
 
-#define PCIX_MN_WINDOW          (0x10200)
+#define PCIX_MN_WINDOW_F0       (0x10200)
+#define PCIX_MN_WINDOW(_f)      (PCIX_MN_WINDOW_F0 + (0x20 * (_f)))
 #define PCIX_MS_WINDOW          (0x10204)
-#define PCIX_SN_WINDOW          (0x10208)
+#define PCIX_SN_WINDOW_F0       (0x10208)
+#define PCIX_SN_WINDOW(_f)      (PCIX_SN_WINDOW_F0 + (0x20 * (_f)))
 #define PCIX_CRB_WINDOW         (0x10210)
 #define PCIX_CRB_WINDOW_F0      (0x10210)
 #define PCIX_CRB_WINDOW_F1      (0x10230)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index aac15421bd..a7b8d7f232 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -904,11 +904,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
                         ddr_mn_window = window;
                         writel(window, PCI_OFFSET_SECOND_RANGE(adapter,
                                                                NETXEN_PCIX_PH_REG
-                                                               (PCIX_MN_WINDOW)));
+                                                               (PCIX_MN_WINDOW(adapter->ahw.pci_func))));
                         /* MUST make sure window is set before we forge on... */
                         readl(PCI_OFFSET_SECOND_RANGE(adapter,
                                                       NETXEN_PCIX_PH_REG
-                                                      (PCIX_MN_WINDOW)));
+                                                      (PCIX_MN_WINDOW(adapter->ahw.pci_func))));
                 }
                 addr -= (window * NETXEN_WINDOW_ONE);
                 addr += NETXEN_PCI_DDR_NET;
@@ -929,11 +929,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
                         writel((window << 22),
                                PCI_OFFSET_SECOND_RANGE(adapter,
                                                        NETXEN_PCIX_PH_REG
-                                                       (PCIX_SN_WINDOW)));
+                                                       (PCIX_SN_WINDOW(adapter->ahw.pci_func))));
                         /* MUST make sure window is set before we forge on... */
                         readl(PCI_OFFSET_SECOND_RANGE(adapter,
                                                       NETXEN_PCIX_PH_REG
-                                                      (PCIX_SN_WINDOW)));
+                                                      (PCIX_SN_WINDOW(adapter->ahw.pci_func))));
                 }
                 addr -= (window * 0x400000);
                 addr += NETXEN_PCI_QDR_NET;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 08a62acde8..3122d01016 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -639,10 +639,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         NETXEN_CRB_NORMALIZE(adapter,
                                 NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
                 /* Handshake with the card before we register the devices. */
-                writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
-                netxen_pinit_from_rom(adapter, 0);
-                msleep(1);
-                netxen_load_firmware(adapter);
                 netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
         }
 
@@ -750,9 +746,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
         netxen_nic_disable_int(adapter);
 
-        if (adapter->irq)
-                free_irq(adapter->irq, adapter);
-
         if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
                 init_firmware_done++;
                 netxen_free_hw_resources(adapter);
@@ -776,13 +769,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                 }
         }
 
-        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
-                pci_disable_msi(pdev);
-
         vfree(adapter->cmd_buf_arr);
 
-        pci_disable_device(pdev);
-
         if (adapter->portnum == 0) {
                 if (init_firmware_done) {
                         i = 100;
@@ -833,12 +821,19 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                 }
         }
 
+        if (adapter->irq)
+                free_irq(adapter->irq, adapter);
+
+        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
+                pci_disable_msi(pdev);
+
         iounmap(adapter->ahw.db_base);
         iounmap(adapter->ahw.pci_base0);
         iounmap(adapter->ahw.pci_base1);
         iounmap(adapter->ahw.pci_base2);
 
         pci_release_regions(pdev);
+        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 
         free_netdev(netdev);
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index e323efd4ed..cb230f44d6 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -409,6 +409,7 @@ int phy_mii_ioctl(struct phy_device *phydev,
 
         return 0;
 }
+EXPORT_SYMBOL(phy_mii_ioctl);
 
 /**
  * phy_start_aneg - start auto-negotiation for this PHY device
@@ -755,7 +756,7 @@ out_unlock:
  */
 void phy_start(struct phy_device *phydev)
 {
-        spin_lock(&phydev->lock);
+        spin_lock_bh(&phydev->lock);
 
         switch (phydev->state) {
                 case PHY_STARTING:
@@ -769,7 +770,7 @@ void phy_start(struct phy_device *phydev)
                 default:
                         break;
         }
-        spin_unlock(&phydev->lock);
+        spin_unlock_bh(&phydev->lock);
 }
 EXPORT_SYMBOL(phy_stop);
 EXPORT_SYMBOL(phy_start);
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index a8b74cdab1..49328e0505 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -364,7 +364,7 @@ EXPORT_SYMBOL(genphy_config_advert);
  */
 int genphy_setup_forced(struct phy_device *phydev)
 {
-        int ctl = BMCR_RESET;
+        int ctl = 0;
 
         phydev->pause = phydev->asym_pause = 0;
 
@@ -644,7 +644,7 @@ static int phy_probe(struct device *dev)
         if (!(phydrv->flags & PHY_HAS_INTERRUPT))
                 phydev->irq = PHY_POLL;
 
-        spin_lock(&phydev->lock);
+        spin_lock_bh(&phydev->lock);
 
         /* Start out supporting everything. Eventually,
          * a controller will attach, and may modify one
@@ -658,7 +658,7 @@ static int phy_probe(struct device *dev)
         if (phydev->drv->probe)
                 err = phydev->drv->probe(phydev);
 
-        spin_unlock(&phydev->lock);
+        spin_unlock_bh(&phydev->lock);
 
         return err;
 
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 9293c82ef2..4b49d0e8c7 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -899,17 +899,9 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* Put the 2-byte PPP protocol number on the front,
            making sure there is room for the address and control fields. */
-        if (skb_headroom(skb) < PPP_HDRLEN) {
-                struct sk_buff *ns;
-
-                ns = alloc_skb(skb->len + dev->hard_header_len, GFP_ATOMIC);
-                if (ns == 0)
-                        goto outf;
-                skb_reserve(ns, dev->hard_header_len);
-                skb_copy_bits(skb, 0, skb_put(ns, skb->len), skb->len);
-                kfree_skb(skb);
-                skb = ns;
-        }
+        if (skb_cow_head(skb, PPP_HDRLEN))
+                goto outf;
+
         pp = skb_push(skb, 2);
         proto = npindex_to_proto[npi];
         pp[0] = proto >> 8;
@@ -1533,7 +1525,7 @@ ppp_input_error(struct ppp_channel *chan, int code)
 static void
 ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
 {
-        if (skb->len >= 2) {
+        if (pskb_may_pull(skb, 2)) {
 #ifdef CONFIG_PPP_MULTILINK
                 /* XXX do channel-level decompression here */
                 if (PPP_PROTO(skb) == PPP_MP)
@@ -1585,7 +1577,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                 if (ppp->vj == 0 || (ppp->flags & SC_REJ_COMP_TCP))
                         goto err;
 
-                if (skb_tailroom(skb) < 124) {
+                if (skb_tailroom(skb) < 124 || skb_cloned(skb)) {
                         /* copy to a new sk_buff with more tailroom */
                         ns = dev_alloc_skb(skb->len + 128);
                         if (ns == 0) {
@@ -1656,23 +1648,29 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                 /* check if the packet passes the pass and active filters */
                 /* the filter instructions are constructed assuming
                    a four-byte PPP header on each packet */
-                *skb_push(skb, 2) = 0;
-                if (ppp->pass_filter
-                    && sk_run_filter(skb, ppp->pass_filter,
-                                     ppp->pass_len) == 0) {
-                        if (ppp->debug & 1)
-                                printk(KERN_DEBUG "PPP: inbound frame not passed\n");
-                        kfree_skb(skb);
-                        return;
-                }
-                if (!(ppp->active_filter
-                      && sk_run_filter(skb, ppp->active_filter,
-                                       ppp->active_len) == 0))
-                        ppp->last_recv = jiffies;
-                skb_pull(skb, 2);
-#else
-                ppp->last_recv = jiffies;
+                if (ppp->pass_filter || ppp->active_filter) {
+                        if (skb_cloned(skb) &&
+                            pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
+                                goto err;
+
+                        *skb_push(skb, 2) = 0;
+                        if (ppp->pass_filter
+                            && sk_run_filter(skb, ppp->pass_filter,
+                                             ppp->pass_len) == 0) {
+                                if (ppp->debug & 1)
+                                        printk(KERN_DEBUG "PPP: inbound frame "
+                                               "not passed\n");
+                                kfree_skb(skb);
+                                return;
+                        }
+                        if (!(ppp->active_filter
+                              && sk_run_filter(skb, ppp->active_filter,
+                                               ppp->active_len) == 0))
+                                ppp->last_recv = jiffies;
+                        __skb_pull(skb, 2);
+                } else
 #endif /* CONFIG_PPP_FILTER */
+                        ppp->last_recv = jiffies;
 
                 if ((ppp->dev->flags & IFF_UP) == 0
                     || ppp->npmode[npi] != NPMODE_PASS) {
@@ -1770,7 +1768,7 @@ ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
         struct channel *ch;
         int mphdrlen = (ppp->flags & SC_MP_SHORTSEQ)? MPHDRLEN_SSN: MPHDRLEN;
 
-        if (!pskb_may_pull(skb, mphdrlen) || ppp->mrru == 0)
+        if (!pskb_may_pull(skb, mphdrlen + 1) || ppp->mrru == 0)
                 goto err;               /* no good, throw it away */
 
         /* Decode sequence number and begin/end bits */
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index f79cf87a2b..c0b6d19d14 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -136,7 +136,7 @@ struct ppp_mppe_state {
  * Key Derivation, from RFC 3078, RFC 3079.
  * Equivalent to Get_Key() for MS-CHAP as described in RFC 3079.
  */
-static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *InterimKey)
+static void get_new_key_from_sha(struct ppp_mppe_state * state)
 {
         struct hash_desc desc;
         struct scatterlist sg[4];
@@ -153,8 +153,6 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I
         desc.flags = 0;
 
         crypto_hash_digest(&desc, sg, nbytes, state->sha1_digest);
-
-        memcpy(InterimKey, state->sha1_digest, state->keylen);
 }
 
 /*
@@ -163,21 +161,21 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I
  */
 static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
 {
-        unsigned char InterimKey[MPPE_MAX_KEY_LEN];
         struct scatterlist sg_in[1], sg_out[1];
         struct blkcipher_desc desc = { .tfm = state->arc4 };
 
-        get_new_key_from_sha(state, InterimKey);
+        get_new_key_from_sha(state);
         if (!initial_key) {
-                crypto_blkcipher_setkey(state->arc4, InterimKey, state->keylen);
-                setup_sg(sg_in, InterimKey, state->keylen);
+                crypto_blkcipher_setkey(state->arc4, state->sha1_digest,
+                                        state->keylen);
+                setup_sg(sg_in, state->sha1_digest, state->keylen);
                 setup_sg(sg_out, state->session_key, state->keylen);
                 if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in,
                                              state->keylen) != 0) {
                     printk(KERN_WARNING "mppe_rekey: cipher_encrypt failed\n");
                 }
         } else {
-                memcpy(state->session_key, InterimKey, state->keylen);
+                memcpy(state->session_key, state->sha1_digest, state->keylen);
         }
         if (state->keylen == 8) {
                 /* See RFC 3078 */
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 68631a5721..9b30cd600a 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -385,12 +385,12 @@ static int pppoe_rcv(struct sk_buff *skb,
         struct pppoe_hdr *ph;
         struct pppox_sock *po;
 
-        if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
-                goto drop;
-
         if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
                 goto out;
 
+        if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
+                goto drop;
+
         ph = pppoe_hdr(skb);
 
         po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
@@ -848,71 +848,44 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
 {
         struct pppox_sock *po = pppox_sk(sk);
         struct net_device *dev = po->pppoe_dev;
-        struct pppoe_hdr hdr;
         struct pppoe_hdr *ph;
-        int headroom = skb_headroom(skb);
         int data_len = skb->len;
-        struct sk_buff *skb2;
 
         if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED))
                 goto abort;
 
-        hdr.ver = 1;
-        hdr.type = 1;
-        hdr.code = 0;
-        hdr.sid = po->num;
-        hdr.length = htons(skb->len);
-
         if (!dev)
                 goto abort;
 
-        /* Copy the skb if there is no space for the header. */
-        if (headroom < (sizeof(struct pppoe_hdr) + dev->hard_header_len)) {
-                skb2 = dev_alloc_skb(32+skb->len +
-                                     sizeof(struct pppoe_hdr) +
-                                     dev->hard_header_len);
-
-                if (skb2 == NULL)
-                        goto abort;
-
-                skb_reserve(skb2, dev->hard_header_len + sizeof(struct pppoe_hdr));
-                skb_copy_from_linear_data(skb, skb_put(skb2, skb->len),
-                                          skb->len);
-        } else {
-                /* Make a clone so as to not disturb the original skb,
-                 * give dev_queue_xmit something it can free.
-                 */
-                skb2 = skb_clone(skb, GFP_ATOMIC);
-
-                if (skb2 == NULL)
-                        goto abort;
-        }
+        /* Copy the data if there is no space for the header or if it's
+         * read-only.
+         */
+        if (skb_cow_head(skb, sizeof(*ph) + dev->hard_header_len))
+                goto abort;
 
-        ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr));
-        memcpy(ph, &hdr, sizeof(struct pppoe_hdr));
-        skb2->protocol = __constant_htons(ETH_P_PPP_SES);
+        __skb_push(skb, sizeof(*ph));
+        skb_reset_network_header(skb);
 
-        skb_reset_network_header(skb2);
+        ph = pppoe_hdr(skb);
+        ph->ver = 1;
+        ph->type = 1;
+        ph->code = 0;
+        ph->sid = po->num;
+        ph->length = htons(data_len);
 
-        skb2->dev = dev;
+        skb->protocol = __constant_htons(ETH_P_PPP_SES);
+        skb->dev = dev;
 
-        dev->hard_header(skb2, dev, ETH_P_PPP_SES,
+        dev->hard_header(skb, dev, ETH_P_PPP_SES,
                          po->pppoe_pa.remote, NULL, data_len);
 
-        /* We're transmitting skb2, and assuming that dev_queue_xmit
-         * will free it.  The generic ppp layer however, is expecting
-         * that we give back 'skb' (not 'skb2') in case of failure,
-         * but free it in case of success.
-         */
-
-        if (dev_queue_xmit(skb2) < 0)
-                goto abort;
+        dev_queue_xmit(skb);
 
-        kfree_skb(skb);
         return 1;
 
 abort:
-        return 0;
+        kfree_skb(skb);
+        return 1;
 }
 
 
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 266e8b38fe..abe91cb595 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -491,44 +491,46 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)
         u16 hdrflags;
         u16 tunnel_id, session_id;
         int length;
-        struct udphdr *uh;
+        int offset;
 
         tunnel = pppol2tp_sock_to_tunnel(sock);
         if (tunnel == NULL)
                 goto error;
 
+        /* UDP always verifies the packet length. */
+        __skb_pull(skb, sizeof(struct udphdr));
+
         /* Short packet? */
-        if (skb->len < sizeof(struct udphdr)) {
+        if (!pskb_may_pull(skb, 12)) {
                 PRINTK(tunnel->debug, PPPOL2TP_MSG_DATA, KERN_INFO,
                        "%s: recv short packet (len=%d)\n", tunnel->name, skb->len);
                 goto error;
         }
 
         /* Point to L2TP header */
-        ptr = skb->data + sizeof(struct udphdr);
+        ptr = skb->data;
 
         /* Get L2TP header flags */
         hdrflags = ntohs(*(__be16*)ptr);
 
         /* Trace packet contents, if enabled */
         if (tunnel->debug & PPPOL2TP_MSG_DATA) {
+                length = min(16u, skb->len);
+                if (!pskb_may_pull(skb, length))
+                        goto error;
+
                 printk(KERN_DEBUG "%s: recv: ", tunnel->name);
 
-                for (length = 0; length < 16; length++)
-                        printk(" %02X", ptr[length]);
+                offset = 0;
+                do {
+                        printk(" %02X", ptr[offset]);
+                } while (++offset < length);
+
                 printk("\n");
         }
 
         /* Get length of L2TP packet */
-        uh = (struct udphdr *) skb_transport_header(skb);
-        length = ntohs(uh->len) - sizeof(struct udphdr);
-
-        /* Too short? */
-        if (length < 12) {
-                PRINTK(tunnel->debug, PPPOL2TP_MSG_DATA, KERN_INFO,
-                       "%s: recv short L2TP packet (len=%d)\n", tunnel->name, length);
-                goto error;
-        }
+        length = skb->len;
 
         /* If type is control packet, it is handled by userspace. */
         if (hdrflags & L2TP_HDRFLAG_T) {
@@ -606,7 +608,6 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)
                                "%s: recv data has no seq numbers when required. "
                                "Discarding\n", session->name);
                         session->stats.rx_seq_discards++;
-                        session->stats.rx_errors++;
                         goto discard;
                 }
 
@@ -625,7 +626,6 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)
                                "%s: recv data has no seq numbers when required. "
                                "Discarding\n", session->name);
                         session->stats.rx_seq_discards++;
-                        session->stats.rx_errors++;
                         goto discard;
                 }
 
@@ -634,10 +634,14 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)
         }
 
         /* If offset bit set, skip it. */
-        if (hdrflags & L2TP_HDRFLAG_O)
-                ptr += 2 + ntohs(*(__be16 *) ptr);
+        if (hdrflags & L2TP_HDRFLAG_O) {
+                offset = ntohs(*(__be16 *)ptr);
+                skb->transport_header += 2 + offset;
+                if (!pskb_may_pull(skb, skb_transport_offset(skb) + 2))
+                        goto discard;
+        }
 
-        skb_pull(skb, ptr - skb->data);
+        __skb_pull(skb, skb_transport_offset(skb));
 
         /* Skip PPP header, if present.  In testing, Microsoft L2TP clients
          * don't send the PPP header (PPP header compression enabled), but
@@ -673,7 +677,6 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)
                          */
                         if (PPPOL2TP_SKB_CB(skb)->ns != session->nr) {
                                 session->stats.rx_seq_discards++;
-                                session->stats.rx_errors++;
                                 PRINTK(session->debug, PPPOL2TP_MSG_SEQ, KERN_DEBUG,
                                        "%s: oos pkt %hu len %d discarded, "
                                        "waiting for %hu, reorder_q_len=%d\n",
@@ -698,6 +701,7 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)
         return 0;
 
 discard:
+        session->stats.rx_errors++;
         kfree_skb(skb);
         sock_put(session->sock);
 
@@ -958,7 +962,6 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         int data_len = skb->len;
         struct inet_sock *inet;
         __wsum csum = 0;
-        struct sk_buff *skb2 = NULL;
         struct udphdr *uh;
         unsigned int len;
 
@@ -989,41 +992,30 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
          */
         headroom = NET_SKB_PAD + sizeof(struct iphdr) +
                 sizeof(struct udphdr) + hdr_len + sizeof(ppph);
-        if (skb_headroom(skb) < headroom) {
-                skb2 = skb_realloc_headroom(skb, headroom);
-                if (skb2 == NULL)
-                        goto abort;
-        } else
-                skb2 = skb;
-
-        /* Check that the socket has room */
-        if (atomic_read(&sk_tun->sk_wmem_alloc) < sk_tun->sk_sndbuf)
-                skb_set_owner_w(skb2, sk_tun);
-        else
-                goto discard;
+        if (skb_cow_head(skb, headroom))
+                goto abort;
 
         /* Setup PPP header */
-        skb_push(skb2, sizeof(ppph));
-        skb2->data[0] = ppph[0];
-        skb2->data[1] = ppph[1];
+        __skb_push(skb, sizeof(ppph));
+        skb->data[0] = ppph[0];
+        skb->data[1] = ppph[1];
 
         /* Setup L2TP header */
-        skb_push(skb2, hdr_len);
-        pppol2tp_build_l2tp_header(session, skb2->data);
+        pppol2tp_build_l2tp_header(session, __skb_push(skb, hdr_len));
 
         /* Setup UDP header */
         inet = inet_sk(sk_tun);
-        skb_push(skb2, sizeof(struct udphdr));
-        skb_reset_transport_header(skb2);
-        uh = (struct udphdr *) skb2->data;
+        __skb_push(skb, sizeof(*uh));
+        skb_reset_transport_header(skb);
+        uh = udp_hdr(skb);
         uh->source = inet->sport;
         uh->dest = inet->dport;
         uh->len = htons(sizeof(struct udphdr) + hdr_len + sizeof(ppph) + data_len);
         uh->check = 0;
 
-        /* Calculate UDP checksum if configured to do so */
+        /* *BROKEN* Calculate UDP checksum if configured to do so */
         if (sk_tun->sk_no_check != UDP_CSUM_NOXMIT)
-                csum = udp_csum_outgoing(sk_tun, skb2);
+                csum = udp_csum_outgoing(sk_tun, skb);
 
         /* Debug */
         if (session->send_seq)
@@ -1036,7 +1028,7 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
 
         if (session->debug & PPPOL2TP_MSG_DATA) {
                 int i;
-                unsigned char *datap = skb2->data;
+                unsigned char *datap = skb->data;
 
                 printk(KERN_DEBUG "%s: xmit:", session->name);
                 for (i = 0; i < data_len; i++) {
@@ -1049,18 +1041,18 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
                 printk("\n");
         }
 
-        memset(&(IPCB(skb2)->opt), 0, sizeof(IPCB(skb2)->opt));
-        IPCB(skb2)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
-                               IPSKB_REROUTED);
-        nf_reset(skb2);
+        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
+        IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
+                              IPSKB_REROUTED);
+        nf_reset(skb);
 
         /* Get routing info from the tunnel socket */
-        dst_release(skb2->dst);
-        skb2->dst = sk_dst_get(sk_tun);
+        dst_release(skb->dst);
+        skb->dst = sk_dst_get(sk_tun);
 
         /* Queue the packet to IP for output */
-        len = skb2->len;
-        rc = ip_queue_xmit(skb2, 1);
+        len = skb->len;
+        rc = ip_queue_xmit(skb, 1);
 
         /* Update stats */
         if (rc >= 0) {
@@ -1073,17 +1065,12 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
                 session->stats.tx_errors++;
         }
 
-        /* Free the original skb */
-        kfree_skb(skb);
-
         return 1;
 
-discard:
-        /* Free the new skb. Caller will free original skb. */
-        if (skb2 != skb)
-                kfree_skb(skb2);
 abort:
-        return 0;
+        /* Free the original skb */
+        kfree_skb(skb);
+        return 1;
 }
 
 /*****************************************************************************
@@ -1326,12 +1313,14 @@ static struct sock *pppol2tp_prepare_tunnel_socket(int fd, u16 tunnel_id,
                 goto err;
         }
 
+        sk = sock->sk;
+
         /* Quick sanity checks */
-        err = -ESOCKTNOSUPPORT;
-        if (sock->type != SOCK_DGRAM) {
+        err = -EPROTONOSUPPORT;
+        if (sk->sk_protocol != IPPROTO_UDP) {
                 PRINTK(-1, PPPOL2TP_MSG_CONTROL, KERN_ERR,
-                       "tunl %hu: fd %d wrong type, got %d, expected %d\n",
-                       tunnel_id, fd, sock->type, SOCK_DGRAM);
+                       "tunl %hu: fd %d wrong protocol, got %d, expected %d\n",
+                       tunnel_id, fd, sk->sk_protocol, IPPROTO_UDP);
                 goto err;
         }
         err = -EAFNOSUPPORT;
@@ -1343,7 +1332,6 @@ static struct sock *pppol2tp_prepare_tunnel_socket(int fd, u16 tunnel_id,
         }
 
         err = -ENOTCONN;
-        sk = sock->sk;
 
         /* Check if this socket has already been prepped */
         tunnel = (struct pppol2tp_tunnel *)sk->sk_user_data;
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 13d1c0a2a2..e565039184 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -556,7 +556,6 @@ static int gelic_net_stop(struct net_device *netdev)
 {
         struct gelic_net_card *card = netdev_priv(netdev);
 
-        netif_poll_disable(netdev);
         netif_stop_queue(netdev);
 
         /* turn off DMA, force end */
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 69da95b5ad..ea15131505 100755
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2248,6 +2248,13 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev,
                 qdev->rsp_consumer_index) && (work_done < work_to_do)) {
 
                 net_rsp = qdev->rsp_current;
+                rmb();
+                /*
+                 * Fix 4032 chipe undocumented "feature" where bit-8 is set if the
+                 * inbound completion is for a VLAN.
+                 */
+                if (qdev->device_id == QL3032_DEVICE_ID)
+                        net_rsp->opcode &= 0x7f;
                 switch (net_rsp->opcode) {
 
                 case OPCODE_OB_MAC_IOCB_FN0:
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index b85ab4a8f2..c76dd29c8e 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1228,7 +1228,10 @@ static void rtl8169_hw_phy_config(struct net_device *dev)
                 return;
         }
 
-        /* phy config for RTL8169s mac_version C chip */
+        if ((tp->mac_version != RTL_GIGA_MAC_VER_02) &&
+            (tp->mac_version != RTL_GIGA_MAC_VER_03))
+                return;
+
         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
@@ -1915,7 +1918,11 @@ static void rtl_hw_start_8169(struct net_device *dev)
 
         rtl_set_rx_max_size(ioaddr);
 
-        rtl_set_rx_tx_config_registers(tp);
+        if ((tp->mac_version == RTL_GIGA_MAC_VER_01) ||
+            (tp->mac_version == RTL_GIGA_MAC_VER_02) ||
+            (tp->mac_version == RTL_GIGA_MAC_VER_03) ||
+            (tp->mac_version == RTL_GIGA_MAC_VER_04))
+                rtl_set_rx_tx_config_registers(tp);
 
         tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW;
 
@@ -1938,6 +1945,14 @@ static void rtl_hw_start_8169(struct net_device *dev)
 
         rtl_set_rx_tx_desc_registers(tp, ioaddr);
 
+        if ((tp->mac_version != RTL_GIGA_MAC_VER_01) &&
+            (tp->mac_version != RTL_GIGA_MAC_VER_02) &&
+            (tp->mac_version != RTL_GIGA_MAC_VER_03) &&
+            (tp->mac_version != RTL_GIGA_MAC_VER_04)) {
+                RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+                rtl_set_rx_tx_config_registers(tp);
+        }
+
         RTL_W8(Cfg9346, Cfg9346_Lock);
 
         /* Initially a 10 us delay. Turned it into a PCI commit. - FR */
@@ -1952,8 +1967,6 @@ static void rtl_hw_start_8169(struct net_device *dev)
 
         /* Enable all known interrupts by setting the interrupt mask. */
         RTL_W16(IntrMask, tp->intr_event);
-
-        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
 }
 
 static void rtl_hw_start_8168(struct net_device *dev)
@@ -2567,6 +2580,15 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
                     (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
                         netif_wake_queue(dev);
                 }
+                /*
+                 * 8168 hack: TxPoll requests are lost when the Tx packets are
+                 * too close. Let's kick an extra TxPoll request when a burst
+                 * of start_xmit activity is detected (if it is not detected,
+                 * it is slow enough). -- FR
+                 */
+                smp_rmb();
+                if (tp->cur_tx != dirty_tx)
+                        RTL_W8(TxPoll, NPQ);
         }
 }
 
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 384b4685e9..0fb74cb51c 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -726,7 +726,7 @@ err_out:
         return err;
 }
 
-static void __exit sgiseeq_remove(struct platform_device *pdev)
+static int __exit sgiseeq_remove(struct platform_device *pdev)
 {
         struct net_device *dev = platform_get_drvdata(pdev);
         struct sgiseeq_private *sp = netdev_priv(dev);
@@ -735,6 +735,8 @@ static void __exit sgiseeq_remove(struct platform_device *pdev)
         free_page((unsigned long) sp->srings);
         free_netdev(dev);
         platform_set_drvdata(pdev, NULL);
+
+        return 0;
 }
 
 static struct platform_driver sgiseeq_driver = {
diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile
new file mode 100644
index 0000000000..afd900d5d7
--- /dev/null
+++ b/drivers/net/sk98lin/Makefile
@@ -0,0 +1,87 @@
+#
+# Makefile for the SysKonnect SK-98xx device driver.
+#
+
+
+#
+# Standalone driver params
+# SKPARAM += -DSK_KERNEL_24
+# SKPARAM += -DSK_KERNEL_24_26
+# SKPARAM += -DSK_KERNEL_26
+# SKPARAM += -DSK_KERNEL_22_24
+
+obj-$(CONFIG_SK98LIN) += sk98lin.o
+sk98lin-objs    :=      \
+                skge.o          \
+                skethtool.o     \
+                skdim.o         \
+                skaddr.o        \
+                skgehwt.o       \
+                skgeinit.o      \
+                skgepnmi.o      \
+                skgesirq.o      \
+                ski2c.o         \
+                sklm80.o        \
+                skqueue.o       \
+                skrlmt.o        \
+                sktimer.o       \
+                skvpd.o         \
+                skxmac2.o
+
+# DBGDEF =  \
+# -DDEBUG
+
+ifdef DEBUG
+DBGDEF +=  \
+-DSK_DEBUG_CHKMOD=0x00000000L \
+-DSK_DEBUG_CHKCAT=0x00000000L
+endif
+
+
+# **** possible debug modules for SK_DEBUG_CHKMOD *****************
+# SK_DBGMOD_MERR        0x00000001L     /* general module error indication */
+# SK_DBGMOD_HWM         0x00000002L     /* Hardware init module */
+# SK_DBGMOD_RLMT        0x00000004L     /* RLMT module */
+# SK_DBGMOD_VPD         0x00000008L     /* VPD module */
+# SK_DBGMOD_I2C         0x00000010L     /* I2C module */
+# SK_DBGMOD_PNMI        0x00000020L     /* PNMI module */
+# SK_DBGMOD_CSUM        0x00000040L     /* CSUM module */
+# SK_DBGMOD_ADDR        0x00000080L     /* ADDR module */
+# SK_DBGMOD_DRV         0x00010000L     /* DRV module */
+
+# **** possible debug categories for SK_DEBUG_CHKCAT **************
+# *** common modules ***
+# SK_DBGCAT_INIT        0x00000001L     module/driver initialization
+# SK_DBGCAT_CTRL        0x00000002L     controlling: add/rmv MCA/MAC and other controls (IOCTL)
+# SK_DBGCAT_ERR         0x00000004L     error handling paths
+# SK_DBGCAT_TX          0x00000008L     transmit path
+# SK_DBGCAT_RX          0x00000010L     receive path
+# SK_DBGCAT_IRQ         0x00000020L     general IRQ handling
+# SK_DBGCAT_QUEUE       0x00000040L     any queue management
+# SK_DBGCAT_DUMP        0x00000080L     large data output e.g. hex dump
+# SK_DBGCAT_FATAL       0x00000100L     large data output e.g. hex dump
+
+# *** driver (file skge.c) ***
+# SK_DBGCAT_DRV_ENTRY           0x00010000      entry points
+# SK_DBGCAT_DRV_???             0x00020000      not used
+# SK_DBGCAT_DRV_MCA             0x00040000      multicast
+# SK_DBGCAT_DRV_TX_PROGRESS     0x00080000      tx path
+# SK_DBGCAT_DRV_RX_PROGRESS     0x00100000      rx path
+# SK_DBGCAT_DRV_PROGRESS        0x00200000      general runtime
+# SK_DBGCAT_DRV_???             0x00400000      not used
+# SK_DBGCAT_DRV_PROM            0x00800000      promiscuous mode
+# SK_DBGCAT_DRV_TX_FRAME        0x01000000      display tx frames
+# SK_DBGCAT_DRV_ERROR           0x02000000      error conditions
+# SK_DBGCAT_DRV_INT_SRC         0x04000000      interrupts sources
+# SK_DBGCAT_DRV_EVENT           0x08000000      driver events
+
+EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
+
+clean:
+        rm -f core *.o *.a *.s
+
+
+
+
+
+
diff --git a/drivers/net/sk98lin/h/lm80.h b/drivers/net/sk98lin/h/lm80.h
new file mode 100644
index 0000000000..4e2dbbf780
--- /dev/null
+++ b/drivers/net/sk98lin/h/lm80.h
@@ -0,0 +1,179 @@
+/******************************************************************************
+ *
+ * Name:        lm80.h  
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.6 $
+ * Date:        $Date: 2003/05/13 17:26:52 $
+ * Purpose:     Contains all defines for the LM80 Chip
+ *              (National Semiconductor).
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef __INC_LM80_H
+#define __INC_LM80_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+/* defines ********************************************************************/
+
+/*
+ * LM80 register definition
+ *
+ * All registers are 8 bit wide
+ */
+#define LM80_CFG                        0x00    /* Configuration Register */
+#define LM80_ISRC_1                     0x01    /* Interrupt Status Register 1 */
+#define LM80_ISRC_2                     0x02    /* Interrupt Status Register 2 */
+#define LM80_IMSK_1                     0x03    /* Interrupt Mask Register 1 */
+#define LM80_IMSK_2                     0x04    /* Interrupt Mask Register 2 */
+#define LM80_FAN_CTRL           0x05    /* Fan Devisor/RST#/OS# Register */
+#define LM80_TEMP_CTRL          0x06    /* OS# Config, Temp Res. Reg */
+        /* 0x07 - 0x1f reserved */
+        /* current values */
+#define LM80_VT0_IN                     0x20    /* current Voltage 0 value */
+#define LM80_VT1_IN                     0x21    /* current Voltage 1 value */
+#define LM80_VT2_IN                     0x22    /* current Voltage 2 value */
+#define LM80_VT3_IN                     0x23    /* current Voltage 3 value */
+#define LM80_VT4_IN                     0x24    /* current Voltage 4 value */
+#define LM80_VT5_IN                     0x25    /* current Voltage 5 value */
+#define LM80_VT6_IN                     0x26    /* current Voltage 6 value */
+#define LM80_TEMP_IN            0x27    /* current Temperature value */
+#define LM80_FAN1_IN            0x28    /* current Fan 1 count */
+#define LM80_FAN2_IN            0x29    /* current Fan 2 count */
+        /* limit values */
+#define LM80_VT0_HIGH_LIM       0x2a    /* high limit val for Voltage 0 */
+#define LM80_VT0_LOW_LIM        0x2b    /* low limit val for Voltage 0 */
+#define LM80_VT1_HIGH_LIM       0x2c    /* high limit val for Voltage 1 */
+#define LM80_VT1_LOW_LIM        0x2d    /* low limit val for Voltage 1 */
+#define LM80_VT2_HIGH_LIM       0x2e    /* high limit val for Voltage 2 */
+#define LM80_VT2_LOW_LIM        0x2f    /* low limit val for Voltage 2 */
+#define LM80_VT3_HIGH_LIM       0x30    /* high limit val for Voltage 3 */
+#define LM80_VT3_LOW_LIM        0x31    /* low limit val for Voltage 3 */
+#define LM80_VT4_HIGH_LIM       0x32    /* high limit val for Voltage 4 */
+#define LM80_VT4_LOW_LIM        0x33    /* low limit val for Voltage 4 */
+#define LM80_VT5_HIGH_LIM       0x34    /* high limit val for Voltage 5 */
+#define LM80_VT5_LOW_LIM        0x35    /* low limit val for Voltage 5 */
+#define LM80_VT6_HIGH_LIM       0x36    /* high limit val for Voltage 6 */
+#define LM80_VT6_LOW_LIM        0x37    /* low limit val for Voltage 6 */
+#define LM80_THOT_LIM_UP        0x38    /* hot temperature limit (high) */
+#define LM80_THOT_LIM_LO        0x39    /* hot temperature limit (low) */
+#define LM80_TOS_LIM_UP         0x3a    /* OS temperature limit (high) */
+#define LM80_TOS_LIM_LO         0x3b    /* OS temperature limit (low) */
+#define LM80_FAN1_COUNT_LIM     0x3c    /* Fan 1 count limit (high) */
+#define LM80_FAN2_COUNT_LIM     0x3d    /* Fan 2 count limit (low) */
+        /* 0x3e - 0x3f reserved */
+
+/*
+ * LM80 bit definitions
+ */
+
+/*      LM80_CFG                Configuration Register */
+#define LM80_CFG_START          (1<<0)  /* start monitoring operation */
+#define LM80_CFG_INT_ENA        (1<<1)  /* enables the INT# Interrupt output */
+#define LM80_CFG_INT_POL        (1<<2)  /* INT# pol: 0 act low, 1 act high */
+#define LM80_CFG_INT_CLR        (1<<3)  /* disables INT#/RST_OUT#/OS# outputs */
+#define LM80_CFG_RESET          (1<<4)  /* signals a reset */
+#define LM80_CFG_CHASS_CLR      (1<<5)  /* clears Chassis Intrusion (CI) pin */
+#define LM80_CFG_GPO            (1<<6)  /* drives the GPO# pin */
+#define LM80_CFG_INIT           (1<<7)  /* restore power on defaults */
+
+/*      LM80_ISRC_1             Interrupt Status Register 1 */
+/*      LM80_IMSK_1             Interrupt Mask Register 1 */
+#define LM80_IS_VT0                     (1<<0)  /* limit exceeded for Voltage 0 */
+#define LM80_IS_VT1                     (1<<1)  /* limit exceeded for Voltage 1 */
+#define LM80_IS_VT2                     (1<<2)  /* limit exceeded for Voltage 2 */
+#define LM80_IS_VT3                     (1<<3)  /* limit exceeded for Voltage 3 */
+#define LM80_IS_VT4                     (1<<4)  /* limit exceeded for Voltage 4 */
+#define LM80_IS_VT5                     (1<<5)  /* limit exceeded for Voltage 5 */
+#define LM80_IS_VT6                     (1<<6)  /* limit exceeded for Voltage 6 */
+#define LM80_IS_INT_IN          (1<<7)  /* state of INT_IN# */
+
+/*      LM80_ISRC_2             Interrupt Status Register 2 */
+/*      LM80_IMSK_2             Interrupt Mask Register 2 */
+#define LM80_IS_TEMP            (1<<0)  /* HOT temperature limit exceeded */
+#define LM80_IS_BTI                     (1<<1)  /* state of BTI# pin */
+#define LM80_IS_FAN1            (1<<2)  /* count limit exceeded for Fan 1 */
+#define LM80_IS_FAN2            (1<<3)  /* count limit exceeded for Fan 2 */
+#define LM80_IS_CI                      (1<<4)  /* Chassis Intrusion occured */
+#define LM80_IS_OS                      (1<<5)  /* OS temperature limit exceeded */
+        /* bit 6 and 7 are reserved in LM80_ISRC_2 */
+#define LM80_IS_HT_IRQ_MD       (1<<6)  /* Hot temperature interrupt mode */
+#define LM80_IS_OT_IRQ_MD       (1<<7)  /* OS temperature interrupt mode */
+
+/*      LM80_FAN_CTRL           Fan Devisor/RST#/OS# Register */
+#define LM80_FAN1_MD_SEL        (1<<0)  /* Fan 1 mode select */
+#define LM80_FAN2_MD_SEL        (1<<1)  /* Fan 2 mode select */
+#define LM80_FAN1_PRM_CTL       (3<<2)  /* Fan 1 speed control */
+#define LM80_FAN2_PRM_CTL       (3<<4)  /* Fan 2 speed control */
+#define LM80_FAN_OS_ENA         (1<<6)  /* enable OS mode on RST_OUT#/OS# pins*/
+#define LM80_FAN_RST_ENA        (1<<7)  /* sets RST_OUT#/OS# pins in RST mode */
+
+/*      LM80_TEMP_CTRL          OS# Config, Temp Res. Reg */
+#define LM80_TEMP_OS_STAT       (1<<0)  /* mirrors the state of RST_OUT#/OS# */
+#define LM80_TEMP_OS_POL        (1<<1)  /* select OS# polarity */
+#define LM80_TEMP_OS_MODE       (1<<2)  /* selects Interrupt mode */
+#define LM80_TEMP_RES           (1<<3)  /* selects 9 or 11 bit temp resulution*/
+#define LM80_TEMP_LSB           (0xf<<4)/* 4 LSBs of 11 bit temp data */
+#define LM80_TEMP_LSB_9         (1<<7)  /* LSB of 9 bit temperature data */
+
+        /* 0x07 - 0x1f reserved */
+/*      LM80_VT0_IN             current Voltage 0 value */
+/*      LM80_VT1_IN             current Voltage 1 value */
+/*      LM80_VT2_IN             current Voltage 2 value */
+/*      LM80_VT3_IN             current Voltage 3 value */
+/*      LM80_VT4_IN             current Voltage 4 value */
+/*      LM80_VT5_IN             current Voltage 5 value */
+/*      LM80_VT6_IN             current Voltage 6 value */
+/*      LM80_TEMP_IN            current temperature value */
+/*      LM80_FAN1_IN            current Fan 1 count */
+/*      LM80_FAN2_IN            current Fan 2 count */
+/*      LM80_VT0_HIGH_LIM       high limit val for Voltage 0 */
+/*      LM80_VT0_LOW_LIM        low limit val for Voltage 0 */
+/*      LM80_VT1_HIGH_LIM       high limit val for Voltage 1 */
+/*      LM80_VT1_LOW_LIM        low limit val for Voltage 1 */
+/*      LM80_VT2_HIGH_LIM       high limit val for Voltage 2 */
+/*      LM80_VT2_LOW_LIM        low limit val for Voltage 2 */
+/*      LM80_VT3_HIGH_LIM       high limit val for Voltage 3 */
+/*      LM80_VT3_LOW_LIM        low limit val for Voltage 3 */
+/*      LM80_VT4_HIGH_LIM       high limit val for Voltage 4 */
+/*      LM80_VT4_LOW_LIM        low limit val for Voltage 4 */
+/*      LM80_VT5_HIGH_LIM       high limit val for Voltage 5 */
+/*      LM80_VT5_LOW_LIM        low limit val for Voltage 5 */
+/*      LM80_VT6_HIGH_LIM       high limit val for Voltage 6 */
+/*      LM80_VT6_LOW_LIM        low limit val for Voltage 6 */
+/*      LM80_THOT_LIM_UP        hot temperature limit (high) */
+/*      LM80_THOT_LIM_LO        hot temperature limit (low) */
+/*      LM80_TOS_LIM_UP         OS temperature limit (high) */
+/*      LM80_TOS_LIM_LO         OS temperature limit (low) */
+/*      LM80_FAN1_COUNT_LIM     Fan 1 count limit (high) */
+/*      LM80_FAN2_COUNT_LIM     Fan 2 count limit (low) */
+        /* 0x3e - 0x3f reserved */
+
+#define LM80_ADDR               0x28    /* LM80 default addr */
+
+/* typedefs *******************************************************************/
+
+
+/* function prototypes ********************************************************/
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif  /* __INC_LM80_H */
diff --git a/drivers/net/sk98lin/h/skaddr.h b/drivers/net/sk98lin/h/skaddr.h
new file mode 100644
index 0000000000..423ad063d0
--- /dev/null
+++ b/drivers/net/sk98lin/h/skaddr.h
@@ -0,0 +1,285 @@
+/******************************************************************************
+ *
+ * Name:        skaddr.h
+ * Project:     Gigabit Ethernet Adapters, ADDR-Modul
+ * Version:     $Revision: 1.29 $
+ * Date:        $Date: 2003/05/13 16:57:24 $
+ * Purpose:     Header file for Address Management (MC, UC, Prom).
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * This module is intended to manage multicast addresses and promiscuous mode
+ * on GEnesis adapters.
+ *
+ * Include File Hierarchy:
+ *
+ *      "skdrv1st.h"
+ *      ...
+ *      "sktypes.h"
+ *      "skqueue.h"
+ *      "skaddr.h"
+ *      ...
+ *      "skdrv2nd.h"
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKADDR_H
+#define __INC_SKADDR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* cplusplus */
+
+/* defines ********************************************************************/
+
+#define SK_MAC_ADDR_LEN                         6       /* Length of MAC address. */
+#define SK_MAX_ADDRS                            14      /* #Addrs for exact match. */
+
+/* ----- Common return values ----- */
+
+#define SK_ADDR_SUCCESS                         0       /* Function returned successfully. */
+#define SK_ADDR_ILLEGAL_PORT                    100     /* Port number too high. */
+#define SK_ADDR_TOO_EARLY                       101     /* Function called too early. */
+
+/* ----- Clear/Add flag bits ----- */
+
+#define SK_ADDR_PERMANENT                       1       /* RLMT Address */
+
+/* ----- Additional Clear flag bits ----- */
+
+#define SK_MC_SW_ONLY                           2       /* Do not update HW when clearing. */
+
+/* ----- Override flag bits ----- */
+
+#define SK_ADDR_LOGICAL_ADDRESS         0
+#define SK_ADDR_VIRTUAL_ADDRESS         (SK_ADDR_LOGICAL_ADDRESS)       /* old */
+#define SK_ADDR_PHYSICAL_ADDRESS        1
+#define SK_ADDR_CLEAR_LOGICAL           2
+#define SK_ADDR_SET_LOGICAL                     4
+
+/* ----- Override return values ----- */
+
+#define SK_ADDR_OVERRIDE_SUCCESS        (SK_ADDR_SUCCESS)
+#define SK_ADDR_DUPLICATE_ADDRESS       1
+#define SK_ADDR_MULTICAST_ADDRESS       2
+
+/* ----- Partitioning of excact match table ----- */
+
+#define SK_ADDR_EXACT_MATCHES           16      /* #Exact match entries. */
+
+#define SK_ADDR_FIRST_MATCH_RLMT        1
+#define SK_ADDR_LAST_MATCH_RLMT         2
+#define SK_ADDR_FIRST_MATCH_DRV         3
+#define SK_ADDR_LAST_MATCH_DRV          (SK_ADDR_EXACT_MATCHES - 1)
+
+/* ----- SkAddrMcAdd/SkAddrMcUpdate return values ----- */
+
+#define SK_MC_FILTERING_EXACT           0       /* Exact filtering. */
+#define SK_MC_FILTERING_INEXACT         1       /* Inexact filtering. */
+
+/* ----- Additional SkAddrMcAdd return values ----- */
+
+#define SK_MC_ILLEGAL_ADDRESS           2       /* Illegal address. */
+#define SK_MC_ILLEGAL_PORT                      3       /* Illegal port (not the active one). */
+#define SK_MC_RLMT_OVERFLOW                     4       /* Too many RLMT mc addresses. */
+
+/* Promiscuous mode bits ----- */
+
+#define SK_PROM_MODE_NONE                       0       /* Normal receive. */
+#define SK_PROM_MODE_LLC                        1       /* Receive all LLC frames. */
+#define SK_PROM_MODE_ALL_MC                     2       /* Receive all multicast frames. */
+/* #define SK_PROM_MODE_NON_LLC         4 */    /* Receive all non-LLC frames. */
+
+/* Macros */
+
+#ifdef OLD_STUFF
+#ifndef SK_ADDR_EQUAL
+/*
+ * "&" instead of "&&" allows better optimization on IA-64.
+ * The replacement is safe here, as all bytes exist.
+ */
+#ifndef SK_ADDR_DWORD_COMPARE
+#define SK_ADDR_EQUAL(A1,A2)    ( \
+        (((SK_U8 *)(A1))[5] == ((SK_U8 *)(A2))[5]) & \
+        (((SK_U8 *)(A1))[4] == ((SK_U8 *)(A2))[4]) & \
+        (((SK_U8 *)(A1))[3] == ((SK_U8 *)(A2))[3]) & \
+        (((SK_U8 *)(A1))[2] == ((SK_U8 *)(A2))[2]) & \
+        (((SK_U8 *)(A1))[1] == ((SK_U8 *)(A2))[1]) & \
+        (((SK_U8 *)(A1))[0] == ((SK_U8 *)(A2))[0]))
+#else   /* SK_ADDR_DWORD_COMPARE */
+#define SK_ADDR_EQUAL(A1,A2)    ( \
+        (*(SK_U32 *)&(((SK_U8 *)(A1))[2]) == *(SK_U32 *)&(((SK_U8 *)(A2))[2])) & \
+        (*(SK_U32 *)&(((SK_U8 *)(A1))[0]) == *(SK_U32 *)&(((SK_U8 *)(A2))[0])))
+#endif  /* SK_ADDR_DWORD_COMPARE */
+#endif  /* SK_ADDR_EQUAL */
+#endif /* 0 */
+
+#ifndef SK_ADDR_EQUAL
+#ifndef SK_ADDR_DWORD_COMPARE
+#define SK_ADDR_EQUAL(A1,A2)    ( \
+        (((SK_U8 SK_FAR *)(A1))[5] == ((SK_U8 SK_FAR *)(A2))[5]) & \
+        (((SK_U8 SK_FAR *)(A1))[4] == ((SK_U8 SK_FAR *)(A2))[4]) & \
+        (((SK_U8 SK_FAR *)(A1))[3] == ((SK_U8 SK_FAR *)(A2))[3]) & \
+        (((SK_U8 SK_FAR *)(A1))[2] == ((SK_U8 SK_FAR *)(A2))[2]) & \
+        (((SK_U8 SK_FAR *)(A1))[1] == ((SK_U8 SK_FAR *)(A2))[1]) & \
+        (((SK_U8 SK_FAR *)(A1))[0] == ((SK_U8 SK_FAR *)(A2))[0]))
+#else   /* SK_ADDR_DWORD_COMPARE */
+#define SK_ADDR_EQUAL(A1,A2)    ( \
+        (*(SK_U16 SK_FAR *)&(((SK_U8 SK_FAR *)(A1))[4]) == \
+        *(SK_U16 SK_FAR *)&(((SK_U8 SK_FAR *)(A2))[4])) && \
+        (*(SK_U32 SK_FAR *)&(((SK_U8 SK_FAR *)(A1))[0]) == \
+        *(SK_U32 SK_FAR *)&(((SK_U8 SK_FAR *)(A2))[0])))
+#endif  /* SK_ADDR_DWORD_COMPARE */
+#endif  /* SK_ADDR_EQUAL */
+
+/* typedefs *******************************************************************/
+
+typedef struct s_MacAddr {
+        SK_U8   a[SK_MAC_ADDR_LEN];
+} SK_MAC_ADDR;
+
+
+/* SK_FILTER is used to ensure alignment of the filter. */
+typedef union s_InexactFilter {
+        SK_U8   Bytes[8];
+        SK_U64  Val;    /* Dummy entry for alignment only. */
+} SK_FILTER64;
+
+
+typedef struct s_AddrNet SK_ADDR_NET;
+
+
+typedef struct s_AddrPort {
+
+/* ----- Public part (read-only) ----- */
+
+        SK_MAC_ADDR     CurrentMacAddress;      /* Current physical MAC Address. */
+        SK_MAC_ADDR     PermanentMacAddress;    /* Permanent physical MAC Address. */
+        int             PromMode;               /* Promiscuous Mode. */
+
+/* ----- Private part ----- */
+
+        SK_MAC_ADDR     PreviousMacAddress;     /* Prev. phys. MAC Address. */
+        SK_BOOL         CurrentMacAddressSet;   /* CurrentMacAddress is set. */
+        SK_U8           Align01;
+
+        SK_U32          FirstExactMatchRlmt;
+        SK_U32          NextExactMatchRlmt;
+        SK_U32          FirstExactMatchDrv;
+        SK_U32          NextExactMatchDrv;
+        SK_MAC_ADDR     Exact[SK_ADDR_EXACT_MATCHES];
+        SK_FILTER64     InexactFilter;                  /* For 64-bit hash register. */
+        SK_FILTER64     InexactRlmtFilter;              /* For 64-bit hash register. */
+        SK_FILTER64     InexactDrvFilter;               /* For 64-bit hash register. */
+} SK_ADDR_PORT;
+
+
+struct s_AddrNet {
+/* ----- Public part (read-only) ----- */
+
+        SK_MAC_ADDR             CurrentMacAddress;      /* Logical MAC Address. */
+        SK_MAC_ADDR             PermanentMacAddress;    /* Logical MAC Address. */
+
+/* ----- Private part ----- */
+
+        SK_U32                  ActivePort;             /* View of module ADDR. */
+        SK_BOOL                 CurrentMacAddressSet;   /* CurrentMacAddress is set. */
+        SK_U8                   Align01;
+        SK_U16                  Align02;
+};
+
+
+typedef struct s_Addr {
+
+/* ----- Public part (read-only) ----- */
+
+        SK_ADDR_NET             Net[SK_MAX_NETS];
+        SK_ADDR_PORT    Port[SK_MAX_MACS];
+
+/* ----- Private part ----- */
+} SK_ADDR;
+
+/* function prototypes ********************************************************/
+
+#ifndef SK_KR_PROTO
+
+/* Functions provided by SkAddr */
+
+/* ANSI/C++ compliant function prototypes */
+
+extern  int     SkAddrInit(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int     Level);
+
+extern  int     SkAddrMcClear(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        SK_U32  PortNumber,
+        int     Flags);
+
+extern  int     SkAddrMcAdd(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        SK_U32          PortNumber,
+        SK_MAC_ADDR     *pMc,
+        int             Flags);
+
+extern  int     SkAddrMcUpdate(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        SK_U32  PortNumber);
+
+extern  int     SkAddrOverride(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        SK_U32          PortNumber,
+        SK_MAC_ADDR     SK_FAR *pNewAddr,
+        int             Flags);
+
+extern  int     SkAddrPromiscuousChange(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        SK_U32  PortNumber,
+        int     NewPromMode);
+
+#ifndef SK_SLIM
+extern  int     SkAddrSwap(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        SK_U32  FromPortNumber,
+        SK_U32  ToPortNumber);
+#endif
+
+#else   /* defined(SK_KR_PROTO)) */
+
+/* Non-ANSI/C++ compliant function prototypes */
+
+#error KR-style prototypes are not yet provided.
+
+#endif  /* defined(SK_KR_PROTO)) */
+
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif  /* __INC_SKADDR_H */
diff --git a/drivers/net/sk98lin/h/skcsum.h b/drivers/net/sk98lin/h/skcsum.h
new file mode 100644
index 0000000000..6e256bd9a2
--- /dev/null
+++ b/drivers/net/sk98lin/h/skcsum.h
@@ -0,0 +1,213 @@
+/******************************************************************************
+ *
+ * Name:        skcsum.h
+ * Project:     GEnesis - SysKonnect SK-NET Gigabit Ethernet (SK-98xx)
+ * Version:     $Revision: 1.10 $
+ * Date:        $Date: 2003/08/20 13:59:57 $
+ * Purpose:     Store/verify Internet checksum in send/receive packets.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (C)Copyright 1998-2001 SysKonnect 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 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * Public header file for the "GEnesis" common module "CSUM".
+ *
+ * "GEnesis" is an abbreviation of "Gigabit Ethernet Network System in Silicon"
+ * and is the code name of this SysKonnect project.
+ *
+ * Compilation Options:
+ *
+ *      SK_USE_CSUM - Define if CSUM is to be used. Otherwise, CSUM will be an
+ *      empty module.
+ *
+ *      SKCS_OVERWRITE_PROTO - Define to overwrite the default protocol id
+ *      definitions. In this case, all SKCS_PROTO_xxx definitions must be made
+ *      external.
+ *
+ *      SKCS_OVERWRITE_STATUS - Define to overwrite the default return status
+ *      definitions. In this case, all SKCS_STATUS_xxx definitions must be made
+ *      external.
+ *
+ * Include File Hierarchy:
+ *
+ *      "h/skcsum.h"
+ *       "h/sktypes.h"
+ *       "h/skqueue.h"
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKCSUM_H
+#define __INC_SKCSUM_H
+
+#include "h/sktypes.h"
+#include "h/skqueue.h"
+
+/* defines ********************************************************************/
+
+/*
+ * Define the default bit flags for 'SKCS_PACKET_INFO.ProtocolFlags'  if no user
+ * overwrite.
+ */
+#ifndef SKCS_OVERWRITE_PROTO    /* User overwrite? */
+#define SKCS_PROTO_IP   0x1     /* IP (Internet Protocol version 4) */
+#define SKCS_PROTO_TCP  0x2     /* TCP (Transmission Control Protocol) */
+#define SKCS_PROTO_UDP  0x4     /* UDP (User Datagram Protocol) */
+
+/* Indices for protocol statistics. */
+#define SKCS_PROTO_STATS_IP     0
+#define SKCS_PROTO_STATS_UDP    1
+#define SKCS_PROTO_STATS_TCP    2
+#define SKCS_NUM_PROTOCOLS      3       /* Number of supported protocols. */
+#endif  /* !SKCS_OVERWRITE_PROTO */
+
+/*
+ * Define the default SKCS_STATUS type and values if no user overwrite.
+ *
+ *      SKCS_STATUS_UNKNOWN_IP_VERSION - Not an IP v4 frame.
+ *      SKCS_STATUS_IP_CSUM_ERROR - IP checksum error.
+ *      SKCS_STATUS_IP_CSUM_ERROR_TCP - IP checksum error in TCP frame.
+ *      SKCS_STATUS_IP_CSUM_ERROR_UDP - IP checksum error in UDP frame
+ *      SKCS_STATUS_IP_FRAGMENT - IP fragment (IP checksum ok).
+ *      SKCS_STATUS_IP_CSUM_OK - IP checksum ok (not a TCP or UDP frame).
+ *      SKCS_STATUS_TCP_CSUM_ERROR - TCP checksum error (IP checksum ok).
+ *      SKCS_STATUS_UDP_CSUM_ERROR - UDP checksum error (IP checksum ok).
+ *      SKCS_STATUS_TCP_CSUM_OK - IP and TCP checksum ok.
+ *      SKCS_STATUS_UDP_CSUM_OK - IP and UDP checksum ok.
+ *      SKCS_STATUS_IP_CSUM_OK_NO_UDP - IP checksum OK and no UDP checksum. 
+ */
+#ifndef SKCS_OVERWRITE_STATUS   /* User overwrite? */
+#define SKCS_STATUS     int     /* Define status type. */
+
+#define SKCS_STATUS_UNKNOWN_IP_VERSION  1
+#define SKCS_STATUS_IP_CSUM_ERROR               2
+#define SKCS_STATUS_IP_FRAGMENT                 3
+#define SKCS_STATUS_IP_CSUM_OK                  4
+#define SKCS_STATUS_TCP_CSUM_ERROR              5
+#define SKCS_STATUS_UDP_CSUM_ERROR              6
+#define SKCS_STATUS_TCP_CSUM_OK                 7
+#define SKCS_STATUS_UDP_CSUM_OK                 8
+/* needed for Microsoft */
+#define SKCS_STATUS_IP_CSUM_ERROR_UDP   9
+#define SKCS_STATUS_IP_CSUM_ERROR_TCP   10
+/* UDP checksum may be omitted */
+#define SKCS_STATUS_IP_CSUM_OK_NO_UDP   11
+#endif  /* !SKCS_OVERWRITE_STATUS */
+
+/* Clear protocol statistics event. */
+#define SK_CSUM_EVENT_CLEAR_PROTO_STATS 1
+
+/*
+ * Add two values in one's complement.
+ *
+ * Note: One of the two input values may be "longer" than 16-bit, but then the
+ * resulting sum may be 17 bits long. In this case, add zero to the result using
+ * SKCS_OC_ADD() again.
+ *
+ *      Result = Value1 + Value2
+ */
+#define SKCS_OC_ADD(Result, Value1, Value2) {                           \
+        unsigned long Sum;                                              \
+                                                                        \
+        Sum = (unsigned long) (Value1) + (unsigned long) (Value2);      \
+        /* Add-in any carry. */                                         \
+        (Result) = (Sum & 0xffff) + (Sum >> 16);                        \
+}
+
+/*
+ * Subtract two values in one's complement.
+ *
+ *      Result = Value1 - Value2
+ */
+#define SKCS_OC_SUB(Result, Value1, Value2)     \
+        SKCS_OC_ADD((Result), (Value1), ~(Value2) & 0xffff)
+
+/* typedefs *******************************************************************/
+
+/*
+ * SKCS_PROTO_STATS - The CSUM protocol statistics structure.
+ *
+ * There is one instance of this structure for each protocol supported.
+ */
+typedef struct s_CsProtocolStatistics {
+        SK_U64 RxOkCts;         /* Receive checksum ok. */
+        SK_U64 RxUnableCts;     /* Unable to verify receive checksum. */
+        SK_U64 RxErrCts;        /* Receive checksum error. */
+        SK_U64 TxOkCts;         /* Transmit checksum ok. */
+        SK_U64 TxUnableCts;     /* Unable to calculate checksum in hw. */
+} SKCS_PROTO_STATS;
+
+/*
+ * s_Csum - The CSUM module context structure.
+ */
+typedef struct s_Csum {
+        /* Enabled receive SK_PROTO_XXX bit flags. */
+        unsigned ReceiveFlags[SK_MAX_NETS];
+#ifdef TX_CSUM
+        unsigned TransmitFlags[SK_MAX_NETS];
+#endif /* TX_CSUM */
+
+        /* The protocol statistics structure; one per supported protocol. */
+        SKCS_PROTO_STATS ProtoStats[SK_MAX_NETS][SKCS_NUM_PROTOCOLS];
+} SK_CSUM;
+
+/*
+ * SKCS_PACKET_INFO - The packet information structure.
+ */
+typedef struct s_CsPacketInfo {
+        /* Bit field specifiying the desired/found protocols. */
+        unsigned ProtocolFlags;
+
+        /* Length of complete IP header, including any option fields. */
+        unsigned IpHeaderLength;
+
+        /* IP header checksum. */
+        unsigned IpHeaderChecksum;
+
+        /* TCP/UDP pseudo header checksum. */
+        unsigned PseudoHeaderChecksum;
+} SKCS_PACKET_INFO;
+
+/* function prototypes ********************************************************/
+
+#ifndef SK_CS_CALCULATE_CHECKSUM
+extern unsigned SkCsCalculateChecksum(
+        void            *pData,
+        unsigned        Length);
+#endif /* SK_CS_CALCULATE_CHECKSUM */
+
+extern int SkCsEvent(
+        SK_AC           *pAc,
+        SK_IOC          Ioc,
+        SK_U32          Event,
+        SK_EVPARA       Param);
+
+extern SKCS_STATUS SkCsGetReceiveInfo(
+        SK_AC           *pAc,
+        void            *pIpHeader,
+        unsigned        Checksum1,
+        unsigned        Checksum2,
+        int                     NetNumber);
+
+extern void SkCsSetReceiveFlags(
+        SK_AC           *pAc,
+        unsigned        ReceiveFlags,
+        unsigned        *pChecksum1Offset,
+        unsigned        *pChecksum2Offset,
+        int                     NetNumber);
+
+#endif  /* __INC_SKCSUM_H */
diff --git a/drivers/net/sk98lin/h/skdebug.h b/drivers/net/sk98lin/h/skdebug.h
new file mode 100644
index 0000000000..3cba171d74
--- /dev/null
+++ b/drivers/net/sk98lin/h/skdebug.h
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ * Name:        skdebug.h
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.14 $
+ * Date:        $Date: 2003/05/13 17:26:00 $
+ * Purpose:     SK specific DEBUG support
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKDEBUG_H
+#define __INC_SKDEBUG_H
+
+#ifdef  DEBUG
+#ifndef SK_DBG_MSG
+#define SK_DBG_MSG(pAC,comp,cat,arg) \
+                if ( ((comp) & SK_DBG_CHKMOD(pAC)) &&   \
+                      ((cat) & SK_DBG_CHKCAT(pAC)) ) {  \
+                        SK_DBG_PRINTF arg ;             \
+                }
+#endif
+#else
+#define SK_DBG_MSG(pAC,comp,lev,arg)
+#endif
+
+/* PLS NOTE:
+ * =========
+ * Due to any restrictions of kernel printf routines do not use other
+ * format identifiers as: %x %d %c %s .
+ * Never use any combined format identifiers such as: %lx %ld in your
+ * printf - argument (arg) because some OS specific kernel printfs may
+ * only support some basic identifiers.
+ */
+
+/* Debug modules */
+
+#define SK_DBGMOD_MERR  0x00000001L     /* general module error indication */
+#define SK_DBGMOD_HWM   0x00000002L     /* Hardware init module */
+#define SK_DBGMOD_RLMT  0x00000004L     /* RLMT module */
+#define SK_DBGMOD_VPD   0x00000008L     /* VPD module */
+#define SK_DBGMOD_I2C   0x00000010L     /* I2C module */
+#define SK_DBGMOD_PNMI  0x00000020L     /* PNMI module */
+#define SK_DBGMOD_CSUM  0x00000040L     /* CSUM module */
+#define SK_DBGMOD_ADDR  0x00000080L     /* ADDR module */
+#define SK_DBGMOD_PECP  0x00000100L     /* PECP module */
+#define SK_DBGMOD_POWM  0x00000200L     /* Power Management module */
+
+/* Debug events */
+
+#define SK_DBGCAT_INIT  0x00000001L     /* module/driver initialization */
+#define SK_DBGCAT_CTRL  0x00000002L     /* controlling devices */
+#define SK_DBGCAT_ERR   0x00000004L     /* error handling paths */
+#define SK_DBGCAT_TX    0x00000008L     /* transmit path */
+#define SK_DBGCAT_RX    0x00000010L     /* receive path */
+#define SK_DBGCAT_IRQ   0x00000020L     /* general IRQ handling */
+#define SK_DBGCAT_QUEUE 0x00000040L     /* any queue management */
+#define SK_DBGCAT_DUMP  0x00000080L     /* large data output e.g. hex dump */
+#define SK_DBGCAT_FATAL 0x00000100L     /* fatal error */
+
+#endif  /* __INC_SKDEBUG_H */
diff --git a/drivers/net/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h
new file mode 100644
index 0000000000..91b8d4f459
--- /dev/null
+++ b/drivers/net/sk98lin/h/skdrv1st.h
@@ -0,0 +1,188 @@
+/******************************************************************************
+ *
+ * Name:        skdrv1st.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * 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-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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * This is the first include file of the driver, which includes all
+ * neccessary system header files and some of the GEnesis header files.
+ * It also defines some basic items.
+ *
+ * Include File Hierarchy:
+ *
+ *      see skge.c
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKDRV1ST_H
+#define __INC_SKDRV1ST_H
+
+typedef struct s_AC     SK_AC;
+
+/* Set card versions */
+#define SK_FAR
+
+/* override some default functions with optimized linux functions */
+
+#define SK_PNMI_STORE_U16(p,v)          memcpy((char*)(p),(char*)&(v),2)
+#define SK_PNMI_STORE_U32(p,v)          memcpy((char*)(p),(char*)&(v),4)
+#define SK_PNMI_STORE_U64(p,v)          memcpy((char*)(p),(char*)&(v),8)
+#define SK_PNMI_READ_U16(p,v)           memcpy((char*)&(v),(char*)(p),2)
+#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 SK_ADDR_EQUAL(a1,a2)            (!memcmp(a1,a2,6))
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/bitops.h>
+#include <asm/byteorder.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+
+#include <linux/init.h>
+#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"
+#include        "h/lm80.h"
+#include        "h/xmac_ii.h"
+
+#ifdef __LITTLE_ENDIAN
+#define SK_LITTLE_ENDIAN
+#else
+#define SK_BIG_ENDIAN
+#endif
+
+#define SK_NET_DEVICE   net_device
+
+
+/* we use gethrtime(), return unit: nanoseconds */
+#define SK_TICKS_PER_SEC        100
+
+#define SK_MEM_MAPPED_IO
+
+// #define SK_RLMT_SLOW_LOOKAHEAD
+
+#define SK_MAX_MACS             2
+#define SK_MAX_NETS             2
+
+#define SK_IOC                  char __iomem *
+
+typedef struct s_DrvRlmtMbuf SK_MBUF;
+
+#define SK_CONST64      INT64_C
+#define SK_CONSTU64     UINT64_C
+
+#define SK_MEMCPY(dest,src,size)        memcpy(dest,src,size)
+#define SK_MEMCMP(s1,s2,size)           memcmp(s1,s2,size)
+#define SK_MEMSET(dest,val,size)        memset(dest,val,size)
+#define SK_STRLEN(pStr)                 strlen((char*)(pStr))
+#define SK_STRNCPY(pDest,pSrc,size)     strncpy((char*)(pDest),(char*)(pSrc),size)
+#define SK_STRCMP(pStr1,pStr2)          strcmp((char*)(pStr1),(char*)(pStr2))
+
+/* macros to access the adapter */
+#define SK_OUT8(b,a,v)          writeb((v), ((b)+(a)))  
+#define SK_OUT16(b,a,v)         writew((v), ((b)+(a)))  
+#define SK_OUT32(b,a,v)         writel((v), ((b)+(a)))  
+#define SK_IN8(b,a,pv)          (*(pv) = readb((b)+(a)))
+#define SK_IN16(b,a,pv)         (*(pv) = readw((b)+(a)))
+#define SK_IN32(b,a,pv)         (*(pv) = readl((b)+(a)))
+
+#define int8_t          char
+#define int16_t         short
+#define int32_t         long
+#define int64_t         long long
+#define uint8_t         u_char
+#define uint16_t        u_short
+#define uint32_t        u_long
+#define uint64_t        unsigned long long
+#define t_scalar_t      int
+#define t_uscalar_t     unsigned int
+#define uintptr_t       unsigned long
+
+#define __CONCAT__(A,B) A##B
+
+#define INT32_C(a)              __CONCAT__(a,L)
+#define INT64_C(a)              __CONCAT__(a,LL)
+#define UINT32_C(a)             __CONCAT__(a,UL)
+#define UINT64_C(a)             __CONCAT__(a,ULL)
+
+#ifdef DEBUG
+#define SK_DBG_PRINTF           printk
+#ifndef SK_DEBUG_CHKMOD
+#define SK_DEBUG_CHKMOD         0
+#endif
+#ifndef SK_DEBUG_CHKCAT
+#define SK_DEBUG_CHKCAT         0
+#endif
+/* those come from the makefile */
+#define SK_DBG_CHKMOD(pAC)      (SK_DEBUG_CHKMOD)
+#define SK_DBG_CHKCAT(pAC)      (SK_DEBUG_CHKCAT)
+
+extern void SkDbgPrintf(const char *format,...);
+
+#define SK_DBGMOD_DRV                   0x00010000
+
+/**** possible driver debug categories ********************************/
+#define SK_DBGCAT_DRV_ENTRY             0x00010000
+#define SK_DBGCAT_DRV_SAP               0x00020000
+#define SK_DBGCAT_DRV_MCA               0x00040000
+#define SK_DBGCAT_DRV_TX_PROGRESS       0x00080000
+#define SK_DBGCAT_DRV_RX_PROGRESS       0x00100000
+#define SK_DBGCAT_DRV_PROGRESS          0x00200000
+#define SK_DBGCAT_DRV_MSG               0x00400000
+#define SK_DBGCAT_DRV_PROM              0x00800000
+#define SK_DBGCAT_DRV_TX_FRAME          0x01000000
+#define SK_DBGCAT_DRV_ERROR             0x02000000
+#define SK_DBGCAT_DRV_INT_SRC           0x04000000
+#define SK_DBGCAT_DRV_EVENT             0x08000000
+
+#endif
+
+#define SK_ERR_LOG              SkErrorLog
+
+extern void SkErrorLog(SK_AC*, int, int, char*);
+
+#endif
+
diff --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h
new file mode 100644
index 0000000000..3fa67171e8
--- /dev/null
+++ b/drivers/net/sk98lin/h/skdrv2nd.h
@@ -0,0 +1,447 @@
+/******************************************************************************
+ *
+ * Name:        skdrv2nd.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * 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-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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * This is the second include file of the driver, which includes all other
+ * neccessary files and defines all structures and constants used by the
+ * driver and the common modules.
+ *
+ * Include File Hierarchy:
+ *
+ *      see skge.c
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKDRV2ND_H
+#define __INC_SKDRV2ND_H
+
+#include "h/skqueue.h"
+#include "h/skgehwt.h"
+#include "h/sktimer.h"
+#include "h/ski2c.h"
+#include "h/skgepnmi.h"
+#include "h/skvpd.h"
+#include "h/skgehw.h"
+#include "h/skgeinit.h"
+#include "h/skaddr.h"
+#include "h/skgesirq.h"
+#include "h/skcsum.h"
+#include "h/skrlmt.h"
+#include "h/skgedrv.h"
+
+
+extern SK_MBUF          *SkDrvAllocRlmtMbuf(SK_AC*, SK_IOC, unsigned);
+extern void             SkDrvFreeRlmtMbuf(SK_AC*, SK_IOC, SK_MBUF*);
+extern SK_U64           SkOsGetTime(SK_AC*);
+extern int              SkPciReadCfgDWord(SK_AC*, int, SK_U32*);
+extern int              SkPciReadCfgWord(SK_AC*, int, SK_U16*);
+extern int              SkPciReadCfgByte(SK_AC*, int, SK_U8*);
+extern int              SkPciWriteCfgWord(SK_AC*, int, SK_U16);
+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.). */
+        unsigned        Size;           /* Data buffer size. */
+        unsigned        Length;         /* Length of packet (<= Size). */
+        SK_U32          PortIdx;        /* Receiving/transmitting port. */
+#ifdef SK_RLMT_MBUF_PRIVATE
+        SK_RLMT_MBUF    Rlmt;           /* Private part for RLMT. */
+#endif  /* SK_RLMT_MBUF_PRIVATE */
+        struct sk_buff  *pOs;           /* Pointer to message block */
+};
+
+
+/*
+ * Time macros
+ */
+#if SK_TICKS_PER_SEC == 100
+#define SK_PNMI_HUNDREDS_SEC(t) (t)
+#else
+#define SK_PNMI_HUNDREDS_SEC(t) ((((unsigned long)t) * 100) / \
+                                                                                (SK_TICKS_PER_SEC))
+#endif
+
+/*
+ * New SkOsGetTime
+ */
+#define SkOsGetTimeCurrent(pAC, pUsec) {\
+        struct timeval t;\
+        do_gettimeofday(&t);\
+        *pUsec = ((((t.tv_sec) * 1000000L)+t.tv_usec)/10000);\
+}
+
+
+/*
+ * ioctl definitions
+ */
+#define         SK_IOCTL_BASE           (SIOCDEVPRIVATE)
+#define         SK_IOCTL_GETMIB         (SK_IOCTL_BASE + 0)
+#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;
+
+struct s_IOCTL {
+        char __user *   pData;
+        unsigned int    Len;
+};
+
+
+/*
+ * define sizes of descriptor rings in bytes
+ */
+
+#define         TX_RING_SIZE    (8*1024)
+#define         RX_RING_SIZE    (24*1024)
+
+/*
+ * Buffer size for ethernet packets
+ */
+#define ETH_BUF_SIZE    1540
+#define ETH_MAX_MTU     1514
+#define ETH_MIN_MTU     60
+#define ETH_MULTICAST_BIT       0x01
+#define SK_JUMBO_MTU    9000
+
+/*
+ * transmit priority selects the queue: LOW=asynchron, HIGH=synchron
+ */
+#define TX_PRIO_LOW     0
+#define TX_PRIO_HIGH    1
+
+/*
+ * alignment of rx/tx descriptors
+ */
+#define DESCR_ALIGN     64
+
+/*
+ * definitions for pnmi. TODO
+ */
+#define SK_DRIVER_RESET(pAC, IoC)       0
+#define SK_DRIVER_SENDEVENT(pAC, IoC)   0
+#define SK_DRIVER_SELFTEST(pAC, IoC)    0
+/* For get mtu you must add an own function */
+#define SK_DRIVER_GET_MTU(pAc,IoC,i)    0
+#define SK_DRIVER_SET_MTU(pAc,IoC,i,v)  0
+#define SK_DRIVER_PRESET_MTU(pAc,IoC,i,v)       0
+
+/*
+** Interim definition of SK_DRV_TIMER placed in this file until 
+** common modules have been finalized
+*/
+#define SK_DRV_TIMER                    11 
+#define SK_DRV_MODERATION_TIMER         1
+#define SK_DRV_MODERATION_TIMER_LENGTH  1000000  /* 1 second */
+#define SK_DRV_RX_CLEANUP_TIMER         2
+#define SK_DRV_RX_CLEANUP_TIMER_LENGTH  1000000  /* 100 millisecs */
+
+/*
+** Definitions regarding transmitting frames 
+** any calculating any checksum.
+*/
+#define C_LEN_ETHERMAC_HEADER_DEST_ADDR 6
+#define C_LEN_ETHERMAC_HEADER_SRC_ADDR  6
+#define C_LEN_ETHERMAC_HEADER_LENTYPE   2
+#define C_LEN_ETHERMAC_HEADER           ( (C_LEN_ETHERMAC_HEADER_DEST_ADDR) + \
+                                          (C_LEN_ETHERMAC_HEADER_SRC_ADDR)  + \
+                                          (C_LEN_ETHERMAC_HEADER_LENTYPE) )
+
+#define C_LEN_ETHERMTU_MINSIZE          46
+#define C_LEN_ETHERMTU_MAXSIZE_STD      1500
+#define C_LEN_ETHERMTU_MAXSIZE_JUMBO    9000
+
+#define C_LEN_ETHERNET_MINSIZE          ( (C_LEN_ETHERMAC_HEADER) + \
+                                          (C_LEN_ETHERMTU_MINSIZE) )
+
+#define C_OFFSET_IPHEADER               C_LEN_ETHERMAC_HEADER
+#define C_OFFSET_IPHEADER_IPPROTO       9
+#define C_OFFSET_TCPHEADER_TCPCS        16
+#define C_OFFSET_UDPHEADER_UDPCS        6
+
+#define C_OFFSET_IPPROTO                ( (C_LEN_ETHERMAC_HEADER) + \
+                                          (C_OFFSET_IPHEADER_IPPROTO) )
+
+#define C_PROTO_ID_UDP                  17       /* refer to RFC 790 or Stevens'   */
+#define C_PROTO_ID_TCP                  6        /* TCP/IP illustrated for details */
+
+/* TX and RX descriptors *****************************************************/
+
+typedef struct s_RxD RXD; /* the receive descriptor */
+
+struct s_RxD {
+        volatile SK_U32 RBControl;      /* Receive Buffer Control */
+        SK_U32          VNextRxd;       /* Next receive descriptor,low dword */
+        SK_U32          VDataLow;       /* Receive buffer Addr, low dword */
+        SK_U32          VDataHigh;      /* Receive buffer Addr, high dword */
+        SK_U32          FrameStat;      /* Receive Frame Status word */
+        SK_U32          TimeStamp;      /* Time stamp from XMAC */
+        SK_U32          TcpSums;        /* TCP Sum 2 / TCP Sum 1 */
+        SK_U32          TcpSumStarts;   /* TCP Sum Start 2 / TCP Sum Start 1 */
+        RXD             *pNextRxd;      /* Pointer to next Rxd */
+        struct sk_buff  *pMBuf;         /* Pointer to Linux' socket buffer */
+};
+
+typedef struct s_TxD TXD; /* the transmit descriptor */
+
+struct s_TxD {
+        volatile SK_U32 TBControl;      /* Transmit Buffer Control */
+        SK_U32          VNextTxd;       /* Next transmit descriptor,low dword */
+        SK_U32          VDataLow;       /* Transmit Buffer Addr, low dword */
+        SK_U32          VDataHigh;      /* Transmit Buffer Addr, high dword */
+        SK_U32          FrameStat;      /* Transmit Frame Status Word */
+        SK_U32          TcpSumOfs;      /* Reserved / TCP Sum Offset */
+        SK_U16          TcpSumSt;       /* TCP Sum Start */
+        SK_U16          TcpSumWr;       /* TCP Sum Write */
+        SK_U32          TcpReserved;    /* not used */
+        TXD             *pNextTxd;      /* Pointer to next Txd */
+        struct sk_buff  *pMBuf;         /* Pointer to Linux' socket buffer */
+};
+
+/* Used interrupt bits in the interrupts source register *********************/
+
+#define DRIVER_IRQS     ((IS_IRQ_SW)   | \
+                        (IS_R1_F)      |(IS_R2_F)  | \
+                        (IS_XS1_F)     |(IS_XA1_F) | \
+                        (IS_XS2_F)     |(IS_XA2_F))
+
+#define SPECIAL_IRQS    ((IS_HW_ERR)   |(IS_I2C_READY)  | \
+                        (IS_EXT_REG)   |(IS_TIMINT)     | \
+                        (IS_PA_TO_RX1) |(IS_PA_TO_RX2)  | \
+                        (IS_PA_TO_TX1) |(IS_PA_TO_TX2)  | \
+                        (IS_MAC1)      |(IS_LNK_SYNC_M1)| \
+                        (IS_MAC2)      |(IS_LNK_SYNC_M2)| \
+                        (IS_R1_C)      |(IS_R2_C)       | \
+                        (IS_XS1_C)     |(IS_XA1_C)      | \
+                        (IS_XS2_C)     |(IS_XA2_C))
+
+#define IRQ_MASK        ((IS_IRQ_SW)   | \
+                        (IS_R1_B)      |(IS_R1_F)     |(IS_R2_B) |(IS_R2_F) | \
+                        (IS_XS1_B)     |(IS_XS1_F)    |(IS_XA1_B)|(IS_XA1_F)| \
+                        (IS_XS2_B)     |(IS_XS2_F)    |(IS_XA2_B)|(IS_XA2_F)| \
+                        (IS_HW_ERR)    |(IS_I2C_READY)| \
+                        (IS_EXT_REG)   |(IS_TIMINT)   | \
+                        (IS_PA_TO_RX1) |(IS_PA_TO_RX2)| \
+                        (IS_PA_TO_TX1) |(IS_PA_TO_TX2)| \
+                        (IS_MAC1)      |(IS_MAC2)     | \
+                        (IS_R1_C)      |(IS_R2_C)     | \
+                        (IS_XS1_C)     |(IS_XA1_C)    | \
+                        (IS_XS2_C)     |(IS_XA2_C))
+
+#define IRQ_HWE_MASK    (IS_ERR_MSK) /* enable all HW irqs */
+
+typedef struct s_DevNet DEV_NET;
+
+struct s_DevNet {
+        int             PortNr;
+        int             NetNr;
+        SK_AC   *pAC;
+};  
+
+typedef struct s_TxPort         TX_PORT;
+
+struct s_TxPort {
+        /* the transmit descriptor rings */
+        caddr_t         pTxDescrRing;   /* descriptor area memory */
+        SK_U64          VTxDescrRing;   /* descr. area bus virt. addr. */
+        TXD             *pTxdRingHead;  /* Head of Tx rings */
+        TXD             *pTxdRingTail;  /* Tail of Tx rings */
+        TXD             *pTxdRingPrev;  /* descriptor sent previously */
+        int             TxdRingFree;    /* # of free entrys */
+        spinlock_t      TxDesRingLock;  /* serialize descriptor accesses */
+        SK_IOC          HwAddr;         /* bmu registers address */
+        int             PortIndex;      /* index number of port (0 or 1) */
+};
+
+typedef struct s_RxPort         RX_PORT;
+
+struct s_RxPort {
+        /* the receive descriptor rings */
+        caddr_t         pRxDescrRing;   /* descriptor area memory */
+        SK_U64          VRxDescrRing;   /* descr. area bus virt. addr. */
+        RXD             *pRxdRingHead;  /* Head of Rx rings */
+        RXD             *pRxdRingTail;  /* Tail of Rx rings */
+        RXD             *pRxdRingPrev;  /* descriptor given to BMU previously */
+        int             RxdRingFree;    /* # of free entrys */
+        int             RxCsum;         /* use receive checksum hardware */
+        spinlock_t      RxDesRingLock;  /* serialize descriptor accesses */
+        int             RxFillLimit;    /* limit for buffers in ring */
+        SK_IOC          HwAddr;         /* bmu registers address */
+        int             PortIndex;      /* index number of port (0 or 1) */
+};
+
+/* Definitions needed for interrupt moderation *******************************/
+
+#define IRQ_EOF_AS_TX     ((IS_XA1_F)     | (IS_XA2_F))
+#define IRQ_EOF_SY_TX     ((IS_XS1_F)     | (IS_XS2_F))
+#define IRQ_MASK_TX_ONLY  ((IRQ_EOF_AS_TX)| (IRQ_EOF_SY_TX))
+#define IRQ_MASK_RX_ONLY  ((IS_R1_F)      | (IS_R2_F))
+#define IRQ_MASK_SP_ONLY  (SPECIAL_IRQS)
+#define IRQ_MASK_TX_RX    ((IRQ_MASK_TX_ONLY)| (IRQ_MASK_RX_ONLY))
+#define IRQ_MASK_SP_RX    ((SPECIAL_IRQS)    | (IRQ_MASK_RX_ONLY))
+#define IRQ_MASK_SP_TX    ((SPECIAL_IRQS)    | (IRQ_MASK_TX_ONLY))
+#define IRQ_MASK_RX_TX_SP ((SPECIAL_IRQS)    | (IRQ_MASK_TX_RX))
+
+#define C_INT_MOD_NONE                 1
+#define C_INT_MOD_STATIC               2
+#define C_INT_MOD_DYNAMIC              4
+
+#define C_CLK_FREQ_GENESIS      53215000 /* shorter: 53.125 MHz  */
+#define C_CLK_FREQ_YUKON        78215000 /* shorter: 78.125 MHz  */
+
+#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 {
+        unsigned long   PrevTimeVal;
+        unsigned int    PrevSysLoad;
+        unsigned int    PrevUsedTime;
+        unsigned int    PrevTotalTime;
+        int             PrevUsedDescrRatio;
+        int             NbrProcessedDescr;
+        SK_U64          PrevPort0RxIntrCts;
+        SK_U64          PrevPort1RxIntrCts;
+        SK_U64          PrevPort0TxIntrCts;
+        SK_U64          PrevPort1TxIntrCts;
+        SK_BOOL         ModJustEnabled;     /* Moderation just enabled yes/no */
+
+        int             MaxModIntsPerSec;            /* Moderation Threshold */
+        int             MaxModIntsPerSecUpperLimit;  /* Upper limit for DIM  */
+        int             MaxModIntsPerSecLowerLimit;  /* Lower limit for DIM  */
+
+        long            MaskIrqModeration;   /* ModIrqType (eg. 'TxRx')      */
+        SK_BOOL         DisplayStats;        /* Stats yes/no                 */
+        SK_BOOL         AutoSizing;          /* Resize DIM-timer on/off      */
+        int             IntModTypeSelect;    /* EnableIntMod (eg. 'dynamic') */
+
+        SK_TIMER        ModTimer; /* just some timer */
+};
+
+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).
+ *      Contains all 'per device' necessary handles, flags, locks etc.:
+ */
+struct s_AC  {
+        SK_GEINIT       GIni;           /* GE init struct */
+        SK_PNMI         Pnmi;           /* PNMI data struct */
+        SK_VPD          vpd;            /* vpd data struct */
+        SK_QUEUE        Event;          /* Event queue */
+        SK_HWT          Hwt;            /* Hardware Timer control struct */
+        SK_TIMCTRL      Tim;            /* Software Timer control struct */
+        SK_I2C          I2c;            /* I2C relevant data structure */
+        SK_ADDR         Addr;           /* for Address module */
+        SK_CSUM         Csum;           /* for checksum module */
+        SK_RLMT         Rlmt;           /* for rlmt module */
+        spinlock_t      SlowPathLock;   /* Normal IRQ lock */
+        struct timer_list BlinkTimer;   /* for LED blinking */
+        int             LedsOn;
+        SK_PNMI_STRUCT_DATA PnmiStruct; /* structure to get all Pnmi-Data */
+        int                     RlmtMode;       /* link check mode to set */
+        int                     RlmtNets;       /* Number of nets */
+        
+        SK_IOC          IoBase;         /* register set of adapter */
+        int             BoardLevel;     /* level of active hw init (0-2) */
+
+        SK_U32          AllocFlag;      /* flag allocation of resources */
+        struct pci_dev  *PciDev;        /* for access to pci config space */
+        struct SK_NET_DEVICE    *dev[2];        /* pointer to device struct */
+
+        int             RxBufSize;      /* length of receive buffers */
+        struct net_device_stats stats;  /* linux 'netstat -i' statistics */
+        int             Index;          /* internal board index number */
+
+        /* adapter RAM sizes for queues of active port */
+        int             RxQueueSize;    /* memory used for receive queue */
+        int             TxSQueueSize;   /* memory used for sync. tx queue */
+        int             TxAQueueSize;   /* memory used for async. tx queue */
+
+        int             PromiscCount;   /* promiscuous mode counter  */
+        int             AllMultiCount;  /* allmulticast mode counter */
+        int             MulticCount;    /* number of different MC    */
+                                        /*  addresses for this board */
+                                        /*  (may be more than HW can)*/
+
+        int             HWRevision;     /* Hardware revision */
+        int             ActivePort;     /* the active XMAC port */
+        int             MaxPorts;               /* number of activated ports */
+        int             TxDescrPerRing; /* # of descriptors per tx ring */
+        int             RxDescrPerRing; /* # of descriptors per rx ring */
+
+        caddr_t         pDescrMem;      /* Pointer to the descriptor area */
+        dma_addr_t      pDescrMemDMA;   /* PCI DMA address of area */
+
+        /* the port structures with descriptor rings */
+        TX_PORT         TxPort[SK_MAX_MACS][2];
+        RX_PORT         RxPort[SK_MAX_MACS];
+
+        SK_BOOL         CheckQueue;     /* check event queue soon */
+        SK_TIMER        DrvCleanupTimer;/* to check for pending descriptors */
+        DIM_INFO        DynIrqModInfo;  /* all data related to DIM */
+
+        /* Only for tests */
+        int             PortDown;
+        int             ChipsetType;    /*  Chipset family type 
+                                         *  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
+
+};
+
+
+#endif /* __INC_SKDRV2ND_H */
+
diff --git a/drivers/net/sk98lin/h/skerror.h b/drivers/net/sk98lin/h/skerror.h
new file mode 100644
index 0000000000..da062f7662
--- /dev/null
+++ b/drivers/net/sk98lin/h/skerror.h
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ * Name:        skerror.h
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.7 $
+ * Date:        $Date: 2003/05/13 17:25:13 $
+ * Purpose:     SK specific Error log support
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef _INC_SKERROR_H_
+#define _INC_SKERROR_H_
+
+/*
+ * Define Error Classes
+ */
+#define SK_ERRCL_OTHER          (0)             /* Other error */
+#define SK_ERRCL_CONFIG         (1L<<0) /* Configuration error */
+#define SK_ERRCL_INIT           (1L<<1) /* Initialization error */
+#define SK_ERRCL_NORES          (1L<<2) /* Out of Resources error */
+#define SK_ERRCL_SW                     (1L<<3) /* Internal Software error */
+#define SK_ERRCL_HW                     (1L<<4) /* Hardware Failure */
+#define SK_ERRCL_COMM           (1L<<5) /* Communication error */
+
+
+/*
+ * Define Error Code Bases
+ */
+#define SK_ERRBASE_RLMT          100    /* Base Error number for RLMT */
+#define SK_ERRBASE_HWINIT        200    /* Base Error number for HWInit */
+#define SK_ERRBASE_VPD           300    /* Base Error number for VPD */
+#define SK_ERRBASE_PNMI          400    /* Base Error number for PNMI */
+#define SK_ERRBASE_CSUM          500    /* Base Error number for Checksum */
+#define SK_ERRBASE_SIRQ          600    /* Base Error number for Special IRQ */
+#define SK_ERRBASE_I2C           700    /* Base Error number for I2C module */
+#define SK_ERRBASE_QUEUE         800    /* Base Error number for Scheduler */
+#define SK_ERRBASE_ADDR          900    /* Base Error number for Address module */
+#define SK_ERRBASE_PECP         1000    /* Base Error number for PECP */
+#define SK_ERRBASE_DRV          1100    /* Base Error number for Driver */
+
+#endif  /* _INC_SKERROR_H_ */
diff --git a/drivers/net/sk98lin/h/skgedrv.h b/drivers/net/sk98lin/h/skgedrv.h
new file mode 100644
index 0000000000..44fd4c3de8
--- /dev/null
+++ b/drivers/net/sk98lin/h/skgedrv.h
@@ -0,0 +1,51 @@
+/******************************************************************************
+ *
+ * Name:        skgedrv.h
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.10 $
+ * Date:        $Date: 2003/07/04 12:25:01 $
+ * Purpose:     Interface with the driver
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKGEDRV_H_
+#define __INC_SKGEDRV_H_
+
+/* defines ********************************************************************/
+
+/*
+ * Define the driver events.
+ * Usually the events are defined by the destination module.
+ * In case of the driver we put the definition of the events here.
+ */
+#define SK_DRV_PORT_RESET                1      /* The port needs to be reset */
+#define SK_DRV_NET_UP                    2      /* The net is operational */
+#define SK_DRV_NET_DOWN                  3      /* The net is down */
+#define SK_DRV_SWITCH_SOFT               4      /* Ports switch with both links connected */
+#define SK_DRV_SWITCH_HARD               5      /* Port switch due to link failure */
+#define SK_DRV_RLMT_SEND                 6      /* Send a RLMT packet */
+#define SK_DRV_ADAP_FAIL                 7      /* The whole adapter fails */
+#define SK_DRV_PORT_FAIL                 8      /* One port fails */
+#define SK_DRV_SWITCH_INTERN     9      /* Port switch by the driver itself */
+#define SK_DRV_POWER_DOWN               10      /* Power down mode */
+#define SK_DRV_TIMER                    11      /* Timer for free use */
+#ifdef SK_NO_RLMT
+#define SK_DRV_LINK_UP                  12      /* Link Up event for driver */
+#define SK_DRV_LINK_DOWN                13      /* Link Down event for driver */
+#endif
+#define SK_DRV_DOWNSHIFT_DET    14      /* Downshift 4-Pair / 2-Pair (YUKON only) */
+#endif /* __INC_SKGEDRV_H_ */
diff --git a/drivers/net/sk98lin/h/skgehw.h b/drivers/net/sk98lin/h/skgehw.h
new file mode 100644
index 0000000000..f6282b7956
--- /dev/null
+++ b/drivers/net/sk98lin/h/skgehw.h
@@ -0,0 +1,2126 @@
+/******************************************************************************
+ *
+ * Name:        skgehw.h
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.56 $
+ * Date:        $Date: 2003/09/23 09:01:00 $
+ * Purpose:     Defines and Macros for the Gigabit Ethernet Adapter Product Family
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKGEHW_H
+#define __INC_SKGEHW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+/* defines ********************************************************************/
+
+#define BIT_31          (1UL << 31)
+#define BIT_30          (1L << 30)
+#define BIT_29          (1L << 29)
+#define BIT_28          (1L << 28)
+#define BIT_27          (1L << 27)
+#define BIT_26          (1L << 26)
+#define BIT_25          (1L << 25)
+#define BIT_24          (1L << 24)
+#define BIT_23          (1L << 23)
+#define BIT_22          (1L << 22)
+#define BIT_21          (1L << 21)
+#define BIT_20          (1L << 20)
+#define BIT_19          (1L << 19)
+#define BIT_18          (1L << 18)
+#define BIT_17          (1L << 17)
+#define BIT_16          (1L << 16)
+#define BIT_15          (1L << 15)
+#define BIT_14          (1L << 14)
+#define BIT_13          (1L << 13)
+#define BIT_12          (1L << 12)
+#define BIT_11          (1L << 11)
+#define BIT_10          (1L << 10)
+#define BIT_9           (1L << 9)
+#define BIT_8           (1L << 8)
+#define BIT_7           (1L << 7)
+#define BIT_6           (1L << 6)
+#define BIT_5           (1L << 5)
+#define BIT_4           (1L << 4)
+#define BIT_3           (1L << 3)
+#define BIT_2           (1L << 2)
+#define BIT_1           (1L << 1)
+#define BIT_0           1L
+
+#define BIT_15S         (1U << 15)
+#define BIT_14S         (1 << 14)
+#define BIT_13S         (1 << 13)
+#define BIT_12S         (1 << 12)
+#define BIT_11S         (1 << 11)
+#define BIT_10S         (1 << 10)
+#define BIT_9S          (1 << 9)
+#define BIT_8S          (1 << 8)
+#define BIT_7S          (1 << 7)
+#define BIT_6S          (1 << 6)
+#define BIT_5S          (1 << 5)
+#define BIT_4S          (1 << 4)
+#define BIT_3S          (1 << 3)
+#define BIT_2S          (1 << 2)
+#define BIT_1S          (1 << 1)
+#define BIT_0S          1
+
+#define SHIFT31(x)      ((x) << 31)
+#define SHIFT30(x)      ((x) << 30)
+#define SHIFT29(x)      ((x) << 29)
+#define SHIFT28(x)      ((x) << 28)
+#define SHIFT27(x)      ((x) << 27)
+#define SHIFT26(x)      ((x) << 26)
+#define SHIFT25(x)      ((x) << 25)
+#define SHIFT24(x)      ((x) << 24)
+#define SHIFT23(x)      ((x) << 23)
+#define SHIFT22(x)      ((x) << 22)
+#define SHIFT21(x)      ((x) << 21)
+#define SHIFT20(x)      ((x) << 20)
+#define SHIFT19(x)      ((x) << 19)
+#define SHIFT18(x)      ((x) << 18)
+#define SHIFT17(x)      ((x) << 17)
+#define SHIFT16(x)      ((x) << 16)
+#define SHIFT15(x)      ((x) << 15)
+#define SHIFT14(x)      ((x) << 14)
+#define SHIFT13(x)      ((x) << 13)
+#define SHIFT12(x)      ((x) << 12)
+#define SHIFT11(x)      ((x) << 11)
+#define SHIFT10(x)      ((x) << 10)
+#define SHIFT9(x)       ((x) << 9)
+#define SHIFT8(x)       ((x) << 8)
+#define SHIFT7(x)       ((x) << 7)
+#define SHIFT6(x)       ((x) << 6)
+#define SHIFT5(x)       ((x) << 5)
+#define SHIFT4(x)       ((x) << 4)
+#define SHIFT3(x)       ((x) << 3)
+#define SHIFT2(x)       ((x) << 2)
+#define SHIFT1(x)       ((x) << 1)
+#define SHIFT0(x)       ((x) << 0)
+
+/*
+ * Configuration Space header
+ * Since this module is used for different OS', those may be
+ * duplicate on some of them (e.g. Linux). But to keep the
+ * common source, we have to live with this...
+ */
+#define PCI_VENDOR_ID   0x00    /* 16 bit       Vendor ID */
+#define PCI_DEVICE_ID   0x02    /* 16 bit       Device ID */
+#define PCI_COMMAND             0x04    /* 16 bit       Command */
+#define PCI_STATUS              0x06    /* 16 bit       Status */
+#define PCI_REV_ID              0x08    /*  8 bit       Revision ID */
+#define PCI_CLASS_CODE  0x09    /* 24 bit       Class Code */
+#define PCI_CACHE_LSZ   0x0c    /*  8 bit       Cache Line Size */
+#define PCI_LAT_TIM             0x0d    /*  8 bit       Latency Timer */
+#define PCI_HEADER_T    0x0e    /*  8 bit       Header Type */
+#define PCI_BIST                0x0f    /*  8 bit       Built-in selftest */
+#define PCI_BASE_1ST    0x10    /* 32 bit       1st Base address */
+#define PCI_BASE_2ND    0x14    /* 32 bit       2nd Base address */
+        /* Byte 0x18..0x2b:     reserved */
+#define PCI_SUB_VID             0x2c    /* 16 bit       Subsystem Vendor ID */
+#define PCI_SUB_ID              0x2e    /* 16 bit       Subsystem ID */
+#define PCI_BASE_ROM    0x30    /* 32 bit       Expansion ROM Base Address */
+#define PCI_CAP_PTR             0x34    /*  8 bit       Capabilities Ptr */
+        /* Byte 0x35..0x3b:     reserved */
+#define PCI_IRQ_LINE    0x3c    /*  8 bit       Interrupt Line */
+#define PCI_IRQ_PIN             0x3d    /*  8 bit       Interrupt Pin */
+#define PCI_MIN_GNT             0x3e    /*  8 bit       Min_Gnt */
+#define PCI_MAX_LAT             0x3f    /*  8 bit       Max_Lat */
+        /* Device Dependent Region */
+#define PCI_OUR_REG_1   0x40    /* 32 bit       Our Register 1 */
+#define PCI_OUR_REG_2   0x44    /* 32 bit       Our Register 2 */
+        /* Power Management Region */
+#define PCI_PM_CAP_ID   0x48    /*  8 bit       Power Management Cap. ID */
+#define PCI_PM_NITEM    0x49    /*  8 bit       Next Item Ptr */
+#define PCI_PM_CAP_REG  0x4a    /* 16 bit       Power Management Capabilities */
+#define PCI_PM_CTL_STS  0x4c    /* 16 bit       Power Manag. Control/Status */
+        /* Byte 0x4e:   reserved */
+#define PCI_PM_DAT_REG  0x4f    /*  8 bit       Power Manag. Data Register */
+        /* VPD Region */
+#define PCI_VPD_CAP_ID  0x50    /*  8 bit       VPD Cap. ID */
+#define PCI_VPD_NITEM   0x51    /*  8 bit       Next Item Ptr */
+#define PCI_VPD_ADR_REG 0x52    /* 16 bit       VPD Address Register */
+#define PCI_VPD_DAT_REG 0x54    /* 32 bit       VPD Data Register */
+        /* Byte 0x58..0x59:     reserved */
+#define PCI_SER_LD_CTRL 0x5a    /* 16 bit       SEEPROM Loader Ctrl (YUKON only) */
+        /* Byte 0x5c..0xff:     reserved */
+
+/*
+ * I2C Address (PCI Config)
+ *
+ * Note: The temperature and voltage sensors are relocated on a different
+ *       I2C bus.
+ */
+#define I2C_ADDR_VPD    0xa0    /* I2C address for the VPD EEPROM */
+
+/*
+ * Define Bits and Values of the registers
+ */
+/*      PCI_COMMAND     16 bit  Command */
+                                                                /* Bit 15..11:  reserved */
+#define PCI_INT_DIS             BIT_10S         /* Interrupt INTx# disable (PCI 2.3) */
+#define PCI_FBTEN               BIT_9S          /* Fast Back-To-Back enable */
+#define PCI_SERREN              BIT_8S          /* SERR enable */
+#define PCI_ADSTEP              BIT_7S          /* Address Stepping */
+#define PCI_PERREN              BIT_6S          /* Parity Report Response enable */
+#define PCI_VGA_SNOOP   BIT_5S          /* VGA palette snoop */
+#define PCI_MWIEN               BIT_4S          /* Memory write an inv cycl ena */
+#define PCI_SCYCEN              BIT_3S          /* Special Cycle enable */
+#define PCI_BMEN                BIT_2S          /* Bus Master enable */
+#define PCI_MEMEN               BIT_1S          /* Memory Space Access enable */
+#define PCI_IOEN                BIT_0S          /* I/O Space Access enable */
+
+#define PCI_COMMAND_VAL (PCI_FBTEN | PCI_SERREN | PCI_PERREN | PCI_MWIEN |\
+                                                 PCI_BMEN | PCI_MEMEN | PCI_IOEN)
+
+/*      PCI_STATUS      16 bit  Status */
+#define PCI_PERR                BIT_15S         /* Parity Error */
+#define PCI_SERR                BIT_14S         /* Signaled SERR */
+#define PCI_RMABORT             BIT_13S         /* Received Master Abort */
+#define PCI_RTABORT             BIT_12S         /* Received Target Abort */
+                                                                /* Bit 11:      reserved */
+#define PCI_DEVSEL              (3<<9)          /* Bit 10.. 9:  DEVSEL Timing */
+#define PCI_DEV_FAST    (0<<9)          /*              fast */
+#define PCI_DEV_MEDIUM  (1<<9)          /*              medium */
+#define PCI_DEV_SLOW    (2<<9)          /*              slow */
+#define PCI_DATAPERR    BIT_8S          /* DATA Parity error detected */
+#define PCI_FB2BCAP             BIT_7S          /* Fast Back-to-Back Capability */
+#define PCI_UDF                 BIT_6S          /* User Defined Features */
+#define PCI_66MHZCAP    BIT_5S          /* 66 MHz PCI bus clock capable */
+#define PCI_NEWCAP              BIT_4S          /* New cap. list implemented */
+#define PCI_INT_STAT    BIT_3S          /* Interrupt INTx# Status (PCI 2.3) */
+                                                                /* Bit  2.. 0:  reserved */
+
+#define PCI_ERRBITS     (PCI_PERR | PCI_SERR | PCI_RMABORT | PCI_RTABORT |\
+                        PCI_DATAPERR)
+
+/*      PCI_CLASS_CODE  24 bit  Class Code */
+/*      Byte 2:         Base Class              (02) */
+/*      Byte 1:         SubClass                (00) */
+/*      Byte 0:         Programming Interface   (00) */
+
+/*      PCI_CACHE_LSZ   8 bit   Cache Line Size */
+/*      Possible values: 0,2,4,8,16,32,64,128   */
+
+/*      PCI_HEADER_T    8 bit   Header Type */
+#define PCI_HD_MF_DEV   BIT_7S  /* 0= single, 1= multi-func dev */
+#define PCI_HD_TYPE             0x7f    /* Bit 6..0:    Header Layout 0= normal */
+
+/*      PCI_BIST        8 bit   Built-in selftest */
+/*      Built-in Self test not supported (optional) */
+
+/*      PCI_BASE_1ST    32 bit  1st Base address */
+#define PCI_MEMSIZE             0x4000L         /* use 16 kB Memory Base */
+#define PCI_MEMBASE_MSK 0xffffc000L     /* Bit 31..14:  Memory Base Address */
+#define PCI_MEMSIZE_MSK 0x00003ff0L     /* Bit 13.. 4:  Memory Size Req. */
+#define PCI_PREFEN              BIT_3           /* Prefetchable */
+#define PCI_MEM_TYP             (3L<<2)         /* Bit  2.. 1:  Memory Type */
+#define PCI_MEM32BIT    (0L<<1)         /* Base addr anywhere in 32 Bit range */
+#define PCI_MEM1M               (1L<<1)         /* Base addr below 1 MegaByte */
+#define PCI_MEM64BIT    (2L<<1)         /* Base addr anywhere in 64 Bit range */
+#define PCI_MEMSPACE    BIT_0           /* Memory Space Indicator */
+
+/*      PCI_BASE_2ND    32 bit  2nd Base address */
+#define PCI_IOBASE              0xffffff00L     /* Bit 31.. 8:  I/O Base address */
+#define PCI_IOSIZE              0x000000fcL     /* Bit  7.. 2:  I/O Size Requirements */
+                                                                        /* Bit  1:      reserved */
+#define PCI_IOSPACE             BIT_0           /* I/O Space Indicator */
+
+/*      PCI_BASE_ROM    32 bit  Expansion ROM Base Address */
+#define PCI_ROMBASE_MSK 0xfffe0000L     /* Bit 31..17:  ROM Base address */
+#define PCI_ROMBASE_SIZ (0x1cL<<14)     /* Bit 16..14:  Treat as Base or Size */
+#define PCI_ROMSIZE             (0x38L<<11)     /* Bit 13..11:  ROM Size Requirements */
+                                                                        /* Bit 10.. 1:  reserved */
+#define PCI_ROMEN               BIT_0           /* Address Decode enable */
+
+/* Device Dependent Region */
+/*      PCI_OUR_REG_1           32 bit  Our Register 1 */
+                                                                        /* Bit 31..29:  reserved */
+#define PCI_PHY_COMA    BIT_28          /* Set PHY to Coma Mode (YUKON only) */
+#define PCI_TEST_CAL    BIT_27          /* Test PCI buffer calib. (YUKON only) */
+#define PCI_EN_CAL              BIT_26          /* Enable PCI buffer calib. (YUKON only) */
+#define PCI_VIO                 BIT_25          /* PCI I/O Voltage, 0 = 3.3V, 1 = 5V */
+#define PCI_DIS_BOOT    BIT_24          /* Disable BOOT via ROM */
+#define PCI_EN_IO               BIT_23          /* Mapping to I/O space */
+#define PCI_EN_FPROM    BIT_22          /* Enable FLASH mapping to memory */
+                                                                        /*              1 = Map Flash to memory */
+                                                                        /*              0 = Disable addr. dec */
+#define PCI_PAGESIZE    (3L<<20)        /* Bit 21..20:  FLASH Page Size */
+#define PCI_PAGE_16             (0L<<20)        /*              16 k pages      */
+#define PCI_PAGE_32K    (1L<<20)        /*              32 k pages      */
+#define PCI_PAGE_64K    (2L<<20)        /*              64 k pages      */
+#define PCI_PAGE_128K   (3L<<20)        /*              128 k pages     */
+                                                                        /* Bit 19:      reserved        */
+#define PCI_PAGEREG             (7L<<16)        /* Bit 18..16:  Page Register   */
+#define PCI_NOTAR               BIT_15          /* No turnaround cycle */
+#define PCI_FORCE_BE    BIT_14          /* Assert all BEs on MR */
+#define PCI_DIS_MRL             BIT_13          /* Disable Mem Read Line */
+#define PCI_DIS_MRM             BIT_12          /* Disable Mem Read Multiple */
+#define PCI_DIS_MWI             BIT_11          /* Disable Mem Write & Invalidate */
+#define PCI_DISC_CLS    BIT_10          /* Disc: cacheLsz bound */
+#define PCI_BURST_DIS   BIT_9           /* Burst Disable */
+#define PCI_DIS_PCI_CLK BIT_8           /* Disable PCI clock driving */
+#define PCI_SKEW_DAS    (0xfL<<4)       /* Bit  7.. 4:  Skew Ctrl, DAS Ext */
+#define PCI_SKEW_BASE   0xfL            /* Bit  3.. 0:  Skew Ctrl, Base */
+
+
+/*      PCI_OUR_REG_2           32 bit  Our Register 2 */
+#define PCI_VPD_WR_THR  (0xffL<<24)     /* Bit 31..24:  VPD Write Threshold */
+#define PCI_DEV_SEL             (0x7fL<<17)     /* Bit 23..17:  EEPROM Device Select */
+#define PCI_VPD_ROM_SZ  (7L<<14)        /* Bit 16..14:  VPD ROM Size    */
+                                                                        /* Bit 13..12:  reserved        */
+#define PCI_PATCH_DIR   (0xfL<<8)       /* Bit 11.. 8:  Ext Patches dir 3..0 */
+#define PCI_PATCH_DIR_3 BIT_11
+#define PCI_PATCH_DIR_2 BIT_10
+#define PCI_PATCH_DIR_1 BIT_9
+#define PCI_PATCH_DIR_0 BIT_8
+#define PCI_EXT_PATCHS  (0xfL<<4)       /* Bit  7.. 4:  Extended Patches 3..0 */
+#define PCI_EXT_PATCH_3 BIT_7
+#define PCI_EXT_PATCH_2 BIT_6
+#define PCI_EXT_PATCH_1 BIT_5
+#define PCI_EXT_PATCH_0 BIT_4
+#define PCI_EN_DUMMY_RD BIT_3           /* Enable Dummy Read */
+#define PCI_REV_DESC    BIT_2           /* Reverse Desc. Bytes */
+                                                                        /* Bit  1:      reserved */
+#define PCI_USEDATA64   BIT_0           /* Use 64Bit Data bus ext */
+
+
+/* Power Management Region */
+/*      PCI_PM_CAP_REG          16 bit  Power Management Capabilities */
+#define PCI_PME_SUP_MSK (0x1f<<11)      /* Bit 15..11:  PM Event Support Mask */
+#define PCI_PME_D3C_SUP BIT_15S         /* PME from D3cold Support (if Vaux) */
+#define PCI_PME_D3H_SUP BIT_14S         /* PME from D3hot Support */
+#define PCI_PME_D2_SUP  BIT_13S         /* PME from D2 Support */
+#define PCI_PME_D1_SUP  BIT_12S         /* PME from D1 Support */
+#define PCI_PME_D0_SUP  BIT_11S         /* PME from D0 Support */
+#define PCI_PM_D2_SUP   BIT_10S         /* D2 Support in 33 MHz mode */
+#define PCI_PM_D1_SUP   BIT_9S          /* D1 Support */
+                                                                        /* Bit  8.. 6:  reserved */
+#define PCI_PM_DSI              BIT_5S          /* Device Specific Initialization */
+#define PCI_PM_APS              BIT_4S          /* Auxialiary Power Source */
+#define PCI_PME_CLOCK   BIT_3S          /* PM Event Clock */
+#define PCI_PM_VER_MSK          7               /* Bit  2.. 0:  PM PCI Spec. version */
+
+/*      PCI_PM_CTL_STS          16 bit  Power Management Control/Status */
+#define PCI_PME_STATUS  BIT_15S         /* PME Status (YUKON only) */
+#define PCI_PM_DAT_SCL  (3<<13)         /* Bit 14..13:  Data Reg. scaling factor */
+#define PCI_PM_DAT_SEL  (0xf<<9)        /* Bit 12.. 9:  PM data selector field */
+#define PCI_PME_EN              BIT_8S          /* Enable PME# generation (YUKON only) */
+                                                                        /* Bit  7.. 2:  reserved */
+#define PCI_PM_STATE_MSK        3               /* Bit  1.. 0:  Power Management State */
+
+#define PCI_PM_STATE_D0         0               /* D0:  Operational (default) */
+#define PCI_PM_STATE_D1         1               /* D1:  (YUKON only) */
+#define PCI_PM_STATE_D2         2               /* D2:  (YUKON only) */
+#define PCI_PM_STATE_D3         3               /* D3:  HOT, Power Down and Reset */
+
+/* VPD Region */
+/*      PCI_VPD_ADR_REG         16 bit  VPD Address Register */
+#define PCI_VPD_FLAG    BIT_15S         /* starts VPD rd/wr cycle */
+#define PCI_VPD_ADR_MSK 0x7fffL         /* Bit 14.. 0:  VPD address mask */
+
+/*      Control Register File (Address Map) */
+
+/*
+ *      Bank 0
+ */
+#define B0_RAP                  0x0000  /*  8 bit       Register Address Port */
+        /* 0x0001 - 0x0003:     reserved */
+#define B0_CTST                 0x0004  /* 16 bit       Control/Status register */
+#define B0_LED                  0x0006  /*  8 Bit       LED register */
+#define B0_POWER_CTRL   0x0007  /*  8 Bit       Power Control reg (YUKON only) */
+#define B0_ISRC                 0x0008  /* 32 bit       Interrupt Source Register */
+#define B0_IMSK                 0x000c  /* 32 bit       Interrupt Mask Register */
+#define B0_HWE_ISRC             0x0010  /* 32 bit       HW Error Interrupt Src Reg */
+#define B0_HWE_IMSK             0x0014  /* 32 bit       HW Error Interrupt Mask Reg */
+#define B0_SP_ISRC              0x0018  /* 32 bit       Special Interrupt Source Reg */
+        /* 0x001c:              reserved */
+
+/* B0 XMAC 1 registers (GENESIS only) */
+#define B0_XM1_IMSK             0x0020  /* 16 bit r/w   XMAC 1 Interrupt Mask Register*/
+        /* 0x0022 - 0x0027:     reserved */
+#define B0_XM1_ISRC             0x0028  /* 16 bit ro    XMAC 1 Interrupt Status Reg */
+        /* 0x002a - 0x002f:     reserved */
+#define B0_XM1_PHY_ADDR 0x0030  /* 16 bit r/w   XMAC 1 PHY Address Register */
+        /* 0x0032 - 0x0033:     reserved */
+#define B0_XM1_PHY_DATA 0x0034  /* 16 bit r/w   XMAC 1 PHY Data Register */
+        /* 0x0036 - 0x003f:     reserved */
+
+/* B0 XMAC 2 registers (GENESIS only) */
+#define B0_XM2_IMSK             0x0040  /* 16 bit r/w   XMAC 2 Interrupt Mask Register*/
+        /* 0x0042 - 0x0047:     reserved */
+#define B0_XM2_ISRC             0x0048  /* 16 bit ro    XMAC 2 Interrupt Status Reg */
+        /* 0x004a - 0x004f:     reserved */
+#define B0_XM2_PHY_ADDR 0x0050  /* 16 bit r/w   XMAC 2 PHY Address Register */
+        /* 0x0052 - 0x0053:     reserved */
+#define B0_XM2_PHY_DATA 0x0054  /* 16 bit r/w   XMAC 2 PHY Data Register */
+        /* 0x0056 - 0x005f:     reserved */
+
+/* BMU Control Status Registers */
+#define B0_R1_CSR               0x0060  /* 32 bit       BMU Ctrl/Stat Rx Queue 1 */
+#define B0_R2_CSR               0x0064  /* 32 bit       BMU Ctrl/Stat Rx Queue 2 */
+#define B0_XS1_CSR              0x0068  /* 32 bit       BMU Ctrl/Stat Sync Tx Queue 1 */
+#define B0_XA1_CSR              0x006c  /* 32 bit       BMU Ctrl/Stat Async Tx Queue 1*/
+#define B0_XS2_CSR              0x0070  /* 32 bit       BMU Ctrl/Stat Sync Tx Queue 2 */
+#define B0_XA2_CSR              0x0074  /* 32 bit       BMU Ctrl/Stat Async Tx Queue 2*/
+        /* 0x0078 - 0x007f:     reserved */
+
+/*
+ *      Bank 1
+ *      - completely empty (this is the RAP Block window)
+ *      Note: if RAP = 1 this page is reserved
+ */
+
+/*
+ *      Bank 2
+ */
+/* NA reg = 48 bit Network Address Register, 3x16 or 8x8 bit readable */
+#define B2_MAC_1                0x0100  /* NA reg        MAC Address 1 */
+        /* 0x0106 - 0x0107:     reserved */
+#define B2_MAC_2                0x0108  /* NA reg        MAC Address 2 */
+        /* 0x010e - 0x010f:     reserved */
+#define B2_MAC_3                0x0110  /* NA reg        MAC Address 3 */
+        /* 0x0116 - 0x0117:     reserved */
+#define B2_CONN_TYP             0x0118  /*  8 bit       Connector type */
+#define B2_PMD_TYP              0x0119  /*  8 bit       PMD type */
+#define B2_MAC_CFG              0x011a  /*  8 bit       MAC Configuration / Chip Revision */
+#define B2_CHIP_ID              0x011b  /*  8 bit       Chip Identification Number */
+        /* Eprom registers are currently of no use */
+#define B2_E_0                  0x011c  /*  8 bit       EPROM Byte 0 (ext. SRAM size */
+#define B2_E_1                  0x011d  /*  8 bit       EPROM Byte 1 (PHY type) */
+#define B2_E_2                  0x011e  /*  8 bit       EPROM Byte 2 */
+#define B2_E_3                  0x011f  /*  8 bit       EPROM Byte 3 */
+#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_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_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.*/
+#define B2_IRQM_VAL             0x0144  /* 32 bit       IRQ Moderation Timer Value */
+#define B2_IRQM_CTRL    0x0148  /*  8 bit       IRQ Moderation Timer Control */
+#define B2_IRQM_TEST    0x0149  /*  8 bit       IRQ Moderation Timer Test */
+#define B2_IRQM_MSK     0x014c  /* 32 bit       IRQ Moderation Mask */
+#define B2_IRQM_HWE_MSK 0x0150  /* 32 bit       IRQ Moderation HW Error Mask */
+        /* 0x0154 - 0x0157:     reserved */
+#define B2_TST_CTRL1    0x0158  /*  8 bit       Test Control Register 1 */
+#define B2_TST_CTRL2    0x0159  /*  8 bit       Test Control Register 2 */
+        /* 0x015a - 0x015b:     reserved */
+#define B2_GP_IO                0x015c  /* 32 bit       General Purpose I/O Register */
+#define B2_I2C_CTRL             0x0160  /* 32 bit       I2C HW Control Register */
+#define B2_I2C_DATA             0x0164  /* 32 bit       I2C HW Data Register */
+#define B2_I2C_IRQ              0x0168  /* 32 bit       I2C HW IRQ Register */
+#define B2_I2C_SW               0x016c  /* 32 bit       I2C SW Port Register */
+
+/* Blink Source Counter (GENESIS only) */
+#define B2_BSC_INI              0x0170  /* 32 bit       Blink Source Counter Init Val */
+#define B2_BSC_VAL              0x0174  /* 32 bit       Blink Source Counter Value */
+#define B2_BSC_CTRL             0x0178  /*  8 bit       Blink Source Counter Control */
+#define B2_BSC_STAT             0x0179  /*  8 bit       Blink Source Counter Status */
+#define B2_BSC_TST              0x017a  /* 16 bit       Blink Source Counter Test Reg */
+        /* 0x017c - 0x017f:     reserved */
+
+/*
+ *      Bank 3
+ */
+/* RAM Random Registers */
+#define B3_RAM_ADDR             0x0180  /* 32 bit       RAM Address, to read or write */
+#define B3_RAM_DATA_LO  0x0184  /* 32 bit       RAM Data Word (low dWord) */
+#define B3_RAM_DATA_HI  0x0188  /* 32 bit       RAM Data Word (high dWord) */
+        /* 0x018c - 0x018f:     reserved */
+
+/* RAM Interface Registers */
+/*
+ * The HW-Spec. calls this registers Timeout Value 0..11. But this names are
+ * not usable in SW. Please notice these are NOT real timeouts, these are
+ * the number of qWords transferred continuously.
+ */
+#define B3_RI_WTO_R1    0x0190  /*  8 bit       WR Timeout Queue R1             (TO0) */
+#define B3_RI_WTO_XA1   0x0191  /*  8 bit       WR Timeout Queue XA1    (TO1) */
+#define B3_RI_WTO_XS1   0x0192  /*  8 bit       WR Timeout Queue XS1    (TO2) */
+#define B3_RI_RTO_R1    0x0193  /*  8 bit       RD Timeout Queue R1             (TO3) */
+#define B3_RI_RTO_XA1   0x0194  /*  8 bit       RD Timeout Queue XA1    (TO4) */
+#define B3_RI_RTO_XS1   0x0195  /*  8 bit       RD Timeout Queue XS1    (TO5) */
+#define B3_RI_WTO_R2    0x0196  /*  8 bit       WR Timeout Queue R2             (TO6) */
+#define B3_RI_WTO_XA2   0x0197  /*  8 bit       WR Timeout Queue XA2    (TO7) */
+#define B3_RI_WTO_XS2   0x0198  /*  8 bit       WR Timeout Queue XS2    (TO8) */
+#define B3_RI_RTO_R2    0x0199  /*  8 bit       RD Timeout Queue R2             (TO9) */
+#define B3_RI_RTO_XA2   0x019a  /*  8 bit       RD Timeout Queue XA2    (TO10)*/
+#define B3_RI_RTO_XS2   0x019b  /*  8 bit       RD Timeout Queue XS2    (TO11)*/
+#define B3_RI_TO_VAL    0x019c  /*  8 bit       Current Timeout Count Val */
+        /* 0x019d - 0x019f:     reserved */
+#define B3_RI_CTRL              0x01a0  /* 16 bit       RAM Interface Control Register */
+#define B3_RI_TEST              0x01a2  /*  8 bit       RAM Interface Test Register */
+        /* 0x01a3 - 0x01af:     reserved */
+
+/* MAC Arbiter Registers (GENESIS only) */
+/* these are the no. of qWord transferred continuously and NOT real timeouts */
+#define B3_MA_TOINI_RX1 0x01b0  /*  8 bit       Timeout Init Val Rx Path MAC 1 */
+#define B3_MA_TOINI_RX2 0x01b1  /*  8 bit       Timeout Init Val Rx Path MAC 2 */
+#define B3_MA_TOINI_TX1 0x01b2  /*  8 bit       Timeout Init Val Tx Path MAC 1 */
+#define B3_MA_TOINI_TX2 0x01b3  /*  8 bit       Timeout Init Val Tx Path MAC 2 */
+#define B3_MA_TOVAL_RX1 0x01b4  /*  8 bit       Timeout Value Rx Path MAC 1 */
+#define B3_MA_TOVAL_RX2 0x01b5  /*  8 bit       Timeout Value Rx Path MAC 1 */
+#define B3_MA_TOVAL_TX1 0x01b6  /*  8 bit       Timeout Value Tx Path MAC 2 */
+#define B3_MA_TOVAL_TX2 0x01b7  /*  8 bit       Timeout Value Tx Path MAC 2 */
+#define B3_MA_TO_CTRL   0x01b8  /* 16 bit       MAC Arbiter Timeout Ctrl Reg */
+#define B3_MA_TO_TEST   0x01ba  /* 16 bit       MAC Arbiter Timeout Test Reg */
+        /* 0x01bc - 0x01bf:     reserved */
+#define B3_MA_RCINI_RX1 0x01c0  /*  8 bit       Recovery Init Val Rx Path MAC 1 */
+#define B3_MA_RCINI_RX2 0x01c1  /*  8 bit       Recovery Init Val Rx Path MAC 2 */
+#define B3_MA_RCINI_TX1 0x01c2  /*  8 bit       Recovery Init Val Tx Path MAC 1 */
+#define B3_MA_RCINI_TX2 0x01c3  /*  8 bit       Recovery Init Val Tx Path MAC 2 */
+#define B3_MA_RCVAL_RX1 0x01c4  /*  8 bit       Recovery Value Rx Path MAC 1 */
+#define B3_MA_RCVAL_RX2 0x01c5  /*  8 bit       Recovery Value Rx Path MAC 1 */
+#define B3_MA_RCVAL_TX1 0x01c6  /*  8 bit       Recovery Value Tx Path MAC 2 */
+#define B3_MA_RCVAL_TX2 0x01c7  /*  8 bit       Recovery Value Tx Path MAC 2 */
+#define B3_MA_RC_CTRL   0x01c8  /* 16 bit       MAC Arbiter Recovery Ctrl Reg */
+#define B3_MA_RC_TEST   0x01ca  /* 16 bit       MAC Arbiter Recovery Test Reg */
+        /* 0x01cc - 0x01cf:     reserved */
+
+/* Packet Arbiter Registers (GENESIS only) */
+/* these are real timeouts */
+#define B3_PA_TOINI_RX1 0x01d0  /* 16 bit       Timeout Init Val Rx Path MAC 1 */
+        /* 0x01d2 - 0x01d3:     reserved */
+#define B3_PA_TOINI_RX2 0x01d4  /* 16 bit       Timeout Init Val Rx Path MAC 2 */
+        /* 0x01d6 - 0x01d7:     reserved */
+#define B3_PA_TOINI_TX1 0x01d8  /* 16 bit       Timeout Init Val Tx Path MAC 1 */
+        /* 0x01da - 0x01db:     reserved */
+#define B3_PA_TOINI_TX2 0x01dc  /* 16 bit       Timeout Init Val Tx Path MAC 2 */
+        /* 0x01de - 0x01df:     reserved */
+#define B3_PA_TOVAL_RX1 0x01e0  /* 16 bit       Timeout Val Rx Path MAC 1 */
+        /* 0x01e2 - 0x01e3:     reserved */
+#define B3_PA_TOVAL_RX2 0x01e4  /* 16 bit       Timeout Val Rx Path MAC 2 */
+        /* 0x01e6 - 0x01e7:     reserved */
+#define B3_PA_TOVAL_TX1 0x01e8  /* 16 bit       Timeout Val Tx Path MAC 1 */
+        /* 0x01ea - 0x01eb:     reserved */
+#define B3_PA_TOVAL_TX2 0x01ec  /* 16 bit       Timeout Val Tx Path MAC 2 */
+        /* 0x01ee - 0x01ef:     reserved */
+#define B3_PA_CTRL      0x01f0  /* 16 bit       Packet Arbiter Ctrl Register */
+#define B3_PA_TEST      0x01f2  /* 16 bit       Packet Arbiter Test Register */
+        /* 0x01f4 - 0x01ff:     reserved */
+
+/*
+ *      Bank 4 - 5
+ */
+/* Transmit Arbiter Registers MAC 1 and 2, use MR_ADDR() to access */
+#define TXA_ITI_INI             0x0200  /* 32 bit       Tx Arb Interval Timer Init Val*/
+#define TXA_ITI_VAL             0x0204  /* 32 bit       Tx Arb Interval Timer Value */
+#define TXA_LIM_INI             0x0208  /* 32 bit       Tx Arb Limit Counter Init Val */
+#define TXA_LIM_VAL             0x020c  /* 32 bit       Tx Arb Limit Counter Value */
+#define TXA_CTRL                0x0210  /*  8 bit       Tx Arbiter Control Register */
+#define TXA_TEST                0x0211  /*  8 bit       Tx Arbiter Test Register */
+#define TXA_STAT                0x0212  /*  8 bit       Tx Arbiter Status Register */
+        /* 0x0213 - 0x027f:     reserved */
+        /* 0x0280 - 0x0292:     MAC 2 */
+        /* 0x0213 - 0x027f:     reserved */
+
+/*
+ *      Bank 6
+ */
+/* External registers (GENESIS only) */
+#define B6_EXT_REG              0x0300
+
+/*
+ *      Bank 7
+ */
+/* This is a copy of the Configuration register file (lower half) */
+#define B7_CFG_SPC              0x0380
+
+/*
+ *      Bank 8 - 15
+ */
+/* Receive and Transmit Queue Registers, use Q_ADDR() to access */
+#define B8_Q_REGS               0x0400
+
+/* Queue Register Offsets, use Q_ADDR() to access */
+#define Q_D             0x00    /* 8*32 bit     Current Descriptor */
+#define Q_DA_L  0x20    /* 32 bit       Current Descriptor Address Low dWord */
+#define Q_DA_H  0x24    /* 32 bit       Current Descriptor Address High dWord */
+#define Q_AC_L  0x28    /* 32 bit       Current Address Counter Low dWord */
+#define Q_AC_H  0x2c    /* 32 bit       Current Address Counter High dWord */
+#define Q_BC    0x30    /* 32 bit       Current Byte Counter */
+#define Q_CSR   0x34    /* 32 bit       BMU Control/Status Register */
+#define Q_F             0x38    /* 32 bit       Flag Register */
+#define Q_T1    0x3c    /* 32 bit       Test Register 1 */
+#define Q_T1_TR 0x3c    /*  8 bit       Test Register 1 Transfer SM */
+#define Q_T1_WR 0x3d    /*  8 bit       Test Register 1 Write Descriptor SM */
+#define Q_T1_RD 0x3e    /*  8 bit       Test Register 1 Read Descriptor SM */
+#define Q_T1_SV 0x3f    /*  8 bit       Test Register 1 Supervisor SM */
+#define Q_T2    0x40    /* 32 bit       Test Register 2 */
+#define Q_T3    0x44    /* 32 bit       Test Register 3 */
+        /* 0x48 - 0x7f: reserved */
+
+/*
+ *      Bank 16 - 23
+ */
+/* RAM Buffer Registers */
+#define B16_RAM_REGS    0x0800
+
+/* RAM Buffer Register Offsets, use RB_ADDR() to access */
+#define RB_START                0x00    /* 32 bit       RAM Buffer Start Address */
+#define RB_END                  0x04    /* 32 bit       RAM Buffer End Address */
+#define RB_WP                   0x08    /* 32 bit       RAM Buffer Write Pointer */
+#define RB_RP                   0x0c    /* 32 bit       RAM Buffer Read Pointer */
+#define RB_RX_UTPP              0x10    /* 32 bit       Rx Upper Threshold, Pause Pack */
+#define RB_RX_LTPP              0x14    /* 32 bit       Rx Lower Threshold, Pause Pack */
+#define RB_RX_UTHP              0x18    /* 32 bit       Rx Upper Threshold, High Prio */
+#define RB_RX_LTHP              0x1c    /* 32 bit       Rx Lower Threshold, High Prio */
+        /* 0x10 - 0x1f: reserved at Tx RAM Buffer Registers */
+#define RB_PC                   0x20    /* 32 bit       RAM Buffer Packet Counter */
+#define RB_LEV                  0x24    /* 32 bit       RAM Buffer Level Register */
+#define RB_CTRL                 0x28    /*  8 bit       RAM Buffer Control Register */
+#define RB_TST1                 0x29    /*  8 bit       RAM Buffer Test Register 1 */
+#define RB_TST2                 0x2A    /*  8 bit       RAM Buffer Test Register 2 */
+        /* 0x2c - 0x7f: reserved */
+
+/*
+ *      Bank 24
+ */
+/*
+ * Receive MAC FIFO, Receive LED, and Link_Sync regs (GENESIS only)
+ * use MR_ADDR() to access
+ */
+#define RX_MFF_EA               0x0c00  /* 32 bit       Receive MAC FIFO End Address */
+#define RX_MFF_WP               0x0c04  /* 32 bit       Receive MAC FIFO Write Pointer */
+        /* 0x0c08 - 0x0c0b:     reserved */
+#define RX_MFF_RP               0x0c0c  /* 32 bit       Receive MAC FIFO Read Pointer */
+#define RX_MFF_PC               0x0c10  /* 32 bit       Receive MAC FIFO Packet Cnt */
+#define RX_MFF_LEV              0x0c14  /* 32 bit       Receive MAC FIFO Level */
+#define RX_MFF_CTRL1    0x0c18  /* 16 bit       Receive MAC FIFO Control Reg 1*/
+#define RX_MFF_STAT_TO  0x0c1a  /*  8 bit       Receive MAC Status Timeout */
+#define RX_MFF_TIST_TO  0x0c1b  /*  8 bit       Receive MAC Time Stamp Timeout */
+#define RX_MFF_CTRL2    0x0c1c  /*  8 bit       Receive MAC FIFO Control Reg 2*/
+#define RX_MFF_TST1             0x0c1d  /*  8 bit       Receive MAC FIFO Test Reg 1 */
+#define RX_MFF_TST2             0x0c1e  /*  8 bit       Receive MAC FIFO Test Reg 2 */
+        /* 0x0c1f:      reserved */
+#define RX_LED_INI              0x0c20  /* 32 bit       Receive LED Cnt Init Value */
+#define RX_LED_VAL              0x0c24  /* 32 bit       Receive LED Cnt Current Value */
+#define RX_LED_CTRL             0x0c28  /*  8 bit       Receive LED Cnt Control Reg */
+#define RX_LED_TST              0x0c29  /*  8 bit       Receive LED Cnt Test Register */
+        /* 0x0c2a - 0x0c2f:     reserved */
+#define LNK_SYNC_INI    0x0c30  /* 32 bit       Link Sync Cnt Init Value */
+#define LNK_SYNC_VAL    0x0c34  /* 32 bit       Link Sync Cnt Current Value */
+#define LNK_SYNC_CTRL   0x0c38  /*  8 bit       Link Sync Cnt Control Register */
+#define LNK_SYNC_TST    0x0c39  /*  8 bit       Link Sync Cnt Test Register */
+        /* 0x0c3a - 0x0c3b:     reserved */
+#define LNK_LED_REG             0x0c3c  /*  8 bit       Link LED Register */
+        /* 0x0c3d - 0x0c3f:     reserved */
+
+/* Receive GMAC FIFO (YUKON only), use MR_ADDR() to access */
+#define RX_GMF_EA               0x0c40  /* 32 bit       Rx GMAC FIFO End Address */
+#define RX_GMF_AF_THR   0x0c44  /* 32 bit       Rx GMAC FIFO Almost Full Thresh. */
+#define RX_GMF_CTRL_T   0x0c48  /* 32 bit       Rx GMAC FIFO Control/Test */
+#define RX_GMF_FL_MSK   0x0c4c  /* 32 bit       Rx GMAC FIFO Flush Mask */
+#define RX_GMF_FL_THR   0x0c50  /* 32 bit       Rx GMAC FIFO Flush Threshold */
+        /* 0x0c54 - 0x0c5f:     reserved */
+#define RX_GMF_WP               0x0c60  /* 32 bit       Rx GMAC FIFO Write Pointer */
+        /* 0x0c64 - 0x0c67:     reserved */
+#define RX_GMF_WLEV             0x0c68  /* 32 bit       Rx GMAC FIFO Write Level */
+        /* 0x0c6c - 0x0c6f:     reserved */
+#define RX_GMF_RP               0x0c70  /* 32 bit       Rx GMAC FIFO Read Pointer */
+        /* 0x0c74 - 0x0c77:     reserved */
+#define RX_GMF_RLEV             0x0c78  /* 32 bit       Rx GMAC FIFO Read Level */
+        /* 0x0c7c - 0x0c7f:     reserved */
+
+/*
+ *      Bank 25
+ */
+        /* 0x0c80 - 0x0cbf:     MAC 2 */
+        /* 0x0cc0 - 0x0cff:     reserved */
+
+/*
+ *      Bank 26
+ */
+/*
+ * Transmit MAC FIFO and Transmit LED Registers (GENESIS only),
+ * use MR_ADDR() to access
+ */
+#define TX_MFF_EA               0x0d00  /* 32 bit       Transmit MAC FIFO End Address */
+#define TX_MFF_WP               0x0d04  /* 32 bit       Transmit MAC FIFO WR Pointer */
+#define TX_MFF_WSP              0x0d08  /* 32 bit       Transmit MAC FIFO WR Shadow Ptr */
+#define TX_MFF_RP               0x0d0c  /* 32 bit       Transmit MAC FIFO RD Pointer */
+#define TX_MFF_PC               0x0d10  /* 32 bit       Transmit MAC FIFO Packet Cnt */
+#define TX_MFF_LEV              0x0d14  /* 32 bit       Transmit MAC FIFO Level */
+#define TX_MFF_CTRL1    0x0d18  /* 16 bit       Transmit MAC FIFO Ctrl Reg 1 */
+#define TX_MFF_WAF              0x0d1a  /*  8 bit       Transmit MAC Wait after flush */
+        /* 0x0c1b:      reserved */
+#define TX_MFF_CTRL2    0x0d1c  /*  8 bit       Transmit MAC FIFO Ctrl Reg 2 */
+#define TX_MFF_TST1             0x0d1d  /*  8 bit       Transmit MAC FIFO Test Reg 1 */
+#define TX_MFF_TST2             0x0d1e  /*  8 bit       Transmit MAC FIFO Test Reg 2 */
+        /* 0x0d1f:      reserved */
+#define TX_LED_INI              0x0d20  /* 32 bit       Transmit LED Cnt Init Value */
+#define TX_LED_VAL              0x0d24  /* 32 bit       Transmit LED Cnt Current Val */
+#define TX_LED_CTRL             0x0d28  /*  8 bit       Transmit LED Cnt Control Reg */
+#define TX_LED_TST              0x0d29  /*  8 bit       Transmit LED Cnt Test Reg */
+        /* 0x0d2a - 0x0d3f:     reserved */
+
+/* Transmit GMAC FIFO (YUKON only), use MR_ADDR() to access */
+#define TX_GMF_EA               0x0d40  /* 32 bit       Tx GMAC FIFO End Address */
+#define TX_GMF_AE_THR   0x0d44  /* 32 bit       Tx GMAC FIFO Almost Empty Thresh.*/
+#define TX_GMF_CTRL_T   0x0d48  /* 32 bit       Tx GMAC FIFO Control/Test */
+        /* 0x0d4c - 0x0d5f:     reserved */
+#define TX_GMF_WP               0x0d60  /* 32 bit       Tx GMAC FIFO Write Pointer */
+#define TX_GMF_WSP              0x0d64  /* 32 bit       Tx GMAC FIFO Write Shadow Ptr. */
+#define TX_GMF_WLEV             0x0d68  /* 32 bit       Tx GMAC FIFO Write Level */
+        /* 0x0d6c - 0x0d6f:     reserved */
+#define TX_GMF_RP               0x0d70  /* 32 bit       Tx GMAC FIFO Read Pointer */
+#define TX_GMF_RSTP             0x0d74  /* 32 bit       Tx GMAC FIFO Restart Pointer */
+#define TX_GMF_RLEV             0x0d78  /* 32 bit       Tx GMAC FIFO Read Level */
+        /* 0x0d7c - 0x0d7f:     reserved */
+
+/*
+ *      Bank 27
+ */
+        /* 0x0d80 - 0x0dbf:     MAC 2 */
+        /* 0x0daa - 0x0dff:     reserved */
+
+/*
+ *      Bank 28
+ */
+/* Descriptor Poll Timer Registers */
+#define B28_DPT_INI             0x0e00  /* 24 bit       Descriptor Poll Timer Init Val */
+#define B28_DPT_VAL             0x0e04  /* 24 bit       Descriptor Poll Timer Curr Val */
+#define B28_DPT_CTRL    0x0e08  /*  8 bit       Descriptor Poll Timer Ctrl Reg */
+        /* 0x0e09:      reserved */
+#define B28_DPT_TST             0x0e0a  /*  8 bit       Descriptor Poll Timer Test Reg */
+        /* 0x0e0b:      reserved */
+
+/* Time Stamp Timer Registers (YUKON only) */
+        /* 0x0e10:      reserved */
+#define GMAC_TI_ST_VAL  0x0e14  /* 32 bit       Time Stamp Timer Curr Val */
+#define GMAC_TI_ST_CTRL 0x0e18  /*  8 bit       Time Stamp Timer Ctrl Reg */
+        /* 0x0e19:      reserved */
+#define GMAC_TI_ST_TST  0x0e1a  /*  8 bit       Time Stamp Timer Test Reg */
+        /* 0x0e1b - 0x0e7f:     reserved */
+
+/*
+ *      Bank 29
+ */
+        /* 0x0e80 - 0x0efc:     reserved */
+
+/*
+ *      Bank 30
+ */
+/* GMAC and GPHY Control Registers (YUKON only) */
+#define GMAC_CTRL               0x0f00  /* 32 bit       GMAC Control Reg */
+#define GPHY_CTRL               0x0f04  /* 32 bit       GPHY Control Reg */
+#define GMAC_IRQ_SRC    0x0f08  /*  8 bit       GMAC Interrupt Source Reg */
+        /* 0x0f09 - 0x0f0b:     reserved */
+#define GMAC_IRQ_MSK    0x0f0c  /*  8 bit       GMAC Interrupt Mask Reg */
+        /* 0x0f0d - 0x0f0f:     reserved */
+#define GMAC_LINK_CTRL  0x0f10  /* 16 bit       Link Control Reg */
+        /* 0x0f14 - 0x0f1f:     reserved */
+
+/* Wake-up Frame Pattern Match Control Registers (YUKON only) */
+
+#define WOL_REG_OFFS    0x20    /* HW-Bug: Address is + 0x20 against spec. */
+
+#define WOL_CTRL_STAT   0x0f20  /* 16 bit       WOL Control/Status Reg */
+#define WOL_MATCH_CTL   0x0f22  /*  8 bit       WOL Match Control Reg */
+#define WOL_MATCH_RES   0x0f23  /*  8 bit       WOL Match Result Reg */
+#define WOL_MAC_ADDR_LO 0x0f24  /* 32 bit       WOL MAC Address Low */
+#define WOL_MAC_ADDR_HI 0x0f28  /* 16 bit       WOL MAC Address High */
+#define WOL_PATT_RPTR   0x0f2c  /*  8 bit       WOL Pattern Read Ptr */
+
+/* use this macro to access above registers */
+#define WOL_REG(Reg)    ((Reg) + (pAC->GIni.GIWolOffs))
+
+
+/* WOL Pattern Length Registers (YUKON only) */
+
+#define WOL_PATT_LEN_LO 0x0f30          /* 32 bit       WOL Pattern Length 3..0 */
+#define WOL_PATT_LEN_HI 0x0f34          /* 24 bit       WOL Pattern Length 6..4 */
+
+/* WOL Pattern Counter Registers (YUKON only) */
+
+#define WOL_PATT_CNT_0  0x0f38          /* 32 bit       WOL Pattern Counter 3..0 */
+#define WOL_PATT_CNT_4  0x0f3c          /* 24 bit       WOL Pattern Counter 6..4 */
+        /* 0x0f40 - 0x0f7f:     reserved */
+
+/*
+ *      Bank 31
+ */
+/* 0x0f80 - 0x0fff:     reserved */
+
+/*
+ *      Bank 32 - 33
+ */
+#define WOL_PATT_RAM_1  0x1000  /*  WOL Pattern RAM Link 1 */
+
+/*
+ *      Bank 0x22 - 0x3f
+ */
+/* 0x1100 - 0x1fff:     reserved */
+
+/*
+ *      Bank 0x40 - 0x4f
+ */
+#define BASE_XMAC_1             0x2000  /* XMAC 1 registers */
+
+/*
+ *      Bank 0x50 - 0x5f
+ */
+
+#define BASE_GMAC_1             0x2800  /* GMAC 1 registers */
+
+/*
+ *      Bank 0x60 - 0x6f
+ */
+#define BASE_XMAC_2             0x3000  /* XMAC 2 registers */
+
+/*
+ *      Bank 0x70 - 0x7f
+ */
+#define BASE_GMAC_2             0x3800  /* GMAC 2 registers */
+
+/*
+ *      Control Register Bit Definitions:
+ */
+/*      B0_RAP          8 bit   Register Address Port */
+                                                                /* Bit 7:       reserved */
+#define RAP_RAP                 0x3f    /* Bit 6..0:    0 = block 0,..,6f = block 6f */
+
+/*      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) */
+#define CS_CLK_RUN_ENA  BIT_11S         /* CLK_RUN enable (YUKON-Lite only) */
+#define CS_VAUX_AVAIL   BIT_10S         /* VAUX available (YUKON only) */
+#define CS_BUS_CLOCK    BIT_9S          /* Bus Clock 0/1 = 33/66 MHz */
+#define CS_BUS_SLOT_SZ  BIT_8S          /* Slot Size 0/1 = 32/64 bit slot */
+#define CS_ST_SW_IRQ    BIT_7S          /* Set IRQ SW Request */
+#define CS_CL_SW_IRQ    BIT_6S          /* Clear IRQ SW Request */
+#define CS_STOP_DONE    BIT_5S          /* Stop Master is finished */
+#define CS_STOP_MAST    BIT_4S          /* Command Bit to stop the master */
+#define CS_MRST_CLR             BIT_3S          /* Clear Master reset   */
+#define CS_MRST_SET             BIT_2S          /* Set Master reset     */
+#define CS_RST_CLR              BIT_1S          /* Clear Software reset */
+#define CS_RST_SET              BIT_0S          /* Set   Software reset */
+
+/*      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       */
+
+/*      B0_POWER_CTRL    8 Bit  Power Control reg (YUKON only) */
+#define PC_VAUX_ENA             BIT_7           /* Switch VAUX Enable  */
+#define PC_VAUX_DIS             BIT_6       /* Switch VAUX Disable */
+#define PC_VCC_ENA              BIT_5       /* Switch VCC Enable  */
+#define PC_VCC_DIS              BIT_4       /* Switch VCC Disable */
+#define PC_VAUX_ON              BIT_3       /* Switch VAUX On  */
+#define PC_VAUX_OFF             BIT_2       /* Switch VAUX Off */
+#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 */
+/*      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 */
+                                                                /* Bit 30:      reserved */
+#define IS_PA_TO_RX1    BIT_29          /* Packet Arb Timeout Rx1 */
+#define IS_PA_TO_RX2    BIT_28          /* Packet Arb Timeout Rx2 */
+#define IS_PA_TO_TX1    BIT_27          /* Packet Arb Timeout Tx1 */
+#define IS_PA_TO_TX2    BIT_26          /* Packet Arb Timeout Tx2 */
+#define IS_I2C_READY    BIT_25          /* IRQ on end of I2C Tx */
+#define IS_IRQ_SW               BIT_24          /* SW forced IRQ        */
+#define IS_EXT_REG              BIT_23          /* IRQ from LM80 or PHY (GENESIS only) */
+                                                                        /* IRQ from PHY (YUKON only) */
+#define IS_TIMINT               BIT_22          /* IRQ from Timer       */
+#define IS_MAC1                 BIT_21          /* IRQ from MAC 1       */
+#define IS_LNK_SYNC_M1  BIT_20          /* Link Sync Cnt wrap MAC 1 */
+#define IS_MAC2                 BIT_19          /* IRQ from MAC 2       */
+#define IS_LNK_SYNC_M2  BIT_18          /* Link Sync Cnt wrap MAC 2 */
+/* Receive Queue 1 */
+#define IS_R1_B                 BIT_17          /* Q_R1 End of Buffer */
+#define IS_R1_F                 BIT_16          /* Q_R1 End of Frame */
+#define IS_R1_C                 BIT_15          /* Q_R1 Encoding Error */
+/* Receive Queue 2 */
+#define IS_R2_B                 BIT_14          /* Q_R2 End of Buffer */
+#define IS_R2_F                 BIT_13          /* Q_R2 End of Frame */
+#define IS_R2_C                 BIT_12          /* Q_R2 Encoding Error */
+/* Synchronous Transmit Queue 1 */
+#define IS_XS1_B                BIT_11          /* Q_XS1 End of Buffer */
+#define IS_XS1_F                BIT_10          /* Q_XS1 End of Frame */
+#define IS_XS1_C                BIT_9           /* Q_XS1 Encoding Error */
+/* Asynchronous Transmit Queue 1 */
+#define IS_XA1_B                BIT_8           /* Q_XA1 End of Buffer */
+#define IS_XA1_F                BIT_7           /* Q_XA1 End of Frame */
+#define IS_XA1_C                BIT_6           /* Q_XA1 Encoding Error */
+/* Synchronous Transmit Queue 2 */
+#define IS_XS2_B                BIT_5           /* Q_XS2 End of Buffer */
+#define IS_XS2_F                BIT_4           /* Q_XS2 End of Frame */
+#define IS_XS2_C                BIT_3           /* Q_XS2 Encoding Error */
+/* Asynchronous Transmit Queue 2 */
+#define IS_XA2_B                BIT_2           /* Q_XA2 End of Buffer */
+#define IS_XA2_F                BIT_1           /* Q_XA2 End of Frame */
+#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 */
+#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) */
+#define IS_IRQ_SENSOR   BIT_12  /* IRQ from Sensor (YUKON only) */
+#define IS_IRQ_MST_ERR  BIT_11  /* IRQ master error detected */
+#define IS_IRQ_STAT             BIT_10  /* IRQ status exception */
+#define IS_NO_STAT_M1   BIT_9   /* No Rx Status from MAC 1 */
+#define IS_NO_STAT_M2   BIT_8   /* No Rx Status from MAC 2 */
+#define IS_NO_TIST_M1   BIT_7   /* No Time Stamp from MAC 1 */
+#define IS_NO_TIST_M2   BIT_6   /* No Time Stamp from MAC 2 */
+#define IS_RAM_RD_PAR   BIT_5   /* RAM Read  Parity Error */
+#define IS_RAM_WR_PAR   BIT_4   /* RAM Write Parity Error */
+#define IS_M1_PAR_ERR   BIT_3   /* MAC 1 Parity Error */
+#define IS_M2_PAR_ERR   BIT_2   /* MAC 2 Parity Error */
+#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 */
+/*      Values of connector and PMD type comply to SysKonnect internal std */
+
+/*      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 */
+#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-A3) */
+#define CHIP_ID_YUKON_LP        0xb2    /* Chip ID for YUKON-LP */
+
+#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_CTRL               8 bit  EPROM loader control register */
+/*      Bits are currently reserved */
+
+/*      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 */
+#define LD_T_STEP               BIT_1S  /* Decrement FPROM addr. Counter */
+#define LD_START                BIT_0S  /* Start loading FPROM */
+
+/*
+ *      Timer Section
+ */
+/*      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_IRQM_TEST     8 bit  IRQ Moderation Timer Test */
+/*      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 */
+#define TIM_T_STEP              BIT_0S  /* Test step */
+
+/*      B28_DPT_INI     32 bit  Descriptor Poll Timer Init Val */
+/*      B28_DPT_VAL     32 bit  Descriptor Poll Timer Curr Val */
+                                                                /* Bit 31..24:  reserved */
+#define DPT_MSK         0x00ffffffL     /* Bit 23.. 0:  Desc Poll Timer Bits */
+
+/*      B28_DPT_CTRL     8 bit  Descriptor Poll Timer Ctrl Reg */
+                                                                /* Bit  7.. 2:  reserved */
+#define DPT_START               BIT_1S  /* Start Descriptor Poll Timer */
+#define DPT_STOP                BIT_0S  /* Stop  Descriptor Poll Timer */
+
+/*      B2_E_3                   8 bit  lower 4 bits used for HW self test result */
+#define B2_E3_RES_MASK  0x0f
+
+/*      B2_TST_CTRL1     8 bit  Test Control Register 1 */
+#define TST_FRC_DPERR_MR        BIT_7S  /* force DATAPERR on MST RD */
+#define TST_FRC_DPERR_MW        BIT_6S  /* force DATAPERR on MST WR */
+#define TST_FRC_DPERR_TR        BIT_5S  /* force DATAPERR on TRG RD */
+#define TST_FRC_DPERR_TW        BIT_4S  /* force DATAPERR on TRG WR */
+#define TST_FRC_APERR_M         BIT_3S  /* force ADDRPERR on MST */
+#define TST_FRC_APERR_T         BIT_2S  /* force ADDRPERR on TRG */
+#define TST_CFG_WRITE_ON        BIT_1S  /* Enable  Config Reg WR */
+#define TST_CFG_WRITE_OFF       BIT_0S  /* Disable Config Reg WR */
+
+/*      B2_TST_CTRL2     8 bit  Test Control Register 2 */
+                                                                        /* Bit 7.. 4:   reserved */
+                        /* force the following error on the next master read/write      */
+#define TST_FRC_DPERR_MR64      BIT_3S  /* DataPERR RD 64       */
+#define TST_FRC_DPERR_MW64      BIT_2S  /* DataPERR WR 64       */
+#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 */
+                                                        /* 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 */
+#define GP_DIR_7        BIT_23  /* IO_7 direct, 0=In/1=Out */
+#define GP_DIR_6        BIT_22  /* IO_6 direct, 0=In/1=Out */
+#define GP_DIR_5        BIT_21  /* IO_5 direct, 0=In/1=Out */
+#define GP_DIR_4        BIT_20  /* IO_4 direct, 0=In/1=Out */
+#define GP_DIR_3        BIT_19  /* IO_3 direct, 0=In/1=Out */
+#define GP_DIR_2        BIT_18  /* IO_2 direct, 0=In/1=Out */
+#define GP_DIR_1        BIT_17  /* IO_1 direct, 0=In/1=Out */
+#define GP_DIR_0        BIT_16  /* IO_0 direct, 0=In/1=Out */
+                                                /* Bit 15..10:  reserved */
+#define GP_IO_9         BIT_9   /* IO_9 pin */
+#define GP_IO_8         BIT_8   /* IO_8 pin */
+#define GP_IO_7         BIT_7   /* IO_7 pin */
+#define GP_IO_6         BIT_6   /* IO_6 pin */
+#define GP_IO_5         BIT_5   /* IO_5 pin */
+#define GP_IO_4         BIT_4   /* IO_4 pin */
+#define GP_IO_3         BIT_3   /* IO_3 pin */
+#define GP_IO_2         BIT_2   /* IO_2 pin */
+#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 */
+#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    (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 */
+                                                                /* 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 */
+                                                                /* Bit  7.. 3:  reserved */
+#define I2C_DATA_DIR    BIT_2S          /* direction of I2C_DATA */
+#define I2C_DATA                BIT_1S          /* I2C Data Port        */
+#define I2C_CLK                 BIT_0S          /* I2C Clock Port       */
+
+/*
+ * I2C Address
+ */
+#define I2C_SENS_ADDR   LM80_ADDR       /* I2C Sensor Address, (Volt and Temp)*/
+
+
+/*      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 */
+                                                        /* 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 */
+#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 */
+                                        /* 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 */
+                                                                /* 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*/
+                                                                /* Bit  7.. 2:  reserved */
+#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 */
+                                                                /* Bit 15.. 4:  reserved */
+#define RI_T_EV                 BIT_3S  /* Timeout Event occured */
+#define RI_T_ON                 BIT_2S  /* Timeout Timer Test On */
+#define RI_T_OFF                BIT_1S  /* Timeout Timer Test Off */
+#define RI_T_STEP               BIT_0S  /* Timeout Timer Step */
+
+/* MAC Arbiter Registers */
+/*      B3_MA_TO_CTRL   16 bit  MAC Arbiter Timeout Ctrl Reg */
+                                                                /* Bit 15.. 4:  reserved */
+#define MA_FOE_ON               BIT_3S  /* XMAC Fast Output Enable ON */
+#define MA_FOE_OFF              BIT_2S  /* XMAC Fast Output Enable OFF */
+#define MA_RST_CLR              BIT_1S  /* Clear MAC Arbiter Reset */
+#define MA_RST_SET              BIT_0S  /* Set   MAC Arbiter Reset */
+
+/*      B3_MA_RC_CTRL   16 bit  MAC Arbiter Recovery Ctrl Reg */
+                                                                /* Bit 15.. 8:  reserved */
+#define MA_ENA_REC_TX2  BIT_7S  /* Enable  Recovery Timer TX2 */
+#define MA_DIS_REC_TX2  BIT_6S  /* Disable Recovery Timer TX2 */
+#define MA_ENA_REC_TX1  BIT_5S  /* Enable  Recovery Timer TX1 */
+#define MA_DIS_REC_TX1  BIT_4S  /* Disable Recovery Timer TX1 */
+#define MA_ENA_REC_RX2  BIT_3S  /* Enable  Recovery Timer RX2 */
+#define MA_DIS_REC_RX2  BIT_2S  /* Disable Recovery Timer RX2 */
+#define MA_ENA_REC_RX1  BIT_1S  /* Enable  Recovery Timer RX1 */
+#define MA_DIS_REC_RX1  BIT_0S  /* Disable Recovery Timer RX1 */
+
+/* Packet Arbiter Registers */
+/*      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 */
+#define PA_CLR_TO_RX2   BIT_11S /* Clear IRQ Packet Timeout RX2 */
+#define PA_CLR_TO_RX1   BIT_10S /* Clear IRQ Packet Timeout RX1 */
+#define PA_ENA_TO_TX2   BIT_9S  /* Enable  Timeout Timer TX2 */
+#define PA_DIS_TO_TX2   BIT_8S  /* Disable Timeout Timer TX2 */
+#define PA_ENA_TO_TX1   BIT_7S  /* Enable  Timeout Timer TX1 */
+#define PA_DIS_TO_TX1   BIT_6S  /* Disable Timeout Timer TX1 */
+#define PA_ENA_TO_RX2   BIT_5S  /* Enable  Timeout Timer RX2 */
+#define PA_DIS_TO_RX2   BIT_4S  /* Disable Timeout Timer RX2 */
+#define PA_ENA_TO_RX1   BIT_3S  /* Enable  Timeout Timer RX1 */
+#define PA_DIS_TO_RX1   BIT_2S  /* Disable Timeout Timer RX1 */
+#define PA_RST_CLR              BIT_1S  /* Clear MAC Arbiter Reset */
+#define PA_RST_SET              BIT_0S  /* Set   MAC Arbiter Reset */
+
+#define PA_ENA_TO_ALL   (PA_ENA_TO_RX1 | PA_ENA_TO_RX2 |\
+                                                PA_ENA_TO_TX1 | PA_ENA_TO_TX2)
+
+/* 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 */
+/*                      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 */
+#define TX2_T_OFF       BIT_13S         /* TX2 Timeout/Recv Timer Tst Off */
+#define TX2_T_STEP      BIT_12S         /* TX2 Timeout/Recv Timer Step */
+#define TX1_T_EV        BIT_11S         /* TX1 Timeout/Recv Event occured */
+#define TX1_T_ON        BIT_10S         /* TX1 Timeout/Recv Timer Test On */
+#define TX1_T_OFF       BIT_9S          /* TX1 Timeout/Recv Timer Tst Off */
+#define TX1_T_STEP      BIT_8S          /* TX1 Timeout/Recv Timer Step */
+#define RX2_T_EV        BIT_7S          /* RX2 Timeout/Recv Event occured */
+#define RX2_T_ON        BIT_6S          /* RX2 Timeout/Recv Timer Test On */
+#define RX2_T_OFF       BIT_5S          /* RX2 Timeout/Recv Timer Tst Off */
+#define RX2_T_STEP      BIT_4S          /* RX2 Timeout/Recv Timer Step */
+#define RX1_T_EV        BIT_3S          /* RX1 Timeout/Recv Event occured */
+#define RX1_T_ON        BIT_2S          /* RX1 Timeout/Recv Timer Test On */
+#define RX1_T_OFF       BIT_1S          /* RX1 Timeout/Recv Timer Tst Off */
+#define RX1_T_STEP      BIT_0S          /* RX1 Timeout/Recv Timer Step */
+
+
+/* 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 */
+                                                                /* 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 */
+#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 */
+#define TXA_DIS_ALLOC   BIT_4S  /* Disable alloc of free bandwidth */
+#define TXA_START_RC    BIT_3S  /* Start sync Rate Control */
+#define TXA_STOP_RC             BIT_2S  /* Stop  sync Rate Control */
+#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 */
+                                                                /* 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 */
+#define TXA_INT_T_STEP  BIT_3S  /* Tx Arb Interval Timer Step */
+#define TXA_LIM_T_ON    BIT_2S  /* Tx Arb Limit Timer Test On */
+#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 */
+                                                                /* Bit 7.. 1:   reserved */
+#define TXA_PRIO_XS             BIT_0S  /* sync queue has prio to send */
+
+/*      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 */
+                                                                /* Bit 31..25:  reserved */
+#define CSR_SV_IDLE             BIT_24          /* BMU SM Idle */
+                                                                /* Bit 23..22:  reserved */
+#define CSR_DESC_CLR    BIT_21          /* Clear Reset for Descr */
+#define CSR_DESC_SET    BIT_20          /* Set   Reset for Descr */
+#define CSR_FIFO_CLR    BIT_19          /* Clear Reset for FIFO */
+#define CSR_FIFO_SET    BIT_18          /* Set   Reset for FIFO */
+#define CSR_HPI_RUN             BIT_17          /* Release HPI SM */
+#define CSR_HPI_RST             BIT_16          /* Reset   HPI SM to Idle */
+#define CSR_SV_RUN              BIT_15          /* Release Supervisor SM */
+#define CSR_SV_RST              BIT_14          /* Reset   Supervisor SM */
+#define CSR_DREAD_RUN   BIT_13          /* Release Descr Read SM */
+#define CSR_DREAD_RST   BIT_12          /* Reset   Descr Read SM */
+#define CSR_DWRITE_RUN  BIT_11          /* Release Descr Write SM */
+#define CSR_DWRITE_RST  BIT_10          /* Reset   Descr Write SM */
+#define CSR_TRANS_RUN   BIT_9           /* Release Transfer SM */
+#define CSR_TRANS_RST   BIT_8           /* Reset   Transfer SM */
+#define CSR_ENA_POL             BIT_7           /* Enable  Descr Polling */
+#define CSR_DIS_POL             BIT_6           /* Disable Descr Polling */
+#define CSR_STOP                BIT_5           /* Stop  Rx/Tx Queue */
+#define CSR_START               BIT_4           /* Start Rx/Tx Queue */
+#define CSR_IRQ_CL_P    BIT_3           /* (Rx) Clear Parity IRQ */
+#define CSR_IRQ_CL_B    BIT_2           /* Clear EOB IRQ */
+#define CSR_IRQ_CL_F    BIT_1           /* Clear EOF IRQ */
+#define CSR_IRQ_CL_C    BIT_0           /* Clear ERR IRQ */
+
+#define CSR_SET_RESET   (CSR_DESC_SET | CSR_FIFO_SET | CSR_HPI_RST |\
+                                                CSR_SV_RST | CSR_DREAD_RST | CSR_DWRITE_RST |\
+                                                CSR_TRANS_RST)
+#define CSR_CLR_RESET   (CSR_DESC_CLR | CSR_FIFO_CLR | CSR_HPI_RUN |\
+                                                CSR_SV_RUN | CSR_DREAD_RUN | CSR_DWRITE_RUN |\
+                                                CSR_TRANS_RUN)
+
+/*      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 */
+#define F_FIFO_EOF              BIT_26          /* Tag (EOF Flag) bit in FIFO */
+#define F_WM_REACHED    BIT_25          /* Watermark reached */
+                                                                        /* reserved */
+#define F_FIFO_LEVEL    (0x1fL<<16)     /* Bit 23..16:  # of Qwords in FIFO */
+                                                                        /* Bit 15..11:  reserved */
+#define F_WATER_MARK    0x0007ffL       /* Bit 10.. 0:  Watermark */
+
+/*      Q_T1                    32 bit  Test Register 1 */
+/*              Holds four State Machine control Bytes */
+#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 */
+#define SM_LOAD                 BIT_3S  /* Load the SM with SM_STATE */
+#define SM_TEST_ON              BIT_2S  /* Switch on SM Test Mode */
+#define SM_TEST_OFF             BIT_1S  /* Go off the Test Mode */
+#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 */
+                                                                /* 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 */
+#define T2_BC_T_ON              BIT_5   /* Byte Counter Test Mode on */
+#define T2_BC_T_OFF             BIT_4   /* Byte Counter Test Mode off */
+#define T2_STEP04               BIT_3   /* Inc AC/Dec BC by 4 */
+#define T2_STEP03               BIT_2   /* Inc AC/Dec BC by 3 */
+#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 */
+                                                                /* 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 */
+                                /* Bit 31..19:  reserved */
+#define RB_MSK  0x0007ffff      /* Bit 18.. 0:  RAM Buffer Pointer Bits */
+
+/*      RB_TST2                  8 bit  RAM Buffer Test Register 2 */
+                                                                /* Bit 7.. 4:   reserved */
+#define RB_PC_DEC               BIT_3S  /* Packet Counter Decrem */
+#define RB_PC_T_ON              BIT_2S  /* Packet Counter Test On */
+#define RB_PC_T_OFF             BIT_1S  /* Packet Counter Tst Off */
+#define RB_PC_INC               BIT_0S  /* Packet Counter Increm */
+
+/*      RB_TST1                  8 bit  RAM Buffer Test Register 1 */
+                                                        /* Bit 7:       reserved */
+#define RB_WP_T_ON              BIT_6S  /* Write Pointer Test On */
+#define RB_WP_T_OFF             BIT_5S  /* Write Pointer Test Off */
+#define RB_WP_INC               BIT_4S  /* Write Pointer Increm */
+                                                                /* Bit 3:       reserved */
+#define RB_RP_T_ON              BIT_2S  /* Read Pointer Test On */
+#define RB_RP_T_OFF             BIT_1S  /* Read Pointer Test Off */
+#define RB_RP_DEC               BIT_0S  /* Read Pointer Decrement */
+
+/*      RB_CTRL                  8 bit  RAM Buffer Control Register */
+                                                                /* Bit 7.. 6:   reserved */
+#define RB_ENA_STFWD    BIT_5S  /* Enable  Store & Forward */
+#define RB_DIS_STFWD    BIT_4S  /* Disable Store & Forward */
+#define RB_ENA_OP_MD    BIT_3S  /* Enable  Operation Mode */
+#define RB_DIS_OP_MD    BIT_2S  /* Disable Operation Mode */
+#define RB_RST_CLR              BIT_1S  /* Clear RAM Buf STM Reset */
+#define RB_RST_SET              BIT_0S  /* Set   RAM Buf STM Reset */
+
+
+/* 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 */
+                                                                /* Bit 31.. 6:  reserved */
+#define MFF_MSK                 0x007fL /* Bit  5.. 0:  MAC FIFO Address/Ptr Bits */
+
+/*      RX_MFF_CTRL1    16 bit  Receive MAC FIFO Control Reg 1 */
+                                                                /* Bit 15..14:  reserved */
+#define MFF_ENA_RDY_PAT BIT_13S         /* Enable  Ready Patch */
+#define MFF_DIS_RDY_PAT BIT_12S         /* Disable Ready Patch */
+#define MFF_ENA_TIM_PAT BIT_11S         /* Enable  Timing Patch */
+#define MFF_DIS_TIM_PAT BIT_10S         /* Disable Timing Patch */
+#define MFF_ENA_ALM_FUL BIT_9S          /* Enable  AlmostFull Sign */
+#define MFF_DIS_ALM_FUL BIT_8S          /* Disable AlmostFull Sign */
+#define MFF_ENA_PAUSE   BIT_7S          /* Enable  Pause Signaling */
+#define MFF_DIS_PAUSE   BIT_6S          /* Disable Pause Signaling */
+#define MFF_ENA_FLUSH   BIT_5S          /* Enable  Frame Flushing */
+#define MFF_DIS_FLUSH   BIT_4S          /* Disable Frame Flushing */
+#define MFF_ENA_TIST    BIT_3S          /* Enable  Time Stamp Gener */
+#define MFF_DIS_TIST    BIT_2S          /* Disable Time Stamp Gener */
+#define MFF_CLR_INTIST  BIT_1S          /* Clear IRQ No Time Stamp */
+#define MFF_CLR_INSTAT  BIT_0S          /* Clear IRQ No Status */
+
+#define MFF_RX_CTRL_DEF MFF_ENA_TIM_PAT
+
+/*      TX_MFF_CTRL1    16 bit  Transmit MAC FIFO Control Reg 1 */
+#define MFF_CLR_PERR    BIT_15S         /* Clear Parity Error IRQ */
+                                                                /* Bit 14:      reserved */
+#define MFF_ENA_PKT_REC BIT_13S         /* Enable  Packet Recovery */
+#define MFF_DIS_PKT_REC BIT_12S         /* Disable Packet Recovery */
+/*      MFF_ENA_TIM_PAT  (see RX_MFF_CTRL1) Bit 11:     Enable  Timing Patch */
+/*      MFF_DIS_TIM_PAT  (see RX_MFF_CTRL1) Bit 10:     Disable Timing Patch */
+/*      MFF_ENA_ALM_FUL  (see RX_MFF_CTRL1) Bit  9:     Enable  Almost Full Sign */
+/*      MFF_DIS_ALM_FUL  (see RX_MFF_CTRL1) Bit  8:     Disable Almost Full Sign */
+#define MFF_ENA_W4E             BIT_7S          /* Enable  Wait for Empty */
+#define MFF_DIS_W4E             BIT_6S          /* Disable Wait for Empty */
+/*      MFF_ENA_FLUSH    (see RX_MFF_CTRL1) Bit  5:     Enable  Frame Flushing */
+/*      MFF_DIS_FLUSH    (see RX_MFF_CTRL1) Bit  4:     Disable Frame Flushing */
+#define MFF_ENA_LOOPB   BIT_3S          /* Enable  Loopback */
+#define MFF_DIS_LOOPB   BIT_2S          /* Disable Loopback */
+#define MFF_CLR_MAC_RST BIT_1S          /* Clear XMAC Reset */
+#define MFF_SET_MAC_RST BIT_0S          /* Set   XMAC Reset */
+
+#define MFF_TX_CTRL_DEF (MFF_ENA_PKT_REC | MFF_ENA_TIM_PAT | MFF_ENA_FLUSH)
+
+/*      RX_MFF_TST2              8 bit  Receive MAC FIFO Test Register 2 */
+/*      TX_MFF_TST2              8 bit  Transmit MAC FIFO Test Register 2 */
+                                                                /* Bit 7:       reserved */
+#define MFF_WSP_T_ON    BIT_6S  /* Tx: Write Shadow Ptr TestOn */
+#define MFF_WSP_T_OFF   BIT_5S  /* Tx: Write Shadow Ptr TstOff */
+#define MFF_WSP_INC             BIT_4S  /* Tx: Write Shadow Ptr Increment */
+#define MFF_PC_DEC              BIT_3S  /* Packet Counter Decrement */
+#define MFF_PC_T_ON             BIT_2S  /* Packet Counter Test On */
+#define MFF_PC_T_OFF    BIT_1S  /* Packet Counter Test Off */
+#define MFF_PC_INC              BIT_0S  /* Packet Counter Increment */
+
+/*      RX_MFF_TST1              8 bit  Receive MAC FIFO Test Register 1 */
+/*      TX_MFF_TST1              8 bit  Transmit MAC FIFO Test Register 1 */
+                                        /* Bit 7:       reserved */
+#define MFF_WP_T_ON             BIT_6S  /* Write Pointer Test On */
+#define MFF_WP_T_OFF    BIT_5S  /* Write Pointer Test Off */
+#define MFF_WP_INC              BIT_4S  /* Write Pointer Increm */
+                                                        /* Bit 3:       reserved */
+#define MFF_RP_T_ON             BIT_2S  /* Read Pointer Test On */
+#define MFF_RP_T_OFF    BIT_1S  /* Read Pointer Test Off */
+#define MFF_RP_DEC              BIT_0S  /* Read Pointer Decrement */
+
+/*      RX_MFF_CTRL2     8 bit  Receive MAC FIFO Control Reg 2 */
+/*      TX_MFF_CTRL2     8 bit  Transmit MAC FIFO Control Reg 2 */
+                                                                /* Bit 7..4:    reserved */
+#define MFF_ENA_OP_MD   BIT_3S  /* Enable  Operation Mode */
+#define MFF_DIS_OP_MD   BIT_2S  /* Disable Operation Mode */
+#define MFF_RST_CLR             BIT_1S  /* Clear MAC FIFO Reset */
+#define MFF_RST_SET             BIT_0S  /* Set   MAC FIFO Reset */
+
+
+/*      Link LED Counter Registers (GENESIS only) */
+
+/*      RX_LED_CTRL              8 bit  Receive LED Cnt Control Reg */
+/*      TX_LED_CTRL              8 bit  Transmit LED Cnt Control Reg */
+/*      LNK_SYNC_CTRL    8 bit  Link Sync Cnt Control Register */
+                                                        /* Bit 7.. 3:   reserved */
+#define LED_START               BIT_2S  /* Start Timer */
+#define LED_STOP                BIT_1S  /* Stop Timer */
+#define LED_STATE               BIT_0S  /* Rx/Tx: LED State, 1=LED on */
+#define LED_CLR_IRQ             BIT_0S  /* Lnk:         Clear Link IRQ */
+
+/*      RX_LED_TST               8 bit  Receive LED Cnt Test Register */
+/*      TX_LED_TST               8 bit  Transmit LED Cnt Test Register */
+/*      LNK_SYNC_TST     8 bit  Link Sync Cnt Test Register */
+                                                        /* Bit 7.. 3:   reserved */
+#define LED_T_ON                BIT_2S  /* LED Counter Test mode On */
+#define LED_T_OFF               BIT_1S  /* LED Counter Test mode Off */
+#define LED_T_STEP              BIT_0S  /* LED Counter Step */
+
+/*      LNK_LED_REG              8 bit  Link LED Register */
+                                                                /* Bit 7.. 6:   reserved */
+#define LED_BLK_ON              BIT_5S  /* Link LED Blinking On */
+#define LED_BLK_OFF             BIT_4S  /* Link LED Blinking Off */
+#define LED_SYNC_ON             BIT_3S  /* Use Sync Wire to switch LED */
+#define LED_SYNC_OFF    BIT_2S  /* Disable Sync Wire Input */
+#define LED_ON                  BIT_1S  /* switch LED on */
+#define LED_OFF                 BIT_0S  /* switch LED off */
+
+/*      Receive and Transmit GMAC FIFO Registers (YUKON only) */
+
+/*      RX_GMF_EA               32 bit  Rx GMAC FIFO End Address */
+/*      RX_GMF_AF_THR   32 bit  Rx GMAC FIFO Almost Full Thresh. */
+/*      RX_GMF_WP               32 bit  Rx GMAC FIFO Write Pointer */
+/*      RX_GMF_WLEV             32 bit  Rx GMAC FIFO Write Level */
+/*      RX_GMF_RP               32 bit  Rx GMAC FIFO Read Pointer */
+/*      RX_GMF_RLEV             32 bit  Rx GMAC FIFO Read Level */
+/*      TX_GMF_EA               32 bit  Tx GMAC FIFO End Address */
+/*      TX_GMF_AE_THR   32 bit  Tx GMAC FIFO Almost Empty Thresh.*/
+/*      TX_GMF_WP               32 bit  Tx GMAC FIFO Write Pointer */
+/*      TX_GMF_WSP              32 bit  Tx GMAC FIFO Write Shadow Ptr. */
+/*      TX_GMF_WLEV             32 bit  Tx GMAC FIFO Write Level */
+/*      TX_GMF_RP               32 bit  Tx GMAC FIFO Read Pointer */
+/*      TX_GMF_RSTP             32 bit  Tx GMAC FIFO Restart Pointer */
+/*      TX_GMF_RLEV             32 bit  Tx GMAC FIFO Read Level */
+
+/*      RX_GMF_CTRL_T   32 bit  Rx GMAC FIFO Control/Test */
+                                                /* Bits 31..15: reserved */
+#define GMF_WP_TST_ON   BIT_14          /* Write Pointer Test On */
+#define GMF_WP_TST_OFF  BIT_13          /* Write Pointer Test Off */
+#define GMF_WP_STEP             BIT_12          /* Write Pointer Step/Increment */
+                                                /* Bit 11:      reserved */
+#define GMF_RP_TST_ON   BIT_10          /* Read Pointer Test On */
+#define GMF_RP_TST_OFF  BIT_9           /* Read Pointer Test Off */
+#define GMF_RP_STEP             BIT_8           /* Read Pointer Step/Increment */
+#define GMF_RX_F_FL_ON  BIT_7           /* Rx FIFO Flush Mode On */
+#define GMF_RX_F_FL_OFF BIT_6           /* Rx FIFO Flush Mode Off */
+#define GMF_CLI_RX_FO   BIT_5           /* Clear IRQ Rx FIFO Overrun */
+#define GMF_CLI_RX_FC   BIT_4           /* Clear IRQ Rx Frame Complete */
+#define GMF_OPER_ON             BIT_3           /* Operational Mode On */
+#define GMF_OPER_OFF    BIT_2           /* Operational Mode Off */
+#define GMF_RST_CLR             BIT_1           /* Clear GMAC FIFO Reset */
+#define GMF_RST_SET             BIT_0           /* Set   GMAC FIFO Reset */
+
+/*      TX_GMF_CTRL_T   32 bit  Tx GMAC FIFO Control/Test */
+                                                /* Bits 31..19: reserved */
+#define GMF_WSP_TST_ON  BIT_18          /* Write Shadow Pointer Test On */
+#define GMF_WSP_TST_OFF BIT_17          /* Write Shadow Pointer Test Off */
+#define GMF_WSP_STEP    BIT_16          /* Write Shadow Pointer Step/Increment */
+                                                /* Bits 15..7: same as for RX_GMF_CTRL_T */
+#define GMF_CLI_TX_FU   BIT_6           /* Clear IRQ Tx FIFO Underrun */
+#define GMF_CLI_TX_FC   BIT_5           /* Clear IRQ Tx Frame Complete */
+#define GMF_CLI_TX_PE   BIT_4           /* Clear IRQ Tx Parity Error */
+                                                /* Bits 3..0: same as for RX_GMF_CTRL_T */
+
+#define GMF_RX_CTRL_DEF         (GMF_OPER_ON | GMF_RX_F_FL_ON)
+#define GMF_TX_CTRL_DEF         GMF_OPER_ON
+
+#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) */
+                                                                /* Bit 7.. 3:   reserved */
+#define GMT_ST_START    BIT_2S          /* Start Time Stamp Timer */
+#define GMT_ST_STOP             BIT_1S          /* Stop  Time Stamp Timer */
+#define GMT_ST_CLR_IRQ  BIT_0S          /* Clear Time Stamp Timer IRQ */
+
+/*      GMAC_CTRL               32 bit  GMAC Control Reg (YUKON only) */
+                                                /* Bits 31.. 8: reserved */
+#define GMC_H_BURST_ON  BIT_7           /* Half Duplex Burst Mode On */
+#define GMC_H_BURST_OFF BIT_6           /* Half Duplex Burst Mode Off */
+#define GMC_F_LOOPB_ON  BIT_5           /* FIFO Loopback On */
+#define GMC_F_LOOPB_OFF BIT_4           /* FIFO Loopback Off */
+#define GMC_PAUSE_ON    BIT_3           /* Pause On */
+#define GMC_PAUSE_OFF   BIT_2           /* Pause Off */
+#define GMC_RST_CLR             BIT_1           /* Clear GMAC Reset */
+#define GMC_RST_SET             BIT_0           /* Set   GMAC Reset */
+
+/*      GPHY_CTRL               32 bit  GPHY Control Reg (YUKON only) */
+                                                /* Bits 31..29: reserved */
+#define GPC_SEL_BDT             BIT_28  /* Select Bi-Dir. Transfer for MDC/MDIO */
+#define GPC_INT_POL_HI  BIT_27  /* IRQ Polarity is Active HIGH */
+#define GPC_75_OHM              BIT_26  /* Use 75 Ohm Termination instead of 50 */
+#define GPC_DIS_FC              BIT_25  /* Disable Automatic Fiber/Copper Detection */
+#define GPC_DIS_SLEEP   BIT_24  /* Disable Energy Detect */
+#define GPC_HWCFG_M_3   BIT_23  /* HWCFG_MODE[3] */
+#define GPC_HWCFG_M_2   BIT_22  /* HWCFG_MODE[2] */
+#define GPC_HWCFG_M_1   BIT_21  /* HWCFG_MODE[1] */
+#define GPC_HWCFG_M_0   BIT_20  /* HWCFG_MODE[0] */
+#define GPC_ANEG_0              BIT_19  /* ANEG[0] */
+#define GPC_ENA_XC              BIT_18  /* Enable MDI crossover */
+#define GPC_DIS_125             BIT_17  /* Disable 125 MHz clock */
+#define GPC_ANEG_3              BIT_16  /* ANEG[3] */
+#define GPC_ANEG_2              BIT_15  /* ANEG[2] */
+#define GPC_ANEG_1              BIT_14  /* ANEG[1] */
+#define GPC_ENA_PAUSE   BIT_13  /* Enable Pause (SYM_OR_REM) */
+#define GPC_PHYADDR_4   BIT_12  /* Bit 4 of Phy Addr */
+#define GPC_PHYADDR_3   BIT_11  /* Bit 3 of Phy Addr */
+#define GPC_PHYADDR_2   BIT_10  /* Bit 2 of Phy Addr */
+#define GPC_PHYADDR_1   BIT_9   /* Bit 1 of Phy Addr */
+#define GPC_PHYADDR_0   BIT_8   /* Bit 0 of Phy Addr */
+                                                /* Bits  7..2:  reserved */
+#define GPC_RST_CLR             BIT_1   /* Clear GPHY Reset */
+#define GPC_RST_SET             BIT_0   /* Set   GPHY Reset */
+
+#define GPC_HWCFG_GMII_COP      (GPC_HWCFG_M_3 | GPC_HWCFG_M_2 | \
+                                                         GPC_HWCFG_M_1 | GPC_HWCFG_M_0)
+
+#define GPC_HWCFG_GMII_FIB      (                                GPC_HWCFG_M_2 | \
+                                                         GPC_HWCFG_M_1 | GPC_HWCFG_M_0)
+
+#define GPC_ANEG_ADV_ALL_M      (GPC_ANEG_3 | GPC_ANEG_2 | \
+                                                         GPC_ANEG_1 | GPC_ANEG_0)
+
+/* forced speed and duplex mode (don't mix with other ANEG bits) */
+#define GPC_FRC10MBIT_HALF      0
+#define GPC_FRC10MBIT_FULL      GPC_ANEG_0
+#define GPC_FRC100MBIT_HALF     GPC_ANEG_1
+#define GPC_FRC100MBIT_FULL     (GPC_ANEG_0 | GPC_ANEG_1)
+
+/* auto-negotiation with limited advertised speeds */
+/* mix only with master/slave settings (for copper) */
+#define GPC_ADV_1000_HALF       GPC_ANEG_2
+#define GPC_ADV_1000_FULL       GPC_ANEG_3
+#define GPC_ADV_ALL                     (GPC_ANEG_2 | GPC_ANEG_3)
+
+/* master/slave settings */
+/* only for copper with 1000 Mbps */
+#define GPC_FORCE_MASTER        0
+#define GPC_FORCE_SLAVE         GPC_ANEG_0
+#define GPC_PREF_MASTER         GPC_ANEG_1
+#define GPC_PREF_SLAVE          (GPC_ANEG_1 | GPC_ANEG_0)
+
+/*      GMAC_IRQ_SRC     8 bit  GMAC Interrupt Source Reg (YUKON only) */
+/*      GMAC_IRQ_MSK     8 bit  GMAC Interrupt Mask   Reg (YUKON only) */
+#define GM_IS_TX_CO_OV  BIT_5           /* Transmit Counter Overflow IRQ */
+#define GM_IS_RX_CO_OV  BIT_4           /* Receive Counter Overflow IRQ */
+#define GM_IS_TX_FF_UR  BIT_3           /* Transmit FIFO Underrun */
+#define GM_IS_TX_COMPL  BIT_2           /* Frame Transmission Complete */
+#define GM_IS_RX_FF_OR  BIT_1           /* Receive FIFO Overrun */
+#define GM_IS_RX_COMPL  BIT_0           /* Frame Reception Complete */
+
+#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) */
+                                                /* 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 */
+#define WOL_CTL_LINK_CHG_OCC                    BIT_15S
+#define WOL_CTL_MAGIC_PKT_OCC                   BIT_14S
+#define WOL_CTL_PATTERN_OCC                             BIT_13S
+
+#define WOL_CTL_CLEAR_RESULT                    BIT_12S
+
+#define WOL_CTL_ENA_PME_ON_LINK_CHG             BIT_11S
+#define WOL_CTL_DIS_PME_ON_LINK_CHG             BIT_10S
+#define WOL_CTL_ENA_PME_ON_MAGIC_PKT    BIT_9S
+#define WOL_CTL_DIS_PME_ON_MAGIC_PKT    BIT_8S
+#define WOL_CTL_ENA_PME_ON_PATTERN              BIT_7S
+#define WOL_CTL_DIS_PME_ON_PATTERN              BIT_6S
+
+#define WOL_CTL_ENA_LINK_CHG_UNIT               BIT_5S
+#define WOL_CTL_DIS_LINK_CHG_UNIT               BIT_4S
+#define WOL_CTL_ENA_MAGIC_PKT_UNIT              BIT_3S
+#define WOL_CTL_DIS_MAGIC_PKT_UNIT              BIT_2S
+#define WOL_CTL_ENA_PATTERN_UNIT                BIT_1S
+#define WOL_CTL_DIS_PATTERN_UNIT                BIT_0S
+
+#define WOL_CTL_DEFAULT                         \
+        (WOL_CTL_DIS_PME_ON_LINK_CHG |  \
+        WOL_CTL_DIS_PME_ON_PATTERN |    \
+        WOL_CTL_DIS_PME_ON_MAGIC_PKT |  \
+        WOL_CTL_DIS_LINK_CHG_UNIT |             \
+        WOL_CTL_DIS_PATTERN_UNIT |              \
+        WOL_CTL_DIS_MAGIC_PKT_UNIT)
+
+/*      WOL_MATCH_CTL    8 bit  WOL Match Control Reg */
+#define WOL_CTL_PATT_ENA(x)                             (BIT_0 << (x))
+
+#define SK_NUM_WOL_PATTERN              7
+#define SK_PATTERN_PER_WORD             4
+#define SK_BITMASK_PATTERN              7
+#define SK_POW_PATTERN_LENGTH   128
+
+#define WOL_LENGTH_MSK          0x7f
+#define WOL_LENGTH_SHIFT        8
+
+
+/* Receive and Transmit Descriptors ******************************************/
+
+/* Transmit Descriptor struct */
+typedef struct s_HwTxd {
+        SK_U32 volatile TxCtrl; /* Transmit Buffer Control Field */
+        SK_U32  TxNext;                 /* Physical Address Pointer to the next TxD */
+        SK_U32  TxAdrLo;                /* Physical Tx Buffer Address lower dword */
+        SK_U32  TxAdrHi;                /* Physical Tx Buffer Address upper dword */
+        SK_U32  TxStat;                 /* Transmit Frame Status Word */
+#ifndef SK_USE_REV_DESC
+        SK_U16  TxTcpOffs;              /* TCP Checksum Calculation Start Value */
+        SK_U16  TxRes1;                 /* 16 bit reserved field */
+        SK_U16  TxTcpWp;                /* TCP Checksum Write Position */
+        SK_U16  TxTcpSp;                /* TCP Checksum Calculation Start Position */
+#else   /* SK_USE_REV_DESC */
+        SK_U16  TxRes1;                 /* 16 bit reserved field */
+        SK_U16  TxTcpOffs;              /* TCP Checksum Calculation Start Value */
+        SK_U16  TxTcpSp;                /* TCP Checksum Calculation Start Position */
+        SK_U16  TxTcpWp;                /* TCP Checksum Write Position */
+#endif  /* SK_USE_REV_DESC */
+        SK_U32  TxRes2;                 /* 32 bit reserved field */
+} SK_HWTXD;
+
+/* Receive Descriptor struct */
+typedef struct s_HwRxd {
+        SK_U32 volatile RxCtrl; /* Receive Buffer Control Field */
+        SK_U32  RxNext;                 /* Physical Address Pointer to the next RxD */
+        SK_U32  RxAdrLo;                /* Physical Rx Buffer Address lower dword */
+        SK_U32  RxAdrHi;                /* Physical Rx Buffer Address upper dword */
+        SK_U32  RxStat;                 /* Receive Frame Status Word */
+        SK_U32  RxTiSt;                 /* Receive Time Stamp (from XMAC on GENESIS) */
+#ifndef SK_USE_REV_DESC
+        SK_U16  RxTcpSum1;              /* TCP Checksum 1 */
+        SK_U16  RxTcpSum2;              /* TCP Checksum 2 */
+        SK_U16  RxTcpSp1;               /* TCP Checksum Calculation Start Position 1 */
+        SK_U16  RxTcpSp2;               /* TCP Checksum Calculation Start Position 2 */
+#else   /* SK_USE_REV_DESC */
+        SK_U16  RxTcpSum2;              /* TCP Checksum 2 */
+        SK_U16  RxTcpSum1;              /* TCP Checksum 1 */
+        SK_U16  RxTcpSp2;               /* TCP Checksum Calculation Start Position 2 */
+        SK_U16  RxTcpSp1;               /* TCP Checksum Calculation Start Position 1 */
+#endif  /* SK_USE_REV_DESC */
+} SK_HWRXD;
+
+/*
+ * Drivers which use the reverse descriptor feature (PCI_OUR_REG_2)
+ * should set the define SK_USE_REV_DESC.
+ * Structures are 'normaly' not endianess dependent. But in
+ * this case the SK_U16 fields are bound to bit positions inside the
+ * descriptor. RxTcpSum1 e.g. must start at bit 0 within the 6.th DWord.
+ * The bit positions inside a DWord are of course endianess dependent and
+ * swaps if the DWord is swapped by the hardware.
+ */
+
+
+/* Descriptor Bit Definition */
+/*      TxCtrl          Transmit Buffer Control Field */
+/*      RxCtrl          Receive  Buffer Control Field */
+#define BMU_OWN                 BIT_31  /* OWN bit: 0=host/1=BMU */
+#define BMU_STF                 BIT_30  /* Start of Frame */
+#define BMU_EOF                 BIT_29  /* End of Frame */
+#define BMU_IRQ_EOB             BIT_28  /* Req "End of Buffer" IRQ */
+#define BMU_IRQ_EOF             BIT_27  /* Req "End of Frame" IRQ */
+/* TxCtrl specific bits */
+#define BMU_STFWD               BIT_26  /* (Tx) Store & Forward Frame */
+#define BMU_NO_FCS              BIT_25  /* (Tx) Disable MAC FCS (CRC) generation */
+#define BMU_SW                  BIT_24  /* (Tx) 1 bit res. for SW use */
+/* RxCtrl specific bits */
+#define BMU_DEV_0               BIT_26  /* (Rx) Transfer data to Dev0 */
+#define BMU_STAT_VAL    BIT_25  /* (Rx) Rx Status Valid */
+#define BMU_TIST_VAL    BIT_24  /* (Rx) Rx TimeStamp Valid */
+                                                                /* Bit 23..16:  BMU Check Opcodes */
+#define BMU_CHECK               (0x55L<<16)     /* Default BMU check */
+#define BMU_TCP_CHECK   (0x56L<<16)     /* Descr with TCP ext */
+#define BMU_UDP_CHECK   (0x57L<<16)     /* Descr with UDP ext (YUKON only) */
+#define BMU_BBC                 0xffffL /* Bit 15.. 0:  Buffer Byte Counter */
+
+/*      TxStat          Transmit Frame Status Word */
+/*      RxStat          Receive Frame Status Word */
+/*
+ *Note: TxStat is reserved for ASIC loopback mode only
+ *
+ *      The Bits of the Status words are defined in xmac_ii.h
+ *      (see XMR_FS bits)
+ */
+
+/* macros ********************************************************************/
+
+/* Receive and Transmit Queues */
+#define Q_R1    0x0000          /* Receive Queue 1 */
+#define Q_R2    0x0080          /* Receive Queue 2 */
+#define Q_XS1   0x0200          /* Synchronous Transmit Queue 1 */
+#define Q_XA1   0x0280          /* Asynchronous Transmit Queue 1 */
+#define Q_XS2   0x0300          /* Synchronous Transmit Queue 2 */
+#define Q_XA2   0x0380          /* Asynchronous Transmit Queue 2 */
+
+/*
+ *      Macro Q_ADDR()
+ *
+ *      Use this macro to access the Receive and Transmit Queue Registers.
+ *
+ * para:
+ *      Queue   Queue to access.
+ *                              Values: Q_R1, Q_R2, Q_XS1, Q_XA1, Q_XS2, and Q_XA2
+ *      Offs    Queue register offset.
+ *                              Values: Q_D, Q_DA_L ... Q_T2, Q_T3
+ *
+ * usage        SK_IN32(pAC, Q_ADDR(Q_R2, Q_BC), pVal)
+ */
+#define Q_ADDR(Queue, Offs)     (B8_Q_REGS + (Queue) + (Offs))
+
+/*
+ *      Macro RB_ADDR()
+ *
+ *      Use this macro to access the RAM Buffer Registers.
+ *
+ * para:
+ *      Queue   Queue to access.
+ *                              Values: Q_R1, Q_R2, Q_XS1, Q_XA1, Q_XS2, and Q_XA2
+ *      Offs    Queue register offset.
+ *                              Values: RB_START, RB_END ... RB_LEV, RB_CTRL
+ *
+ * usage        SK_IN32(pAC, RB_ADDR(Q_R2, RB_RP), pVal)
+ */
+#define RB_ADDR(Queue, Offs)    (B16_RAM_REGS + (Queue) + (Offs))
+
+
+/* MAC Related Registers */
+#define MAC_1           0       /* belongs to the port near the slot */
+#define MAC_2           1       /* belongs to the port far away from the slot */
+
+/*
+ *      Macro MR_ADDR()
+ *
+ *      Use this macro to access a MAC Related Registers inside the ASIC.
+ *
+ * para:
+ *      Mac             MAC to access.
+ *                              Values: MAC_1, MAC_2
+ *      Offs    MAC register offset.
+ *                              Values: RX_MFF_EA, RX_MFF_WP ... LNK_LED_REG,
+ *                                              TX_MFF_EA, TX_MFF_WP ... TX_LED_TST
+ *
+ * usage        SK_IN32(pAC, MR_ADDR(MAC_1, TX_MFF_EA), pVal)
+ */
+#define MR_ADDR(Mac, Offs)      (((Mac) << 7) + (Offs))
+
+#ifdef  SK_LITTLE_ENDIAN
+#define XM_WORD_LO      0
+#define XM_WORD_HI      1
+#else   /* !SK_LITTLE_ENDIAN */
+#define XM_WORD_LO      1
+#define XM_WORD_HI      0
+#endif  /* !SK_LITTLE_ENDIAN */
+
+
+/*
+ * macros to access the XMAC (GENESIS only)
+ *
+ * XM_IN16(),           to read a 16 bit register (e.g. XM_MMU_CMD)
+ * XM_OUT16(),          to write a 16 bit register (e.g. XM_MMU_CMD)
+ * XM_IN32(),           to read a 32 bit register (e.g. XM_TX_EV_CNT)
+ * XM_OUT32(),          to write a 32 bit register (e.g. XM_TX_EV_CNT)
+ * XM_INADDR(),         to read a network address register (e.g. XM_SRC_CHK)
+ * XM_OUTADDR(),        to write a network address register (e.g. XM_SRC_CHK)
+ * XM_INHASH(),         to read the XM_HSM_CHK register
+ * XM_OUTHASH()         to write the XM_HSM_CHK register
+ *
+ * para:
+ *      Mac             XMAC to access          values: MAC_1 or MAC_2
+ *      IoC             I/O context needed for SK I/O macros
+ *      Reg             XMAC Register to read or write
+ *      (p)Val  Value or pointer to the value which should be read or written
+ *
+ * usage:       XM_OUT16(IoC, MAC_1, XM_MMU_CMD, Value);
+ */
+
+#define XMA(Mac, Reg)                                                                   \
+        ((BASE_XMAC_1 + (Mac) * (BASE_XMAC_2 - BASE_XMAC_1)) | ((Reg) << 1))
+
+#define XM_IN16(IoC, Mac, Reg, pVal)                                    \
+        SK_IN16((IoC), XMA((Mac), (Reg)), (pVal))
+
+#define XM_OUT16(IoC, Mac, Reg, Val)                                    \
+        SK_OUT16((IoC), XMA((Mac), (Reg)), (Val))
+
+#define XM_IN32(IoC, Mac, Reg, pVal) {                                  \
+        SK_IN16((IoC), XMA((Mac), (Reg)),                                       \
+                (SK_U16 SK_FAR*)&((SK_U16 SK_FAR*)(pVal))[XM_WORD_LO]);         \
+        SK_IN16((IoC), XMA((Mac), (Reg+2)),                                     \
+                (SK_U16 SK_FAR*)&((SK_U16 SK_FAR*)(pVal))[XM_WORD_HI]);         \
+}
+
+#define XM_OUT32(IoC, Mac, Reg, Val) {                                                                          \
+        SK_OUT16((IoC), XMA((Mac), (Reg)), (SK_U16)((Val) & 0xffffL));                  \
+        SK_OUT16((IoC), XMA((Mac), (Reg+2)), (SK_U16)(((Val) >> 16) & 0xffffL));\
+}
+
+/* Remember: we are always writing to / reading from LITTLE ENDIAN memory */
+
+#define XM_INADDR(IoC, Mac, Reg, pVal) {                                \
+        SK_U16  Word;                                                                           \
+        SK_U8   *pByte;                                                                         \
+        pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];                         \
+        SK_IN16((IoC), XMA((Mac), (Reg)), &Word);                       \
+        pByte[0] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), XMA((Mac), (Reg+2)), &Word);                     \
+        pByte[2] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[3] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), XMA((Mac), (Reg+4)), &Word);                     \
+        pByte[4] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[5] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+}
+
+#define XM_OUTADDR(IoC, Mac, Reg, pVal) {                               \
+        SK_U8   SK_FAR *pByte;                                                          \
+        pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];   \
+        SK_OUT16((IoC), XMA((Mac), (Reg)), (SK_U16)                     \
+                (((SK_U16)(pByte[0]) & 0x00ff) |                                \
+                (((SK_U16)(pByte[1]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), XMA((Mac), (Reg+2)), (SK_U16)           \
+                (((SK_U16)(pByte[2]) & 0x00ff) |                                \
+                (((SK_U16)(pByte[3]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), XMA((Mac), (Reg+4)), (SK_U16)           \
+                (((SK_U16)(pByte[4]) & 0x00ff) |                                \
+                (((SK_U16)(pByte[5]) << 8) & 0xff00)));                 \
+}
+
+#define XM_INHASH(IoC, Mac, Reg, pVal) {                                \
+        SK_U16  Word;                                                                           \
+        SK_U8   SK_FAR *pByte;                                                          \
+        pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];   \
+        SK_IN16((IoC), XMA((Mac), (Reg)), &Word);                       \
+        pByte[0] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), XMA((Mac), (Reg+2)), &Word);                     \
+        pByte[2] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[3] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), XMA((Mac), (Reg+4)), &Word);                     \
+        pByte[4] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[5] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), XMA((Mac), (Reg+6)), &Word);                     \
+        pByte[6] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[7] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+}
+
+#define XM_OUTHASH(IoC, Mac, Reg, pVal) {                               \
+        SK_U8   SK_FAR *pByte;                                                          \
+        pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];   \
+        SK_OUT16((IoC), XMA((Mac), (Reg)), (SK_U16)                     \
+                (((SK_U16)(pByte[0]) & 0x00ff)|                                 \
+                (((SK_U16)(pByte[1]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), XMA((Mac), (Reg+2)), (SK_U16)           \
+                (((SK_U16)(pByte[2]) & 0x00ff)|                                 \
+                (((SK_U16)(pByte[3]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), XMA((Mac), (Reg+4)), (SK_U16)           \
+                (((SK_U16)(pByte[4]) & 0x00ff)|                                 \
+                (((SK_U16)(pByte[5]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), XMA((Mac), (Reg+6)), (SK_U16)           \
+                (((SK_U16)(pByte[6]) & 0x00ff)|                                 \
+                (((SK_U16)(pByte[7]) << 8) & 0xff00)));                 \
+}
+
+/*
+ * macros to access the GMAC (YUKON only)
+ *
+ * GM_IN16(),           to read  a 16 bit register (e.g. GM_GP_STAT)
+ * GM_OUT16(),          to write a 16 bit register (e.g. GM_GP_CTRL)
+ * GM_IN32(),           to read  a 32 bit register (e.g. GM_)
+ * GM_OUT32(),          to write a 32 bit register (e.g. GM_)
+ * GM_INADDR(),         to read  a network address register (e.g. GM_SRC_ADDR_1L)
+ * GM_OUTADDR(),        to write a network address register (e.g. GM_SRC_ADDR_2L)
+ * GM_INHASH(),         to read  the GM_MC_ADDR_H1 register
+ * GM_OUTHASH()         to write the GM_MC_ADDR_H1 register
+ *
+ * para:
+ *      Mac             GMAC to access          values: MAC_1 or MAC_2
+ *      IoC             I/O context needed for SK I/O macros
+ *      Reg             GMAC Register to read or write
+ *      (p)Val  Value or pointer to the value which should be read or written
+ *
+ * usage:       GM_OUT16(IoC, MAC_1, GM_GP_CTRL, Value);
+ */
+
+#define GMA(Mac, Reg)                                                                   \
+        ((BASE_GMAC_1 + (Mac) * (BASE_GMAC_2 - BASE_GMAC_1)) | (Reg))
+
+#define GM_IN16(IoC, Mac, Reg, pVal)                                    \
+        SK_IN16((IoC), GMA((Mac), (Reg)), (pVal))
+
+#define GM_OUT16(IoC, Mac, Reg, Val)                                    \
+        SK_OUT16((IoC), GMA((Mac), (Reg)), (Val))
+
+#define GM_IN32(IoC, Mac, Reg, pVal) {                                  \
+        SK_IN16((IoC), GMA((Mac), (Reg)),                                       \
+                (SK_U16 SK_FAR*)&((SK_U16 SK_FAR*)(pVal))[XM_WORD_LO]);         \
+        SK_IN16((IoC), GMA((Mac), (Reg+4)),                                     \
+                (SK_U16 SK_FAR*)&((SK_U16 SK_FAR*)(pVal))[XM_WORD_HI]);         \
+}
+
+#define GM_OUT32(IoC, Mac, Reg, Val) {                                                                          \
+        SK_OUT16((IoC), GMA((Mac), (Reg)), (SK_U16)((Val) & 0xffffL));                  \
+        SK_OUT16((IoC), GMA((Mac), (Reg+4)), (SK_U16)(((Val) >> 16) & 0xffffL));\
+}
+
+#define GM_INADDR(IoC, Mac, Reg, pVal) {                                \
+        SK_U16  Word;                                                                           \
+        SK_U8   *pByte;                                                                         \
+        pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];                         \
+        SK_IN16((IoC), GMA((Mac), (Reg)), &Word);                       \
+        pByte[0] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), GMA((Mac), (Reg+4)), &Word);                     \
+        pByte[2] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[3] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), GMA((Mac), (Reg+8)), &Word);                     \
+        pByte[4] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[5] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+}
+
+#define GM_OUTADDR(IoC, Mac, Reg, pVal) {                               \
+        SK_U8   SK_FAR *pByte;                                                          \
+        pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];   \
+        SK_OUT16((IoC), GMA((Mac), (Reg)), (SK_U16)                     \
+                (((SK_U16)(pByte[0]) & 0x00ff) |                                \
+                (((SK_U16)(pByte[1]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), GMA((Mac), (Reg+4)), (SK_U16)           \
+                (((SK_U16)(pByte[2]) & 0x00ff) |                                \
+                (((SK_U16)(pByte[3]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), GMA((Mac), (Reg+8)), (SK_U16)           \
+                (((SK_U16)(pByte[4]) & 0x00ff) |                                \
+                (((SK_U16)(pByte[5]) << 8) & 0xff00)));                 \
+}
+
+#define GM_INHASH(IoC, Mac, Reg, pVal) {                                \
+        SK_U16  Word;                                                                           \
+        SK_U8   *pByte;                                                                         \
+        pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];                         \
+        SK_IN16((IoC), GMA((Mac), (Reg)), &Word);                       \
+        pByte[0] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), GMA((Mac), (Reg+4)), &Word);                     \
+        pByte[2] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[3] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), GMA((Mac), (Reg+8)), &Word);                     \
+        pByte[4] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[5] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+        SK_IN16((IoC), GMA((Mac), (Reg+12)), &Word);            \
+        pByte[6] = (SK_U8)(Word  & 0x00ff);                                     \
+        pByte[7] = (SK_U8)((Word >> 8) & 0x00ff);                       \
+}
+
+#define GM_OUTHASH(IoC, Mac, Reg, pVal) {                               \
+        SK_U8   *pByte;                                                                         \
+        pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];                         \
+        SK_OUT16((IoC), GMA((Mac), (Reg)), (SK_U16)                     \
+                (((SK_U16)(pByte[0]) & 0x00ff)|                                 \
+                (((SK_U16)(pByte[1]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), GMA((Mac), (Reg+4)), (SK_U16)           \
+                (((SK_U16)(pByte[2]) & 0x00ff)|                                 \
+                (((SK_U16)(pByte[3]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), GMA((Mac), (Reg+8)), (SK_U16)           \
+                (((SK_U16)(pByte[4]) & 0x00ff)|                                 \
+                (((SK_U16)(pByte[5]) << 8) & 0xff00)));                 \
+        SK_OUT16((IoC), GMA((Mac), (Reg+12)), (SK_U16)          \
+                (((SK_U16)(pByte[6]) & 0x00ff)|                                 \
+                (((SK_U16)(pByte[7]) << 8) & 0xff00)));                 \
+}
+
+/*
+ * Different MAC Types
+ */
+#define SK_MAC_XMAC             0       /* Xaqti XMAC II */
+#define SK_MAC_GMAC             1       /* Marvell GMAC */
+
+/*
+ * Different PHY Types
+ */
+#define SK_PHY_XMAC                     0       /* integrated in XMAC II */
+#define SK_PHY_BCOM                     1       /* Broadcom BCM5400 */
+#define SK_PHY_LONE                     2       /* Level One LXT1000 */
+#define SK_PHY_NAT                      3       /* National DP83891 */
+#define SK_PHY_MARV_COPPER      4       /* Marvell 88E1011S */
+#define SK_PHY_MARV_FIBER       5       /* Marvell 88E1011S working on fiber */
+
+/*
+ * PHY addresses (bits 12..8 of PHY address reg)
+ */
+#define PHY_ADDR_XMAC   (0<<8)
+#define PHY_ADDR_BCOM   (1<<8)
+#define PHY_ADDR_LONE   (3<<8)
+#define PHY_ADDR_NAT    (0<<8)
+
+/* GPHY address (bits 15..11 of SMI control reg) */
+#define PHY_ADDR_MARV   0
+
+/*
+ * macros to access the PHY
+ *
+ * PHY_READ()           read a 16 bit value from the PHY
+ * PHY_WRITE()          write a 16 bit value to the PHY
+ *
+ * para:
+ *      IoC             I/O context needed for SK I/O macros
+ *      pPort   Pointer to port struct for PhyAddr
+ *      Mac             XMAC to access          values: MAC_1 or MAC_2
+ *      PhyReg  PHY Register to read or write
+ *      (p)Val  Value or pointer to the value which should be read or
+ *                      written.
+ *
+ * usage:       PHY_READ(IoC, pPort, MAC_1, PHY_CTRL, Value);
+ * Warning: a PHY_READ on an uninitialized PHY (PHY still in reset) never
+ *          comes back. This is checked in DEBUG mode.
+ */
+#ifndef DEBUG
+#define PHY_READ(IoC, pPort, Mac, PhyReg, pVal) {                                               \
+        SK_U16 Mmu;                                                                                                             \
+                                                                                                                                                \
+        XM_OUT16((IoC), (Mac), XM_PHY_ADDR, (PhyReg) | (pPort)->PhyAddr);       \
+        XM_IN16((IoC), (Mac), XM_PHY_DATA, (pVal));                                                     \
+        if ((pPort)->PhyType != SK_PHY_XMAC) {                                                          \
+                do {                                                                                                                    \
+                        XM_IN16((IoC), (Mac), XM_MMU_CMD, &Mmu);                                        \
+                } while ((Mmu & XM_MMU_PHY_RDY) == 0);                                                  \
+                XM_IN16((IoC), (Mac), XM_PHY_DATA, (pVal));                                             \
+        }                                                                                                                                       \
+}
+#else
+#define PHY_READ(IoC, pPort, Mac, PhyReg, pVal) {                                               \
+        SK_U16 Mmu;                                                                                                             \
+        int __i = 0;                                                                                                            \
+                                                                                                                                                \
+        XM_OUT16((IoC), (Mac), XM_PHY_ADDR, (PhyReg) | (pPort)->PhyAddr);       \
+        XM_IN16((IoC), (Mac), XM_PHY_DATA, (pVal));                                                     \
+        if ((pPort)->PhyType != SK_PHY_XMAC) {                                                          \
+                do {                                                                                                                    \
+                        XM_IN16((IoC), (Mac), XM_MMU_CMD, &Mmu);                                        \
+                        __i++;                                                                                                          \
+                        if (__i > 100000) {                                                                                     \
+                                SK_DBG_PRINTF("*****************************\n");               \
+                                SK_DBG_PRINTF("PHY_READ on uninitialized PHY\n");               \
+                                SK_DBG_PRINTF("*****************************\n");               \
+                                break;                                                                                                  \
+                        }                                                                                                                       \
+                } while ((Mmu & XM_MMU_PHY_RDY) == 0);                                                  \
+                XM_IN16((IoC), (Mac), XM_PHY_DATA, (pVal));                                             \
+        }                                                                                                                                       \
+}
+#endif /* DEBUG */
+
+#define PHY_WRITE(IoC, pPort, Mac, PhyReg, Val) {                                               \
+        SK_U16 Mmu;                                                                                                                     \
+                                                                                                                                                \
+        if ((pPort)->PhyType != SK_PHY_XMAC) {                                                          \
+                do {                                                                                                                    \
+                        XM_IN16((IoC), (Mac), XM_MMU_CMD, &Mmu);                                        \
+                } while ((Mmu & XM_MMU_PHY_BUSY) != 0);                                                 \
+        }                                                                                                                                       \
+        XM_OUT16((IoC), (Mac), XM_PHY_ADDR, (PhyReg) | (pPort)->PhyAddr);       \
+        XM_OUT16((IoC), (Mac), XM_PHY_DATA, (Val));                                                     \
+        if ((pPort)->PhyType != SK_PHY_XMAC) {                                                          \
+                do {                                                                                                                    \
+                        XM_IN16((IoC), (Mac), XM_MMU_CMD, &Mmu);                                        \
+                } while ((Mmu & XM_MMU_PHY_BUSY) != 0);                                                 \
+        }                                                                                                                                       \
+}
+
+/*
+ *      Macro PCI_C()
+ *
+ *      Use this macro to access PCI config register from the I/O space.
+ *
+ * para:
+ *      Addr    PCI configuration register to access.
+ *                      Values: PCI_VENDOR_ID ... PCI_VPD_ADR_REG,
+ *
+ * usage        SK_IN16(pAC, PCI_C(PCI_VENDOR_ID), pVal);
+ */
+#define PCI_C(Addr)     (B7_CFG_SPC + (Addr))   /* PCI Config Space */
+
+/*
+ *      Macro SK_HW_ADDR(Base, Addr)
+ *
+ *      Calculates the effective HW address
+ *
+ * para:
+ *      Base    I/O or memory base address
+ *      Addr    Address offset
+ *
+ * usage:       May be used in SK_INxx and SK_OUTxx macros
+ *              #define SK_IN8(pAC, Addr, pVal) ...\
+ *                      *pVal = (SK_U8)inp(SK_HW_ADDR(pAC->Hw.Iop, Addr)))
+ */
+#ifdef SK_MEM_MAPPED_IO
+#define SK_HW_ADDR(Base, Addr)  ((Base) + (Addr))
+#else  /* SK_MEM_MAPPED_IO */
+#define SK_HW_ADDR(Base, Addr)  \
+                        ((Base) + (((Addr) & 0x7f) | (((Addr) >> 7 > 0) ? 0x80 : 0)))
+#endif /* SK_MEM_MAPPED_IO */
+
+#define SZ_LONG (sizeof(SK_U32))
+
+/*
+ *      Macro SK_HWAC_LINK_LED()
+ *
+ *      Use this macro to set the link LED mode.
+ * para:
+ *      pAC             Pointer to adapter context struct
+ *      IoC             I/O context needed for SK I/O macros
+ *  Port        Port number
+ *      Mode    Mode to set for this LED
+ */
+#define SK_HWAC_LINK_LED(pAC, IoC, Port, Mode) \
+        SK_OUT8(IoC, MR_ADDR(Port, LNK_LED_REG), Mode);
+
+
+/* typedefs *******************************************************************/
+
+
+/* function prototypes ********************************************************/
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif  /* __INC_SKGEHW_H */
diff --git a/drivers/net/sk98lin/h/skgehwt.h b/drivers/net/sk98lin/h/skgehwt.h
new file mode 100644
index 0000000000..e6b0016a69
--- /dev/null
+++ b/drivers/net/sk98lin/h/skgehwt.h
@@ -0,0 +1,48 @@
+/******************************************************************************
+ *
+ * Name:        skhwt.h
+ * 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
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ * SKGEHWT.H    contains all defines and types for the timer functions
+ */
+
+#ifndef _SKGEHWT_H_
+#define _SKGEHWT_H_
+
+/*
+ * SK Hardware Timer
+ * - needed wherever the HWT module is used
+ * - 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_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 void SkHwtIsr(SK_AC *pAC, SK_IOC Ioc);
+#endif  /* _SKGEHWT_H_ */
diff --git a/drivers/net/sk98lin/h/skgei2c.h b/drivers/net/sk98lin/h/skgei2c.h
new file mode 100644
index 0000000000..d9b6f6d8df
--- /dev/null
+++ b/drivers/net/sk98lin/h/skgei2c.h
@@ -0,0 +1,210 @@
+/******************************************************************************
+ *
+ * Name:        skgei2c.h
+ * 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.
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ * SKGEI2C.H    contains all SK-98xx specific defines for the TWSI handling
+ */
+
+#ifndef _INC_SKGEI2C_H_
+#define _INC_SKGEI2C_H_
+
+/*
+ * Macros to access the B2_I2C_CTRL
+ */
+#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) | \
+                (dev_size & I2C_DEV_SIZE) | \
+                ((burst << 4) & I2C_BURST_LEN))
+
+#define SK_I2C_STOP(IoC) {                              \
+        SK_U32  I2cCtrl;                                \
+        SK_IN32(IoC, B2_I2C_CTRL, &I2cCtrl);            \
+        SK_OUT32(IoC, B2_I2C_CTRL, I2cCtrl | I2C_STOP); \
+}
+
+#define SK_I2C_GET_CTL(IoC, pI2cCtrl)   SK_IN32(IoC, B2_I2C_CTRL, pI2cCtrl)
+
+/*
+ * Macros to access the TWSI SW Registers
+ */
+#define SK_I2C_SET_BIT(IoC, SetBits) {                  \
+        SK_U8   OrgBits;                                \
+        SK_IN8(IoC, B2_I2C_SW, &OrgBits);               \
+        SK_OUT8(IoC, B2_I2C_SW, OrgBits | (SK_U8)(SetBits));    \
+}
+
+#define SK_I2C_CLR_BIT(IoC, ClrBits) {                  \
+        SK_U8   OrgBits;                                \
+        SK_IN8(IoC, B2_I2C_SW, &OrgBits);               \
+        SK_OUT8(IoC, B2_I2C_SW, OrgBits & ~((SK_U8)(ClrBits))); \
+}
+
+#define SK_I2C_GET_SW(IoC, pI2cSw)      SK_IN8(IoC, B2_I2C_SW, pI2cSw)
+
+/*
+ * define the possible sensor states
+ */
+#define SK_SEN_IDLE             0       /* Idle: sensor not read */
+#define SK_SEN_VALUE    1       /* Value Read cycle */
+#define SK_SEN_VALEXT   2       /* Extended Value Read cycle */
+
+/*
+ * Conversion factor to convert read Voltage sensor to milli Volt
+ * Conversion factor to convert read Temperature sensor to 10th degree Celsius
+ */
+#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 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 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 state machine (SM) use the timer in two ways
+ * instead of one as hitherto
+ */
+#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
+ */
+
+/* Temperature sensor */
+#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 */
+
+/* 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_LOW_WARN          4664    /* Voltage PCI Low  Warn Threshold */
+#define SK_SEN_PCI_5V_LOW_ERR           4422    /* Voltage PCI Low  Err  Threshold */
+
+/*
+ * VIO may be 5 V or 3.3 V. Initialization takes two parts:
+ * 1. Initialize lowest lower limit and highest higher limit.
+ * 2. After the first value is read correct the upper or the lower limit to
+ *    the appropriate C constant.
+ *
+ * Warning limits are +-5% of the exepected voltage.
+ * Error limits are +-10% of the expected voltage.
+ */
+
+/* Bug fix AF: 16.Aug.2001: Correct the init base of LM80 sensor */
+
+#define SK_SEN_PCI_IO_5V_HIGH_ERR       5566    /* + 10% V PCI-IO High Err Threshold */
+#define SK_SEN_PCI_IO_5V_HIGH_WARN      5324    /* +  5% V PCI-IO High Warn Threshold */
+                                        /*              5000    mVolt */
+#define SK_SEN_PCI_IO_5V_LOW_WARN       4686    /* -  5% V PCI-IO Low Warn Threshold */
+#define SK_SEN_PCI_IO_5V_LOW_ERR        4444    /* - 10% V PCI-IO Low Err Threshold */
+
+#define SK_SEN_PCI_IO_RANGE_LIMITER     4000    /* 4000 mV range delimiter */
+
+/* correction values for the second pass */
+#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 */
+
+/*
+ * 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 */
+
+/*
+ * PHY PLL 3V3 voltage
+ */
+#define SK_SEN_PLL_3V3_HIGH_ERR         3630    /* Voltage PMA High Err  Threshold */
+#define SK_SEN_PLL_3V3_HIGH_WARN        3476    /* Voltage PMA High Warn Threshold */
+#define SK_SEN_PLL_3V3_LOW_WARN         3146    /* Voltage PMA Low  Warn Threshold */
+#define SK_SEN_PLL_3V3_LOW_ERR          2970    /* Voltage PMA Low  Err  Threshold */
+
+/*
+ * VAUX (YUKON only)
+ */
+#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_RANGE_LIMITER       1000    /* 1000 mV range delimiter */
+
+/*
+ * PHY 2V5 voltage
+ */
+#define SK_SEN_PHY_2V5_HIGH_ERR         2750    /* Voltage PHY High Err Threshold */
+#define SK_SEN_PHY_2V5_HIGH_WARN        2640    /* Voltage PHY High Warn Threshold */
+#define SK_SEN_PHY_2V5_LOW_WARN         2376    /* Voltage PHY Low Warn Threshold */
+#define SK_SEN_PHY_2V5_LOW_ERR          2222    /* Voltage PHY Low Err Threshold */
+
+/*
+ * 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_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 */
+
+/*
+ * FAN 1 speed
+ */
+/* assuming: 6500rpm +-15%, 4 pulses,
+ * warning at:  80 %
+ * error at:    70 %
+ * no upper limit
+ */
+#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 */
+
+/*
+ * Some Voltages need dynamic thresholds
+ */
+#define SK_SEN_DYN_INIT_NONE             0  /* No dynamic init of thresholds */
+#define SK_SEN_DYN_INIT_PCI_IO          10  /* Init PCI-IO with new thresholds */
+#define SK_SEN_DYN_INIT_VAUX            11  /* Init VAUX with new thresholds */
+
+extern  int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
+#endif  /* n_INC_SKGEI2C_H */
diff --git a/drivers/net/sk98lin/h/skgeinit.h b/drivers/net/sk98lin/h/skgeinit.h
new file mode 100644
index 0000000000..143e635ec2
--- /dev/null
+++ b/drivers/net/sk98lin/h/skgeinit.h
@@ -0,0 +1,797 @@
+/******************************************************************************
+ *
+ * Name:        skgeinit.h
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.83 $
+ * Date:        $Date: 2003/09/16 14:07:37 $
+ * Purpose:     Structures and prototypes for the GE Init Module
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKGEINIT_H_
+#define __INC_SKGEINIT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+/* defines ********************************************************************/
+
+#define SK_TEST_VAL             0x11335577UL
+
+/* modifying Link LED behaviour (used with SkGeLinkLED()) */
+#define SK_LNK_OFF              LED_OFF
+#define SK_LNK_ON               (LED_ON | LED_BLK_OFF | LED_SYNC_OFF)
+#define SK_LNK_BLINK    (LED_ON | LED_BLK_ON  | LED_SYNC_ON)
+#define SK_LNK_PERM             (LED_ON | LED_BLK_OFF | LED_SYNC_ON)
+#define SK_LNK_TST              (LED_ON | LED_BLK_ON  | LED_SYNC_OFF)
+
+/* parameter 'Mode' when calling SK_HWAC_LINK_LED() */
+#define SK_LED_OFF              LED_OFF
+#define SK_LED_ACTIVE   (LED_ON | LED_BLK_OFF | LED_SYNC_OFF)
+#define SK_LED_STANDBY  (LED_ON | LED_BLK_ON  | LED_SYNC_OFF)
+
+/* addressing LED Registers in SkGeXmitLED() */
+#define XMIT_LED_INI    0
+#define XMIT_LED_CNT    (RX_LED_VAL - RX_LED_INI)
+#define XMIT_LED_CTRL   (RX_LED_CTRL- RX_LED_INI)
+#define XMIT_LED_TST    (RX_LED_TST - RX_LED_INI)
+
+/* parameter 'Mode' when calling SkGeXmitLED() */
+#define SK_LED_DIS      0
+#define SK_LED_ENA      1
+#define SK_LED_TST      2
+
+/* Counter and Timer constants, for a host clock of 62.5 MHz */
+#define SK_XMIT_DUR             0x002faf08UL    /*  50 ms */
+#define SK_BLK_DUR              0x01dcd650UL    /* 500 ms */
+
+#define SK_DPOLL_DEF    0x00ee6b28UL    /* 250 ms at 62.5 MHz */
+
+#define SK_DPOLL_MAX    0x00ffffffUL    /* 268 ms at 62.5 MHz */
+                                                                                /* 215 ms at 78.12 MHz */
+
+#define SK_FACT_62              100                     /* is given in percent */
+#define SK_FACT_53               85         /* on GENESIS:      53.12 MHz */
+#define SK_FACT_78              125                     /* on YUKON:    78.12 MHz */
+
+/* Timeout values */
+#define SK_MAC_TO_53    72                      /* MAC arbiter timeout */
+#define SK_PKT_TO_53    0x2000          /* Packet arbiter timeout */
+#define SK_PKT_TO_MAX   0xffff          /* Maximum value */
+#define SK_RI_TO_53             36                      /* RAM interface timeout */
+
+#define SK_PHY_ACC_TO   600000          /* PHY access timeout */
+
+/* RAM Buffer High Pause Threshold values */
+#define SK_RB_ULPP              ( 8 * 1024)     /* Upper Level in kB/8 */
+#define SK_RB_LLPP_S    (10 * 1024)     /* Lower Level for small Queues */
+#define SK_RB_LLPP_B    (16 * 1024)     /* Lower Level for big Queues */
+
+#ifndef SK_BMU_RX_WM
+#define SK_BMU_RX_WM    0x600           /* BMU Rx Watermark */
+#endif
+#ifndef SK_BMU_TX_WM
+#define SK_BMU_TX_WM    0x600           /* BMU Tx Watermark */
+#endif
+
+/* XMAC II Rx High Watermark */
+#define SK_XM_RX_HI_WM  0x05aa          /* 1450 */
+
+/* XMAC II Tx Threshold */
+#define SK_XM_THR_REDL  0x01fb          /* .. for redundant link usage */
+#define SK_XM_THR_SL    0x01fb          /* .. for single link adapters */
+#define SK_XM_THR_MULL  0x01fb          /* .. for multiple link usage */
+#define SK_XM_THR_JUMBO 0x03fc          /* .. for jumbo frame usage */
+
+/* values for GIPortUsage */
+#define SK_RED_LINK             1               /* redundant link usage */
+#define SK_MUL_LINK             2               /* multiple link usage */
+#define SK_JUMBO_LINK   3               /* driver uses jumbo frames */
+
+/* Minimum RAM Buffer Rx Queue Size */
+#define SK_MIN_RXQ_SIZE 16              /* 16 kB */
+
+/* Minimum RAM Buffer Tx Queue Size */
+#define SK_MIN_TXQ_SIZE 16              /* 16 kB */
+
+/* Queue Size units */
+#define QZ_UNITS                0x7
+#define QZ_STEP                 8
+
+/* Percentage of queue size from whole memory */
+/* 80 % for receive */
+#define RAM_QUOTA_RX    80L
+/* 0% for sync transfer */
+#define RAM_QUOTA_SYNC  0L
+/* the rest (20%) is taken for async transfer */
+
+/* Get the rounded queue size in Bytes in 8k steps */
+#define ROUND_QUEUE_SIZE(SizeInBytes)                                   \
+        ((((unsigned long) (SizeInBytes) + (QZ_STEP*1024L)-1) / 1024) & \
+        ~(QZ_STEP-1))
+
+/* Get the rounded queue size in KBytes in 8k steps */
+#define ROUND_QUEUE_SIZE_KB(Kilobytes) \
+        ROUND_QUEUE_SIZE((Kilobytes) * 1024L)
+
+/* Types of RAM Buffer Queues */
+#define SK_RX_SRAM_Q    1       /* small receive queue */
+#define SK_RX_BRAM_Q    2       /* big receive queue */
+#define SK_TX_RAM_Q             3       /* small or big transmit queue */
+
+/* parameter 'Dir' when calling SkGeStopPort() */
+#define SK_STOP_TX      1       /* Stops the transmit path, resets the XMAC */
+#define SK_STOP_RX      2       /* Stops the receive path */
+#define SK_STOP_ALL     3       /* Stops Rx and Tx path, resets the XMAC */
+
+/* parameter 'RstMode' when calling SkGeStopPort() */
+#define SK_SOFT_RST     1       /* perform a software reset */
+#define SK_HARD_RST     2       /* perform a hardware reset */
+
+/* Init Levels */
+#define SK_INIT_DATA    0       /* Init level 0: init data structures */
+#define SK_INIT_IO              1       /* Init level 1: init with IOs */
+#define SK_INIT_RUN             2       /* Init level 2: init for run time */
+
+/* Link Mode Parameter */
+#define SK_LMODE_HALF           1       /* Half Duplex Mode */
+#define SK_LMODE_FULL           2       /* Full Duplex Mode */
+#define SK_LMODE_AUTOHALF       3       /* AutoHalf Duplex Mode */
+#define SK_LMODE_AUTOFULL       4       /* AutoFull Duplex Mode */
+#define SK_LMODE_AUTOBOTH       5       /* AutoBoth Duplex Mode */
+#define SK_LMODE_AUTOSENSE      6       /* configured mode auto sensing */
+#define SK_LMODE_INDETERMINATED 7       /* indeterminated */
+
+/* Auto-negotiation timeout in 100ms granularity */
+#define SK_AND_MAX_TO           6       /* Wait 600 msec before link comes up */
+
+/* Auto-negotiation error codes */
+#define SK_AND_OK                       0       /* no error */
+#define SK_AND_OTHER            1       /* other error than below */
+#define SK_AND_DUP_CAP          2       /* Duplex capabilities error */
+
+
+/* Link Speed Capabilities */
+#define SK_LSPEED_CAP_AUTO                      (1<<0)  /* Automatic resolution */
+#define SK_LSPEED_CAP_10MBPS            (1<<1)  /* 10 Mbps */
+#define SK_LSPEED_CAP_100MBPS           (1<<2)  /* 100 Mbps */
+#define SK_LSPEED_CAP_1000MBPS          (1<<3)  /* 1000 Mbps */
+#define SK_LSPEED_CAP_INDETERMINATED (1<<4) /* indeterminated */
+
+/* Link Speed Parameter */
+#define SK_LSPEED_AUTO                          1       /* Automatic resolution */
+#define SK_LSPEED_10MBPS                        2       /* 10 Mbps */
+#define SK_LSPEED_100MBPS                       3       /* 100 Mbps */
+#define SK_LSPEED_1000MBPS                      4       /* 1000 Mbps */
+#define SK_LSPEED_INDETERMINATED        5       /* indeterminated */
+
+/* Link Speed Current State */
+#define SK_LSPEED_STAT_UNKNOWN          1
+#define SK_LSPEED_STAT_10MBPS           2
+#define SK_LSPEED_STAT_100MBPS          3
+#define SK_LSPEED_STAT_1000MBPS         4
+#define SK_LSPEED_STAT_INDETERMINATED 5
+
+
+/* Link Capability Parameter */
+#define SK_LMODE_CAP_HALF               (1<<0)  /* Half Duplex Mode */
+#define SK_LMODE_CAP_FULL               (1<<1)  /* Full Duplex Mode */
+#define SK_LMODE_CAP_AUTOHALF   (1<<2)  /* AutoHalf Duplex Mode */
+#define SK_LMODE_CAP_AUTOFULL   (1<<3)  /* AutoFull Duplex Mode */
+#define SK_LMODE_CAP_INDETERMINATED (1<<4) /* indeterminated */
+
+/* Link Mode Current State */
+#define SK_LMODE_STAT_UNKNOWN   1       /* Unknown Duplex Mode */
+#define SK_LMODE_STAT_HALF              2       /* Half Duplex Mode */
+#define SK_LMODE_STAT_FULL              3       /* Full Duplex Mode */
+#define SK_LMODE_STAT_AUTOHALF  4       /* Half Duplex Mode obtained by Auto-Neg */
+#define SK_LMODE_STAT_AUTOFULL  5       /* Full Duplex Mode obtained by Auto-Neg */
+#define SK_LMODE_STAT_INDETERMINATED 6  /* indeterminated */
+
+/* Flow Control Mode Parameter (and capabilities) */
+#define SK_FLOW_MODE_NONE               1       /* No Flow-Control */
+#define SK_FLOW_MODE_LOC_SEND   2       /* Local station sends PAUSE */
+#define SK_FLOW_MODE_SYMMETRIC  3       /* Both stations may send PAUSE */
+#define SK_FLOW_MODE_SYM_OR_REM 4       /* Both stations may send PAUSE or
+                                         * just the remote station may send PAUSE
+                                         */
+#define SK_FLOW_MODE_INDETERMINATED 5   /* indeterminated */
+
+/* Flow Control Status Parameter */
+#define SK_FLOW_STAT_NONE               1       /* No Flow Control */
+#define SK_FLOW_STAT_REM_SEND   2       /* Remote Station sends PAUSE */
+#define SK_FLOW_STAT_LOC_SEND   3       /* Local station sends PAUSE */
+#define SK_FLOW_STAT_SYMMETRIC  4       /* Both station may send PAUSE */
+#define SK_FLOW_STAT_INDETERMINATED 5   /* indeterminated */
+
+/* Master/Slave Mode Capabilities */
+#define SK_MS_CAP_AUTO          (1<<0)  /* Automatic resolution */
+#define SK_MS_CAP_MASTER        (1<<1)  /* This station is master */
+#define SK_MS_CAP_SLAVE         (1<<2)  /* This station is slave */
+#define SK_MS_CAP_INDETERMINATED (1<<3) /* indeterminated */
+
+/* Set Master/Slave Mode Parameter (and capabilities) */
+#define SK_MS_MODE_AUTO         1       /* Automatic resolution */
+#define SK_MS_MODE_MASTER       2       /* This station is master */
+#define SK_MS_MODE_SLAVE        3       /* This station is slave */
+#define SK_MS_MODE_INDETERMINATED 4     /* indeterminated */
+
+/* Master/Slave Status Parameter */
+#define SK_MS_STAT_UNSET        1       /* The M/S status is not set */
+#define SK_MS_STAT_MASTER       2       /* This station is master */
+#define SK_MS_STAT_SLAVE        3       /* This station is slave */
+#define SK_MS_STAT_FAULT        4       /* M/S resolution failed */
+#define SK_MS_STAT_INDETERMINATED 5     /* indeterminated */
+
+/* parameter 'Mode' when calling SkXmSetRxCmd() */
+#define SK_STRIP_FCS_ON         (1<<0)  /* Enable  FCS stripping of Rx frames */
+#define SK_STRIP_FCS_OFF        (1<<1)  /* Disable FCS stripping of Rx frames */
+#define SK_STRIP_PAD_ON         (1<<2)  /* Enable  pad byte stripping of Rx fr */
+#define SK_STRIP_PAD_OFF        (1<<3)  /* Disable pad byte stripping of Rx fr */
+#define SK_LENERR_OK_ON         (1<<4)  /* Don't chk fr for in range len error */
+#define SK_LENERR_OK_OFF        (1<<5)  /* Check frames for in range len error */
+#define SK_BIG_PK_OK_ON         (1<<6)  /* Don't set Rx Error bit for big frames */
+#define SK_BIG_PK_OK_OFF        (1<<7)  /* Set Rx Error bit for big frames */
+#define SK_SELF_RX_ON           (1<<8)  /* Enable  Rx of own packets */
+#define SK_SELF_RX_OFF          (1<<9)  /* Disable Rx of own packets */
+
+/* parameter 'Para' when calling SkMacSetRxTxEn() */
+#define SK_MAC_LOOPB_ON         (1<<0)  /* Enable  MAC Loopback Mode */
+#define SK_MAC_LOOPB_OFF        (1<<1)  /* Disable MAC Loopback Mode */
+#define SK_PHY_LOOPB_ON         (1<<2)  /* Enable  PHY Loopback Mode */
+#define SK_PHY_LOOPB_OFF        (1<<3)  /* Disable PHY Loopback Mode */
+#define SK_PHY_FULLD_ON         (1<<4)  /* Enable  GMII Full Duplex */
+#define SK_PHY_FULLD_OFF        (1<<5)  /* Disable GMII Full Duplex */
+
+/* States of PState */
+#define SK_PRT_RESET    0       /* the port is reset */
+#define SK_PRT_STOP             1       /* the port is stopped (similar to SW reset) */
+#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)
+
+/* values for GILedBlinkCtrl (LED Blink Control) */
+#define SK_ACT_LED_BLINK        (1<<0)  /* Active LED blinking */
+#define SK_DUP_LED_NORMAL       (1<<1)  /* Duplex LED normal */
+#define SK_LED_LINK100_ON       (1<<2)  /* Link 100M LED on */
+
+/* Link Partner Status */
+#define SK_LIPA_UNKNOWN 0       /* Link partner is in unknown state */
+#define SK_LIPA_MANUAL  1       /* Link partner is in detected manual state */
+#define SK_LIPA_AUTO    2       /* Link partner is in auto-negotiation state */
+
+/* Maximum Restarts before restart is ignored (3Com WA) */
+#define SK_MAX_LRESTART 3       /* Max. 3 times the link is restarted */
+
+/* Max. Auto-neg. timeouts before link detection in sense mode is reset */
+#define SK_MAX_ANEG_TO  10      /* Max. 10 times the sense mode is reset */
+
+/* structures *****************************************************************/
+
+/*
+ * MAC specific functions
+ */
+typedef struct s_GeMacFunc {
+        int  (*pFnMacUpdateStats)(SK_AC *pAC, SK_IOC IoC, unsigned int Port);
+        int  (*pFnMacStatistic)(SK_AC *pAC, SK_IOC IoC, unsigned int Port,
+                                                        SK_U16 StatAddr, SK_U32 SK_FAR *pVal);
+        int  (*pFnMacResetCounter)(SK_AC *pAC, SK_IOC IoC, unsigned int Port);
+        int  (*pFnMacOverflow)(SK_AC *pAC, SK_IOC IoC, unsigned int Port,
+                                                   SK_U16 IStatus, SK_U64 SK_FAR *pVal);
+} SK_GEMACFUNC;
+
+/*
+ * Port Structure
+ */
+typedef struct s_GePort {
+#ifndef SK_DIAG
+        SK_TIMER        PWaTimer;       /* Workaround Timer */
+        SK_TIMER        HalfDupChkTimer;
+#endif /* SK_DIAG */
+        SK_U32  PPrevShorts;    /* Previous Short Counter checking */
+        SK_U32  PPrevFcs;               /* Previous FCS Error Counter checking */
+        SK_U64  PPrevRx;                /* Previous RxOk Counter checking */
+        SK_U64  PRxLim;                 /* Previous RxOk Counter checking */
+        SK_U64  LastOctets;             /* For half duplex hang check */
+        int             PLinkResCt;             /* Link Restart Counter */
+        int             PAutoNegTimeOut;/* Auto-negotiation timeout current value */
+        int             PAutoNegTOCt;   /* Auto-negotiation Timeout Counter */
+        int             PRxQSize;               /* Port Rx Queue Size in kB */
+        int             PXSQSize;               /* Port Synchronous  Transmit Queue Size in kB */
+        int             PXAQSize;               /* Port Asynchronous Transmit Queue Size in kB */
+        SK_U32  PRxQRamStart;   /* Receive Queue RAM Buffer Start Address */
+        SK_U32  PRxQRamEnd;             /* Receive Queue RAM Buffer End Address */
+        SK_U32  PXsQRamStart;   /* Sync Tx Queue RAM Buffer Start Address */
+        SK_U32  PXsQRamEnd;             /* Sync Tx Queue RAM Buffer End Address */
+        SK_U32  PXaQRamStart;   /* Async Tx Queue RAM Buffer Start Address */
+        SK_U32  PXaQRamEnd;             /* Async Tx Queue RAM Buffer End Address */
+        SK_U32  PRxOverCnt;             /* Receive Overflow Counter */
+        int             PRxQOff;                /* Rx Queue Address Offset */
+        int             PXsQOff;                /* Synchronous Tx Queue Address Offset */
+        int             PXaQOff;                /* Asynchronous Tx Queue Address Offset */
+        int             PhyType;                /* PHY used on this port */
+        int             PState;                 /* Port status (reset, stop, init, run) */
+        SK_U16  PhyId1;                 /* PHY Id1 on this port */
+        SK_U16  PhyAddr;                /* MDIO/MDC PHY address */
+        SK_U16  PIsave;                 /* Saved Interrupt status word */
+        SK_U16  PSsave;                 /* Saved PHY status word */
+        SK_U16  PGmANegAdv;             /* Saved GPhy AutoNegAdvertisment register */
+        SK_BOOL PHWLinkUp;              /* The hardware Link is up (wiring) */
+        SK_BOOL PLinkBroken;    /* Is Link broken ? */
+        SK_BOOL PCheckPar;              /* Do we check for parity errors ? */
+        SK_BOOL HalfDupTimerActive;
+        SK_U8   PLinkCap;               /* Link Capabilities */
+        SK_U8   PLinkModeConf;  /* Link Mode configured */
+        SK_U8   PLinkMode;              /* Link Mode currently used */
+        SK_U8   PLinkModeStatus;/* Link Mode Status */
+        SK_U8   PLinkSpeedCap;  /* Link Speed Capabilities(10/100/1000 Mbps) */
+        SK_U8   PLinkSpeed;             /* configured Link Speed (10/100/1000 Mbps) */
+        SK_U8   PLinkSpeedUsed; /* current Link Speed (10/100/1000 Mbps) */
+        SK_U8   PFlowCtrlCap;   /* Flow Control Capabilities */
+        SK_U8   PFlowCtrlMode;  /* Flow Control Mode */
+        SK_U8   PFlowCtrlStatus;/* Flow Control Status */
+        SK_U8   PMSCap;                 /* Master/Slave Capabilities */
+        SK_U8   PMSMode;                /* Master/Slave Mode */
+        SK_U8   PMSStatus;              /* Master/Slave Status */
+        SK_BOOL PAutoNegFail;   /* Auto-negotiation fail flag */
+        SK_U8   PLipaAutoNeg;   /* Auto-negotiation possible with Link Partner */
+        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;
+
+/*
+ * Gigabit Ethernet Initialization Struct
+ * (has to be included in the adapter context)
+ */
+typedef struct s_GeInit {
+        int                     GIChipId;               /* Chip Identification Number */
+        int                     GIChipRev;              /* Chip Revision Number */
+        SK_U8           GIPciHwRev;             /* PCI HW Revision Number */
+        SK_BOOL         GIGenesis;              /* Genesis adapter ? */
+        SK_BOOL         GIYukon;                /* YUKON-A1/Bx chip */
+        SK_BOOL         GIYukonLite;    /* YUKON-Lite chip */
+        SK_BOOL         GICopperType;   /* Copper Type adapter ? */
+        SK_BOOL         GIPciSlot64;    /* 64-bit PCI Slot */
+        SK_BOOL         GIPciClock66;   /* 66 MHz PCI Clock */
+        SK_BOOL         GIVauxAvail;    /* VAUX available (YUKON) */
+        SK_BOOL         GIYukon32Bit;   /* 32-Bit YUKON adapter */
+        SK_U16          GILedBlinkCtrl; /* LED Blink Control */
+        int                     GIMacsFound;    /* Number of MACs found on this adapter */
+        int                     GIMacType;              /* MAC Type used on this adapter */
+        int                     GIHstClkFact;   /* Host Clock Factor (62.5 / HstClk * 100) */
+        int                     GIPortUsage;    /* Driver Port Usage */
+        int                     GILevel;                /* Initialization Level completed */
+        int                     GIRamSize;              /* The RAM size of the adapter in kB */
+        int                     GIWolOffs;              /* WOL Register Offset (HW-Bug in Rev. A) */
+        SK_U32          GIRamOffs;              /* RAM Address Offset for addr calculation */
+        SK_U32          GIPollTimerVal; /* Descr. Poll Timer Init Val (HstClk ticks) */
+        SK_U32          GIValIrqMask;   /* Value for Interrupt Mask */
+        SK_U32          GITimeStampCnt; /* Time Stamp High Counter (YUKON only) */
+        SK_GEPORT       GP[SK_MAX_MACS];/* Port Dependent Information */
+        SK_GEMACFUNC GIFunc;            /* MAC depedent functions */
+} SK_GEINIT;
+
+/*
+ * Error numbers and messages for skxmac2.c and skgeinit.c
+ */
+#define SKERR_HWI_E001          (SK_ERRBASE_HWINIT)
+#define SKERR_HWI_E001MSG       "SkXmClrExactAddr() has got illegal parameters"
+#define SKERR_HWI_E002          (SKERR_HWI_E001+1)
+#define SKERR_HWI_E002MSG       "SkGeInit(): Level 1 call missing"
+#define SKERR_HWI_E003          (SKERR_HWI_E002+1)
+#define SKERR_HWI_E003MSG       "SkGeInit() called with illegal init Level"
+#define SKERR_HWI_E004          (SKERR_HWI_E003+1)
+#define SKERR_HWI_E004MSG       "SkGeInitPort(): Queue Size illegal configured"
+#define SKERR_HWI_E005          (SKERR_HWI_E004+1)
+#define SKERR_HWI_E005MSG       "SkGeInitPort(): cannot init running ports"
+#define SKERR_HWI_E006          (SKERR_HWI_E005+1)
+#define SKERR_HWI_E006MSG       "SkGeMacInit(): PState does not match HW state"
+#define SKERR_HWI_E007          (SKERR_HWI_E006+1)
+#define SKERR_HWI_E007MSG       "SkXmInitDupMd() called with invalid Dup Mode"
+#define SKERR_HWI_E008          (SKERR_HWI_E007+1)
+#define SKERR_HWI_E008MSG       "SkXmSetRxCmd() called with invalid Mode"
+#define SKERR_HWI_E009          (SKERR_HWI_E008+1)
+#define SKERR_HWI_E009MSG       "SkGeCfgSync() called although PXSQSize zero"
+#define SKERR_HWI_E010          (SKERR_HWI_E009+1)
+#define SKERR_HWI_E010MSG       "SkGeCfgSync() called with invalid parameters"
+#define SKERR_HWI_E011          (SKERR_HWI_E010+1)
+#define SKERR_HWI_E011MSG       "SkGeInitPort(): Receive Queue Size too small"
+#define SKERR_HWI_E012          (SKERR_HWI_E011+1)
+#define SKERR_HWI_E012MSG       "SkGeInitPort(): invalid Queue Size specified"
+#define SKERR_HWI_E013          (SKERR_HWI_E012+1)
+#define SKERR_HWI_E013MSG       "SkGeInitPort(): cfg changed for running queue"
+#define SKERR_HWI_E014          (SKERR_HWI_E013+1)
+#define SKERR_HWI_E014MSG       "SkGeInitPort(): unknown GIPortUsage specified"
+#define SKERR_HWI_E015          (SKERR_HWI_E014+1)
+#define SKERR_HWI_E015MSG       "Illegal Link mode parameter"
+#define SKERR_HWI_E016          (SKERR_HWI_E015+1)
+#define SKERR_HWI_E016MSG       "Illegal Flow control mode parameter"
+#define SKERR_HWI_E017          (SKERR_HWI_E016+1)
+#define SKERR_HWI_E017MSG       "Illegal value specified for GIPollTimerVal"
+#define SKERR_HWI_E018          (SKERR_HWI_E017+1)
+#define SKERR_HWI_E018MSG       "FATAL: SkGeStopPort() does not terminate (Tx)"
+#define SKERR_HWI_E019          (SKERR_HWI_E018+1)
+#define SKERR_HWI_E019MSG       "Illegal Speed parameter"
+#define SKERR_HWI_E020          (SKERR_HWI_E019+1)
+#define SKERR_HWI_E020MSG       "Illegal Master/Slave parameter"
+#define SKERR_HWI_E021          (SKERR_HWI_E020+1)
+#define SKERR_HWI_E021MSG       "MacUpdateStats(): cannot update statistic counter"
+#define SKERR_HWI_E022          (SKERR_HWI_E021+1)
+#define SKERR_HWI_E022MSG       "MacStatistic(): illegal statistic base address"
+#define SKERR_HWI_E023          (SKERR_HWI_E022+1)
+#define SKERR_HWI_E023MSG       "SkGeInitPort(): Transmit Queue Size too small"
+#define SKERR_HWI_E024          (SKERR_HWI_E023+1)
+#define SKERR_HWI_E024MSG       "FATAL: SkGeStopPort() does not terminate (Rx)"
+#define SKERR_HWI_E025          (SKERR_HWI_E024+1)
+#define SKERR_HWI_E025MSG       ""
+
+/* function prototypes ********************************************************/
+
+#ifndef SK_KR_PROTO
+
+/*
+ * public functions in skgeinit.c
+ */
+extern void     SkGePollTxD(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_BOOL PollTxD);
+
+extern void     SkGeYellowLED(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             State);
+
+extern int      SkGeCfgSync(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_U32  IntTime,
+        SK_U32  LimCount,
+        int             SyncMode);
+
+extern void     SkGeLoadLnkSyncCnt(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_U32  CntVal);
+
+extern void     SkGeStopPort(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             Dir,
+        int             RstMode);
+
+extern int      SkGeInit(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Level);
+
+extern void     SkGeDeInit(
+        SK_AC   *pAC,
+        SK_IOC  IoC);
+
+extern int      SkGeInitPort(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkGeXmitLED(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Led,
+        int             Mode);
+
+extern int      SkGeInitAssignRamToQueues(
+        SK_AC   *pAC,
+        int             ActivePort,
+        SK_BOOL DualNet);
+
+/*
+ * public functions in skxmac2.c
+ */
+extern void SkMacRxTxDisable(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkMacSoftRst(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkMacHardRst(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkXmInitMac(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkGmInitMac(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void SkMacInitPhy(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_BOOL DoLoop);
+
+extern void SkMacIrqDisable(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkMacFlushTxFifo(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkMacIrq(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern int      SkMacAutoNegDone(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkMacAutoNegLipaPhy(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_U16  IStatus);
+
+extern int  SkMacRxTxEnable(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port);
+
+extern void     SkMacPromiscMode(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_BOOL Enable);
+
+extern void     SkMacHashing(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_BOOL Enable);
+
+extern void     SkXmPhyRead(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             Addr,
+        SK_U16  SK_FAR *pVal);
+
+extern void     SkXmPhyWrite(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             Addr,
+        SK_U16  Val);
+
+extern void     SkGmPhyRead(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             Addr,
+        SK_U16  SK_FAR *pVal);
+
+extern void     SkGmPhyWrite(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             Addr,
+        SK_U16  Val);
+
+extern void     SkXmClrExactAddr(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             StartNum,
+        int             StopNum);
+
+extern void     SkXmAutoNegLipaXmac(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_U16  IStatus);
+
+extern int SkXmUpdateStats(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        unsigned int Port);
+
+extern int SkGmUpdateStats(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        unsigned int Port);
+
+extern int SkXmMacStatistic(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        unsigned int Port,
+        SK_U16  StatAddr,
+        SK_U32  SK_FAR *pVal);
+
+extern int SkGmMacStatistic(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        unsigned int Port,
+        SK_U16  StatAddr,
+        SK_U32  SK_FAR *pVal);
+
+extern int SkXmResetCounter(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        unsigned int Port);
+
+extern int SkGmResetCounter(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        unsigned int Port);
+
+extern int SkXmOverflowStatus(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        unsigned int Port,
+        SK_U16  IStatus,
+        SK_U64  SK_FAR *pStatus);
+
+extern int SkGmOverflowStatus(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        unsigned int Port,
+        SK_U16  MacStatus,
+        SK_U64  SK_FAR *pStatus);
+
+extern int SkGmCableDiagStatus(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_BOOL StartTest);
+
+#ifdef SK_DIAG
+extern void     SkGePhyRead(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             Addr,
+        SK_U16  *pVal);
+
+extern void     SkGePhyWrite(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             Addr,
+        SK_U16  Val);
+
+extern void     SkMacSetRxCmd(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        int             Mode);
+extern void     SkMacCrcGener(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_BOOL Enable);
+extern void     SkMacTimeStamp(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_BOOL Enable);
+extern void     SkXmSendCont(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Port,
+        SK_BOOL Enable);
+#endif /* SK_DIAG */
+
+#else   /* SK_KR_PROTO */
+
+/*
+ * public functions in skgeinit.c
+ */
+extern void     SkGePollTxD();
+extern void     SkGeYellowLED();
+extern int      SkGeCfgSync();
+extern void     SkGeLoadLnkSyncCnt();
+extern void     SkGeStopPort();
+extern int      SkGeInit();
+extern void     SkGeDeInit();
+extern int      SkGeInitPort();
+extern void     SkGeXmitLED();
+extern int      SkGeInitAssignRamToQueues();
+
+/*
+ * public functions in skxmac2.c
+ */
+extern void SkMacRxTxDisable();
+extern void     SkMacSoftRst();
+extern void     SkMacHardRst();
+extern void SkMacInitPhy();
+extern int  SkMacRxTxEnable();
+extern void SkMacPromiscMode();
+extern void SkMacHashing();
+extern void SkMacIrqDisable();
+extern void     SkMacFlushTxFifo();
+extern void     SkMacIrq();
+extern int      SkMacAutoNegDone();
+extern void     SkMacAutoNegLipaPhy();
+extern void     SkXmInitMac();
+extern void     SkXmPhyRead();
+extern void     SkXmPhyWrite();
+extern void     SkGmInitMac();
+extern void     SkGmPhyRead();
+extern void     SkGmPhyWrite();
+extern void     SkXmClrExactAddr();
+extern void     SkXmAutoNegLipaXmac();
+extern int      SkXmUpdateStats();
+extern int      SkGmUpdateStats();
+extern int      SkXmMacStatistic();
+extern int      SkGmMacStatistic();
+extern int      SkXmResetCounter();
+extern int      SkGmResetCounter();
+extern int      SkXmOverflowStatus();
+extern int      SkGmOverflowStatus();
+extern int      SkGmCableDiagStatus();
+
+#ifdef SK_DIAG
+extern void     SkGePhyRead();
+extern void     SkGePhyWrite();
+extern void     SkMacSetRxCmd();
+extern void     SkMacCrcGener();
+extern void     SkMacTimeStamp();
+extern void     SkXmSendCont();
+#endif /* SK_DIAG */
+
+#endif  /* SK_KR_PROTO */
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif  /* __INC_SKGEINIT_H_ */
diff --git a/drivers/net/sk98lin/h/skgepnm2.h b/drivers/net/sk98lin/h/skgepnm2.h
new file mode 100644
index 0000000000..ddd304f1a4
--- /dev/null
+++ b/drivers/net/sk98lin/h/skgepnm2.h
@@ -0,0 +1,334 @@
+/*****************************************************************************
+ *
+ * Name:        skgepnm2.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.36 $
+ * Date:        $Date: 2003/05/23 12:45:13 $
+ * Purpose:     Defines for Private Network Management Interface
+ *
+ ****************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef _SKGEPNM2_H_
+#define _SKGEPNM2_H_
+
+/*
+ * General definitions
+ */
+#define SK_PNMI_CHIPSET_XMAC    1       /* XMAC11800FP */
+#define SK_PNMI_CHIPSET_YUKON   2       /* YUKON */
+
+#define SK_PNMI_BUS_PCI         1       /* PCI bus*/
+
+/*
+ * Actions
+ */
+#define SK_PNMI_ACT_IDLE                1
+#define SK_PNMI_ACT_RESET               2
+#define SK_PNMI_ACT_SELFTEST    3
+#define SK_PNMI_ACT_RESETCNT    4
+
+/*
+ * VPD releated defines
+ */
+
+#define SK_PNMI_VPD_RW          1
+#define SK_PNMI_VPD_RO          2
+
+#define SK_PNMI_VPD_OK                  0
+#define SK_PNMI_VPD_NOTFOUND    1
+#define SK_PNMI_VPD_CUT                 2
+#define SK_PNMI_VPD_TIMEOUT             3
+#define SK_PNMI_VPD_FULL                4
+#define SK_PNMI_VPD_NOWRITE             5
+#define SK_PNMI_VPD_FATAL               6
+
+#define SK_PNMI_VPD_IGNORE      0
+#define SK_PNMI_VPD_CREATE      1
+#define SK_PNMI_VPD_DELETE      2
+
+
+/*
+ * RLMT related defines
+ */
+#define SK_PNMI_DEF_RLMT_CHG_THRES      240     /* 4 changes per minute */
+
+
+/*
+ * VCT internal status values
+ */
+#define SK_PNMI_VCT_PENDING     32
+#define SK_PNMI_VCT_TEST_DONE   64
+#define SK_PNMI_VCT_LINK        128
+
+/*
+ * Internal table definitions
+ */
+#define SK_PNMI_GET             0
+#define SK_PNMI_PRESET  1
+#define SK_PNMI_SET             2
+
+#define SK_PNMI_RO              0
+#define SK_PNMI_RW              1
+#define SK_PNMI_WO              2
+
+typedef struct s_OidTabEntry {
+        SK_U32                  Id;
+        SK_U32                  InstanceNo;
+        unsigned int    StructSize;
+        unsigned int    Offset;
+        int                             Access;
+        int                             (* Func)(SK_AC *pAc, SK_IOC pIo, int action,
+                                                         SK_U32 Id, char* pBuf, unsigned int* pLen,
+                                                         SK_U32 Instance, unsigned int TableIndex,
+                                                         SK_U32 NetNumber);
+        SK_U16                  Param;
+} SK_PNMI_TAB_ENTRY;
+
+
+/*
+ * Trap lengths
+ */
+#define SK_PNMI_TRAP_SIMPLE_LEN                 17
+#define SK_PNMI_TRAP_SENSOR_LEN_BASE    46
+#define SK_PNMI_TRAP_RLMT_CHANGE_LEN    23
+#define SK_PNMI_TRAP_RLMT_PORT_LEN              23
+
+/*
+ * Number of MAC types supported
+ */
+#define SK_PNMI_MAC_TYPES       (SK_MAC_GMAC + 1)
+
+/*
+ * MAC statistic data list (overall set for MAC types used)
+ */
+enum SK_MACSTATS {
+        SK_PNMI_HTX                             = 0,
+        SK_PNMI_HTX_OCTET,
+        SK_PNMI_HTX_OCTETHIGH   = SK_PNMI_HTX_OCTET,
+        SK_PNMI_HTX_OCTETLOW,
+        SK_PNMI_HTX_BROADCAST,
+        SK_PNMI_HTX_MULTICAST,
+        SK_PNMI_HTX_UNICAST,
+        SK_PNMI_HTX_BURST,
+        SK_PNMI_HTX_PMACC,
+        SK_PNMI_HTX_MACC,
+        SK_PNMI_HTX_COL,
+        SK_PNMI_HTX_SINGLE_COL,
+        SK_PNMI_HTX_MULTI_COL,
+        SK_PNMI_HTX_EXCESS_COL,
+        SK_PNMI_HTX_LATE_COL,
+        SK_PNMI_HTX_DEFFERAL,
+        SK_PNMI_HTX_EXCESS_DEF,
+        SK_PNMI_HTX_UNDERRUN,
+        SK_PNMI_HTX_CARRIER,
+        SK_PNMI_HTX_UTILUNDER,
+        SK_PNMI_HTX_UTILOVER,
+        SK_PNMI_HTX_64,
+        SK_PNMI_HTX_127,
+        SK_PNMI_HTX_255,
+        SK_PNMI_HTX_511,
+        SK_PNMI_HTX_1023,
+        SK_PNMI_HTX_MAX,
+        SK_PNMI_HTX_LONGFRAMES,
+        SK_PNMI_HTX_SYNC,
+        SK_PNMI_HTX_SYNC_OCTET,
+        SK_PNMI_HTX_RESERVED,
+        
+        SK_PNMI_HRX,
+        SK_PNMI_HRX_OCTET,
+        SK_PNMI_HRX_OCTETHIGH   = SK_PNMI_HRX_OCTET,
+        SK_PNMI_HRX_OCTETLOW,
+        SK_PNMI_HRX_BADOCTET,
+        SK_PNMI_HRX_BADOCTETHIGH = SK_PNMI_HRX_BADOCTET,
+        SK_PNMI_HRX_BADOCTETLOW,
+        SK_PNMI_HRX_BROADCAST,
+        SK_PNMI_HRX_MULTICAST,
+        SK_PNMI_HRX_UNICAST,
+        SK_PNMI_HRX_PMACC,
+        SK_PNMI_HRX_MACC,
+        SK_PNMI_HRX_PMACC_ERR,
+        SK_PNMI_HRX_MACC_UNKWN,
+        SK_PNMI_HRX_BURST,
+        SK_PNMI_HRX_MISSED,
+        SK_PNMI_HRX_FRAMING,
+        SK_PNMI_HRX_UNDERSIZE,
+        SK_PNMI_HRX_OVERFLOW,
+        SK_PNMI_HRX_JABBER,
+        SK_PNMI_HRX_CARRIER,
+        SK_PNMI_HRX_IRLENGTH,
+        SK_PNMI_HRX_SYMBOL,
+        SK_PNMI_HRX_SHORTS,
+        SK_PNMI_HRX_RUNT,
+        SK_PNMI_HRX_TOO_LONG,
+        SK_PNMI_HRX_FCS,
+        SK_PNMI_HRX_CEXT,
+        SK_PNMI_HRX_UTILUNDER,
+        SK_PNMI_HRX_UTILOVER,
+        SK_PNMI_HRX_64,
+        SK_PNMI_HRX_127,
+        SK_PNMI_HRX_255,
+        SK_PNMI_HRX_511,
+        SK_PNMI_HRX_1023,
+        SK_PNMI_HRX_MAX,
+        SK_PNMI_HRX_LONGFRAMES,
+        
+        SK_PNMI_HRX_RESERVED,
+        
+        SK_PNMI_MAX_IDX         /* NOTE: Ensure SK_PNMI_CNT_NO is set to this value */
+};
+
+/*
+ * MAC specific data
+ */
+typedef struct s_PnmiStatAddr {
+        SK_U16          Reg;            /* MAC register containing the value */
+        SK_BOOL         GetOffset;      /* TRUE: Offset managed by PNMI (call GetStatVal())*/
+} SK_PNMI_STATADDR;
+
+
+/*
+ * SK_PNMI_STRUCT_DATA copy offset evaluation macros
+ */
+#define SK_PNMI_OFF(e)          ((SK_U32)(SK_UPTR)&(((SK_PNMI_STRUCT_DATA *)0)->e))
+#define SK_PNMI_MAI_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_STRUCT_DATA *)0)->e))
+#define SK_PNMI_VPD_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_VPD *)0)->e))
+#define SK_PNMI_SEN_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_SENSOR *)0)->e))
+#define SK_PNMI_CHK_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_CHECKSUM *)0)->e))
+#define SK_PNMI_STA_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_STAT *)0)->e))
+#define SK_PNMI_CNF_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_CONF *)0)->e))
+#define SK_PNMI_RLM_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_RLMT *)0)->e))
+#define SK_PNMI_MON_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_RLMT_MONITOR *)0)->e))
+#define SK_PNMI_TRP_OFF(e)      ((SK_U32)(SK_UPTR)&(((SK_PNMI_TRAP *)0)->e))
+
+#define SK_PNMI_SET_STAT(b,s,o) {SK_U32 Val32; char *pVal; \
+                                        Val32 = (s); \
+                                        pVal = (char *)(b) + ((SK_U32)(SK_UPTR) \
+                                                &(((SK_PNMI_STRUCT_DATA *)0)-> \
+                                                ReturnStatus.ErrorStatus)); \
+                                        SK_PNMI_STORE_U32(pVal, Val32); \
+                                        Val32 = (o); \
+                                        pVal = (char *)(b) + ((SK_U32)(SK_UPTR) \
+                                                &(((SK_PNMI_STRUCT_DATA *)0)-> \
+                                                ReturnStatus.ErrorOffset)); \
+                                        SK_PNMI_STORE_U32(pVal, Val32);}
+
+/*
+ * Time macros
+ */
+#ifndef SK_PNMI_HUNDREDS_SEC
+#if SK_TICKS_PER_SEC == 100
+#define SK_PNMI_HUNDREDS_SEC(t) (t)
+#else
+#define SK_PNMI_HUNDREDS_SEC(t) (((t) * 100) / (SK_TICKS_PER_SEC))
+#endif /* !SK_TICKS_PER_SEC */
+#endif /* !SK_PNMI_HUNDREDS_SEC */
+
+/*
+ * Macros to work around alignment problems
+ */
+#ifndef SK_PNMI_STORE_U16
+#define SK_PNMI_STORE_U16(p,v)  {*(char *)(p) = *((char *)&(v)); \
+                                        *((char *)(p) + 1) = \
+                                                *(((char *)&(v)) + 1);}
+#endif
+
+#ifndef SK_PNMI_STORE_U32
+#define SK_PNMI_STORE_U32(p,v)  {*(char *)(p) = *((char *)&(v)); \
+                                        *((char *)(p) + 1) = \
+                                                *(((char *)&(v)) + 1); \
+                                        *((char *)(p) + 2) = \
+                                                *(((char *)&(v)) + 2); \
+                                        *((char *)(p) + 3) = \
+                                                *(((char *)&(v)) + 3);}
+#endif
+
+#ifndef SK_PNMI_STORE_U64
+#define SK_PNMI_STORE_U64(p,v)  {*(char *)(p) = *((char *)&(v)); \
+                                        *((char *)(p) + 1) = \
+                                                *(((char *)&(v)) + 1); \
+                                        *((char *)(p) + 2) = \
+                                                *(((char *)&(v)) + 2); \
+                                        *((char *)(p) + 3) = \
+                                                *(((char *)&(v)) + 3); \
+                                        *((char *)(p) + 4) = \
+                                                *(((char *)&(v)) + 4); \
+                                        *((char *)(p) + 5) = \
+                                                *(((char *)&(v)) + 5); \
+                                        *((char *)(p) + 6) = \
+                                                *(((char *)&(v)) + 6); \
+                                        *((char *)(p) + 7) = \
+                                                *(((char *)&(v)) + 7);}
+#endif
+
+#ifndef SK_PNMI_READ_U16
+#define SK_PNMI_READ_U16(p,v)   {*((char *)&(v)) = *(char *)(p); \
+                                        *(((char *)&(v)) + 1) = \
+                                                *((char *)(p) + 1);}
+#endif
+
+#ifndef SK_PNMI_READ_U32
+#define SK_PNMI_READ_U32(p,v)   {*((char *)&(v)) = *(char *)(p); \
+                                        *(((char *)&(v)) + 1) = \
+                                                *((char *)(p) + 1); \
+                                        *(((char *)&(v)) + 2) = \
+                                                *((char *)(p) + 2); \
+                                        *(((char *)&(v)) + 3) = \
+                                                *((char *)(p) + 3);}
+#endif
+
+#ifndef SK_PNMI_READ_U64
+#define SK_PNMI_READ_U64(p,v)   {*((char *)&(v)) = *(char *)(p); \
+                                        *(((char *)&(v)) + 1) = \
+                                                *((char *)(p) + 1); \
+                                        *(((char *)&(v)) + 2) = \
+                                                *((char *)(p) + 2); \
+                                        *(((char *)&(v)) + 3) = \
+                                                *((char *)(p) + 3); \
+                                        *(((char *)&(v)) + 4) = \
+                                                *((char *)(p) + 4); \
+                                        *(((char *)&(v)) + 5) = \
+                                                *((char *)(p) + 5); \
+                                        *(((char *)&(v)) + 6) = \
+                                                *((char *)(p) + 6); \
+                                        *(((char *)&(v)) + 7) = \
+                                                *((char *)(p) + 7);}
+#endif
+
+/*
+ * Macros for Debug
+ */
+#ifdef DEBUG
+
+#define SK_PNMI_CHECKFLAGS(vSt) {if (pAC->Pnmi.MacUpdatedFlag > 0 || \
+                                        pAC->Pnmi.RlmtUpdatedFlag > 0 || \
+                                        pAC->Pnmi.SirqUpdatedFlag > 0) { \
+                                                SK_DBG_MSG(pAC, \
+                                                SK_DBGMOD_PNMI, \
+                                                SK_DBGCAT_CTRL, \
+                                                ("PNMI: ERR: %s MacUFlag=%d, RlmtUFlag=%d, SirqUFlag=%d\n", \
+                                                vSt, \
+                                                pAC->Pnmi.MacUpdatedFlag, \
+                                                pAC->Pnmi.RlmtUpdatedFlag, \
+                                                pAC->Pnmi.SirqUpdatedFlag))}}
+
+#else   /* !DEBUG */
+
+#define SK_PNMI_CHECKFLAGS(vSt) /* Nothing */
+
+#endif  /* !DEBUG */
+
+#endif  /* _SKGEPNM2_H_ */
diff --git a/drivers/net/sk98lin/h/skgepnmi.h b/drivers/net/sk98lin/h/skgepnmi.h
new file mode 100644
index 0000000000..1ed214ccb2
--- /dev/null
+++ b/drivers/net/sk98lin/h/skgepnmi.h
@@ -0,0 +1,962 @@
+/*****************************************************************************
+ *
+ * Name:        skgepnmi.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.62 $
+ * Date:        $Date: 2003/08/15 12:31:52 $
+ * Purpose:     Defines for Private Network Management Interface
+ *
+ ****************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef _SKGEPNMI_H_
+#define _SKGEPNMI_H_
+
+/*
+ * Include dependencies
+ */
+#include "h/sktypes.h"
+#include "h/skerror.h"
+#include "h/sktimer.h"
+#include "h/ski2c.h"
+#include "h/skaddr.h"
+#include "h/skrlmt.h"
+#include "h/skvpd.h"
+
+/*
+ * Management Database Version
+ */
+#define SK_PNMI_MDB_VERSION             0x00030001      /* 3.1 */
+
+
+/*
+ * Event definitions
+ */
+#define SK_PNMI_EVT_SIRQ_OVERFLOW               1       /* Counter overflow */
+#define SK_PNMI_EVT_SEN_WAR_LOW                 2       /* Lower war thres exceeded */
+#define SK_PNMI_EVT_SEN_WAR_UPP                 3       /* Upper war thres exceeded */
+#define SK_PNMI_EVT_SEN_ERR_LOW                 4       /* Lower err thres exceeded */
+#define SK_PNMI_EVT_SEN_ERR_UPP                 5       /* Upper err thres exceeded */
+#define SK_PNMI_EVT_CHG_EST_TIMER               6       /* Timer event for RLMT Chg */
+#define SK_PNMI_EVT_UTILIZATION_TIMER   7       /* Timer event for Utiliza. */
+#define SK_PNMI_EVT_CLEAR_COUNTER               8       /* Clear statistic counters */
+#define SK_PNMI_EVT_XMAC_RESET                  9       /* XMAC will be reset */
+
+#define SK_PNMI_EVT_RLMT_PORT_UP                10      /* Port came logically up */
+#define SK_PNMI_EVT_RLMT_PORT_DOWN              11      /* Port went logically down */
+#define SK_PNMI_EVT_RLMT_SEGMENTATION   13      /* Two SP root bridges found */
+#define SK_PNMI_EVT_RLMT_ACTIVE_DOWN    14      /* Port went logically down */
+#define SK_PNMI_EVT_RLMT_ACTIVE_UP              15      /* Port came logically up */
+#define SK_PNMI_EVT_RLMT_SET_NETS               16      /* 1. Parameter is number of nets
+                                                                                                1 = single net; 2 = dual net */
+#define SK_PNMI_EVT_VCT_RESET           17      /* VCT port reset timer event started with SET. */
+
+
+/*
+ * Return values
+ */
+#define SK_PNMI_ERR_OK                          0
+#define SK_PNMI_ERR_GENERAL                     1
+#define SK_PNMI_ERR_TOO_SHORT           2
+#define SK_PNMI_ERR_BAD_VALUE           3
+#define SK_PNMI_ERR_READ_ONLY           4
+#define SK_PNMI_ERR_UNKNOWN_OID         5
+#define SK_PNMI_ERR_UNKNOWN_INST        6
+#define SK_PNMI_ERR_UNKNOWN_NET         7
+#define SK_PNMI_ERR_NOT_SUPPORTED       10
+
+
+/*
+ * Return values of driver reset function SK_DRIVER_RESET() and
+ * driver event function SK_DRIVER_EVENT()
+ */
+#define SK_PNMI_ERR_OK                  0
+#define SK_PNMI_ERR_FAIL                1
+
+
+/*
+ * Return values of driver test function SK_DRIVER_SELFTEST()
+ */
+#define SK_PNMI_TST_UNKNOWN             (1 << 0)
+#define SK_PNMI_TST_TRANCEIVER          (1 << 1)
+#define SK_PNMI_TST_ASIC                (1 << 2)
+#define SK_PNMI_TST_SENSOR              (1 << 3)
+#define SK_PNMI_TST_POWERMGMT           (1 << 4)
+#define SK_PNMI_TST_PCI                 (1 << 5)
+#define SK_PNMI_TST_MAC                 (1 << 6)
+
+
+/*
+ * RLMT specific definitions
+ */
+#define SK_PNMI_RLMT_STATUS_STANDBY     1
+#define SK_PNMI_RLMT_STATUS_ACTIVE      2
+#define SK_PNMI_RLMT_STATUS_ERROR       3
+
+#define SK_PNMI_RLMT_LSTAT_PHY_DOWN     1
+#define SK_PNMI_RLMT_LSTAT_AUTONEG      2
+#define SK_PNMI_RLMT_LSTAT_LOG_DOWN     3
+#define SK_PNMI_RLMT_LSTAT_LOG_UP       4
+#define SK_PNMI_RLMT_LSTAT_INDETERMINATED 5
+
+#define SK_PNMI_RLMT_MODE_CHK_LINK      (SK_RLMT_CHECK_LINK)
+#define SK_PNMI_RLMT_MODE_CHK_RX        (SK_RLMT_CHECK_LOC_LINK)
+#define SK_PNMI_RLMT_MODE_CHK_SPT       (SK_RLMT_CHECK_SEG)
+/* #define SK_PNMI_RLMT_MODE_CHK_EX */
+
+/*
+ * OID definition
+ */
+#ifndef _NDIS_  /* Check, whether NDIS already included OIDs */
+
+#define OID_GEN_XMIT_OK                                 0x00020101
+#define OID_GEN_RCV_OK                                  0x00020102
+#define OID_GEN_XMIT_ERROR                              0x00020103
+#define OID_GEN_RCV_ERROR                               0x00020104
+#define OID_GEN_RCV_NO_BUFFER                   0x00020105
+
+/* #define OID_GEN_DIRECTED_BYTES_XMIT  0x00020201 */
+#define OID_GEN_DIRECTED_FRAMES_XMIT    0x00020202
+/* #define OID_GEN_MULTICAST_BYTES_XMIT 0x00020203 */
+#define OID_GEN_MULTICAST_FRAMES_XMIT   0x00020204
+/* #define OID_GEN_BROADCAST_BYTES_XMIT 0x00020205 */
+#define OID_GEN_BROADCAST_FRAMES_XMIT   0x00020206
+/* #define OID_GEN_DIRECTED_BYTES_RCV   0x00020207 */
+#define OID_GEN_DIRECTED_FRAMES_RCV             0x00020208
+/* #define OID_GEN_MULTICAST_BYTES_RCV  0x00020209 */
+#define OID_GEN_MULTICAST_FRAMES_RCV    0x0002020A
+/* #define OID_GEN_BROADCAST_BYTES_RCV  0x0002020B */
+#define OID_GEN_BROADCAST_FRAMES_RCV    0x0002020C
+#define OID_GEN_RCV_CRC_ERROR                   0x0002020D
+#define OID_GEN_TRANSMIT_QUEUE_LENGTH   0x0002020E
+
+#define OID_802_3_PERMANENT_ADDRESS             0x01010101
+#define OID_802_3_CURRENT_ADDRESS               0x01010102
+/* #define OID_802_3_MULTICAST_LIST             0x01010103 */
+/* #define OID_802_3_MAXIMUM_LIST_SIZE  0x01010104 */
+/* #define OID_802_3_MAC_OPTIONS                0x01010105 */
+                        
+#define OID_802_3_RCV_ERROR_ALIGNMENT   0x01020101
+#define OID_802_3_XMIT_ONE_COLLISION    0x01020102
+#define OID_802_3_XMIT_MORE_COLLISIONS  0x01020103
+#define OID_802_3_XMIT_DEFERRED                 0x01020201
+#define OID_802_3_XMIT_MAX_COLLISIONS   0x01020202
+#define OID_802_3_RCV_OVERRUN                   0x01020203
+#define OID_802_3_XMIT_UNDERRUN                 0x01020204
+#define OID_802_3_XMIT_TIMES_CRS_LOST   0x01020206
+#define OID_802_3_XMIT_LATE_COLLISIONS  0x01020207
+
+/*
+ * PnP and PM OIDs
+ */
+#ifdef SK_POWER_MGMT
+#define OID_PNP_CAPABILITIES                    0xFD010100
+#define OID_PNP_SET_POWER                               0xFD010101
+#define OID_PNP_QUERY_POWER                             0xFD010102
+#define OID_PNP_ADD_WAKE_UP_PATTERN             0xFD010103
+#define OID_PNP_REMOVE_WAKE_UP_PATTERN  0xFD010104
+#define OID_PNP_ENABLE_WAKE_UP                  0xFD010106
+#endif /* SK_POWER_MGMT */
+
+#endif /* _NDIS_ */
+
+#define OID_SKGE_MDB_VERSION                    0xFF010100
+#define OID_SKGE_SUPPORTED_LIST                 0xFF010101
+#define OID_SKGE_VPD_FREE_BYTES                 0xFF010102
+#define OID_SKGE_VPD_ENTRIES_LIST               0xFF010103
+#define OID_SKGE_VPD_ENTRIES_NUMBER             0xFF010104
+#define OID_SKGE_VPD_KEY                                0xFF010105
+#define OID_SKGE_VPD_VALUE                              0xFF010106
+#define OID_SKGE_VPD_ACCESS                             0xFF010107
+#define OID_SKGE_VPD_ACTION                             0xFF010108
+                        
+#define OID_SKGE_PORT_NUMBER                    0xFF010110
+#define OID_SKGE_DEVICE_TYPE                    0xFF010111
+#define OID_SKGE_DRIVER_DESCR                   0xFF010112
+#define OID_SKGE_DRIVER_VERSION                 0xFF010113
+#define OID_SKGE_HW_DESCR                               0xFF010114
+#define OID_SKGE_HW_VERSION                             0xFF010115
+#define OID_SKGE_CHIPSET                                0xFF010116
+#define OID_SKGE_ACTION                                 0xFF010117
+#define OID_SKGE_RESULT                                 0xFF010118
+#define OID_SKGE_BUS_TYPE                               0xFF010119
+#define OID_SKGE_BUS_SPEED                              0xFF01011A
+#define OID_SKGE_BUS_WIDTH                              0xFF01011B
+/* 0xFF01011C unused */
+#define OID_SKGE_DIAG_ACTION                    0xFF01011D
+#define OID_SKGE_DIAG_RESULT                    0xFF01011E
+#define OID_SKGE_MTU                                    0xFF01011F
+#define OID_SKGE_PHYS_CUR_ADDR                  0xFF010120
+#define OID_SKGE_PHYS_FAC_ADDR                  0xFF010121
+#define OID_SKGE_PMD                                    0xFF010122
+#define OID_SKGE_CONNECTOR                              0xFF010123
+#define OID_SKGE_LINK_CAP                               0xFF010124
+#define OID_SKGE_LINK_MODE                              0xFF010125
+#define OID_SKGE_LINK_MODE_STATUS               0xFF010126
+#define OID_SKGE_LINK_STATUS                    0xFF010127
+#define OID_SKGE_FLOWCTRL_CAP                   0xFF010128
+#define OID_SKGE_FLOWCTRL_MODE                  0xFF010129
+#define OID_SKGE_FLOWCTRL_STATUS                0xFF01012A
+#define OID_SKGE_PHY_OPERATION_CAP              0xFF01012B
+#define OID_SKGE_PHY_OPERATION_MODE             0xFF01012C
+#define OID_SKGE_PHY_OPERATION_STATUS   0xFF01012D
+#define OID_SKGE_MULTICAST_LIST                 0xFF01012E
+#define OID_SKGE_CURRENT_PACKET_FILTER  0xFF01012F
+
+#define OID_SKGE_TRAP                                   0xFF010130
+#define OID_SKGE_TRAP_NUMBER                    0xFF010131
+
+#define OID_SKGE_RLMT_MODE                              0xFF010140
+#define OID_SKGE_RLMT_PORT_NUMBER               0xFF010141
+#define OID_SKGE_RLMT_PORT_ACTIVE               0xFF010142
+#define OID_SKGE_RLMT_PORT_PREFERRED    0xFF010143
+#define OID_SKGE_INTERMEDIATE_SUPPORT   0xFF010160
+
+#define OID_SKGE_SPEED_CAP                              0xFF010170
+#define OID_SKGE_SPEED_MODE                             0xFF010171
+#define OID_SKGE_SPEED_STATUS                   0xFF010172
+
+#define OID_SKGE_BOARDLEVEL                             0xFF010180
+
+#define OID_SKGE_SENSOR_NUMBER                  0xFF020100                      
+#define OID_SKGE_SENSOR_INDEX                   0xFF020101
+#define OID_SKGE_SENSOR_DESCR                   0xFF020102
+#define OID_SKGE_SENSOR_TYPE                    0xFF020103
+#define OID_SKGE_SENSOR_VALUE                   0xFF020104
+#define OID_SKGE_SENSOR_WAR_THRES_LOW   0xFF020105
+#define OID_SKGE_SENSOR_WAR_THRES_UPP   0xFF020106
+#define OID_SKGE_SENSOR_ERR_THRES_LOW   0xFF020107
+#define OID_SKGE_SENSOR_ERR_THRES_UPP   0xFF020108
+#define OID_SKGE_SENSOR_STATUS                  0xFF020109
+#define OID_SKGE_SENSOR_WAR_CTS                 0xFF02010A
+#define OID_SKGE_SENSOR_ERR_CTS                 0xFF02010B
+#define OID_SKGE_SENSOR_WAR_TIME                0xFF02010C
+#define OID_SKGE_SENSOR_ERR_TIME                0xFF02010D
+
+#define OID_SKGE_CHKSM_NUMBER                   0xFF020110
+#define OID_SKGE_CHKSM_RX_OK_CTS                0xFF020111
+#define OID_SKGE_CHKSM_RX_UNABLE_CTS    0xFF020112
+#define OID_SKGE_CHKSM_RX_ERR_CTS               0xFF020113
+#define OID_SKGE_CHKSM_TX_OK_CTS                0xFF020114
+#define OID_SKGE_CHKSM_TX_UNABLE_CTS    0xFF020115
+
+#define OID_SKGE_STAT_TX                                0xFF020120
+#define OID_SKGE_STAT_TX_OCTETS                 0xFF020121
+#define OID_SKGE_STAT_TX_BROADCAST              0xFF020122
+#define OID_SKGE_STAT_TX_MULTICAST              0xFF020123
+#define OID_SKGE_STAT_TX_UNICAST                0xFF020124
+#define OID_SKGE_STAT_TX_LONGFRAMES             0xFF020125
+#define OID_SKGE_STAT_TX_BURST                  0xFF020126
+#define OID_SKGE_STAT_TX_PFLOWC                 0xFF020127
+#define OID_SKGE_STAT_TX_FLOWC                  0xFF020128
+#define OID_SKGE_STAT_TX_SINGLE_COL             0xFF020129
+#define OID_SKGE_STAT_TX_MULTI_COL              0xFF02012A
+#define OID_SKGE_STAT_TX_EXCESS_COL             0xFF02012B
+#define OID_SKGE_STAT_TX_LATE_COL               0xFF02012C
+#define OID_SKGE_STAT_TX_DEFFERAL               0xFF02012D
+#define OID_SKGE_STAT_TX_EXCESS_DEF             0xFF02012E
+#define OID_SKGE_STAT_TX_UNDERRUN               0xFF02012F
+#define OID_SKGE_STAT_TX_CARRIER                0xFF020130
+/* #define OID_SKGE_STAT_TX_UTIL                0xFF020131 */
+#define OID_SKGE_STAT_TX_64                             0xFF020132
+#define OID_SKGE_STAT_TX_127                    0xFF020133
+#define OID_SKGE_STAT_TX_255                    0xFF020134
+#define OID_SKGE_STAT_TX_511                    0xFF020135
+#define OID_SKGE_STAT_TX_1023                   0xFF020136
+#define OID_SKGE_STAT_TX_MAX                    0xFF020137
+#define OID_SKGE_STAT_TX_SYNC                   0xFF020138
+#define OID_SKGE_STAT_TX_SYNC_OCTETS    0xFF020139
+#define OID_SKGE_STAT_RX                                0xFF02013A
+#define OID_SKGE_STAT_RX_OCTETS                 0xFF02013B
+#define OID_SKGE_STAT_RX_BROADCAST              0xFF02013C
+#define OID_SKGE_STAT_RX_MULTICAST              0xFF02013D
+#define OID_SKGE_STAT_RX_UNICAST                0xFF02013E
+#define OID_SKGE_STAT_RX_PFLOWC                 0xFF02013F
+#define OID_SKGE_STAT_RX_FLOWC                  0xFF020140
+#define OID_SKGE_STAT_RX_PFLOWC_ERR             0xFF020141
+#define OID_SKGE_STAT_RX_FLOWC_UNKWN    0xFF020142
+#define OID_SKGE_STAT_RX_BURST                  0xFF020143
+#define OID_SKGE_STAT_RX_MISSED                 0xFF020144
+#define OID_SKGE_STAT_RX_FRAMING                0xFF020145
+#define OID_SKGE_STAT_RX_OVERFLOW               0xFF020146
+#define OID_SKGE_STAT_RX_JABBER                 0xFF020147
+#define OID_SKGE_STAT_RX_CARRIER                0xFF020148
+#define OID_SKGE_STAT_RX_IR_LENGTH              0xFF020149
+#define OID_SKGE_STAT_RX_SYMBOL                 0xFF02014A
+#define OID_SKGE_STAT_RX_SHORTS                 0xFF02014B
+#define OID_SKGE_STAT_RX_RUNT                   0xFF02014C
+#define OID_SKGE_STAT_RX_CEXT                   0xFF02014D
+#define OID_SKGE_STAT_RX_TOO_LONG               0xFF02014E
+#define OID_SKGE_STAT_RX_FCS                    0xFF02014F
+/* #define OID_SKGE_STAT_RX_UTIL                0xFF020150 */
+#define OID_SKGE_STAT_RX_64                             0xFF020151
+#define OID_SKGE_STAT_RX_127                    0xFF020152
+#define OID_SKGE_STAT_RX_255                    0xFF020153
+#define OID_SKGE_STAT_RX_511                    0xFF020154
+#define OID_SKGE_STAT_RX_1023                   0xFF020155
+#define OID_SKGE_STAT_RX_MAX                    0xFF020156
+#define OID_SKGE_STAT_RX_LONGFRAMES             0xFF020157
+
+#define OID_SKGE_RLMT_CHANGE_CTS                0xFF020160
+#define OID_SKGE_RLMT_CHANGE_TIME               0xFF020161
+#define OID_SKGE_RLMT_CHANGE_ESTIM              0xFF020162
+#define OID_SKGE_RLMT_CHANGE_THRES              0xFF020163
+
+#define OID_SKGE_RLMT_PORT_INDEX                0xFF020164
+#define OID_SKGE_RLMT_STATUS                    0xFF020165
+#define OID_SKGE_RLMT_TX_HELLO_CTS              0xFF020166
+#define OID_SKGE_RLMT_RX_HELLO_CTS              0xFF020167
+#define OID_SKGE_RLMT_TX_SP_REQ_CTS             0xFF020168
+#define OID_SKGE_RLMT_RX_SP_CTS                 0xFF020169
+
+#define OID_SKGE_RLMT_MONITOR_NUMBER    0xFF010150
+#define OID_SKGE_RLMT_MONITOR_INDEX             0xFF010151
+#define OID_SKGE_RLMT_MONITOR_ADDR              0xFF010152
+#define OID_SKGE_RLMT_MONITOR_ERRS              0xFF010153
+#define OID_SKGE_RLMT_MONITOR_TIMESTAMP 0xFF010154
+#define OID_SKGE_RLMT_MONITOR_ADMIN             0xFF010155
+
+#define OID_SKGE_TX_SW_QUEUE_LEN                0xFF020170
+#define OID_SKGE_TX_SW_QUEUE_MAX                0xFF020171
+#define OID_SKGE_TX_RETRY                               0xFF020172
+#define OID_SKGE_RX_INTR_CTS                    0xFF020173
+#define OID_SKGE_TX_INTR_CTS                    0xFF020174
+#define OID_SKGE_RX_NO_BUF_CTS                  0xFF020175
+#define OID_SKGE_TX_NO_BUF_CTS                  0xFF020176
+#define OID_SKGE_TX_USED_DESCR_NO               0xFF020177
+#define OID_SKGE_RX_DELIVERED_CTS               0xFF020178
+#define OID_SKGE_RX_OCTETS_DELIV_CTS    0xFF020179
+#define OID_SKGE_RX_HW_ERROR_CTS                0xFF02017A
+#define OID_SKGE_TX_HW_ERROR_CTS                0xFF02017B
+#define OID_SKGE_IN_ERRORS_CTS                  0xFF02017C
+#define OID_SKGE_OUT_ERROR_CTS                  0xFF02017D
+#define OID_SKGE_ERR_RECOVERY_CTS               0xFF02017E
+#define OID_SKGE_SYSUPTIME                              0xFF02017F
+
+#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
+
+#ifdef SK_DIAG_SUPPORT
+/* Defines for driver DIAG mode. */
+#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 {
+        SK_U8                   VctStatus;
+        SK_U8                   PCableLen;
+        SK_U32                  PMdiPairLen[4];
+        SK_U8                   PMdiPairSts[4];
+} SK_PNMI_VCT;
+
+
+/* VCT status values (to be given to CPA via OID_SKGE_VCT_STATUS). */
+#define SK_PNMI_VCT_NONE                0
+#define SK_PNMI_VCT_OLD_VCT_DATA        1
+#define SK_PNMI_VCT_NEW_VCT_DATA        2
+#define SK_PNMI_VCT_OLD_DSP_DATA        4
+#define SK_PNMI_VCT_NEW_DSP_DATA        8
+#define SK_PNMI_VCT_RUNNING             16
+
+
+/* VCT cable test status. */
+#define SK_PNMI_VCT_NORMAL_CABLE                0
+#define SK_PNMI_VCT_SHORT_CABLE                 1
+#define SK_PNMI_VCT_OPEN_CABLE                  2
+#define SK_PNMI_VCT_TEST_FAIL                   3
+#define SK_PNMI_VCT_IMPEDANCE_MISMATCH          4
+
+#define OID_SKGE_TRAP_SEN_WAR_LOW               500
+#define OID_SKGE_TRAP_SEN_WAR_UPP               501
+#define OID_SKGE_TRAP_SEN_ERR_LOW               502
+#define OID_SKGE_TRAP_SEN_ERR_UPP               503
+#define OID_SKGE_TRAP_RLMT_CHANGE_THRES 520
+#define OID_SKGE_TRAP_RLMT_CHANGE_PORT  521
+#define OID_SKGE_TRAP_RLMT_PORT_DOWN    522
+#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.
+ */
+#define SK_GET_SINGLE_VAR               1
+#define SK_SET_SINGLE_VAR               2
+#define SK_PRESET_SINGLE_VAR    3
+#define SK_GET_FULL_MIB                 4
+#define SK_SET_FULL_MIB                 5
+#define SK_PRESET_FULL_MIB              6
+
+
+/*
+ * Define error numbers and messages for syslog
+ */
+#define SK_PNMI_ERR001          (SK_ERRBASE_PNMI + 1)
+#define SK_PNMI_ERR001MSG       "SkPnmiGetStruct: Unknown OID"
+#define SK_PNMI_ERR002          (SK_ERRBASE_PNMI + 2)
+#define SK_PNMI_ERR002MSG       "SkPnmiGetStruct: Cannot read VPD keys"
+#define SK_PNMI_ERR003          (SK_ERRBASE_PNMI + 3)
+#define SK_PNMI_ERR003MSG       "OidStruct: Called with wrong OID"
+#define SK_PNMI_ERR004          (SK_ERRBASE_PNMI + 4)
+#define SK_PNMI_ERR004MSG       "OidStruct: Called with wrong action"
+#define SK_PNMI_ERR005          (SK_ERRBASE_PNMI + 5)
+#define SK_PNMI_ERR005MSG       "Perform: Cannot reset driver"
+#define SK_PNMI_ERR006          (SK_ERRBASE_PNMI + 6)
+#define SK_PNMI_ERR006MSG       "Perform: Unknown OID action command"
+#define SK_PNMI_ERR007          (SK_ERRBASE_PNMI + 7)
+#define SK_PNMI_ERR007MSG       "General: Driver description not initialized"
+#define SK_PNMI_ERR008          (SK_ERRBASE_PNMI + 8)
+#define SK_PNMI_ERR008MSG       "Addr: Tried to get unknown OID"
+#define SK_PNMI_ERR009          (SK_ERRBASE_PNMI + 9)
+#define SK_PNMI_ERR009MSG       "Addr: Unknown OID"
+#define SK_PNMI_ERR010          (SK_ERRBASE_PNMI + 10)
+#define SK_PNMI_ERR010MSG       "CsumStat: Unknown OID"
+#define SK_PNMI_ERR011          (SK_ERRBASE_PNMI + 11)
+#define SK_PNMI_ERR011MSG       "SensorStat: Sensor descr string too long"
+#define SK_PNMI_ERR012          (SK_ERRBASE_PNMI + 12)
+#define SK_PNMI_ERR012MSG       "SensorStat: Unknown OID"
+#define SK_PNMI_ERR013          (SK_ERRBASE_PNMI + 13)
+#define SK_PNMI_ERR013MSG       ""
+#define SK_PNMI_ERR014          (SK_ERRBASE_PNMI + 14)
+#define SK_PNMI_ERR014MSG       "Vpd: Cannot read VPD keys"
+#define SK_PNMI_ERR015          (SK_ERRBASE_PNMI + 15)
+#define SK_PNMI_ERR015MSG       "Vpd: Internal array for VPD keys to small"
+#define SK_PNMI_ERR016          (SK_ERRBASE_PNMI + 16)
+#define SK_PNMI_ERR016MSG       "Vpd: Key string too long"
+#define SK_PNMI_ERR017          (SK_ERRBASE_PNMI + 17)
+#define SK_PNMI_ERR017MSG       "Vpd: Invalid VPD status pointer"
+#define SK_PNMI_ERR018          (SK_ERRBASE_PNMI + 18)
+#define SK_PNMI_ERR018MSG       "Vpd: VPD data not valid"
+#define SK_PNMI_ERR019          (SK_ERRBASE_PNMI + 19)
+#define SK_PNMI_ERR019MSG       "Vpd: VPD entries list string too long"
+#define SK_PNMI_ERR021          (SK_ERRBASE_PNMI + 21)
+#define SK_PNMI_ERR021MSG       "Vpd: VPD data string too long"
+#define SK_PNMI_ERR022          (SK_ERRBASE_PNMI + 22)
+#define SK_PNMI_ERR022MSG       "Vpd: VPD data string too long should be errored before"
+#define SK_PNMI_ERR023          (SK_ERRBASE_PNMI + 23)
+#define SK_PNMI_ERR023MSG       "Vpd: Unknown OID in get action"
+#define SK_PNMI_ERR024          (SK_ERRBASE_PNMI + 24)
+#define SK_PNMI_ERR024MSG       "Vpd: Unknown OID in preset/set action"
+#define SK_PNMI_ERR025          (SK_ERRBASE_PNMI + 25)
+#define SK_PNMI_ERR025MSG       "Vpd: Cannot write VPD after modify entry"
+#define SK_PNMI_ERR026          (SK_ERRBASE_PNMI + 26)
+#define SK_PNMI_ERR026MSG       "Vpd: Cannot update VPD"
+#define SK_PNMI_ERR027          (SK_ERRBASE_PNMI + 27)
+#define SK_PNMI_ERR027MSG       "Vpd: Cannot delete VPD entry"
+#define SK_PNMI_ERR028          (SK_ERRBASE_PNMI + 28)
+#define SK_PNMI_ERR028MSG       "Vpd: Cannot update VPD after delete entry"
+#define SK_PNMI_ERR029          (SK_ERRBASE_PNMI + 29)
+#define SK_PNMI_ERR029MSG       "General: Driver description string too long"
+#define SK_PNMI_ERR030          (SK_ERRBASE_PNMI + 30)
+#define SK_PNMI_ERR030MSG       "General: Driver version not initialized"
+#define SK_PNMI_ERR031          (SK_ERRBASE_PNMI + 31)
+#define SK_PNMI_ERR031MSG       "General: Driver version string too long"
+#define SK_PNMI_ERR032          (SK_ERRBASE_PNMI + 32)
+#define SK_PNMI_ERR032MSG       "General: Cannot read VPD Name for HW descr"
+#define SK_PNMI_ERR033          (SK_ERRBASE_PNMI + 33)
+#define SK_PNMI_ERR033MSG       "General: HW description string too long"
+#define SK_PNMI_ERR034          (SK_ERRBASE_PNMI + 34)
+#define SK_PNMI_ERR034MSG       "General: Unknown OID"
+#define SK_PNMI_ERR035          (SK_ERRBASE_PNMI + 35)
+#define SK_PNMI_ERR035MSG       "Rlmt: Unknown OID"
+#define SK_PNMI_ERR036          (SK_ERRBASE_PNMI + 36)
+#define SK_PNMI_ERR036MSG       ""
+#define SK_PNMI_ERR037          (SK_ERRBASE_PNMI + 37)
+#define SK_PNMI_ERR037MSG       "Rlmt: SK_RLMT_MODE_CHANGE event return not 0"
+#define SK_PNMI_ERR038          (SK_ERRBASE_PNMI + 38)
+#define SK_PNMI_ERR038MSG       "Rlmt: SK_RLMT_PREFPORT_CHANGE event return not 0"
+#define SK_PNMI_ERR039          (SK_ERRBASE_PNMI + 39)
+#define SK_PNMI_ERR039MSG       "RlmtStat: Unknown OID"
+#define SK_PNMI_ERR040          (SK_ERRBASE_PNMI + 40)
+#define SK_PNMI_ERR040MSG       "PowerManagement: Unknown OID"
+#define SK_PNMI_ERR041          (SK_ERRBASE_PNMI + 41)
+#define SK_PNMI_ERR041MSG       "MacPrivateConf: Unknown OID"
+#define SK_PNMI_ERR042          (SK_ERRBASE_PNMI + 42)
+#define SK_PNMI_ERR042MSG       "MacPrivateConf: SK_HWEV_SET_ROLE returned not 0"
+#define SK_PNMI_ERR043          (SK_ERRBASE_PNMI + 43)
+#define SK_PNMI_ERR043MSG       "MacPrivateConf: SK_HWEV_SET_LMODE returned not 0"
+#define SK_PNMI_ERR044          (SK_ERRBASE_PNMI + 44)
+#define SK_PNMI_ERR044MSG       "MacPrivateConf: SK_HWEV_SET_FLOWMODE returned not 0"
+#define SK_PNMI_ERR045          (SK_ERRBASE_PNMI + 45)
+#define SK_PNMI_ERR045MSG       "MacPrivateConf: SK_HWEV_SET_SPEED returned not 0"
+#define SK_PNMI_ERR046          (SK_ERRBASE_PNMI + 46)
+#define SK_PNMI_ERR046MSG       "Monitor: Unknown OID"
+#define SK_PNMI_ERR047          (SK_ERRBASE_PNMI + 47)
+#define SK_PNMI_ERR047MSG       "SirqUpdate: Event function returns not 0"
+#define SK_PNMI_ERR048          (SK_ERRBASE_PNMI + 48)
+#define SK_PNMI_ERR048MSG       "RlmtUpdate: Event function returns not 0"
+#define SK_PNMI_ERR049          (SK_ERRBASE_PNMI + 49)
+#define SK_PNMI_ERR049MSG       "SkPnmiInit: Invalid size of 'CounterOffset' struct!!"
+#define SK_PNMI_ERR050          (SK_ERRBASE_PNMI + 50)
+#define SK_PNMI_ERR050MSG       "SkPnmiInit: Invalid size of 'StatAddr' table!!"
+#define SK_PNMI_ERR051          (SK_ERRBASE_PNMI + 51)
+#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
+ */
+#define SK_PNMI_SET_DRIVER_DESCR(pAC,v) ((pAC)->Pnmi.pDriverDescription = \
+        (char *)(v))
+
+#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) \
+        { \
+                (pAC)->Pnmi.Port[p].TxSwQueueLen = (SK_U64)(v); \
+                if ((pAC)->Pnmi.Port[p].TxSwQueueLen > (pAC)->Pnmi.Port[p].TxSwQueueMax) { \
+                        (pAC)->Pnmi.Port[p].TxSwQueueMax = (pAC)->Pnmi.Port[p].TxSwQueueLen; \
+                } \
+        }
+#define SK_PNMI_CNT_TX_RETRY(pAC,p)     (((pAC)->Pnmi.Port[p].TxRetryCts)++)
+#define SK_PNMI_CNT_RX_INTR(pAC,p)      (((pAC)->Pnmi.Port[p].RxIntrCts)++)
+#define SK_PNMI_CNT_TX_INTR(pAC,p)      (((pAC)->Pnmi.Port[p].TxIntrCts)++)
+#define SK_PNMI_CNT_NO_RX_BUF(pAC,p)    (((pAC)->Pnmi.Port[p].RxNoBufCts)++)
+#define SK_PNMI_CNT_NO_TX_BUF(pAC,p)    (((pAC)->Pnmi.Port[p].TxNoBufCts)++)
+#define SK_PNMI_CNT_USED_TX_DESCR(pAC,v,p) \
+        ((pAC)->Pnmi.Port[p].TxUsedDescrNo=(SK_U64)(v));
+#define SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,v,p) \
+        { \
+                ((pAC)->Pnmi.Port[p].RxDeliveredCts)++; \
+                (pAC)->Pnmi.Port[p].RxOctetsDeliveredCts += (SK_U64)(v); \
+        }
+#define SK_PNMI_CNT_ERR_RECOVERY(pAC,p) (((pAC)->Pnmi.Port[p].ErrRecoveryCts)++);
+
+#define SK_PNMI_CNT_SYNC_OCTETS(pAC,p,v) \
+        { \
+                if ((p) < SK_MAX_MACS) { \
+                        ((pAC)->Pnmi.Port[p].StatSyncCts)++; \
+                        (pAC)->Pnmi.Port[p].StatSyncOctetsCts += (SK_U64)(v); \
+                } \
+        }
+
+#define SK_PNMI_CNT_RX_LONGFRAMES(pAC,p) \
+        { \
+                if ((p) < SK_MAX_MACS) { \
+                        ((pAC)->Pnmi.Port[p].StatRxLongFrameCts++); \
+                } \
+        }
+
+#define SK_PNMI_CNT_RX_FRAMETOOLONG(pAC,p) \
+        { \
+                if ((p) < SK_MAX_MACS) { \
+                        ((pAC)->Pnmi.Port[p].StatRxFrameTooLongCts++); \
+                } \
+        }
+
+#define SK_PNMI_CNT_RX_PMACC_ERR(pAC,p) \
+        { \
+                if ((p) < SK_MAX_MACS) { \
+                        ((pAC)->Pnmi.Port[p].StatRxPMaccErr++); \
+                } \
+        }
+
+/*
+ * Conversion Macros
+ */
+#define SK_PNMI_PORT_INST2LOG(i)        ((unsigned int)(i) - 1)
+#define SK_PNMI_PORT_LOG2INST(l)        ((unsigned int)(l) + 1)
+#define SK_PNMI_PORT_PHYS2LOG(p)        ((unsigned int)(p) + 1)
+#define SK_PNMI_PORT_LOG2PHYS(pAC,l)    ((unsigned int)(l) - 1)
+#define SK_PNMI_PORT_PHYS2INST(pAC,p)   \
+        (pAC->Pnmi.DualNetActiveFlag ? 2 : ((unsigned int)(p) + 2))
+#define SK_PNMI_PORT_INST2PHYS(pAC,i)   ((unsigned int)(i) - 2)
+
+/*
+ * Structure definition for SkPnmiGetStruct and SkPnmiSetStruct
+ */
+#define SK_PNMI_VPD_KEY_SIZE    5
+#define SK_PNMI_VPD_BUFSIZE             (VPD_SIZE)
+#define SK_PNMI_VPD_ENTRIES             (VPD_SIZE / 4)
+#define SK_PNMI_VPD_DATALEN             128 /*  Number of data bytes */
+
+#define SK_PNMI_MULTICAST_LISTLEN       64
+#define SK_PNMI_SENSOR_ENTRIES          (SK_MAX_SENSORS)
+#define SK_PNMI_CHECKSUM_ENTRIES        3
+#define SK_PNMI_MAC_ENTRIES                     (SK_MAX_MACS + 1)
+#define SK_PNMI_MONITOR_ENTRIES         20
+#define SK_PNMI_TRAP_ENTRIES            10
+#define SK_PNMI_TRAPLEN                         128
+#define SK_PNMI_STRINGLEN1                      80
+#define SK_PNMI_STRINGLEN2                      25
+#define SK_PNMI_TRAP_QUEUE_LEN          512
+
+typedef struct s_PnmiVpd {
+        char                    VpdKey[SK_PNMI_VPD_KEY_SIZE];
+        char                    VpdValue[SK_PNMI_VPD_DATALEN];
+        SK_U8                   VpdAccess;
+        SK_U8                   VpdAction;
+} SK_PNMI_VPD;
+
+typedef struct s_PnmiSensor {
+        SK_U8                   SensorIndex;
+        char                    SensorDescr[SK_PNMI_STRINGLEN2];
+        SK_U8                   SensorType;
+        SK_U32                  SensorValue;
+        SK_U32                  SensorWarningThresholdLow;
+        SK_U32                  SensorWarningThresholdHigh;
+        SK_U32                  SensorErrorThresholdLow;
+        SK_U32                  SensorErrorThresholdHigh;
+        SK_U8                   SensorStatus;
+        SK_U64                  SensorWarningCts;
+        SK_U64                  SensorErrorCts;
+        SK_U64                  SensorWarningTimestamp;
+        SK_U64                  SensorErrorTimestamp;
+} SK_PNMI_SENSOR;
+
+typedef struct s_PnmiChecksum {
+        SK_U64                  ChecksumRxOkCts;
+        SK_U64                  ChecksumRxUnableCts;
+        SK_U64                  ChecksumRxErrCts;
+        SK_U64                  ChecksumTxOkCts;
+        SK_U64                  ChecksumTxUnableCts;
+} SK_PNMI_CHECKSUM;
+
+typedef struct s_PnmiStat {
+        SK_U64                  StatTxOkCts;
+        SK_U64                  StatTxOctetsOkCts;
+        SK_U64                  StatTxBroadcastOkCts;
+        SK_U64                  StatTxMulticastOkCts;
+        SK_U64                  StatTxUnicastOkCts;
+        SK_U64                  StatTxLongFramesCts;
+        SK_U64                  StatTxBurstCts;
+        SK_U64                  StatTxPauseMacCtrlCts;
+        SK_U64                  StatTxMacCtrlCts;
+        SK_U64                  StatTxSingleCollisionCts;
+        SK_U64                  StatTxMultipleCollisionCts;
+        SK_U64                  StatTxExcessiveCollisionCts;
+        SK_U64                  StatTxLateCollisionCts;
+        SK_U64                  StatTxDeferralCts;
+        SK_U64                  StatTxExcessiveDeferralCts;
+        SK_U64                  StatTxFifoUnderrunCts;
+        SK_U64                  StatTxCarrierCts;
+        SK_U64                  Dummy1; /* StatTxUtilization */
+        SK_U64                  StatTx64Cts;
+        SK_U64                  StatTx127Cts;
+        SK_U64                  StatTx255Cts;
+        SK_U64                  StatTx511Cts;
+        SK_U64                  StatTx1023Cts;
+        SK_U64                  StatTxMaxCts;
+        SK_U64                  StatTxSyncCts;
+        SK_U64                  StatTxSyncOctetsCts;
+        SK_U64                  StatRxOkCts;
+        SK_U64                  StatRxOctetsOkCts;
+        SK_U64                  StatRxBroadcastOkCts;
+        SK_U64                  StatRxMulticastOkCts;
+        SK_U64                  StatRxUnicastOkCts;
+        SK_U64                  StatRxLongFramesCts;
+        SK_U64                  StatRxPauseMacCtrlCts;
+        SK_U64                  StatRxMacCtrlCts;
+        SK_U64                  StatRxPauseMacCtrlErrorCts;
+        SK_U64                  StatRxMacCtrlUnknownCts;
+        SK_U64                  StatRxBurstCts;
+        SK_U64                  StatRxMissedCts;
+        SK_U64                  StatRxFramingCts;
+        SK_U64                  StatRxFifoOverflowCts;
+        SK_U64                  StatRxJabberCts;
+        SK_U64                  StatRxCarrierCts;
+        SK_U64                  StatRxIRLengthCts;
+        SK_U64                  StatRxSymbolCts;
+        SK_U64                  StatRxShortsCts;
+        SK_U64                  StatRxRuntCts;
+        SK_U64                  StatRxCextCts;
+        SK_U64                  StatRxTooLongCts;
+        SK_U64                  StatRxFcsCts;
+        SK_U64                  Dummy2; /* StatRxUtilization */
+        SK_U64                  StatRx64Cts;
+        SK_U64                  StatRx127Cts;
+        SK_U64                  StatRx255Cts;
+        SK_U64                  StatRx511Cts;
+        SK_U64                  StatRx1023Cts;
+        SK_U64                  StatRxMaxCts;
+} SK_PNMI_STAT;
+
+typedef struct s_PnmiConf {
+        char                    ConfMacCurrentAddr[6];
+        char                    ConfMacFactoryAddr[6];
+        SK_U8                   ConfPMD;
+        SK_U8                   ConfConnector;
+        SK_U32                  ConfPhyType;
+        SK_U32                  ConfPhyMode;
+        SK_U8                   ConfLinkCapability;
+        SK_U8                   ConfLinkMode;
+        SK_U8                   ConfLinkModeStatus;
+        SK_U8                   ConfLinkStatus;
+        SK_U8                   ConfFlowCtrlCapability;
+        SK_U8                   ConfFlowCtrlMode;
+        SK_U8                   ConfFlowCtrlStatus;
+        SK_U8                   ConfPhyOperationCapability;
+        SK_U8                   ConfPhyOperationMode;
+        SK_U8                   ConfPhyOperationStatus;
+        SK_U8                   ConfSpeedCapability;
+        SK_U8                   ConfSpeedMode;
+        SK_U8                   ConfSpeedStatus;
+} SK_PNMI_CONF;
+
+typedef struct s_PnmiRlmt {
+        SK_U32                  RlmtIndex;
+        SK_U32                  RlmtStatus;
+        SK_U64                  RlmtTxHelloCts;
+        SK_U64                  RlmtRxHelloCts;
+        SK_U64                  RlmtTxSpHelloReqCts;
+        SK_U64                  RlmtRxSpHelloCts;
+} SK_PNMI_RLMT;
+
+typedef struct s_PnmiRlmtMonitor {
+        SK_U32                  RlmtMonitorIndex;
+        char                    RlmtMonitorAddr[6];
+        SK_U64                  RlmtMonitorErrorCts;
+        SK_U64                  RlmtMonitorTimestamp;
+        SK_U8                   RlmtMonitorAdmin;
+} SK_PNMI_RLMT_MONITOR;
+
+typedef struct s_PnmiRequestStatus {
+        SK_U32                  ErrorStatus;
+        SK_U32                  ErrorOffset;
+} SK_PNMI_REQUEST_STATUS;
+
+typedef struct s_PnmiStrucData {
+        SK_U32                  MgmtDBVersion;
+        SK_PNMI_REQUEST_STATUS  ReturnStatus;
+        SK_U32                  VpdFreeBytes;
+        char                    VpdEntriesList[SK_PNMI_VPD_ENTRIES * SK_PNMI_VPD_KEY_SIZE];
+        SK_U32                  VpdEntriesNumber;
+        SK_PNMI_VPD             Vpd[SK_PNMI_VPD_ENTRIES];
+        SK_U32                  PortNumber;
+        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;
+        SK_U8                   BusType;
+        SK_U8                   BusSpeed;
+        SK_U8                   BusWidth;
+        SK_U8                   SensorNumber;
+        SK_PNMI_SENSOR  Sensor[SK_PNMI_SENSOR_ENTRIES];
+        SK_U8                   ChecksumNumber;
+        SK_PNMI_CHECKSUM        Checksum[SK_PNMI_CHECKSUM_ENTRIES];
+        SK_PNMI_STAT    Stat[SK_PNMI_MAC_ENTRIES];
+        SK_PNMI_CONF    Conf[SK_PNMI_MAC_ENTRIES];
+        SK_U8                   RlmtMode;
+        SK_U32                  RlmtPortNumber;
+        SK_U8                   RlmtPortActive;
+        SK_U8                   RlmtPortPreferred;
+        SK_U64                  RlmtChangeCts;
+        SK_U64                  RlmtChangeTime;
+        SK_U64                  RlmtChangeEstimate;
+        SK_U64                  RlmtChangeThreshold;
+        SK_PNMI_RLMT    Rlmt[SK_MAX_MACS];
+        SK_U32                  RlmtMonitorNumber;
+        SK_PNMI_RLMT_MONITOR    RlmtMonitor[SK_PNMI_MONITOR_ENTRIES];
+        SK_U32                  TrapNumber;
+        SK_U8                   Trap[SK_PNMI_TRAP_QUEUE_LEN];
+        SK_U64                  TxSwQueueLen;
+        SK_U64                  TxSwQueueMax;
+        SK_U64                  TxRetryCts;
+        SK_U64                  RxIntrCts;
+        SK_U64                  TxIntrCts;
+        SK_U64                  RxNoBufCts;
+        SK_U64                  TxNoBufCts;
+        SK_U64                  TxUsedDescrNo;
+        SK_U64                  RxDeliveredCts;
+        SK_U64                  RxOctetsDeliveredCts;
+        SK_U64                  RxHwErrorsCts;
+        SK_U64                  TxHwErrorsCts;
+        SK_U64                  InErrorsCts;
+        SK_U64                  OutErrorsCts;
+        SK_U64                  ErrRecoveryCts;
+        SK_U64                  SysUpTime;
+} SK_PNMI_STRUCT_DATA;
+
+#define SK_PNMI_STRUCT_SIZE     (sizeof(SK_PNMI_STRUCT_DATA))
+#define SK_PNMI_MIN_STRUCT_SIZE ((unsigned int)(SK_UPTR)\
+                                 &(((SK_PNMI_STRUCT_DATA *)0)->VpdFreeBytes))
+                                                                                                                /*
+                                                                                                                 * ReturnStatus field
+                                                                                                                 * must be located
+                                                                                                                 * before VpdFreeBytes
+                                                                                                                 */
+
+/*
+ * Various definitions
+ */
+#define SK_PNMI_MAX_PROTOS              3
+
+#define SK_PNMI_CNT_NO                  66      /* Must have the value of the enum
+                                                                         * SK_PNMI_MAX_IDX. Define SK_PNMI_CHECK
+                                                                         * for check while init phase 1
+                                                                         */
+
+/*
+ * Estimate data structure
+ */
+typedef struct s_PnmiEstimate {
+        unsigned int    EstValueIndex;
+        SK_U64                  EstValue[7];
+        SK_U64                  Estimate;
+        SK_TIMER                EstTimer;
+} SK_PNMI_ESTIMATE;
+
+
+/*
+ * VCT timer data structure
+ */
+typedef struct s_VctTimer {
+        SK_TIMER                VctTimer;
+} SK_PNMI_VCT_TIMER;
+
+
+/*
+ * PNMI specific adapter context structure
+ */
+typedef struct s_PnmiPort {
+        SK_U64                  StatSyncCts;
+        SK_U64                  StatSyncOctetsCts;
+        SK_U64                  StatRxLongFrameCts;
+        SK_U64                  StatRxFrameTooLongCts;
+        SK_U64                  StatRxPMaccErr;
+        SK_U64                  TxSwQueueLen;
+        SK_U64                  TxSwQueueMax;
+        SK_U64                  TxRetryCts;
+        SK_U64                  RxIntrCts;
+        SK_U64                  TxIntrCts;
+        SK_U64                  RxNoBufCts;
+        SK_U64                  TxNoBufCts;
+        SK_U64                  TxUsedDescrNo;
+        SK_U64                  RxDeliveredCts;
+        SK_U64                  RxOctetsDeliveredCts;
+        SK_U64                  RxHwErrorsCts;
+        SK_U64                  TxHwErrorsCts;
+        SK_U64                  InErrorsCts;
+        SK_U64                  OutErrorsCts;
+        SK_U64                  ErrRecoveryCts;
+        SK_U64                  RxShortZeroMark;
+        SK_U64                  CounterOffset[SK_PNMI_CNT_NO];
+        SK_U32                  CounterHigh[SK_PNMI_CNT_NO];
+        SK_BOOL                 ActiveFlag;
+        SK_U8                   Align[3];
+} SK_PNMI_PORT;
+
+
+typedef struct s_PnmiData {
+        SK_PNMI_PORT    Port    [SK_MAX_MACS];
+        SK_PNMI_PORT    BufPort [SK_MAX_MACS]; /* 2002-09-13 pweber  */
+        SK_U64                  VirtualCounterOffset[SK_PNMI_CNT_NO];
+        SK_U32                  TestResult;
+        char                    HwVersion[10];
+        SK_U16                  Align01;
+
+        char                    *pDriverDescription;
+        char                    *pDriverVersion;
+        char                    *pDriverReleaseDate;
+        char                    *pDriverFileName;
+
+        int                             MacUpdatedFlag;
+        int                             RlmtUpdatedFlag;
+        int                             SirqUpdatedFlag;
+
+        SK_U64                  RlmtChangeCts;
+        SK_U64                  RlmtChangeTime;
+        SK_PNMI_ESTIMATE        RlmtChangeEstimate;
+        SK_U64                  RlmtChangeThreshold;
+
+        SK_U64                  StartUpTime;
+        SK_U32                  DeviceType;
+        char                    PciBusSpeed;
+        char                    PciBusWidth;
+        char                    Chipset;
+        char                    PMD;
+        char                    Connector;
+        SK_BOOL                 DualNetActiveFlag;
+        SK_U16                  Align02;
+
+        char                    TrapBuf[SK_PNMI_TRAP_QUEUE_LEN];
+        unsigned int    TrapBufFree;
+        unsigned int    TrapQueueBeg;
+        unsigned int    TrapQueueEnd;
+        unsigned int    TrapBufPad;
+        unsigned int    TrapUnique;
+        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;
+
+
+/*
+ * Function prototypes
+ */
+extern int SkPnmiInit(SK_AC *pAC, SK_IOC IoC, int Level);
+extern int SkPnmiSetVar(SK_AC *pAC, SK_IOC IoC, SK_U32 Id, void* pBuf,
+        unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
+extern int SkPnmiGetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
+        unsigned int *pLen, SK_U32 NetIndex);
+extern int SkPnmiPreSetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
+        unsigned int *pLen, SK_U32 NetIndex);
+extern int SkPnmiSetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
+        unsigned int *pLen, SK_U32 NetIndex);
+extern int SkPnmiEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event,
+        SK_EVPARA Param);
+extern int SkPnmiGenIoctl(SK_AC *pAC, SK_IOC IoC, void * pBuf,
+        unsigned int * pLen, SK_U32 NetIndex);
+
+#endif
diff --git a/drivers/net/sk98lin/h/skgesirq.h b/drivers/net/sk98lin/h/skgesirq.h
new file mode 100644
index 0000000000..3eec6274e4
--- /dev/null
+++ b/drivers/net/sk98lin/h/skgesirq.h
@@ -0,0 +1,110 @@
+/******************************************************************************
+ *
+ * Name:        skgesirq.h
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.30 $
+ * Date:        $Date: 2003/07/04 12:34:13 $
+ * Purpose:     SK specific Gigabit Ethernet special IRQ functions
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef _INC_SKGESIRQ_H_
+#define _INC_SKGESIRQ_H_
+
+/* Define return codes of SkGePortCheckUp and CheckShort */
+#define SK_HW_PS_NONE           0       /* No action needed */
+#define SK_HW_PS_RESTART        1       /* Restart needed */
+#define SK_HW_PS_LINK           2       /* Link Up actions needed */
+
+/*
+ * Define the Event the special IRQ/INI module can handle
+ */
+#define SK_HWEV_WATIM                   1       /* Timeout for WA Errata #2 XMAC */
+#define SK_HWEV_PORT_START              2       /* Port Start Event by RLMT */
+#define SK_HWEV_PORT_STOP               3       /* Port Stop Event by RLMT */
+#define SK_HWEV_CLEAR_STAT              4       /* Clear Statistics by PNMI */
+#define SK_HWEV_UPDATE_STAT             5       /* Update Statistics by PNMI */
+#define SK_HWEV_SET_LMODE               6       /* Set Link Mode by PNMI */
+#define SK_HWEV_SET_FLOWMODE    7       /* Set Flow Control Mode by PNMI */
+#define SK_HWEV_SET_ROLE                8       /* Set Master/Slave (Role) by PNMI */
+#define SK_HWEV_SET_SPEED               9       /* Set Link Speed by PNMI */
+#define SK_HWEV_HALFDUP_CHK             10      /* Half Duplex Hangup Workaround */
+
+#define SK_WA_ACT_TIME          (5000000UL)     /* 5 sec */
+#define SK_WA_INA_TIME          (100000UL)      /* 100 msec */
+
+#define SK_HALFDUP_CHK_TIME     (10000UL)       /* 10 msec */
+
+/*
+ * Define the error numbers and messages
+ */
+#define SKERR_SIRQ_E001         (SK_ERRBASE_SIRQ+0)
+#define SKERR_SIRQ_E001MSG      "Unknown event"
+#define SKERR_SIRQ_E002         (SKERR_SIRQ_E001+1)
+#define SKERR_SIRQ_E002MSG      "Packet timeout RX1"
+#define SKERR_SIRQ_E003         (SKERR_SIRQ_E002+1)
+#define SKERR_SIRQ_E003MSG      "Packet timeout RX2"
+#define SKERR_SIRQ_E004         (SKERR_SIRQ_E003+1)
+#define SKERR_SIRQ_E004MSG      "MAC 1 not correctly initialized"
+#define SKERR_SIRQ_E005         (SKERR_SIRQ_E004+1)
+#define SKERR_SIRQ_E005MSG      "MAC 2 not correctly initialized"
+#define SKERR_SIRQ_E006         (SKERR_SIRQ_E005+1)
+#define SKERR_SIRQ_E006MSG      "CHECK failure R1"
+#define SKERR_SIRQ_E007         (SKERR_SIRQ_E006+1)
+#define SKERR_SIRQ_E007MSG      "CHECK failure R2"
+#define SKERR_SIRQ_E008         (SKERR_SIRQ_E007+1)
+#define SKERR_SIRQ_E008MSG      "CHECK failure XS1"
+#define SKERR_SIRQ_E009         (SKERR_SIRQ_E008+1)
+#define SKERR_SIRQ_E009MSG      "CHECK failure XA1"
+#define SKERR_SIRQ_E010         (SKERR_SIRQ_E009+1)
+#define SKERR_SIRQ_E010MSG      "CHECK failure XS2"
+#define SKERR_SIRQ_E011         (SKERR_SIRQ_E010+1)
+#define SKERR_SIRQ_E011MSG      "CHECK failure XA2"
+#define SKERR_SIRQ_E012         (SKERR_SIRQ_E011+1)
+#define SKERR_SIRQ_E012MSG      "unexpected IRQ Master error"
+#define SKERR_SIRQ_E013         (SKERR_SIRQ_E012+1)
+#define SKERR_SIRQ_E013MSG      "unexpected IRQ Status error"
+#define SKERR_SIRQ_E014         (SKERR_SIRQ_E013+1)
+#define SKERR_SIRQ_E014MSG      "Parity error on RAM (read)"
+#define SKERR_SIRQ_E015         (SKERR_SIRQ_E014+1)
+#define SKERR_SIRQ_E015MSG      "Parity error on RAM (write)"
+#define SKERR_SIRQ_E016         (SKERR_SIRQ_E015+1)
+#define SKERR_SIRQ_E016MSG      "Parity error MAC 1"
+#define SKERR_SIRQ_E017         (SKERR_SIRQ_E016+1)
+#define SKERR_SIRQ_E017MSG      "Parity error MAC 2"
+#define SKERR_SIRQ_E018         (SKERR_SIRQ_E017+1)
+#define SKERR_SIRQ_E018MSG      "Parity error RX 1"
+#define SKERR_SIRQ_E019         (SKERR_SIRQ_E018+1)
+#define SKERR_SIRQ_E019MSG      "Parity error RX 2"
+#define SKERR_SIRQ_E020         (SKERR_SIRQ_E019+1)
+#define SKERR_SIRQ_E020MSG      "MAC transmit FIFO underrun"
+#define SKERR_SIRQ_E021         (SKERR_SIRQ_E020+1)
+#define SKERR_SIRQ_E021MSG      "Spurious TWSI interrupt"
+#define SKERR_SIRQ_E022         (SKERR_SIRQ_E021+1)
+#define SKERR_SIRQ_E022MSG      "Cable pair swap error"
+#define SKERR_SIRQ_E023         (SKERR_SIRQ_E022+1)
+#define SKERR_SIRQ_E023MSG      "Auto-negotiation error"
+#define SKERR_SIRQ_E024         (SKERR_SIRQ_E023+1)
+#define SKERR_SIRQ_E024MSG      "FIFO overflow error"
+#define SKERR_SIRQ_E025         (SKERR_SIRQ_E024+1)
+#define SKERR_SIRQ_E025MSG      "2 Pair Downshift detected"
+
+extern void SkGeSirqIsr(SK_AC *pAC, SK_IOC IoC, SK_U32 Istatus);
+extern int  SkGeSirqEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Para);
+extern void SkHWLinkDown(SK_AC *pAC, SK_IOC IoC, int Port);
+
+#endif  /* _INC_SKGESIRQ_H_ */
diff --git a/drivers/net/sk98lin/h/ski2c.h b/drivers/net/sk98lin/h/ski2c.h
new file mode 100644
index 0000000000..6a63f4a15d
--- /dev/null
+++ b/drivers/net/sk98lin/h/ski2c.h
@@ -0,0 +1,174 @@
+/******************************************************************************
+ *
+ * Name:        ski2c.h
+ * 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-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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ * SKI2C.H      contains all I2C specific defines
+ */
+
+#ifndef _SKI2C_H_
+#define _SKI2C_H_
+
+typedef struct  s_Sensor SK_SENSOR;
+
+#include "h/skgei2c.h"
+
+/*
+ * Define the I2C events.
+ */
+#define SK_I2CEV_IRQ    1       /* IRQ happened Event */
+#define SK_I2CEV_TIM    2       /* Timeout event */
+#define SK_I2CEV_CLEAR  3       /* Clear MIB Values */
+
+/*
+ * Define READ and WRITE Constants.
+ */
+#define I2C_READ        0
+#define I2C_WRITE       1
+#define I2C_BURST       1
+#define I2C_SINGLE      0
+
+#define SKERR_I2C_E001          (SK_ERRBASE_I2C+0)
+#define SKERR_I2C_E001MSG       "Sensor index unknown"
+#define SKERR_I2C_E002          (SKERR_I2C_E001+1)
+#define SKERR_I2C_E002MSG       "TWSI: transfer does not complete"
+#define SKERR_I2C_E003          (SKERR_I2C_E002+1)
+#define SKERR_I2C_E003MSG       "LM80: NAK on device send"
+#define SKERR_I2C_E004          (SKERR_I2C_E003+1)
+#define SKERR_I2C_E004MSG       "LM80: NAK on register send"
+#define SKERR_I2C_E005          (SKERR_I2C_E004+1)
+#define SKERR_I2C_E005MSG       "LM80: NAK on device (2) send"
+#define SKERR_I2C_E006          (SKERR_I2C_E005+1)
+#define SKERR_I2C_E006MSG       "Unknown event"
+#define SKERR_I2C_E007          (SKERR_I2C_E006+1)
+#define SKERR_I2C_E007MSG       "LM80 read out of state"
+#define SKERR_I2C_E008          (SKERR_I2C_E007+1)
+#define SKERR_I2C_E008MSG       "Unexpected sensor read completed"
+#define SKERR_I2C_E009          (SKERR_I2C_E008+1)
+#define SKERR_I2C_E009MSG       "WARNING: temperature sensor out of range"
+#define SKERR_I2C_E010          (SKERR_I2C_E009+1)
+#define SKERR_I2C_E010MSG       "WARNING: voltage sensor out of range"
+#define SKERR_I2C_E011          (SKERR_I2C_E010+1)
+#define SKERR_I2C_E011MSG       "ERROR: temperature sensor out of range"
+#define SKERR_I2C_E012          (SKERR_I2C_E011+1)
+#define SKERR_I2C_E012MSG       "ERROR: voltage sensor out of range"
+#define SKERR_I2C_E013          (SKERR_I2C_E012+1)
+#define SKERR_I2C_E013MSG       "ERROR: couldn't init sensor"
+#define SKERR_I2C_E014          (SKERR_I2C_E013+1)
+#define SKERR_I2C_E014MSG       "WARNING: fan sensor out of range"
+#define SKERR_I2C_E015          (SKERR_I2C_E014+1)
+#define SKERR_I2C_E015MSG       "ERROR: fan sensor out of range"
+#define SKERR_I2C_E016          (SKERR_I2C_E015+1)
+#define SKERR_I2C_E016MSG       "TWSI: active transfer does not complete"
+
+/*
+ * Define Timeout values
+ */
+#define SK_I2C_TIM_LONG         2000000L        /* 2 seconds */
+#define SK_I2C_TIM_SHORT         100000L        /* 100 milliseconds */
+#define SK_I2C_TIM_WATCH        1000000L        /* 1 second */
+
+/*
+ * Define trap and error log hold times
+ */
+#ifndef SK_SEN_ERR_TR_HOLD
+#define SK_SEN_ERR_TR_HOLD              (4*SK_TICKS_PER_SEC)
+#endif
+#ifndef SK_SEN_ERR_LOG_HOLD
+#define SK_SEN_ERR_LOG_HOLD             (60*SK_TICKS_PER_SEC)
+#endif
+#ifndef SK_SEN_WARN_TR_HOLD
+#define SK_SEN_WARN_TR_HOLD             (15*SK_TICKS_PER_SEC)
+#endif
+#ifndef SK_SEN_WARN_LOG_HOLD
+#define SK_SEN_WARN_LOG_HOLD    (15*60*SK_TICKS_PER_SEC)
+#endif
+
+/*
+ * Defines for SenType
+ */
+#define SK_SEN_UNKNOWN  0
+#define SK_SEN_TEMP             1
+#define SK_SEN_VOLT             2
+#define SK_SEN_FAN              3
+
+/*
+ * Define for the SenErrorFlag
+ */
+#define SK_SEN_ERR_NOT_PRESENT  0       /* Error Flag: Sensor not present */
+#define SK_SEN_ERR_OK                   1       /* Error Flag: O.K. */
+#define SK_SEN_ERR_WARN                 2       /* Error Flag: Warning */
+#define SK_SEN_ERR_ERR                  3       /* Error Flag: Error */
+#define SK_SEN_ERR_FAULTY               4       /* Error Flag: Faulty */
+
+/*
+ * Define the Sensor struct
+ */
+struct  s_Sensor {
+        char    *SenDesc;                       /* Description */
+        int             SenType;                        /* Voltage or Temperature */
+        SK_I32  SenValue;                       /* Current value of the sensor */
+        SK_I32  SenThreErrHigh;         /* High error Threshhold of this sensor */
+        SK_I32  SenThreWarnHigh;        /* High warning Threshhold of this sensor */
+        SK_I32  SenThreErrLow;          /* Lower error Threshold of the 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  SenWarnCts;                     /* Warning trap counter */
+        SK_U64  SenBegErrTS;            /* Begin error timestamp */
+        SK_U64  SenBegWarnTS;           /* Begin warning timestamp */
+        SK_U64  SenLastErrTrapTS;       /* Last error trap timestamp */
+        SK_U64  SenLastErrLogTS;        /* Last error log timestamp */
+        SK_U64  SenLastWarnTrapTS;      /* Last warning trap timestamp */
+        SK_U64  SenLastWarnLogTS;       /* Last warning log timestamp */
+        int             SenState;                       /* Sensor State (see HW specific include) */
+        int             (*SenRead)(SK_AC *pAC, SK_IOC IoC, struct s_Sensor *pSen);
+                                                                /* Sensors read function */
+        SK_U16  SenReg;                         /* Register Address for this sensor */
+        SK_U8   SenDev;                         /* Device Selection for this sensor */
+};
+
+typedef struct  s_I2c {
+        SK_SENSOR       SenTable[SK_MAX_SENSORS];       /* Sensor Table */
+        int                     CurrSens;       /* Which sensor is currently queried */
+        int                     MaxSens;        /* Max. number of sensors */
+        int                     TimerMode;      /* Use the timer also to watch the state machine */
+        int                     InitLevel;      /* Initialized Level */
+#ifndef SK_DIAG
+        int                     DummyReads;     /* Number of non-checked dummy reads */
+        SK_TIMER        SenTimer;       /* Sensors timer */
+#endif /* !SK_DIAG */
+} SK_I2C;
+
+extern int SkI2cInit(SK_AC *pAC, SK_IOC IoC, int Level);
+#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 void SkI2cWaitIrq(SK_AC *pAC, SK_IOC IoC);
+extern void SkI2cIsr(SK_AC *pAC, SK_IOC IoC);
+#endif /* !SK_DIAG */
+#endif /* n_SKI2C_H */
+
diff --git a/drivers/net/sk98lin/h/skqueue.h b/drivers/net/sk98lin/h/skqueue.h
new file mode 100644
index 0000000000..2ec40d4fdf
--- /dev/null
+++ b/drivers/net/sk98lin/h/skqueue.h
@@ -0,0 +1,94 @@
+/******************************************************************************
+ *
+ * Name:        skqueue.h
+ * 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
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ * SKQUEUE.H    contains all defines and types for the event queue
+ */
+
+#ifndef _SKQUEUE_H_
+#define _SKQUEUE_H_
+
+
+/*
+ * define the event classes to be served
+ */
+#define SKGE_DRV        1       /* Driver Event Class */
+#define SKGE_RLMT       2       /* RLMT 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 */
+
+#define SKGE_SWT        9       /* Software Timer Event Class */
+#define SKGE_LACP       10      /* LACP Aggregation Event Class */
+#define SKGE_RSF        11      /* RSF Aggregation Event Class */
+#define SKGE_MARKER     12      /* MARKER Aggregation Event Class */
+#define SKGE_FD         13      /* FD Distributor Event Class */
+
+/*
+ * define event queue as circular buffer
+ */
+#define SK_MAX_EVENT    64
+
+/*
+ * Parameter union for the Para stuff
+ */
+typedef union u_EvPara {
+        void    *pParaPtr;      /* Parameter Pointer */
+        SK_U64  Para64;         /* Parameter 64bit version */
+        SK_U32  Para32[2];      /* Parameter Array of 32bit parameters */
+} SK_EVPARA;
+
+/*
+ * Event Queue
+ *      skqueue.c
+ * events are class/value pairs
+ *      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_EVENTELEM;
+
+typedef struct s_Queue {
+        SK_EVENTELEM    EvQueue[SK_MAX_EVENT];
+        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);
+
+
+/* Define Error Numbers and messages */
+#define SKERR_Q_E001    (SK_ERRBASE_QUEUE+0)
+#define SKERR_Q_E001MSG "Event queue overflow"
+#define SKERR_Q_E002    (SKERR_Q_E001+1)
+#define SKERR_Q_E002MSG "Undefined event class"
+#endif  /* _SKQUEUE_H_ */
+
diff --git a/drivers/net/sk98lin/h/skrlmt.h b/drivers/net/sk98lin/h/skrlmt.h
new file mode 100644
index 0000000000..ca75dfdcf2
--- /dev/null
+++ b/drivers/net/sk98lin/h/skrlmt.h
@@ -0,0 +1,438 @@
+/******************************************************************************
+ *
+ * Name:        skrlmt.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.37 $
+ * Date:        $Date: 2003/04/15 09:43:43 $
+ * Purpose:     Header file for Redundant Link ManagemenT.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * This is the header file for Redundant Link ManagemenT.
+ *
+ * Include File Hierarchy:
+ *
+ *      "skdrv1st.h"
+ *      ...
+ *      "sktypes.h"
+ *      "skqueue.h"
+ *      "skaddr.h"
+ *      "skrlmt.h"
+ *      ...
+ *      "skdrv2nd.h"
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKRLMT_H
+#define __INC_SKRLMT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* cplusplus */
+
+/* defines ********************************************************************/
+
+#define SK_RLMT_NET_DOWN_TEMP   1       /* NET_DOWN due to last port down. */
+#define SK_RLMT_NET_DOWN_FINAL  2       /* NET_DOWN due to RLMT_STOP. */
+
+/* ----- Default queue sizes - must be multiples of 8 KB ----- */
+
+/* Less than 8 KB free in RX queue => pause frames. */
+#define SK_RLMT_STANDBY_QRXSIZE 128     /* Size of rx standby queue in KB. */
+#define SK_RLMT_STANDBY_QXASIZE 32      /* Size of async standby queue in KB. */
+#define SK_RLMT_STANDBY_QXSSIZE 0       /* Size of sync standby queue in KB. */
+
+#define SK_RLMT_MAX_TX_BUF_SIZE 60      /* Maximum RLMT transmit size. */
+
+/* ----- PORT states ----- */
+
+#define SK_RLMT_PS_INIT                 0       /* Port state: Init. */
+#define SK_RLMT_PS_LINK_DOWN    1       /* Port state: Link down. */
+#define SK_RLMT_PS_DOWN                 2       /* Port state: Port down. */
+#define SK_RLMT_PS_GOING_UP             3       /* Port state: Going up. */
+#define SK_RLMT_PS_UP                   4       /* Port state: Up. */
+
+/* ----- RLMT states ----- */
+
+#define SK_RLMT_RS_INIT                 0       /* RLMT state: Init. */
+#define SK_RLMT_RS_NET_DOWN             1       /* RLMT state: Net down. */
+#define SK_RLMT_RS_NET_UP               2       /* RLMT state: Net up. */
+
+/* ----- PORT events ----- */
+
+#define SK_RLMT_LINK_UP                 1001    /* Link came up. */
+#define SK_RLMT_LINK_DOWN               1002    /* Link went down. */
+#define SK_RLMT_PORT_ADDR               1003    /* Port address changed. */
+
+/* ----- RLMT events ----- */
+
+#define SK_RLMT_START                   2001    /* Start RLMT. */
+#define SK_RLMT_STOP                    2002    /* Stop RLMT. */
+#define SK_RLMT_PACKET_RECEIVED 2003    /* Packet was received for RLMT. */
+#define SK_RLMT_STATS_CLEAR             2004    /* Clear statistics. */
+#define SK_RLMT_STATS_UPDATE    2005    /* Update statistics. */
+#define SK_RLMT_PREFPORT_CHANGE 2006    /* Change preferred port. */
+#define SK_RLMT_MODE_CHANGE             2007    /* New RlmtMode. */
+#define SK_RLMT_SET_NETS                2008    /* Number of Nets (1 or 2). */
+
+/* ----- RLMT mode bits ----- */
+
+/*
+ * CAUTION:     These defines are private to RLMT.
+ *                      Please use the RLMT mode defines below.
+ */
+
+#define SK_RLMT_CHECK_LINK                1             /* Check Link. */
+#define SK_RLMT_CHECK_LOC_LINK    2             /* Check other link on same adapter. */
+#define SK_RLMT_CHECK_SEG                 4             /* Check segmentation. */
+
+#ifndef RLMT_CHECK_REMOTE
+#define SK_RLMT_CHECK_OTHERS    SK_RLMT_CHECK_LOC_LINK
+#else   /* RLMT_CHECK_REMOTE */
+#define SK_RLMT_CHECK_REM_LINK    8             /* Check link(s) on other adapter(s). */
+#define SK_RLMT_MAX_REMOTE_PORTS_CHECKED        3
+#define SK_RLMT_CHECK_OTHERS    \
+                (SK_RLMT_CHECK_LOC_LINK | SK_RLMT_CHECK_REM_LINK)
+#endif  /* RLMT_CHECK_REMOTE */
+
+#ifndef SK_RLMT_ENABLE_TRANSPARENT
+#define SK_RLMT_TRANSPARENT               0             /* RLMT transparent - inactive. */
+#else   /* SK_RLMT_ENABLE_TRANSPARENT */
+#define SK_RLMT_TRANSPARENT             128             /* RLMT transparent. */
+#endif  /* SK_RLMT_ENABLE_TRANSPARENT */
+
+/* ----- RLMT modes ----- */
+
+/* Check Link State. */
+#define SK_RLMT_MODE_CLS        (SK_RLMT_CHECK_LINK)
+
+/* Check Local Ports: check other links on the same adapter. */
+#define SK_RLMT_MODE_CLP        (SK_RLMT_CHECK_LINK | SK_RLMT_CHECK_LOC_LINK)
+
+/* Check Local Ports and Segmentation Status. */
+#define SK_RLMT_MODE_CLPSS      \
+                (SK_RLMT_CHECK_LINK | SK_RLMT_CHECK_LOC_LINK | SK_RLMT_CHECK_SEG)
+
+#ifdef RLMT_CHECK_REMOTE
+/* Check Local and Remote Ports: check links (local or remote). */
+        Name of define TBD!
+#define SK_RLMT_MODE_CRP        \
+                (SK_RLMT_CHECK_LINK | SK_RLMT_CHECK_LOC_LINK | SK_RLMT_CHECK_REM_LINK)
+
+/* Check Local and Remote Ports and Segmentation Status. */
+        Name of define TBD!
+#define SK_RLMT_MODE_CRPSS      \
+                (SK_RLMT_CHECK_LINK | SK_RLMT_CHECK_LOC_LINK | \
+                SK_RLMT_CHECK_REM_LINK | SK_RLMT_CHECK_SEG)
+#endif  /* RLMT_CHECK_REMOTE */
+
+/* ----- RLMT lookahead result bits ----- */
+
+#define SK_RLMT_RX_RLMT                 1       /* Give packet to RLMT. */
+#define SK_RLMT_RX_PROTOCOL             2       /* Give packet to protocol. */
+
+/* Macros */
+
+#if 0
+SK_AC           *pAC            /* adapter context */
+SK_U32          PortNum         /* receiving port */
+unsigned        PktLen          /* received packet's length */
+SK_BOOL         IsBc            /* Flag: packet is broadcast */
+unsigned        *pOffset        /* offs. of bytes to present to SK_RLMT_LOOKAHEAD */
+unsigned        *pNumBytes      /* #Bytes to present to SK_RLMT_LOOKAHEAD */
+#endif  /* 0 */
+
+#define SK_RLMT_PRE_LOOKAHEAD(pAC,PortNum,PktLen,IsBc,pOffset,pNumBytes) { \
+        SK_AC   *_pAC; \
+        SK_U32  _PortNum; \
+        _pAC = (pAC); \
+        _PortNum = (SK_U32)(PortNum); \
+        /* _pAC->Rlmt.Port[_PortNum].PacketsRx++; */ \
+        _pAC->Rlmt.Port[_PortNum].PacketsPerTimeSlot++; \
+    if (_pAC->Rlmt.RlmtOff) { \
+                *(pNumBytes) = 0; \
+    } \
+    else {\
+        if ((_pAC->Rlmt.Port[_PortNum].Net->RlmtMode & SK_RLMT_TRANSPARENT) != 0) { \
+                *(pNumBytes) = 0; \
+        } \
+        else if (IsBc) { \
+                if (_pAC->Rlmt.Port[_PortNum].Net->RlmtMode != SK_RLMT_MODE_CLS) { \
+                        *(pNumBytes) = 6; \
+                        *(pOffset) = 6; \
+                } \
+                else { \
+                        *(pNumBytes) = 0; \
+                } \
+        } \
+        else { \
+                if ((PktLen) > SK_RLMT_MAX_TX_BUF_SIZE) { \
+                        /* _pAC->Rlmt.Port[_PortNum].DataPacketsPerTimeSlot++; */ \
+                        *(pNumBytes) = 0; \
+                } \
+                else { \
+                        *(pNumBytes) = 6; \
+                        *(pOffset) = 0; \
+                } \
+        } \
+    } \
+}
+
+#if 0
+SK_AC           *pAC            /* adapter context */
+SK_U32          PortNum         /* receiving port */
+SK_U8           *pLaPacket,     /* received packet's data (points to pOffset) */
+SK_BOOL         IsBc            /* Flag: packet is broadcast */
+SK_BOOL         IsMc            /* Flag: packet is multicast */
+unsigned        *pForRlmt       /* Result: bits SK_RLMT_RX_RLMT, SK_RLMT_RX_PROTOCOL */
+SK_RLMT_LOOKAHEAD() expects *pNumBytes from
+packet offset *pOffset (s.a.) at *pLaPacket.
+
+If you use SK_RLMT_LOOKAHEAD in a path where you already know if the packet is
+BC, MC, or UC, you should use constants for IsBc and IsMc, so that your compiler
+can trash unneeded parts of the if construction.
+#endif  /* 0 */
+
+#define SK_RLMT_LOOKAHEAD(pAC,PortNum,pLaPacket,IsBc,IsMc,pForRlmt) { \
+        SK_AC   *_pAC; \
+        SK_U32  _PortNum; \
+        SK_U8   *_pLaPacket; \
+        _pAC = (pAC); \
+        _PortNum = (SK_U32)(PortNum); \
+        _pLaPacket = (SK_U8 *)(pLaPacket); \
+        if (IsBc) {\
+                if (!SK_ADDR_EQUAL(_pLaPacket, _pAC->Addr.Net[_pAC->Rlmt.Port[ \
+                        _PortNum].Net->NetNumber].CurrentMacAddress.a)) { \
+                        _pAC->Rlmt.Port[_PortNum].BcTimeStamp = SkOsGetTime(_pAC); \
+                        _pAC->Rlmt.CheckSwitch = SK_TRUE; \
+                } \
+                /* _pAC->Rlmt.Port[_PortNum].DataPacketsPerTimeSlot++; */ \
+                *(pForRlmt) = SK_RLMT_RX_PROTOCOL; \
+        } \
+        else if (IsMc) { \
+                if (SK_ADDR_EQUAL(_pLaPacket, BridgeMcAddr.a)) { \
+                        _pAC->Rlmt.Port[_PortNum].BpduPacketsPerTimeSlot++; \
+                        if (_pAC->Rlmt.Port[_PortNum].Net->RlmtMode & SK_RLMT_CHECK_SEG) { \
+                                *(pForRlmt) = SK_RLMT_RX_RLMT | SK_RLMT_RX_PROTOCOL; \
+                        } \
+                        else { \
+                                *(pForRlmt) = SK_RLMT_RX_PROTOCOL; \
+                        } \
+                } \
+                else if (SK_ADDR_EQUAL(_pLaPacket, SkRlmtMcAddr.a)) { \
+                        *(pForRlmt) = SK_RLMT_RX_RLMT; \
+                } \
+                else { \
+                        /* _pAC->Rlmt.Port[_PortNum].DataPacketsPerTimeSlot++; */ \
+                        *(pForRlmt) = SK_RLMT_RX_PROTOCOL; \
+                } \
+        } \
+        else { \
+                if (SK_ADDR_EQUAL( \
+                        _pLaPacket, \
+                        _pAC->Addr.Port[_PortNum].CurrentMacAddress.a)) { \
+                        *(pForRlmt) = SK_RLMT_RX_RLMT; \
+                } \
+                else { \
+                        /* _pAC->Rlmt.Port[_PortNum].DataPacketsPerTimeSlot++; */ \
+                        *(pForRlmt) = SK_RLMT_RX_PROTOCOL; \
+                } \
+        } \
+}
+
+#ifdef SK_RLMT_FAST_LOOKAHEAD
+Error: SK_RLMT_FAST_LOOKAHEAD no longer used. Use new macros for lookahead.
+#endif  /* SK_RLMT_FAST_LOOKAHEAD */
+#ifdef SK_RLMT_SLOW_LOOKAHEAD
+Error: SK_RLMT_SLOW_LOOKAHEAD no longer used. Use new macros for lookahead.
+#endif  /* SK_RLMT_SLOW_LOOKAHEAD */
+
+/* typedefs *******************************************************************/
+
+#ifdef SK_RLMT_MBUF_PRIVATE
+typedef struct s_RlmtMbuf {
+        some content
+} SK_RLMT_MBUF;
+#endif  /* SK_RLMT_MBUF_PRIVATE */
+
+
+#ifdef SK_LA_INFO
+typedef struct s_Rlmt_PacketInfo {
+        unsigned        PacketLength;                   /* Length of packet. */
+        unsigned        PacketType;                             /* Directed/Multicast/Broadcast. */
+} SK_RLMT_PINFO;
+#endif  /* SK_LA_INFO */
+
+
+typedef struct s_RootId {
+        SK_U8           Id[8];                                  /* Root Bridge Id. */
+} SK_RLMT_ROOT_ID;
+
+
+typedef struct s_port {
+        SK_MAC_ADDR     CheckAddr;
+        SK_BOOL         SuspectTx;
+} SK_PORT_CHECK;
+
+
+typedef struct s_RlmtNet SK_RLMT_NET;
+
+
+typedef struct s_RlmtPort {
+
+/* ----- Public part (read-only) ----- */
+
+        SK_U8                   PortState;                              /* Current state of this port. */
+
+        /* For PNMI */
+        SK_BOOL                 LinkDown;
+        SK_BOOL                 PortDown;
+        SK_U8                   Align01;
+
+        SK_U32                  PortNumber;                             /* Number of port on adapter. */
+        SK_RLMT_NET *   Net;                                    /* Net port belongs to. */
+
+        SK_U64                  TxHelloCts;
+        SK_U64                  RxHelloCts;
+        SK_U64                  TxSpHelloReqCts;
+        SK_U64                  RxSpHelloCts;
+
+/* ----- Private part ----- */
+
+/*      SK_U64                  PacketsRx; */                           /* Total packets received. */
+        SK_U32                  PacketsPerTimeSlot;             /* Packets rxed between TOs. */
+/*      SK_U32                  DataPacketsPerTimeSlot; */      /* Data packets ... */
+        SK_U32                  BpduPacketsPerTimeSlot; /* BPDU packets rxed in TS. */
+        SK_U64                  BcTimeStamp;                    /* Time of last BC receive. */
+        SK_U64                  GuTimeStamp;                    /* Time of entering GOING_UP. */
+
+        SK_TIMER                UpTimer;                                /* Timer struct Link/Port up. */
+        SK_TIMER                DownRxTimer;                    /* Timer struct down rx. */
+        SK_TIMER                DownTxTimer;                    /* Timer struct down tx. */
+
+        SK_U32                  CheckingState;                  /* Checking State. */
+
+        SK_ADDR_PORT *  AddrPort;
+
+        SK_U8                   Random[4];                              /* Random value. */
+        unsigned                PortsChecked;                   /* #ports checked. */
+        unsigned                PortsSuspect;                   /* #ports checked that are s. */
+        SK_PORT_CHECK   PortCheck[1];
+/*      SK_PORT_CHECK   PortCheck[SK_MAX_MACS - 1]; */
+
+        SK_BOOL                 PortStarted;                    /* Port is started. */
+        SK_BOOL                 PortNoRx;                               /* NoRx for >= 1 time slot. */
+        SK_BOOL                 RootIdSet;
+        SK_RLMT_ROOT_ID Root;                                   /* Root Bridge Id. */
+} SK_RLMT_PORT;
+
+
+struct s_RlmtNet {
+
+/* ----- Public part (read-only) ----- */
+
+        SK_U32                  NetNumber;                      /* Number of net. */
+
+        SK_RLMT_PORT *  Port[SK_MAX_MACS];      /* Ports that belong to this net. */
+        SK_U32                  NumPorts;                       /* Number of ports. */
+        SK_U32                  PrefPort;                       /* Preferred port. */
+
+        /* For PNMI */
+
+        SK_U32                  ChgBcPrio;                      /* Change Priority of last broadcast received */
+        SK_U32                  RlmtMode;                       /* Check ... */
+        SK_U32                  ActivePort;                     /* Active port. */
+        SK_U32                  Preference;             /* 0xFFFFFFFF: Automatic. */
+
+        SK_U8                   RlmtState;                      /* Current RLMT state. */
+
+/* ----- Private part ----- */
+        SK_BOOL                 RootIdSet;
+        SK_U16                  Align01;
+
+        int                             LinksUp;                        /* #Links up. */
+        int                             PortsUp;                        /* #Ports up. */
+        SK_U32                  TimeoutValue;           /* RLMT timeout value. */
+
+        SK_U32                  CheckingState;          /* Checking State. */
+        SK_RLMT_ROOT_ID Root;                           /* Root Bridge Id. */
+
+        SK_TIMER                LocTimer;                       /* Timer struct. */
+        SK_TIMER                SegTimer;                       /* Timer struct. */
+};
+
+
+typedef struct s_Rlmt {
+
+/* ----- Public part (read-only) ----- */
+
+        SK_U32                  NumNets;                        /* Number of nets. */
+        SK_U32                  NetsStarted;            /* Number of nets started. */
+        SK_RLMT_NET             Net[SK_MAX_NETS];       /* Array of available nets. */
+        SK_RLMT_PORT    Port[SK_MAX_MACS];      /* Array of available ports. */
+
+/* ----- Private part ----- */
+        SK_BOOL                 CheckSwitch;
+        SK_BOOL                 RlmtOff;            /* set to zero if the Mac addresses 
+                                           are equal or the second one 
+                                           is zero */
+        SK_U16                  Align01;
+
+} SK_RLMT;
+
+
+extern  SK_MAC_ADDR     BridgeMcAddr;
+extern  SK_MAC_ADDR     SkRlmtMcAddr;
+
+/* function prototypes ********************************************************/
+
+
+#ifndef SK_KR_PROTO
+
+/* Functions provided by SkRlmt */
+
+/* ANSI/C++ compliant function prototypes */
+
+extern  void    SkRlmtInit(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        int             Level);
+
+extern  int     SkRlmtEvent(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        SK_U32          Event,
+        SK_EVPARA       Para);
+
+#else   /* defined(SK_KR_PROTO) */
+
+/* Non-ANSI/C++ compliant function prototypes */
+
+#error KR-style function prototypes are not yet provided.
+
+#endif  /* defined(SK_KR_PROTO)) */
+
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif  /* __INC_SKRLMT_H */
diff --git a/drivers/net/sk98lin/h/sktimer.h b/drivers/net/sk98lin/h/sktimer.h
new file mode 100644
index 0000000000..04e6d7c1ec
--- /dev/null
+++ b/drivers/net/sk98lin/h/sktimer.h
@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
+ * Name:        sktimer.h
+ * 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
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ * SKTIMER.H    contains all defines and types for the timer functions
+ */
+
+#ifndef _SKTIMER_H_
+#define _SKTIMER_H_
+
+#include "h/skqueue.h"
+
+/*
+ * SK timer
+ * - needed wherever a timer is used. Put this in your data structure
+ *   wherever you want.
+ */
+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 */
+};
+
+/*
+ * Timer control struct.
+ * - use in Adapters context name pAC->Tim
+ */
+typedef struct s_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);
+#endif  /* _SKTIMER_H_ */
diff --git a/drivers/net/sk98lin/h/sktypes.h b/drivers/net/sk98lin/h/sktypes.h
new file mode 100644
index 0000000000..40edc96e10
--- /dev/null
+++ b/drivers/net/sk98lin/h/sktypes.h
@@ -0,0 +1,69 @@
+/******************************************************************************
+ *
+ * Name:        sktypes.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.2 $
+ * Date:        $Date: 2003/10/07 08:16:51 $
+ * Purpose:     Define data types for Linux
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+ 
+/******************************************************************************
+ *
+ * Description:
+ *
+ * In this file, all data types that are needed by the common modules
+ * are mapped to Linux data types.
+ * 
+ *
+ * Include File Hierarchy:
+ *
+ *
+ ******************************************************************************/
+
+#ifndef __INC_SKTYPES_H
+#define __INC_SKTYPES_H
+
+
+/* defines *******************************************************************/
+
+/*
+ * Data types with a specific size. 'I' = signed, 'U' = unsigned.
+ */
+#define SK_I8   s8
+#define SK_U8   u8
+#define SK_I16  s16
+#define SK_U16  u16
+#define SK_I32  s32
+#define SK_U32  u32
+#define SK_I64  s64
+#define SK_U64  u64
+
+#define SK_UPTR ulong           /* casting pointer <-> integral */
+
+/*
+* Boolean type.
+*/
+#define SK_BOOL         SK_U8
+#define SK_FALSE        0
+#define SK_TRUE         (!SK_FALSE)
+
+/* typedefs *******************************************************************/
+
+/* function prototypes ********************************************************/
+
+#endif  /* __INC_SKTYPES_H */
diff --git a/drivers/net/sk98lin/h/skversion.h b/drivers/net/sk98lin/h/skversion.h
new file mode 100644
index 0000000000..a1a7294828
--- /dev/null
+++ b/drivers/net/sk98lin/h/skversion.h
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
+ * Name:        version.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.5 $
+ * Date:        $Date: 2003/10/07 08:16:51 $
+ * Purpose:     SK specific Error log support
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifdef  lint
+static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH.";
+static const char SysKonnectBuildNumber[] =
+        "@(#)SK-BUILD: 6.23 PL: 01"; 
+#endif  /* !defined(lint) */
+
+#define BOOT_STRING     "sk98lin: Network Device Driver v6.23\n" \
+                        "(C)Copyright 1999-2004 Marvell(R)."
+
+#define VER_STRING      "6.23"
+#define DRIVER_FILE_NAME        "sk98lin"
+#define DRIVER_REL_DATE         "Feb-13-2004"
+
+
diff --git a/drivers/net/sk98lin/h/skvpd.h b/drivers/net/sk98lin/h/skvpd.h
new file mode 100644
index 0000000000..fdd9e48e80
--- /dev/null
+++ b/drivers/net/sk98lin/h/skvpd.h
@@ -0,0 +1,248 @@
+/******************************************************************************
+ *
+ * Name:        skvpd.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.15 $
+ * Date:        $Date: 2003/01/13 10:39:38 $
+ * Purpose:     Defines and Macros for VPD handling
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (C)Copyright 1998-2003 SysKonnect 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 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ * skvpd.h      contains Diagnostic specific defines for VPD handling
+ */
+
+#ifndef __INC_SKVPD_H_
+#define __INC_SKVPD_H_
+
+/*
+ * Define Resource Type Identifiers and VPD keywords
+ */
+#define RES_ID          0x82    /* Resource Type ID String (Product Name) */
+#define RES_VPD_R       0x90    /* start of VPD read only area */
+#define RES_VPD_W       0x91    /* start of VPD read/write area */
+#define RES_END         0x78    /* Resource Type End Tag */
+
+#ifndef VPD_NAME
+#define VPD_NAME        "Name"  /* Product Name, VPD name of RES_ID */
+#endif  /* VPD_NAME */
+#define VPD_PN          "PN"    /* Adapter Part Number */
+#define VPD_EC          "EC"    /* Adapter Engineering Level */
+#define VPD_MN          "MN"    /* Manufacture ID */
+#define VPD_SN          "SN"    /* Serial Number */
+#define VPD_CP          "CP"    /* Extended Capability */
+#define VPD_RV          "RV"    /* Checksum and Reserved */
+#define VPD_YA          "YA"    /* Asset Tag Identifier */
+#define VPD_VL          "VL"    /* First Error Log Message (SK specific) */
+#define VPD_VF          "VF"    /* Second Error Log Message (SK specific) */
+#define VPD_RW          "RW"    /* Remaining Read / Write Area */
+
+/* 'type' values for vpd_setup_para() */
+#define VPD_RO_KEY      1       /* RO keys are "PN", "EC", "MN", "SN", "RV" */
+#define VPD_RW_KEY      2       /* RW keys are "Yx", "Vx", and "RW" */
+
+/* 'op' values for vpd_setup_para() */
+#define ADD_KEY         1       /* add the key at the pos "RV" or "RW" */
+#define OWR_KEY         2       /* overwrite key if already exists */
+
+/*
+ * Define READ and WRITE Constants.
+ */
+
+#define VPD_DEV_ID_GENESIS      0x4300
+
+#define VPD_SIZE_YUKON          256
+#define VPD_SIZE_GENESIS        512
+#define VPD_SIZE                        512
+#define VPD_READ        0x0000
+#define VPD_WRITE       0x8000
+
+#define VPD_STOP(pAC,IoC)       VPD_OUT16(pAC,IoC,PCI_VPD_ADR_REG,VPD_WRITE)
+
+#define VPD_GET_RES_LEN(p)      ((unsigned int) \
+                                        (* (SK_U8 *)&(p)[1]) |\
+                                        ((* (SK_U8 *)&(p)[2]) << 8))
+#define VPD_GET_VPD_LEN(p)      ((unsigned int)(* (SK_U8 *)&(p)[2]))
+#define VPD_GET_VAL(p)          ((char *)&(p)[3])
+
+#define VPD_MAX_LEN     50
+
+/* VPD status */
+        /* bit 7..1 reserved */
+#define VPD_VALID       (1<<0)  /* VPD data buffer, vpd_free_ro, */
+                                                        /* and vpd_free_rw valid         */
+
+/*
+ * VPD structs
+ */
+typedef struct s_vpd_status {
+        unsigned short  Align01;                        /* Alignment */
+        unsigned short  vpd_status;                     /* VPD status, description see above */
+        int                             vpd_free_ro;            /* unused bytes in read only area */
+        int                             vpd_free_rw;            /* bytes available in read/write area */
+} SK_VPD_STATUS;
+
+typedef struct s_vpd {
+        SK_VPD_STATUS   v;                                      /* VPD status structure */
+        char                    vpd_buf[VPD_SIZE];      /* VPD buffer */
+        int                             rom_size;                       /* VPD ROM Size from PCI_OUR_REG_2 */
+        int                             vpd_size;                       /* saved VPD-size */
+} SK_VPD;
+
+typedef struct s_vpd_para {
+        unsigned int    p_len;  /* parameter length */
+        char                    *p_val; /* points to the value */
+} SK_VPD_PARA;
+
+/*
+ * structure of Large Resource Type Identifiers
+ */
+
+/* was removed because of alignment problems */
+
+/*
+ * structure of VPD keywords
+ */
+typedef struct s_vpd_key {
+        char                    p_key[2];       /* 2 bytes ID string */
+        unsigned char   p_len;          /* 1 byte length */
+        char                    p_val;          /* start of the value string */
+} SK_VPD_KEY;
+
+
+/*
+ * System specific VPD macros
+ */
+#ifndef SKDIAG
+#ifndef VPD_DO_IO
+#define VPD_OUT8(pAC,IoC,Addr,Val)      (void)SkPciWriteCfgByte(pAC,Addr,Val)
+#define VPD_OUT16(pAC,IoC,Addr,Val)     (void)SkPciWriteCfgWord(pAC,Addr,Val)
+#define VPD_IN8(pAC,IoC,Addr,pVal)      (void)SkPciReadCfgByte(pAC,Addr,pVal)
+#define VPD_IN16(pAC,IoC,Addr,pVal)     (void)SkPciReadCfgWord(pAC,Addr,pVal)
+#define VPD_IN32(pAC,IoC,Addr,pVal)     (void)SkPciReadCfgDWord(pAC,Addr,pVal)
+#else   /* VPD_DO_IO */
+#define VPD_OUT8(pAC,IoC,Addr,Val)      SK_OUT8(IoC,PCI_C(Addr),Val)
+#define VPD_OUT16(pAC,IoC,Addr,Val)     SK_OUT16(IoC,PCI_C(Addr),Val)
+#define VPD_IN8(pAC,IoC,Addr,pVal)      SK_IN8(IoC,PCI_C(Addr),pVal)
+#define VPD_IN16(pAC,IoC,Addr,pVal)     SK_IN16(IoC,PCI_C(Addr),pVal)
+#define VPD_IN32(pAC,IoC,Addr,pVal)     SK_IN32(IoC,PCI_C(Addr),pVal)
+#endif  /* VPD_DO_IO */
+#else   /* SKDIAG */
+#define VPD_OUT8(pAC,Ioc,Addr,Val) {                    \
+                if ((pAC)->DgT.DgUseCfgCycle)                   \
+                        SkPciWriteCfgByte(pAC,Addr,Val);        \
+                else                                                                    \
+                        SK_OUT8(pAC,PCI_C(Addr),Val);           \
+                }
+#define VPD_OUT16(pAC,Ioc,Addr,Val) {                   \
+                if ((pAC)->DgT.DgUseCfgCycle)                   \
+                        SkPciWriteCfgWord(pAC,Addr,Val);        \
+                else                                            \
+                        SK_OUT16(pAC,PCI_C(Addr),Val);          \
+                }
+#define VPD_IN8(pAC,Ioc,Addr,pVal) {                    \
+                if ((pAC)->DgT.DgUseCfgCycle)                   \
+                        SkPciReadCfgByte(pAC,Addr,pVal);        \
+                else                                            \
+                        SK_IN8(pAC,PCI_C(Addr),pVal);           \
+                }
+#define VPD_IN16(pAC,Ioc,Addr,pVal) {                   \
+                if ((pAC)->DgT.DgUseCfgCycle)                   \
+                        SkPciReadCfgWord(pAC,Addr,pVal);        \
+                else                                            \
+                        SK_IN16(pAC,PCI_C(Addr),pVal);          \
+                }
+#define VPD_IN32(pAC,Ioc,Addr,pVal) {                   \
+                if ((pAC)->DgT.DgUseCfgCycle)                   \
+                        SkPciReadCfgDWord(pAC,Addr,pVal);       \
+                else                                            \
+                        SK_IN32(pAC,PCI_C(Addr),pVal);          \
+                }
+#endif  /* nSKDIAG */
+
+/* function prototypes ********************************************************/
+
+#ifndef SK_KR_PROTO
+#ifdef SKDIAG
+extern SK_U32   VpdReadDWord(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        int                     addr);
+#endif  /* SKDIAG */
+
+extern SK_VPD_STATUS    *VpdStat(
+        SK_AC           *pAC,
+        SK_IOC          IoC);
+
+extern int      VpdKeys(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        char            *buf,
+        int                     *len,
+        int                     *elements);
+
+extern int      VpdRead(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        const char      *key,
+        char            *buf,
+        int                     *len);
+
+extern SK_BOOL  VpdMayWrite(
+        char            *key);
+
+extern int      VpdWrite(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        const char      *key,
+        const char      *buf);
+
+extern int      VpdDelete(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        char            *key);
+
+extern int      VpdUpdate(
+        SK_AC           *pAC,
+        SK_IOC          IoC);
+
+#ifdef  SKDIAG
+extern int      VpdReadBlock(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        char            *buf,
+        int                     addr,
+        int                     len);
+
+extern int      VpdWriteBlock(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        char            *buf,
+        int                     addr,
+        int                     len);
+#endif  /* SKDIAG */
+#else   /* SK_KR_PROTO */
+extern SK_U32   VpdReadDWord();
+extern SK_VPD_STATUS    *VpdStat();
+extern int      VpdKeys();
+extern int      VpdRead();
+extern SK_BOOL  VpdMayWrite();
+extern int      VpdWrite();
+extern int      VpdDelete();
+extern int      VpdUpdate();
+#endif  /* SK_KR_PROTO */
+
+#endif  /* __INC_SKVPD_H_ */
diff --git a/drivers/net/sk98lin/h/xmac_ii.h b/drivers/net/sk98lin/h/xmac_ii.h
new file mode 100644
index 0000000000..7f8e6d0084
--- /dev/null
+++ b/drivers/net/sk98lin/h/xmac_ii.h
@@ -0,0 +1,1579 @@
+/******************************************************************************
+ *
+ * Name:        xmac_ii.h
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.52 $
+ * Date:        $Date: 2003/10/02 16:35:50 $
+ * Purpose:     Defines and Macros for Gigabit Ethernet Controller
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifndef __INC_XMAC_H
+#define __INC_XMAC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+/* defines ********************************************************************/
+
+/*
+ * XMAC II registers
+ *
+ * The XMAC registers are 16 or 32 bits wide.
+ * The XMACs host processor interface is set to 16 bit mode,
+ * therefore ALL registers will be addressed with 16 bit accesses.
+ *
+ * The following macros are provided to access the XMAC registers
+ * XM_IN16(), XM_OUT16, XM_IN32(), XM_OUT32(), XM_INADR(), XM_OUTADR(),
+ * XM_INHASH(), and XM_OUTHASH().
+ * The macros are defined in SkGeHw.h.
+ *
+ * Note:        NA reg  = Network Address e.g DA, SA etc.
+ *
+ */
+#define XM_MMU_CMD              0x0000  /* 16 bit r/w   MMU Command Register */
+        /* 0x0004:              reserved */
+#define XM_POFF                 0x0008  /* 32 bit r/w   Packet Offset Register */
+#define XM_BURST                0x000c  /* 32 bit r/w   Burst Register for half duplex*/
+#define XM_1L_VLAN_TAG  0x0010  /* 16 bit r/w   One Level VLAN Tag ID */
+#define XM_2L_VLAN_TAG  0x0014  /* 16 bit r/w   Two Level VLAN Tag ID */
+        /* 0x0018 - 0x001e:     reserved */
+#define XM_TX_CMD               0x0020  /* 16 bit r/w   Transmit Command Register */
+#define XM_TX_RT_LIM    0x0024  /* 16 bit r/w   Transmit Retry Limit Register */
+#define XM_TX_STIME             0x0028  /* 16 bit r/w   Transmit Slottime Register */
+#define XM_TX_IPG               0x002c  /* 16 bit r/w   Transmit Inter Packet Gap */
+#define XM_RX_CMD               0x0030  /* 16 bit r/w   Receive Command Register */
+#define XM_PHY_ADDR             0x0034  /* 16 bit r/w   PHY Address Register */
+#define XM_PHY_DATA             0x0038  /* 16 bit r/w   PHY Data Register */
+        /* 0x003c:              reserved */
+#define XM_GP_PORT              0x0040  /* 32 bit r/w   General Purpose Port Register */
+#define XM_IMSK                 0x0044  /* 16 bit r/w   Interrupt Mask Register */
+#define XM_ISRC                 0x0048  /* 16 bit r/o   Interrupt Status Register */
+#define XM_HW_CFG               0x004c  /* 16 bit r/w   Hardware Config Register */
+        /* 0x0050 - 0x005e:     reserved */
+#define XM_TX_LO_WM             0x0060  /* 16 bit r/w   Tx FIFO Low Water Mark */
+#define XM_TX_HI_WM             0x0062  /* 16 bit r/w   Tx FIFO High Water Mark */
+#define XM_TX_THR               0x0064  /* 16 bit r/w   Tx Request Threshold */
+#define XM_HT_THR               0x0066  /* 16 bit r/w   Host Request Threshold */
+#define XM_PAUSE_DA             0x0068  /* NA reg r/w   Pause Destination Address */
+        /* 0x006e:              reserved */
+#define XM_CTL_PARA             0x0070  /* 32 bit r/w   Control Parameter Register */
+#define XM_MAC_OPCODE   0x0074  /* 16 bit r/w   Opcode for MAC control frames */
+#define XM_MAC_PTIME    0x0076  /* 16 bit r/w   Pause time for MAC ctrl frames*/
+#define XM_TX_STAT              0x0078  /* 32 bit r/o   Tx Status LIFO Register */
+
+        /* 0x0080 - 0x00fc:     16 NA reg r/w   Exact Match Address Registers */
+        /*                              use the XM_EXM() macro to address */
+#define XM_EXM_START    0x0080  /* r/w  Start Address of the EXM Regs */
+
+        /*
+         * XM_EXM(Reg)
+         *
+         * returns the XMAC address offset of specified Exact Match Addr Reg
+         *
+         * para:        Reg     EXM register to addr    (0 .. 15)
+         *
+         * usage:       XM_INADDR(IoC, MAC_1, XM_EXM(i), &val[i]);
+         */
+#define XM_EXM(Reg)     (XM_EXM_START + ((Reg) << 3))
+
+#define XM_SRC_CHK              0x0100  /* NA reg r/w   Source Check Address Register */
+#define XM_SA                   0x0108  /* NA reg r/w   Station Address Register */
+#define XM_HSM                  0x0110  /* 64 bit r/w   Hash Match Address Registers */
+#define XM_RX_LO_WM             0x0118  /* 16 bit r/w   Receive Low Water Mark */
+#define XM_RX_HI_WM             0x011a  /* 16 bit r/w   Receive High Water Mark */
+#define XM_RX_THR               0x011c  /* 32 bit r/w   Receive Request Threshold */
+#define XM_DEV_ID               0x0120  /* 32 bit r/o   Device ID Register */
+#define XM_MODE                 0x0124  /* 32 bit r/w   Mode Register */
+#define XM_LSA                  0x0128  /* NA reg r/o   Last Source Register */
+        /* 0x012e:              reserved */
+#define XM_TS_READ              0x0130  /* 32 bit r/o   Time Stamp Read Register */
+#define XM_TS_LOAD              0x0134  /* 32 bit r/o   Time Stamp Load Value */
+        /* 0x0138 - 0x01fe:     reserved */
+#define XM_STAT_CMD     0x0200  /* 16 bit r/w   Statistics Command Register */
+#define XM_RX_CNT_EV    0x0204  /* 32 bit r/o   Rx Counter Event Register */
+#define XM_TX_CNT_EV    0x0208  /* 32 bit r/o   Tx Counter Event Register */
+#define XM_RX_EV_MSK    0x020c  /* 32 bit r/w   Rx Counter Event Mask */
+#define XM_TX_EV_MSK    0x0210  /* 32 bit r/w   Tx Counter Event Mask */
+        /* 0x0204 - 0x027e:     reserved */
+#define XM_TXF_OK               0x0280  /* 32 bit r/o   Frames Transmitted OK Conuter */
+#define XM_TXO_OK_HI    0x0284  /* 32 bit r/o   Octets Transmitted OK High Cnt*/
+#define XM_TXO_OK_LO    0x0288  /* 32 bit r/o   Octets Transmitted OK Low Cnt */
+#define XM_TXF_BC_OK    0x028c  /* 32 bit r/o   Broadcast Frames Xmitted OK */
+#define XM_TXF_MC_OK    0x0290  /* 32 bit r/o   Multicast Frames Xmitted OK */
+#define XM_TXF_UC_OK    0x0294  /* 32 bit r/o   Unicast Frames Xmitted OK */
+#define XM_TXF_LONG             0x0298  /* 32 bit r/o   Tx Long Frame Counter */
+#define XM_TXE_BURST    0x029c  /* 32 bit r/o   Tx Burst Event Counter */
+#define XM_TXF_MPAUSE   0x02a0  /* 32 bit r/o   Tx Pause MAC Ctrl Frame Cnt */
+#define XM_TXF_MCTRL    0x02a4  /* 32 bit r/o   Tx MAC Ctrl Frame Counter */
+#define XM_TXF_SNG_COL  0x02a8  /* 32 bit r/o   Tx Single Collision Counter */
+#define XM_TXF_MUL_COL  0x02ac  /* 32 bit r/o   Tx Multiple Collision Counter */
+#define XM_TXF_ABO_COL  0x02b0  /* 32 bit r/o   Tx aborted due to Exces. Col. */
+#define XM_TXF_LAT_COL  0x02b4  /* 32 bit r/o   Tx Late Collision Counter */
+#define XM_TXF_DEF              0x02b8  /* 32 bit r/o   Tx Deferred Frame Counter */
+#define XM_TXF_EX_DEF   0x02bc  /* 32 bit r/o   Tx Excessive Deferall Counter */
+#define XM_TXE_FIFO_UR  0x02c0  /* 32 bit r/o   Tx FIFO Underrun Event Cnt */
+#define XM_TXE_CS_ERR   0x02c4  /* 32 bit r/o   Tx Carrier Sense Error Cnt */
+#define XM_TXP_UTIL             0x02c8  /* 32 bit r/o   Tx Utilization in % */
+        /* 0x02cc - 0x02ce:     reserved */
+#define XM_TXF_64B              0x02d0  /* 32 bit r/o   64 Byte Tx Frame Counter */
+#define XM_TXF_127B             0x02d4  /* 32 bit r/o   65-127 Byte Tx Frame Counter */
+#define XM_TXF_255B             0x02d8  /* 32 bit r/o   128-255 Byte Tx Frame Counter */
+#define XM_TXF_511B             0x02dc  /* 32 bit r/o   256-511 Byte Tx Frame Counter */
+#define XM_TXF_1023B    0x02e0  /* 32 bit r/o   512-1023 Byte Tx Frame Counter*/
+#define XM_TXF_MAX_SZ   0x02e4  /* 32 bit r/o   1024-MaxSize Byte Tx Frame Cnt*/
+        /* 0x02e8 - 0x02fe:     reserved */
+#define XM_RXF_OK               0x0300  /* 32 bit r/o   Frames Received OK */
+#define XM_RXO_OK_HI    0x0304  /* 32 bit r/o   Octets Received OK High Cnt */
+#define XM_RXO_OK_LO    0x0308  /* 32 bit r/o   Octets Received OK Low Counter*/
+#define XM_RXF_BC_OK    0x030c  /* 32 bit r/o   Broadcast Frames Received OK */
+#define XM_RXF_MC_OK    0x0310  /* 32 bit r/o   Multicast Frames Received OK */
+#define XM_RXF_UC_OK    0x0314  /* 32 bit r/o   Unicast Frames Received OK */
+#define XM_RXF_MPAUSE   0x0318  /* 32 bit r/o   Rx Pause MAC Ctrl Frame Cnt */
+#define XM_RXF_MCTRL    0x031c  /* 32 bit r/o   Rx MAC Ctrl Frame Counter */
+#define XM_RXF_INV_MP   0x0320  /* 32 bit r/o   Rx invalid Pause Frame Cnt */
+#define XM_RXF_INV_MOC  0x0324  /* 32 bit r/o   Rx Frames with inv. MAC Opcode*/
+#define XM_RXE_BURST    0x0328  /* 32 bit r/o   Rx Burst Event Counter */
+#define XM_RXE_FMISS    0x032c  /* 32 bit r/o   Rx Missed Frames Event Cnt */
+#define XM_RXF_FRA_ERR  0x0330  /* 32 bit r/o   Rx Framing Error Counter */
+#define XM_RXE_FIFO_OV  0x0334  /* 32 bit r/o   Rx FIFO overflow Event Cnt */
+#define XM_RXF_JAB_PKT  0x0338  /* 32 bit r/o   Rx Jabber Packet Frame Cnt */
+#define XM_RXE_CAR_ERR  0x033c  /* 32 bit r/o   Rx Carrier Event Error Cnt */
+#define XM_RXF_LEN_ERR  0x0340  /* 32 bit r/o   Rx in Range Length Error */
+#define XM_RXE_SYM_ERR  0x0344  /* 32 bit r/o   Rx Symbol Error Counter */
+#define XM_RXE_SHT_ERR  0x0348  /* 32 bit r/o   Rx Short Event Error Cnt */
+#define XM_RXE_RUNT             0x034c  /* 32 bit r/o   Rx Runt Event Counter */
+#define XM_RXF_LNG_ERR  0x0350  /* 32 bit r/o   Rx Frame too Long Error Cnt */
+#define XM_RXF_FCS_ERR  0x0354  /* 32 bit r/o   Rx Frame Check Seq. Error Cnt */
+        /* 0x0358 - 0x035a:     reserved */
+#define XM_RXF_CEX_ERR  0x035c  /* 32 bit r/o   Rx Carrier Ext Error Frame Cnt*/
+#define XM_RXP_UTIL             0x0360  /* 32 bit r/o   Rx Utilization in % */
+        /* 0x0364 - 0x0366:     reserved */
+#define XM_RXF_64B              0x0368  /* 32 bit r/o   64 Byte Rx Frame Counter */
+#define XM_RXF_127B             0x036c  /* 32 bit r/o   65-127 Byte Rx Frame Counter */
+#define XM_RXF_255B             0x0370  /* 32 bit r/o   128-255 Byte Rx Frame Counter */
+#define XM_RXF_511B             0x0374  /* 32 bit r/o   256-511 Byte Rx Frame Counter */
+#define XM_RXF_1023B    0x0378  /* 32 bit r/o   512-1023 Byte Rx Frame Counter*/
+#define XM_RXF_MAX_SZ   0x037c  /* 32 bit r/o   1024-MaxSize Byte Rx Frame Cnt*/
+        /* 0x02e8 - 0x02fe:     reserved */
+
+
+/*----------------------------------------------------------------------------*/
+/*
+ * XMAC Bit Definitions
+ *
+ * If the bit access behaviour differs from the register access behaviour
+ * (r/w, r/o) this is documented after the bit number.
+ * The following bit access behaviours are used:
+ *      (sc)    self clearing
+ *      (ro)    read only
+ */
+
+/*      XM_MMU_CMD      16 bit r/w      MMU Command Register */
+                                                                /* Bit 15..13:  reserved */
+#define XM_MMU_PHY_RDY  (1<<12) /* Bit 12:      PHY Read Ready */
+#define XM_MMU_PHY_BUSY (1<<11) /* Bit 11:      PHY Busy */
+#define XM_MMU_IGN_PF   (1<<10) /* Bit 10:      Ignore Pause Frame */
+#define XM_MMU_MAC_LB   (1<<9)  /* Bit  9:      Enable MAC Loopback */
+                                                                /* Bit  8:      reserved */
+#define XM_MMU_FRC_COL  (1<<7)  /* Bit  7:      Force Collision */
+#define XM_MMU_SIM_COL  (1<<6)  /* Bit  6:      Simulate Collision */
+#define XM_MMU_NO_PRE   (1<<5)  /* Bit  5:      No MDIO Preamble */
+#define XM_MMU_GMII_FD  (1<<4)  /* Bit  4:      GMII uses Full Duplex */
+#define XM_MMU_RAT_CTRL (1<<3)  /* Bit  3:      Enable Rate Control */
+#define XM_MMU_GMII_LOOP (1<<2) /* Bit  2:      PHY is in Loopback Mode */
+#define XM_MMU_ENA_RX   (1<<1)  /* Bit  1:      Enable Receiver */
+#define XM_MMU_ENA_TX   (1<<0)  /* Bit  0:      Enable Transmitter */
+
+
+/*      XM_TX_CMD       16 bit r/w      Transmit Command Register */
+                                                                /* Bit 15..7:   reserved */
+#define XM_TX_BK2BK             (1<<6)  /* Bit  6:      Ignor Carrier Sense (Tx Bk2Bk)*/
+#define XM_TX_ENC_BYP   (1<<5)  /* Bit  5:      Set Encoder in Bypass Mode */
+#define XM_TX_SAM_LINE  (1<<4)  /* Bit  4: (sc) Start utilization calculation */
+#define XM_TX_NO_GIG_MD (1<<3)  /* Bit  3:      Disable Carrier Extension */
+#define XM_TX_NO_PRE    (1<<2)  /* Bit  2:      Disable Preamble Generation */
+#define XM_TX_NO_CRC    (1<<1)  /* Bit  1:      Disable CRC Generation */
+#define XM_TX_AUTO_PAD  (1<<0)  /* Bit  0:      Enable Automatic Padding */
+
+
+/*      XM_TX_RT_LIM    16 bit r/w      Transmit Retry Limit Register */
+                                                                /* Bit 15..5:   reserved */
+#define XM_RT_LIM_MSK   0x1f    /* Bit  4..0:   Tx Retry Limit */
+
+
+/*      XM_TX_STIME     16 bit r/w      Transmit Slottime Register */
+                                                                /* Bit 15..7:   reserved */
+#define XM_STIME_MSK    0x7f    /* Bit  6..0:   Tx Slottime bits */
+
+
+/*      XM_TX_IPG       16 bit r/w      Transmit Inter Packet Gap */
+                                                                /* Bit 15..8:   reserved */
+#define XM_IPG_MSK              0xff    /* Bit  7..0:   IPG value bits */
+
+
+/*      XM_RX_CMD       16 bit r/w      Receive Command Register */
+                                                                /* Bit 15..9:   reserved */
+#define XM_RX_LENERR_OK (1<<8)  /* Bit  8       don't set Rx Err bit for */
+                                                                /*              inrange error packets */
+#define XM_RX_BIG_PK_OK (1<<7)  /* Bit  7       don't set Rx Err bit for */
+                                                                /*              jumbo packets */
+#define XM_RX_IPG_CAP   (1<<6)  /* Bit  6       repl. type field with IPG */
+#define XM_RX_TP_MD             (1<<5)  /* Bit  5:      Enable transparent Mode */
+#define XM_RX_STRIP_FCS (1<<4)  /* Bit  4:      Enable FCS Stripping */
+#define XM_RX_SELF_RX   (1<<3)  /* Bit  3:      Enable Rx of own packets */
+#define XM_RX_SAM_LINE  (1<<2)  /* Bit  2: (sc) Start utilization calculation */
+#define XM_RX_STRIP_PAD (1<<1)  /* Bit  1:      Strip pad bytes of Rx frames */
+#define XM_RX_DIS_CEXT  (1<<0)  /* Bit  0:      Disable carrier ext. check */
+
+
+/*      XM_PHY_ADDR     16 bit r/w      PHY Address Register */
+                                                                /* Bit 15..5:   reserved */
+#define XM_PHY_ADDR_SZ  0x1f    /* Bit  4..0:   PHY Address bits */
+
+
+/*      XM_GP_PORT      32 bit r/w      General Purpose Port Register */
+                                                                /* Bit 31..7:   reserved */
+#define XM_GP_ANIP              (1L<<6) /* Bit  6: (ro) Auto-Neg. in progress */
+#define XM_GP_FRC_INT   (1L<<5) /* Bit  5: (sc) Force Interrupt */
+                                                                /* Bit  4:      reserved */
+#define XM_GP_RES_MAC   (1L<<3) /* Bit  3: (sc) Reset MAC and FIFOs */
+#define XM_GP_RES_STAT  (1L<<2) /* Bit  2: (sc) Reset the statistics module */
+                                                                /* Bit  1:      reserved */
+#define XM_GP_INP_ASS   (1L<<0) /* Bit  0: (ro) GP Input Pin asserted */
+
+
+/*      XM_IMSK         16 bit r/w      Interrupt Mask Register */
+/*      XM_ISRC         16 bit r/o      Interrupt Status Register */
+                                                                /* Bit 15:      reserved */
+#define XM_IS_LNK_AE    (1<<14) /* Bit 14:      Link Asynchronous Event */
+#define XM_IS_TX_ABORT  (1<<13) /* Bit 13:      Transmit Abort, late Col. etc */
+#define XM_IS_FRC_INT   (1<<12) /* Bit 12:      Force INT bit set in GP */
+#define XM_IS_INP_ASS   (1<<11) /* Bit 11:      Input Asserted, GP bit 0 set */
+#define XM_IS_LIPA_RC   (1<<10) /* Bit 10:      Link Partner requests config */
+#define XM_IS_RX_PAGE   (1<<9)  /* Bit  9:      Page Received */
+#define XM_IS_TX_PAGE   (1<<8)  /* Bit  8:      Next Page Loaded for Transmit */
+#define XM_IS_AND               (1<<7)  /* Bit  7:      Auto-Negotiation Done */
+#define XM_IS_TSC_OV    (1<<6)  /* Bit  6:      Time Stamp Counter Overflow */
+#define XM_IS_RXC_OV    (1<<5)  /* Bit  5:      Rx Counter Event Overflow */
+#define XM_IS_TXC_OV    (1<<4)  /* Bit  4:      Tx Counter Event Overflow */
+#define XM_IS_RXF_OV    (1<<3)  /* Bit  3:      Receive FIFO Overflow */
+#define XM_IS_TXF_UR    (1<<2)  /* Bit  2:      Transmit FIFO Underrun */
+#define XM_IS_TX_COMP   (1<<1)  /* Bit  1:      Frame Tx Complete */
+#define XM_IS_RX_COMP   (1<<0)  /* Bit  0:      Frame Rx Complete */
+
+#define XM_DEF_MSK      (~(XM_IS_INP_ASS | XM_IS_LIPA_RC | XM_IS_RX_PAGE |\
+                        XM_IS_AND | XM_IS_RXC_OV | XM_IS_TXC_OV | XM_IS_TXF_UR))
+
+
+/*      XM_HW_CFG       16 bit r/w      Hardware Config Register */
+                                                                /* Bit 15.. 4:  reserved */
+#define XM_HW_GEN_EOP   (1<<3)  /* Bit  3:      generate End of Packet pulse */
+#define XM_HW_COM4SIG   (1<<2)  /* Bit  2:      use Comma Detect for Sig. Det.*/
+                                                                /* Bit  1:      reserved */
+#define XM_HW_GMII_MD   (1<<0)  /* Bit  0:      GMII Interface selected */
+
+
+/*      XM_TX_LO_WM     16 bit r/w      Tx FIFO Low Water Mark */
+/*      XM_TX_HI_WM     16 bit r/w      Tx FIFO High Water Mark */
+                                                                /* Bit 15..10   reserved */
+#define XM_TX_WM_MSK    0x01ff  /* Bit  9.. 0   Tx FIFO Watermark bits */
+
+/*      XM_TX_THR       16 bit r/w      Tx Request Threshold */
+/*      XM_HT_THR       16 bit r/w      Host Request Threshold */
+/*      XM_RX_THR       16 bit r/w      Rx Request Threshold */
+                                                                /* Bit 15..11   reserved */
+#define XM_THR_MSK              0x03ff  /* Bit 10.. 0   Rx/Tx Request Threshold bits */
+
+
+/*      XM_TX_STAT      32 bit r/o      Tx Status LIFO Register */
+#define XM_ST_VALID             (1UL<<31)       /* Bit 31:      Status Valid */
+#define XM_ST_BYTE_CNT  (0x3fffL<<17)   /* Bit 30..17:  Tx frame Length */
+#define XM_ST_RETRY_CNT (0x1fL<<12)     /* Bit 16..12:  Retry Count */
+#define XM_ST_EX_COL    (1L<<11)        /* Bit 11:      Excessive Collisions */
+#define XM_ST_EX_DEF    (1L<<10)        /* Bit 10:      Excessive Deferral */
+#define XM_ST_BURST             (1L<<9)         /* Bit  9:      p. xmitted in burst md*/
+#define XM_ST_DEFER             (1L<<8)         /* Bit  8:      packet was defered */
+#define XM_ST_BC                (1L<<7)         /* Bit  7:      Broadcast packet */
+#define XM_ST_MC                (1L<<6)         /* Bit  6:      Multicast packet */
+#define XM_ST_UC                (1L<<5)         /* Bit  5:      Unicast packet */
+#define XM_ST_TX_UR             (1L<<4)         /* Bit  4:      FIFO Underrun occured */
+#define XM_ST_CS_ERR    (1L<<3)         /* Bit  3:      Carrier Sense Error */
+#define XM_ST_LAT_COL   (1L<<2)         /* Bit  2:      Late Collision Error */
+#define XM_ST_MUL_COL   (1L<<1)         /* Bit  1:      Multiple Collisions */
+#define XM_ST_SGN_COL   (1L<<0)         /* Bit  0:      Single Collision */
+
+/*      XM_RX_LO_WM     16 bit r/w      Receive Low Water Mark */
+/*      XM_RX_HI_WM     16 bit r/w      Receive High Water Mark */
+                                                                        /* Bit 15..11:  reserved */
+#define XM_RX_WM_MSK    0x03ff          /* Bit 11.. 0:  Rx FIFO Watermark bits */
+
+
+/*      XM_DEV_ID       32 bit r/o      Device ID Register */
+#define XM_DEV_OUI      (0x00ffffffUL<<8)       /* Bit 31..8:   Device OUI */
+#define XM_DEV_REV      (0x07L << 5)            /* Bit  7..5:   Chip Rev Num */
+
+
+/*      XM_MODE         32 bit r/w      Mode Register */
+                                                                        /* Bit 31..27:  reserved */
+#define XM_MD_ENA_REJ   (1L<<26)        /* Bit 26:      Enable Frame Reject */
+#define XM_MD_SPOE_E    (1L<<25)        /* Bit 25:      Send Pause on Edge */
+                                                                        /*              extern generated */
+#define XM_MD_TX_REP    (1L<<24)        /* Bit 24:      Transmit Repeater Mode */
+#define XM_MD_SPOFF_I   (1L<<23)        /* Bit 23:      Send Pause on FIFO full */
+                                                                        /*              intern generated */
+#define XM_MD_LE_STW    (1L<<22)        /* Bit 22:      Rx Stat Word in Little Endian */
+#define XM_MD_TX_CONT   (1L<<21)        /* Bit 21:      Send Continuous */
+#define XM_MD_TX_PAUSE  (1L<<20)        /* Bit 20: (sc) Send Pause Frame */
+#define XM_MD_ATS               (1L<<19)        /* Bit 19:      Append Time Stamp */
+#define XM_MD_SPOL_I    (1L<<18)        /* Bit 18:      Send Pause on Low */
+                                                                        /*              intern generated */
+#define XM_MD_SPOH_I    (1L<<17)        /* Bit 17:      Send Pause on High */
+                                                                        /*              intern generated */
+#define XM_MD_CAP               (1L<<16)        /* Bit 16:      Check Address Pair */
+#define XM_MD_ENA_HASH  (1L<<15)        /* Bit 15:      Enable Hashing */
+#define XM_MD_CSA               (1L<<14)        /* Bit 14:      Check Station Address */
+#define XM_MD_CAA               (1L<<13)        /* Bit 13:      Check Address Array */
+#define XM_MD_RX_MCTRL  (1L<<12)        /* Bit 12:      Rx MAC Control Frame */
+#define XM_MD_RX_RUNT   (1L<<11)        /* Bit 11:      Rx Runt Frames */
+#define XM_MD_RX_IRLE   (1L<<10)        /* Bit 10:      Rx in Range Len Err Frame */
+#define XM_MD_RX_LONG   (1L<<9)         /* Bit  9:      Rx Long Frame */
+#define XM_MD_RX_CRCE   (1L<<8)         /* Bit  8:      Rx CRC Error Frame */
+#define XM_MD_RX_ERR    (1L<<7)         /* Bit  7:      Rx Error Frame */
+#define XM_MD_DIS_UC    (1L<<6)         /* Bit  6:      Disable Rx Unicast */
+#define XM_MD_DIS_MC    (1L<<5)         /* Bit  5:      Disable Rx Multicast */
+#define XM_MD_DIS_BC    (1L<<4)         /* Bit  4:      Disable Rx Broadcast */
+#define XM_MD_ENA_PROM  (1L<<3)         /* Bit  3:      Enable Promiscuous */
+#define XM_MD_ENA_BE    (1L<<2)         /* Bit  2:      Enable Big Endian */
+#define XM_MD_FTF               (1L<<1)         /* Bit  1: (sc) Flush Tx FIFO */
+#define XM_MD_FRF               (1L<<0)         /* Bit  0: (sc) Flush Rx FIFO */
+
+#define XM_PAUSE_MODE   (XM_MD_SPOE_E | XM_MD_SPOL_I | XM_MD_SPOH_I)
+#define XM_DEF_MODE             (XM_MD_RX_RUNT | XM_MD_RX_IRLE | XM_MD_RX_LONG |\
+                                XM_MD_RX_CRCE | XM_MD_RX_ERR | XM_MD_CSA | XM_MD_CAA)
+
+/*      XM_STAT_CMD     16 bit r/w      Statistics Command Register */
+                                                                /* Bit 16..6:   reserved */
+#define XM_SC_SNP_RXC   (1<<5)  /* Bit  5: (sc) Snap Rx Counters */
+#define XM_SC_SNP_TXC   (1<<4)  /* Bit  4: (sc) Snap Tx Counters */
+#define XM_SC_CP_RXC    (1<<3)  /* Bit  3:      Copy Rx Counters Continuously */
+#define XM_SC_CP_TXC    (1<<2)  /* Bit  2:      Copy Tx Counters Continuously */
+#define XM_SC_CLR_RXC   (1<<1)  /* Bit  1: (sc) Clear Rx Counters */
+#define XM_SC_CLR_TXC   (1<<0)  /* Bit  0: (sc) Clear Tx Counters */
+
+
+/*      XM_RX_CNT_EV    32 bit r/o      Rx Counter Event Register */
+/*      XM_RX_EV_MSK    32 bit r/w      Rx Counter Event Mask */
+#define XMR_MAX_SZ_OV   (1UL<<31)       /* Bit 31:      1024-MaxSize Rx Cnt Ov*/
+#define XMR_1023B_OV    (1L<<30)        /* Bit 30:      512-1023Byte Rx Cnt Ov*/
+#define XMR_511B_OV             (1L<<29)        /* Bit 29:      256-511 Byte Rx Cnt Ov*/
+#define XMR_255B_OV             (1L<<28)        /* Bit 28:      128-255 Byte Rx Cnt Ov*/
+#define XMR_127B_OV             (1L<<27)        /* Bit 27:      65-127 Byte Rx Cnt Ov */
+#define XMR_64B_OV              (1L<<26)        /* Bit 26:      64 Byte Rx Cnt Ov */
+#define XMR_UTIL_OV             (1L<<25)        /* Bit 25:      Rx Util Cnt Overflow */
+#define XMR_UTIL_UR             (1L<<24)        /* Bit 24:      Rx Util Cnt Underrun */
+#define XMR_CEX_ERR_OV  (1L<<23)        /* Bit 23:      CEXT Err Cnt Ov */
+                                                                        /* Bit 22:      reserved */
+#define XMR_FCS_ERR_OV  (1L<<21)        /* Bit 21:      Rx FCS Error Cnt Ov */
+#define XMR_LNG_ERR_OV  (1L<<20)        /* Bit 20:      Rx too Long Err Cnt Ov*/
+#define XMR_RUNT_OV             (1L<<19)        /* Bit 19:      Runt Event Cnt Ov */
+#define XMR_SHT_ERR_OV  (1L<<18)        /* Bit 18:      Rx Short Ev Err Cnt Ov*/
+#define XMR_SYM_ERR_OV  (1L<<17)        /* Bit 17:      Rx Sym Err Cnt Ov */
+                                                                        /* Bit 16:      reserved */
+#define XMR_CAR_ERR_OV  (1L<<15)        /* Bit 15:      Rx Carr Ev Err Cnt Ov */
+#define XMR_JAB_PKT_OV  (1L<<14)        /* Bit 14:      Rx Jabb Packet Cnt Ov */
+#define XMR_FIFO_OV             (1L<<13)        /* Bit 13:      Rx FIFO Ov Ev Cnt Ov */
+#define XMR_FRA_ERR_OV  (1L<<12)        /* Bit 12:      Rx Framing Err Cnt Ov */
+#define XMR_FMISS_OV    (1L<<11)        /* Bit 11:      Rx Missed Ev Cnt Ov */
+#define XMR_BURST               (1L<<10)        /* Bit 10:      Rx Burst Event Cnt Ov */
+#define XMR_INV_MOC             (1L<<9)         /* Bit  9:      Rx with inv. MAC OC Ov*/
+#define XMR_INV_MP              (1L<<8)         /* Bit  8:      Rx inv Pause Frame Ov */
+#define XMR_MCTRL_OV    (1L<<7)         /* Bit  7:      Rx MAC Ctrl-F Cnt Ov */
+#define XMR_MPAUSE_OV   (1L<<6)         /* Bit  6:      Rx Pause MAC Ctrl-F Ov*/
+#define XMR_UC_OK_OV    (1L<<5)         /* Bit  5:      Rx Unicast Frame CntOv*/
+#define XMR_MC_OK_OV    (1L<<4)         /* Bit  4:      Rx Multicast Cnt Ov */
+#define XMR_BC_OK_OV    (1L<<3)         /* Bit  3:      Rx Broadcast Cnt Ov */
+#define XMR_OK_LO_OV    (1L<<2)         /* Bit  2:      Octets Rx OK Low CntOv*/
+#define XMR_OK_HI_OV    (1L<<1)         /* Bit  1:      Octets Rx OK Hi Cnt Ov*/
+#define XMR_OK_OV               (1L<<0)         /* Bit  0:      Frames Received Ok Ov */
+
+#define XMR_DEF_MSK             (XMR_OK_LO_OV | XMR_OK_HI_OV)
+
+/*      XM_TX_CNT_EV    32 bit r/o      Tx Counter Event Register */
+/*      XM_TX_EV_MSK    32 bit r/w      Tx Counter Event Mask */
+                                                                        /* Bit 31..26:  reserved */
+#define XMT_MAX_SZ_OV   (1L<<25)        /* Bit 25:      1024-MaxSize Tx Cnt Ov*/
+#define XMT_1023B_OV    (1L<<24)        /* Bit 24:      512-1023Byte Tx Cnt Ov*/
+#define XMT_511B_OV             (1L<<23)        /* Bit 23:      256-511 Byte Tx Cnt Ov*/
+#define XMT_255B_OV             (1L<<22)        /* Bit 22:      128-255 Byte Tx Cnt Ov*/
+#define XMT_127B_OV             (1L<<21)        /* Bit 21:      65-127 Byte Tx Cnt Ov */
+#define XMT_64B_OV              (1L<<20)        /* Bit 20:      64 Byte Tx Cnt Ov */
+#define XMT_UTIL_OV             (1L<<19)        /* Bit 19:      Tx Util Cnt Overflow */
+#define XMT_UTIL_UR             (1L<<18)        /* Bit 18:      Tx Util Cnt Underrun */
+#define XMT_CS_ERR_OV   (1L<<17)        /* Bit 17:      Tx Carr Sen Err Cnt Ov*/
+#define XMT_FIFO_UR_OV  (1L<<16)        /* Bit 16:      Tx FIFO Ur Ev Cnt Ov */
+#define XMT_EX_DEF_OV   (1L<<15)        /* Bit 15:      Tx Ex Deferall Cnt Ov */
+#define XMT_DEF                 (1L<<14)        /* Bit 14:      Tx Deferred Cnt Ov */
+#define XMT_LAT_COL_OV  (1L<<13)        /* Bit 13:      Tx Late Col Cnt Ov */
+#define XMT_ABO_COL_OV  (1L<<12)        /* Bit 12:      Tx abo dueto Ex Col Ov*/
+#define XMT_MUL_COL_OV  (1L<<11)        /* Bit 11:      Tx Mult Col Cnt Ov */
+#define XMT_SNG_COL             (1L<<10)        /* Bit 10:      Tx Single Col Cnt Ov */
+#define XMT_MCTRL_OV    (1L<<9)         /* Bit  9:      Tx MAC Ctrl Counter Ov*/
+#define XMT_MPAUSE              (1L<<8)         /* Bit  8:      Tx Pause MAC Ctrl-F Ov*/
+#define XMT_BURST               (1L<<7)         /* Bit  7:      Tx Burst Event Cnt Ov */
+#define XMT_LONG                (1L<<6)         /* Bit  6:      Tx Long Frame Cnt Ov */
+#define XMT_UC_OK_OV    (1L<<5)         /* Bit  5:      Tx Unicast Cnt Ov */
+#define XMT_MC_OK_OV    (1L<<4)         /* Bit  4:      Tx Multicast Cnt Ov */
+#define XMT_BC_OK_OV    (1L<<3)         /* Bit  3:      Tx Broadcast Cnt Ov */
+#define XMT_OK_LO_OV    (1L<<2)         /* Bit  2:      Octets Tx OK Low CntOv*/
+#define XMT_OK_HI_OV    (1L<<1)         /* Bit  1:      Octets Tx OK Hi Cnt Ov*/
+#define XMT_OK_OV               (1L<<0)         /* Bit  0:      Frames Tx Ok Ov */
+
+#define XMT_DEF_MSK             (XMT_OK_LO_OV | XMT_OK_HI_OV)
+
+/*
+ * Receive Frame Status Encoding
+ */
+#define XMR_FS_LEN      (0x3fffUL<<18)  /* Bit 31..18:  Rx Frame Length */
+#define XMR_FS_2L_VLAN  (1L<<17)        /* Bit 17:      tagged wh 2Lev VLAN ID*/
+#define XMR_FS_1L_VLAN  (1L<<16)        /* Bit 16:      tagged wh 1Lev VLAN ID*/
+#define XMR_FS_BC               (1L<<15)        /* Bit 15:      Broadcast Frame */
+#define XMR_FS_MC               (1L<<14)        /* Bit 14:      Multicast Frame */
+#define XMR_FS_UC               (1L<<13)        /* Bit 13:      Unicast Frame */
+                                                                        /* Bit 12:      reserved */
+#define XMR_FS_BURST    (1L<<11)        /* Bit 11:      Burst Mode */
+#define XMR_FS_CEX_ERR  (1L<<10)        /* Bit 10:      Carrier Ext. Error */
+#define XMR_FS_802_3    (1L<<9)         /* Bit  9:      802.3 Frame */
+#define XMR_FS_COL_ERR  (1L<<8)         /* Bit  8:      Collision Error */
+#define XMR_FS_CAR_ERR  (1L<<7)         /* Bit  7:      Carrier Event Error */
+#define XMR_FS_LEN_ERR  (1L<<6)         /* Bit  6:      In-Range Length Error */
+#define XMR_FS_FRA_ERR  (1L<<5)         /* Bit  5:      Framing Error */
+#define XMR_FS_RUNT             (1L<<4)         /* Bit  4:      Runt Frame */
+#define XMR_FS_LNG_ERR  (1L<<3)         /* Bit  3:      Giant (Jumbo) Frame */
+#define XMR_FS_FCS_ERR  (1L<<2)         /* Bit  2:      Frame Check Sequ Err */
+#define XMR_FS_ERR              (1L<<1)         /* Bit  1:      Frame Error */
+#define XMR_FS_MCTRL    (1L<<0)         /* Bit  0:      MAC Control Packet */
+
+/*
+ * XMR_FS_ERR will be set if
+ *      XMR_FS_FCS_ERR, XMR_FS_LNG_ERR, XMR_FS_RUNT,
+ *      XMR_FS_FRA_ERR, XMR_FS_LEN_ERR, or XMR_FS_CEX_ERR
+ * is set. XMR_FS_LNG_ERR and XMR_FS_LEN_ERR will issue
+ * XMR_FS_ERR unless the corresponding bit in the Receive Command
+ * Register is set.
+ */
+#define XMR_FS_ANY_ERR  XMR_FS_ERR
+
+/*----------------------------------------------------------------------------*/
+/*
+ * XMAC-PHY Registers, indirect addressed over the XMAC
+ */
+#define PHY_XMAC_CTRL           0x00    /* 16 bit r/w   PHY Control Register */
+#define PHY_XMAC_STAT           0x01    /* 16 bit r/w   PHY Status Register */
+#define PHY_XMAC_ID0            0x02    /* 16 bit r/o   PHY ID0 Register */
+#define PHY_XMAC_ID1            0x03    /* 16 bit r/o   PHY ID1 Register */
+#define PHY_XMAC_AUNE_ADV       0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
+#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 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 */
+
+/*----------------------------------------------------------------------------*/
+/*
+ * Broadcom-PHY Registers, indirect addressed over XMAC
+ */
+#define PHY_BCOM_CTRL           0x00    /* 16 bit r/w   PHY Control Register */
+#define PHY_BCOM_STAT           0x01    /* 16 bit r/o   PHY Status Register */
+#define PHY_BCOM_ID0            0x02    /* 16 bit r/o   PHY ID0 Register */
+#define PHY_BCOM_ID1            0x03    /* 16 bit r/o   PHY ID1 Register */
+#define PHY_BCOM_AUNE_ADV       0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
+#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 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 */
+        /* 0x0b - 0x0e:         reserved */
+#define PHY_BCOM_EXT_STAT       0x0f    /* 16 bit r/o   Extended Status Reg */
+#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 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 */
+#define PHY_BCOM_AUX_STAT       0x19    /* 16 bit r/o   Auxiliary Stat Summary */
+#define PHY_BCOM_INT_STAT       0x1a    /* 16 bit r/o   Interrupt Status Reg */
+#define PHY_BCOM_INT_MASK       0x1b    /* 16 bit r/w   Interrupt Mask Reg */
+        /* 0x1c:                reserved */
+        /* 0x1d - 0x1f:         test registers */
+
+/*----------------------------------------------------------------------------*/
+/*
+ * Marvel-PHY Registers, indirect addressed over GMAC
+ */
+#define PHY_MARV_CTRL           0x00    /* 16 bit r/w   PHY Control Register */
+#define PHY_MARV_STAT           0x01    /* 16 bit r/o   PHY Status Register */
+#define PHY_MARV_ID0            0x02    /* 16 bit r/o   PHY ID0 Register */
+#define PHY_MARV_ID1            0x03    /* 16 bit r/o   PHY ID1 Register */
+#define PHY_MARV_AUNE_ADV       0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
+#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 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 */
+        /* 0x0b - 0x0e:         reserved */
+#define PHY_MARV_EXT_STAT       0x0f    /* 16 bit r/o   Extended Status Reg */
+#define PHY_MARV_PHY_CTRL       0x10    /* 16 bit r/w   PHY Specific Ctrl Reg */
+#define PHY_MARV_PHY_STAT       0x11    /* 16 bit r/o   PHY Specific Stat Reg */
+#define PHY_MARV_INT_MASK       0x12    /* 16 bit r/w   Interrupt Mask Reg */
+#define PHY_MARV_INT_STAT       0x13    /* 16 bit r/o   Interrupt Status Reg */
+#define PHY_MARV_EXT_CTRL       0x14    /* 16 bit r/w   Ext. PHY Specific Ctrl */
+#define PHY_MARV_RXE_CNT        0x15    /* 16 bit r/w   Receive Error Counter */
+#define PHY_MARV_EXT_ADR        0x16    /* 16 bit r/w   Ext. Ad. for Cable Diag. */
+        /* 0x17:                reserved */
+#define PHY_MARV_LED_CTRL       0x18    /* 16 bit r/w   LED Control Reg */
+#define PHY_MARV_LED_OVER       0x19    /* 16 bit r/w   Manual LED Override Reg */
+#define PHY_MARV_EXT_CTRL_2     0x1a    /* 16 bit r/w   Ext. PHY Specific Ctrl 2 */
+#define PHY_MARV_EXT_P_STAT     0x1b    /* 16 bit r/w   Ext. PHY Spec. Stat Reg */
+#define PHY_MARV_CABLE_DIAG     0x1c    /* 16 bit r/o   Cable Diagnostic Reg */
+        /* 0x1d - 0x1f:         reserved */
+
+/*----------------------------------------------------------------------------*/
+/*
+ * Level One-PHY Registers, indirect addressed over XMAC
+ */
+#define PHY_LONE_CTRL           0x00    /* 16 bit r/w   PHY Control Register */
+#define PHY_LONE_STAT           0x01    /* 16 bit r/o   PHY Status Register */
+#define PHY_LONE_ID0            0x02    /* 16 bit r/o   PHY ID0 Register */
+#define PHY_LONE_ID1            0x03    /* 16 bit r/o   PHY ID1 Register */
+#define PHY_LONE_AUNE_ADV       0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
+#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 */
+        /* 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 */
+        /* 0x0b -0x0e:          reserved */
+#define PHY_LONE_EXT_STAT       0x0f    /* 16 bit r/o   Extended Status Reg */
+#define PHY_LONE_PORT_CFG       0x10    /* 16 bit r/w   Port Configuration Reg*/
+#define PHY_LONE_Q_STAT         0x11    /* 16 bit r/o   Quick Status Reg */
+#define PHY_LONE_INT_ENAB       0x12    /* 16 bit r/w   Interrupt Enable Reg */
+#define PHY_LONE_INT_STAT       0x13    /* 16 bit r/o   Interrupt Status Reg */
+#define PHY_LONE_LED_CFG        0x14    /* 16 bit r/w   LED Configuration Reg */
+#define PHY_LONE_PORT_CTRL      0x15    /* 16 bit r/w   Port Control Reg */
+#define PHY_LONE_CIM            0x16    /* 16 bit r/o   CIM Reg */
+        /* 0x17 -0x1c:          reserved */
+
+/*----------------------------------------------------------------------------*/
+/*
+ * National-PHY Registers, indirect addressed over XMAC
+ */
+#define PHY_NAT_CTRL            0x00    /* 16 bit r/w   PHY Control Register */
+#define PHY_NAT_STAT            0x01    /* 16 bit r/w   PHY Status Register */
+#define PHY_NAT_ID0                     0x02    /* 16 bit r/o   PHY ID0 Register */
+#define PHY_NAT_ID1                     0x03    /* 16 bit r/o   PHY ID1 Register */
+#define PHY_NAT_AUNE_ADV        0x04    /* 16 bit r/w   Auto-Neg. Advertisement */
+#define PHY_NAT_AUNE_LP         0x05    /* 16 bit r/o   Link Partner Ability Reg */
+#define PHY_NAT_AUNE_EXP        0x06    /* 16 bit r/o   Auto-Neg. Expansion Reg */
+#define PHY_NAT_NEPG            0x07    /* 16 bit r/w   Next Page Register */
+#define PHY_NAT_NEPG_LP         0x08    /* 16 bit r/o   Next Page Link Partner Reg */
+        /* National-specific registers */
+#define PHY_NAT_1000T_CTRL      0x09    /* 16 bit r/w   1000Base-T Control Reg */
+#define PHY_NAT_1000T_STAT      0x0a    /* 16 bit r/o   1000Base-T Status Reg */
+        /* 0x0b -0x0e:          reserved */
+#define PHY_NAT_EXT_STAT        0x0f    /* 16 bit r/o   Extended Status Register */
+#define PHY_NAT_EXT_CTRL1       0x10    /* 16 bit r/o   Extended Control Reg1 */
+#define PHY_NAT_Q_STAT1         0x11    /* 16 bit r/o   Quick Status Reg1 */
+#define PHY_NAT_10B_OP          0x12    /* 16 bit r/o   10Base-T Operations Reg */
+#define PHY_NAT_EXT_CTRL2       0x13    /* 16 bit r/o   Extended Control Reg1 */
+#define PHY_NAT_Q_STAT2         0x14    /* 16 bit r/o   Quick Status Reg2 */
+        /* 0x15 -0x18:          reserved */
+#define PHY_NAT_PHY_ADDR        0x19    /* 16 bit r/o   PHY Address Register */
+
+
+/*----------------------------------------------------------------------------*/
+
+/*
+ * PHY bit definitions
+ * Bits defined as PHY_X_..., PHY_B_..., PHY_L_... or PHY_N_... are
+ * 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 */
+#define PHY_CT_SPS_LSB  (1<<13) /* Bit 13: (BC,L1) Speed select, lower bit */
+#define PHY_CT_ANE              (1<<12) /* Bit 12:      Auto-Negotiation Enabled */
+#define PHY_CT_PDOWN    (1<<11) /* Bit 11: (BC,L1) Power Down Mode */
+#define PHY_CT_ISOL             (1<<10) /* Bit 10: (BC,L1) Isolate Mode */
+#define PHY_CT_RE_CFG   (1<<9)  /* Bit  9: (sc) Restart Auto-Negotiation */
+#define PHY_CT_DUP_MD   (1<<8)  /* Bit  8:      Duplex Mode */
+#define PHY_CT_COL_TST  (1<<7)  /* Bit  7: (BC,L1) Collision Test enabled */
+#define PHY_CT_SPS_MSB  (1<<6)  /* Bit  6: (BC,L1) Speed select, upper bit */
+                                                                /* Bit  5..0:   reserved */
+
+#define PHY_CT_SP1000   PHY_CT_SPS_MSB  /* enable speed of 1000 Mbps */
+#define PHY_CT_SP100    PHY_CT_SPS_LSB  /* enable speed of  100 Mbps */
+#define PHY_CT_SP10             (0)                             /* enable speed of   10 Mbps */
+
+
+/*****  PHY_XMAC_STAT   16 bit r/w      PHY Status Register *****/
+/*****  PHY_BCOM_STAT   16 bit r/w      PHY Status Register *****/
+/*****  PHY_MARV_STAT   16 bit r/w      PHY Status Register *****/
+/*****  PHY_LONE_STAT   16 bit r/w      PHY Status Register *****/
+                                                                /* Bit 15..9:   reserved */
+                                /*      (BC/L1) 100/10 Mbps cap bits ignored*/
+#define PHY_ST_EXT_ST   (1<<8)  /* Bit  8:      Extended Status Present */
+                                                                /* Bit  7:      reserved */
+#define PHY_ST_PRE_SUP  (1<<6)  /* Bit  6: (BC/L1) preamble suppression */
+#define PHY_ST_AN_OVER  (1<<5)  /* Bit  5:      Auto-Negotiation Over */
+#define PHY_ST_REM_FLT  (1<<4)  /* Bit  4:      Remote Fault Condition Occured */
+#define PHY_ST_AN_CAP   (1<<3)  /* Bit  3:      Auto-Negotiation Capability */
+#define PHY_ST_LSYNC    (1<<2)  /* Bit  2:      Link Synchronized */
+#define PHY_ST_JAB_DET  (1<<1)  /* Bit  1: (BC/L1) Jabber Detected */
+#define PHY_ST_EXT_REG  (1<<0)  /* Bit  0:      Extended Register available */
+
+
+/*****  PHY_XMAC_ID1            16 bit r/o      PHY ID1 Register */
+/*****  PHY_BCOM_ID1            16 bit r/o      PHY ID1 Register */
+/*****  PHY_MARV_ID1            16 bit r/o      PHY ID1 Register */
+/*****  PHY_LONE_ID1            16 bit r/o      PHY ID1 Register */
+#define PHY_I1_OUI_MSK  (0x3f<<10)      /* Bit 15..10:  Organization Unique ID */
+#define PHY_I1_MOD_NUM  (0x3f<<4)       /* Bit  9.. 4:  Model Number */
+#define PHY_I1_REV_MSK  0x0f            /* Bit  3.. 0:  Revision Number */
+
+/* different Broadcom PHY Ids */
+#define PHY_BCOM_ID1_A1         0x6041
+#define PHY_BCOM_ID1_B2         0x6043
+#define PHY_BCOM_ID1_C0         0x6044
+#define PHY_BCOM_ID1_C5         0x6047
+
+
+/*****  PHY_XMAC_AUNE_ADV       16 bit r/w      Auto-Negotiation Advertisement *****/
+/*****  PHY_XMAC_AUNE_LP        16 bit r/o      Link Partner Ability Reg *****/
+#define PHY_AN_NXT_PG   (1<<15) /* Bit 15:      Request Next Page */
+#define PHY_X_AN_ACK    (1<<14) /* Bit 14: (ro) Acknowledge Received */
+#define PHY_X_AN_RFB    (3<<12) /* Bit 13..12:  Remote Fault Bits */
+                                                                /* Bit 11.. 9:  reserved */
+#define PHY_X_AN_PAUSE  (3<<7)  /* Bit  8.. 7:  Pause Bits */
+#define PHY_X_AN_HD             (1<<6)  /* Bit  6:      Half Duplex */
+#define PHY_X_AN_FD             (1<<5)  /* Bit  5:      Full Duplex */
+                                                                /* Bit  4.. 0:  reserved */
+
+/*****  PHY_BCOM_AUNE_ADV       16 bit r/w      Auto-Negotiation Advertisement *****/
+/*****  PHY_BCOM_AUNE_LP        16 bit r/o      Link Partner Ability Reg *****/
+/*      PHY_AN_NXT_PG           (see XMAC) Bit 15:      Request Next Page */
+                                                                /* Bit 14:      reserved */
+#define PHY_B_AN_RF             (1<<13) /* Bit 13:      Remote Fault */
+                                                                /* Bit 12:      reserved */
+#define PHY_B_AN_ASP    (1<<11) /* Bit 11:      Asymmetric Pause */
+#define PHY_B_AN_PC             (1<<10) /* Bit 10:      Pause Capable */
+                                                                /* Bit  9..5:   100/10 BT cap bits ingnored */
+#define PHY_B_AN_SEL    0x1f    /* Bit 4..0:    Selector Field, 00001=Ethernet*/
+
+/*****  PHY_LONE_AUNE_ADV       16 bit r/w      Auto-Negotiation Advertisement *****/
+/*****  PHY_LONE_AUNE_LP        16 bit r/o      Link Partner Ability Reg *****/
+/*      PHY_AN_NXT_PG           (see XMAC) Bit 15:      Request Next Page */
+                                                                /* Bit 14:      reserved */
+#define PHY_L_AN_RF             (1<<13) /* Bit 13:      Remote Fault */
+                                                                /* Bit 12:      reserved */
+#define PHY_L_AN_ASP    (1<<11) /* Bit 11:      Asymmetric Pause */
+#define PHY_L_AN_PC             (1<<10) /* Bit 10:      Pause Capable */
+                                                                /* Bit  9..5:   100/10 BT cap bits ingnored */
+#define PHY_L_AN_SEL    0x1f    /* Bit 4..0:    Selector Field, 00001=Ethernet*/
+
+/*****  PHY_NAT_AUNE_ADV        16 bit r/w      Auto-Negotiation Advertisement *****/
+/*****  PHY_NAT_AUNE_LP         16 bit r/o      Link Partner Ability Reg *****/
+/*      PHY_AN_NXT_PG           (see XMAC) Bit 15:      Request Next Page */
+                                                                /* Bit 14:      reserved */
+#define PHY_N_AN_RF             (1<<13) /* Bit 13:      Remote Fault */
+                                                                /* Bit 12:      reserved */
+#define PHY_N_AN_100F   (1<<11) /* Bit 11:      100Base-T2 FD Support */
+#define PHY_N_AN_100H   (1<<10) /* Bit 10:      100Base-T2 HD Support */
+                                                                /* Bit  9..5:   100/10 BT cap bits ingnored */
+#define PHY_N_AN_SEL    0x1f    /* Bit 4..0:    Selector Field, 00001=Ethernet*/
+
+/* field type definition for PHY_x_AN_SEL */
+#define PHY_SEL_TYPE    0x01    /* 00001 = Ethernet */
+
+/*****  PHY_XMAC_AUNE_EXP       16 bit r/o      Auto-Negotiation Expansion Reg *****/
+                                                                /* Bit 15..4:   reserved */
+#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 *****/
+/*****  PHY_LONE_AUNE_EXP       16 bit r/o      Auto-Negotiation Expansion Reg *****/
+/*****  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 *****/
+/*****  PHY_LONE_NEPG           16 bit r/w      Next Page Register *****/
+/*****  PHY_XMAC_NEPG_LP        16 bit r/o      Next Page Link Partner *****/
+/*****  PHY_BCOM_NEPG_LP        16 bit r/o      Next Page Link Partner *****/
+/*****  PHY_LONE_NEPG_LP        16 bit r/o      Next Page Link Partner *****/
+#define PHY_NP_MORE             (1<<15) /* Bit 15:      More, Next Pages to follow */
+#define PHY_NP_ACK1             (1<<14) /* Bit 14: (ro) Ack1, for receiving a message */
+#define PHY_NP_MSG_VAL  (1<<13) /* Bit 13:      Message Page valid */
+#define PHY_NP_ACK2             (1<<12) /* Bit 12:      Ack2, comply with msg content */
+#define PHY_NP_TOG              (1<<11) /* Bit 11:      Toggle Bit, ensure sync */
+#define PHY_NP_MSG              0x07ff  /* Bit 10..0:   Message from/to Link Partner */
+
+/*
+ * XMAC-Specific
+ */
+/*****  PHY_XMAC_EXT_STAT       16 bit r/w      Extended Status Register *****/
+#define PHY_X_EX_FD             (1<<15) /* Bit 15:      Device Supports Full Duplex */
+#define PHY_X_EX_HD             (1<<14) /* Bit 14:      Device Supports Half Duplex */
+                                                                /* Bit 13..0:   reserved */
+
+/*****  PHY_XMAC_RES_ABI        16 bit r/o      PHY Resolved Ability *****/
+                                                                /* Bit 15..9:   reserved */
+#define PHY_X_RS_PAUSE  (3<<7)  /* Bit  8..7:   selected Pause Mode */
+#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 mismatch */
+                                                                /* Bit  2..0:   reserved */
+/*
+ * Remote Fault Bits (PHY_X_AN_RFB) encoding
+ */
+#define X_RFB_OK                (0<<12) /* Bit 13..12   No errors, Link OK */
+#define X_RFB_LF                (1<<12) /* Bit 13..12   Link Failure */
+#define X_RFB_OFF               (2<<12) /* Bit 13..12   Offline */
+#define X_RFB_AN_ERR    (3<<12) /* Bit 13..12   Auto-Negotiation Error */
+
+/*
+ * Pause Bits (PHY_X_AN_PAUSE and PHY_X_RS_PAUSE) encoding
+ */
+#define PHY_X_P_NO_PAUSE        (0<<7)  /* Bit  8..7:   no Pause Mode */
+#define PHY_X_P_SYM_MD          (1<<7)  /* Bit  8..7:   symmetric Pause Mode */
+#define PHY_X_P_ASYM_MD         (2<<7)  /* Bit  8..7:   asymmetric Pause Mode */
+#define PHY_X_P_BOTH_MD         (3<<7)  /* Bit  8..7:   both Pause Mode */
+
+
+/*
+ * Broadcom-Specific
+ */
+/*****  PHY_BCOM_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
+#define PHY_B_1000C_TEST        (7<<13) /* Bit 15..13:  Test Modes */
+#define PHY_B_1000C_MSE         (1<<12) /* Bit 12:      Master/Slave Enable */
+#define PHY_B_1000C_MSC         (1<<11) /* Bit 11:      M/S Configuration */
+#define PHY_B_1000C_RD          (1<<10) /* Bit 10:      Repeater/DTE */
+#define PHY_B_1000C_AFD         (1<<9)  /* Bit  9:      Advertise Full Duplex */
+#define PHY_B_1000C_AHD         (1<<8)  /* Bit  8:      Advertise Half Duplex */
+                                                                        /* 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 */
+#define PHY_B_1000S_RRS         (1<<12) /* Bit 12:      Remote Receiver Status */
+#define PHY_B_1000S_LP_FD       (1<<11) /* Bit 11:      Link Partner can FD */
+#define PHY_B_1000S_LP_HD       (1<<10) /* Bit 10:      Link Partner can HD */
+                                                                        /* Bit  9..8:   reserved */
+#define PHY_B_1000S_IEC         0xff    /* Bit  7..0:   Idle Error Count */
+
+/*****  PHY_BCOM_EXT_STAT       16 bit r/o      Extended Status Register *****/
+#define PHY_B_ES_X_FD_CAP       (1<<15) /* Bit 15:      1000Base-X FD capable */
+#define PHY_B_ES_X_HD_CAP       (1<<14) /* Bit 14:      1000Base-X HD capable */
+#define PHY_B_ES_T_FD_CAP       (1<<13) /* Bit 13:      1000Base-T FD capable */
+#define PHY_B_ES_T_HD_CAP       (1<<12) /* Bit 12:      1000Base-T HD capable */
+                                                                        /* Bit 11..0:   reserved */
+
+/*****  PHY_BCOM_P_EXT_CTRL     16 bit r/w      PHY Extended Control Reg *****/
+#define PHY_B_PEC_MAC_PHY       (1<<15) /* Bit 15:      10BIT/GMI-Interface */
+#define PHY_B_PEC_DIS_CROSS     (1<<14) /* Bit 14:      Disable MDI Crossover */
+#define PHY_B_PEC_TX_DIS        (1<<13) /* Bit 13:      Tx output Disabled */
+#define PHY_B_PEC_INT_DIS       (1<<12) /* Bit 12:      Interrupts Disabled */
+#define PHY_B_PEC_F_INT         (1<<11) /* Bit 11:      Force Interrupt */
+#define PHY_B_PEC_BY_45         (1<<10) /* Bit 10:      Bypass 4B5B-Decoder */
+#define PHY_B_PEC_BY_SCR        (1<<9)  /* Bit  9:      Bypass Scrambler */
+#define PHY_B_PEC_BY_MLT3       (1<<8)  /* Bit  8:      Bypass MLT3 Encoder */
+#define PHY_B_PEC_BY_RXA        (1<<7)  /* Bit  7:      Bypass Rx Alignm. */
+#define PHY_B_PEC_RES_SCR       (1<<6)  /* Bit  6:      Reset Scrambler */
+#define PHY_B_PEC_EN_LTR        (1<<5)  /* Bit  5:      Ena LED Traffic Mode */
+#define PHY_B_PEC_LED_ON        (1<<4)  /* Bit  4:      Force LED's on */
+#define PHY_B_PEC_LED_OFF       (1<<3)  /* Bit  3:      Force LED's off */
+#define PHY_B_PEC_EX_IPG        (1<<2)  /* Bit  2:      Extend Tx IPG Mode */
+#define PHY_B_PEC_3_LED         (1<<1)  /* Bit  1:      Three Link LED mode */
+#define PHY_B_PEC_HIGH_LA       (1<<0)  /* Bit  0:      GMII FIFO Elasticy */
+
+/*****  PHY_BCOM_P_EXT_STAT     16 bit r/o      PHY Extended Status Reg *****/
+                                                                        /* Bit 15..14:  reserved */
+#define PHY_B_PES_CROSS_STAT    (1<<13) /* Bit 13:      MDI Crossover Status */
+#define PHY_B_PES_INT_STAT      (1<<12) /* Bit 12:      Interrupt Status */
+#define PHY_B_PES_RRS           (1<<11) /* Bit 11:      Remote Receiver Stat. */
+#define PHY_B_PES_LRS           (1<<10) /* Bit 10:      Local Receiver Stat. */
+#define PHY_B_PES_LOCKED        (1<<9)  /* Bit  9:      Locked */
+#define PHY_B_PES_LS            (1<<8)  /* Bit  8:      Link Status */
+#define PHY_B_PES_RF            (1<<7)  /* Bit  7:      Remote Fault */
+#define PHY_B_PES_CE_ER         (1<<6)  /* Bit  6:      Carrier Ext Error */
+#define PHY_B_PES_BAD_SSD       (1<<5)  /* Bit  5:      Bad SSD */
+#define PHY_B_PES_BAD_ESD       (1<<4)  /* Bit  4:      Bad ESD */
+#define PHY_B_PES_RX_ER         (1<<3)  /* Bit  3:      Receive Error */
+#define PHY_B_PES_TX_ER         (1<<2)  /* Bit  2:      Transmit Error */
+#define PHY_B_PES_LOCK_ER       (1<<1)  /* Bit  1:      Lock Error */
+#define PHY_B_PES_MLT3_ER       (1<<0)  /* Bit  0:      MLT3 code Error */
+
+/*****  PHY_BCOM_FC_CTR         16 bit r/w      False Carrier Counter *****/
+                                                                        /* Bit 15..8:   reserved */
+#define PHY_B_FC_CTR            0xff    /* Bit  7..0:   False Carrier Counter */
+
+/*****  PHY_BCOM_RNO_CTR        16 bit r/w      Receive NOT_OK Counter *****/
+#define PHY_B_RC_LOC_MSK        0xff00  /* Bit 15..8:   Local Rx NOT_OK cnt */
+#define PHY_B_RC_REM_MSK        0x00ff  /* Bit  7..0:   Remote Rx NOT_OK cnt */
+
+/*****  PHY_BCOM_AUX_CTRL       16 bit r/w      Auxiliary Control Reg *****/
+#define PHY_B_AC_L_SQE          (1<<15) /* Bit 15:      Low Squelch */
+#define PHY_B_AC_LONG_PACK      (1<<14) /* Bit 14:      Rx Long Packets */
+#define PHY_B_AC_ER_CTRL        (3<<12) /* Bit 13..12:  Edgerate Control */
+                                                                        /* Bit 11:      reserved */
+#define PHY_B_AC_TX_TST         (1<<10) /* Bit 10:      Tx test bit, always 1 */
+                                                                        /* Bit  9.. 8:  reserved */
+#define PHY_B_AC_DIS_PRF        (1<<7)  /* Bit  7:      dis part resp filter */
+                                                                        /* Bit  6:      reserved */
+#define PHY_B_AC_DIS_PM         (1<<5)  /* Bit  5:      dis power management */
+                                                                        /* Bit  4:      reserved */
+#define PHY_B_AC_DIAG           (1<<3)  /* Bit  3:      Diagnostic Mode */
+                                                                        /* Bit  2.. 0:  reserved */
+
+/*****  PHY_BCOM_AUX_STAT       16 bit r/o      Auxiliary Status Reg *****/
+#define PHY_B_AS_AN_C           (1<<15) /* Bit 15:      AutoNeg complete */
+#define PHY_B_AS_AN_CA          (1<<14) /* Bit 14:      AN Complete Ack */
+#define PHY_B_AS_ANACK_D        (1<<13) /* Bit 13:      AN Ack Detect */
+#define PHY_B_AS_ANAB_D         (1<<12) /* Bit 12:      AN Ability Detect */
+#define PHY_B_AS_NPW            (1<<11) /* Bit 11:      AN Next Page Wait */
+#define PHY_B_AS_AN_RES_MSK     (7<<8)  /* Bit 10..8:   AN HDC */
+#define PHY_B_AS_PDF            (1<<7)  /* Bit  7:      Parallel Detect. Fault */
+#define PHY_B_AS_RF                     (1<<6)  /* Bit  6:      Remote Fault */
+#define PHY_B_AS_ANP_R          (1<<5)  /* Bit  5:      AN Page Received */
+#define PHY_B_AS_LP_ANAB        (1<<4)  /* Bit  4:      LP AN Ability */
+#define PHY_B_AS_LP_NPAB        (1<<3)  /* Bit  3:      LP Next Page Ability */
+#define PHY_B_AS_LS                     (1<<2)  /* Bit  2:      Link Status */
+#define PHY_B_AS_PRR            (1<<1)  /* Bit  1:      Pause Resolution-Rx */
+#define PHY_B_AS_PRT            (1<<0)  /* Bit  0:      Pause Resolution-Tx */
+
+#define PHY_B_AS_PAUSE_MSK      (PHY_B_AS_PRR | PHY_B_AS_PRT)
+
+/*****  PHY_BCOM_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
+/*****  PHY_BCOM_INT_MASK       16 bit r/w      Interrupt Mask Reg *****/
+                                                                        /* Bit 15:      reserved */
+#define PHY_B_IS_PSE            (1<<14) /* Bit 14:      Pair Swap Error */
+#define PHY_B_IS_MDXI_SC        (1<<13) /* Bit 13:      MDIX Status Change */
+#define PHY_B_IS_HCT            (1<<12) /* Bit 12:      counter above 32k */
+#define PHY_B_IS_LCT            (1<<11) /* Bit 11:      counter above 128 */
+#define PHY_B_IS_AN_PR          (1<<10) /* Bit 10:      Page Received */
+#define PHY_B_IS_NO_HDCL        (1<<9)  /* Bit  9:      No HCD Link */
+#define PHY_B_IS_NO_HDC         (1<<8)  /* Bit  8:      No HCD */
+#define PHY_B_IS_NEG_USHDC      (1<<7)  /* Bit  7:      Negotiated Unsup. HCD */
+#define PHY_B_IS_SCR_S_ER       (1<<6)  /* Bit  6:      Scrambler Sync Error */
+#define PHY_B_IS_RRS_CHANGE     (1<<5)  /* Bit  5:      Remote Rx Stat Change */
+#define PHY_B_IS_LRS_CHANGE     (1<<4)  /* Bit  4:      Local Rx Stat Change */
+#define PHY_B_IS_DUP_CHANGE     (1<<3)  /* Bit  3:      Duplex Mode Change */
+#define PHY_B_IS_LSP_CHANGE     (1<<2)  /* Bit  2:      Link Speed Change */
+#define PHY_B_IS_LST_CHANGE     (1<<1)  /* Bit  1:      Link Status Changed */
+#define PHY_B_IS_CRC_ER         (1<<0)  /* Bit  0:      CRC Error */
+
+#define PHY_B_DEF_MSK   (~(PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE))
+
+/* Pause Bits (PHY_B_AN_ASP and PHY_B_AN_PC) encoding */
+#define PHY_B_P_NO_PAUSE        (0<<10) /* Bit 11..10:  no Pause Mode */
+#define PHY_B_P_SYM_MD          (1<<10) /* Bit 11..10:  symmetric Pause Mode */
+#define PHY_B_P_ASYM_MD         (2<<10) /* Bit 11..10:  asymmetric Pause Mode */
+#define PHY_B_P_BOTH_MD         (3<<10) /* Bit 11..10:  both Pause Mode */
+
+/*
+ * Resolved Duplex mode and Capabilities (Aux Status Summary Reg)
+ */
+#define PHY_B_RES_1000FD        (7<<8)  /* Bit 10..8:   1000Base-T Full Dup. */
+#define PHY_B_RES_1000HD        (6<<8)  /* Bit 10..8:   1000Base-T Half Dup. */
+/* others: 100/10: invalid for us */
+
+/*
+ * Level One-Specific
+ */
+/*****  PHY_LONE_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
+#define PHY_L_1000C_TEST        (7<<13) /* Bit 15..13:  Test Modes */
+#define PHY_L_1000C_MSE         (1<<12) /* Bit 12:      Master/Slave Enable */
+#define PHY_L_1000C_MSC         (1<<11) /* Bit 11:      M/S Configuration */
+#define PHY_L_1000C_RD          (1<<10) /* Bit 10:      Repeater/DTE */
+#define PHY_L_1000C_AFD         (1<<9)  /* Bit  9:      Advertise Full Duplex */
+#define PHY_L_1000C_AHD         (1<<8)  /* Bit  8:      Advertise Half Duplex */
+                                                                        /* Bit  7..0:   reserved */
+
+/*****  PHY_LONE_1000T_STAT     16 bit r/o      1000Base-T Status Reg *****/
+#define PHY_L_1000S_MSF         (1<<15) /* Bit 15:      Master/Slave Fault */
+#define PHY_L_1000S_MSR         (1<<14) /* Bit 14:      Master/Slave Result */
+#define PHY_L_1000S_LRS         (1<<13) /* Bit 13:      Local Receiver Status */
+#define PHY_L_1000S_RRS         (1<<12) /* Bit 12:      Remote Receiver Status */
+#define PHY_L_1000S_LP_FD       (1<<11) /* Bit 11:      Link Partner can FD */
+#define PHY_L_1000S_LP_HD       (1<<10) /* Bit 10:      Link Partner can HD */
+                                                                        /* Bit  9..8:   reserved */
+#define PHY_B_1000S_IEC         0xff    /* Bit  7..0:   Idle Error Count */
+
+/*****  PHY_LONE_EXT_STAT       16 bit r/o      Extended Status Register *****/
+#define PHY_L_ES_X_FD_CAP       (1<<15) /* Bit 15:      1000Base-X FD capable */
+#define PHY_L_ES_X_HD_CAP       (1<<14) /* Bit 14:      1000Base-X HD capable */
+#define PHY_L_ES_T_FD_CAP       (1<<13) /* Bit 13:      1000Base-T FD capable */
+#define PHY_L_ES_T_HD_CAP       (1<<12) /* Bit 12:      1000Base-T HD capable */
+                                                                        /* Bit 11..0:   reserved */
+
+/*****  PHY_LONE_PORT_CFG       16 bit r/w      Port Configuration Reg *****/
+#define PHY_L_PC_REP_MODE       (1<<15) /* Bit 15:      Repeater Mode */
+                                                                        /* Bit 14:      reserved */
+#define PHY_L_PC_TX_DIS         (1<<13) /* Bit 13:      Tx output Disabled */
+#define PHY_L_PC_BY_SCR         (1<<12) /* Bit 12:      Bypass Scrambler */
+#define PHY_L_PC_BY_45          (1<<11) /* Bit 11:      Bypass 4B5B-Decoder */
+#define PHY_L_PC_JAB_DIS        (1<<10) /* Bit 10:      Jabber Disabled */
+#define PHY_L_PC_SQE            (1<<9)  /* Bit  9:      Enable Heartbeat */
+#define PHY_L_PC_TP_LOOP        (1<<8)  /* Bit  8:      TP Loopback */
+#define PHY_L_PC_SSS            (1<<7)  /* Bit  7:      Smart Speed Selection */
+#define PHY_L_PC_FIFO_SIZE      (1<<6)  /* Bit  6:      FIFO Size */
+#define PHY_L_PC_PRE_EN         (1<<5)  /* Bit  5:      Preamble Enable */
+#define PHY_L_PC_CIM            (1<<4)  /* Bit  4:      Carrier Integrity Mon */
+#define PHY_L_PC_10_SER         (1<<3)  /* Bit  3:      Use Serial Output */
+#define PHY_L_PC_ANISOL         (1<<2)  /* Bit  2:      Unisolate Port */
+#define PHY_L_PC_TEN_BIT        (1<<1)  /* Bit  1:      10bit iface mode on */
+#define PHY_L_PC_ALTCLOCK       (1<<0)  /* Bit  0: (ro) ALTCLOCK Mode on */
+
+/*****  PHY_LONE_Q_STAT         16 bit r/o      Quick Status Reg *****/
+#define PHY_L_QS_D_RATE         (3<<14) /* Bit 15..14:  Data Rate */
+#define PHY_L_QS_TX_STAT        (1<<13) /* Bit 13:      Transmitting */
+#define PHY_L_QS_RX_STAT        (1<<12) /* Bit 12:      Receiving */
+#define PHY_L_QS_COL_STAT       (1<<11) /* Bit 11:      Collision */
+#define PHY_L_QS_L_STAT         (1<<10) /* Bit 10:      Link is up */
+#define PHY_L_QS_DUP_MOD        (1<<9)  /* Bit  9:      Full/Half Duplex */
+#define PHY_L_QS_AN                     (1<<8)  /* Bit  8:      AutoNeg is On */
+#define PHY_L_QS_AN_C           (1<<7)  /* Bit  7:      AN is Complete */
+#define PHY_L_QS_LLE            (7<<4)  /* Bit  6:      Line Length Estim. */
+#define PHY_L_QS_PAUSE          (1<<3)  /* Bit  3:      LP advertised Pause */
+#define PHY_L_QS_AS_PAUSE       (1<<2)  /* Bit  2:      LP adv. asym. Pause */
+#define PHY_L_QS_ISOLATE        (1<<1)  /* Bit  1:      CIM Isolated */
+#define PHY_L_QS_EVENT          (1<<0)  /* Bit  0:      Event has occurred */
+
+/*****  PHY_LONE_INT_ENAB       16 bit r/w      Interrupt Enable Reg *****/
+/*****  PHY_LONE_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
+                                                                        /* Bit 15..14:  reserved */
+#define PHY_L_IS_AN_F           (1<<13) /* Bit 13:      Auto-Negotiation fault */
+                                                                        /* Bit 12:      not described */
+#define PHY_L_IS_CROSS          (1<<11) /* Bit 11:      Crossover used */
+#define PHY_L_IS_POL            (1<<10) /* Bit 10:      Polarity correct. used */
+#define PHY_L_IS_SS                     (1<<9)  /* Bit  9:      Smart Speed Downgrade */
+#define PHY_L_IS_CFULL          (1<<8)  /* Bit  8:      Counter Full */
+#define PHY_L_IS_AN_C           (1<<7)  /* Bit  7:      AutoNeg Complete */
+#define PHY_L_IS_SPEED          (1<<6)  /* Bit  6:      Speed Changed */
+#define PHY_L_IS_DUP            (1<<5)  /* Bit  5:      Duplex Changed */
+#define PHY_L_IS_LS                     (1<<4)  /* Bit  4:      Link Status Changed */
+#define PHY_L_IS_ISOL           (1<<3)  /* Bit  3:      Isolate Occured */
+#define PHY_L_IS_MDINT          (1<<2)  /* Bit  2: (ro) STAT: MII Int Pending */
+#define PHY_L_IS_INTEN          (1<<1)  /* Bit  1:      ENAB: Enable IRQs */
+#define PHY_L_IS_FORCE          (1<<0)  /* Bit  0:      ENAB: Force Interrupt */
+
+/* int. mask */
+#define PHY_L_DEF_MSK           (PHY_L_IS_LS | PHY_L_IS_ISOL | PHY_L_IS_INTEN)
+
+/*****  PHY_LONE_LED_CFG        16 bit r/w      LED Configuration Reg *****/
+#define PHY_L_LC_LEDC           (3<<14) /* Bit 15..14:  Col/Blink/On/Off */
+#define PHY_L_LC_LEDR           (3<<12) /* Bit 13..12:  Rx/Blink/On/Off */
+#define PHY_L_LC_LEDT           (3<<10) /* Bit 11..10:  Tx/Blink/On/Off */
+#define PHY_L_LC_LEDG           (3<<8)  /* Bit  9..8:   Giga/Blink/On/Off */
+#define PHY_L_LC_LEDS           (3<<6)  /* Bit  7..6:   10-100/Blink/On/Off */
+#define PHY_L_LC_LEDL           (3<<4)  /* Bit  5..4:   Link/Blink/On/Off */
+#define PHY_L_LC_LEDF           (3<<2)  /* Bit  3..2:   Duplex/Blink/On/Off */
+#define PHY_L_LC_PSTRECH        (1<<1)  /* Bit  1:      Strech LED Pulses */
+#define PHY_L_LC_FREQ           (1<<0)  /* Bit  0:      30/100 ms */
+
+/*****  PHY_LONE_PORT_CTRL      16 bit r/w      Port Control Reg *****/
+#define PHY_L_PC_TX_TCLK        (1<<15) /* Bit 15:      Enable TX_TCLK */
+                                                                        /* Bit 14:      reserved */
+#define PHY_L_PC_ALT_NP         (1<<13) /* Bit 14:      Alternate Next Page */
+#define PHY_L_PC_GMII_ALT       (1<<12) /* Bit 13:      Alternate GMII driver */
+                                                                        /* Bit 11:      reserved */
+#define PHY_L_PC_TEN_CRS        (1<<10) /* Bit 10:      Extend CRS*/
+                                                                        /* Bit  9..0:   not described */
+
+/*****  PHY_LONE_CIM            16 bit r/o      CIM Reg *****/
+#define PHY_L_CIM_ISOL          (255<<8)/* Bit 15..8:   Isolate Count */
+#define PHY_L_CIM_FALSE_CAR     (255<<0)/* Bit  7..0:   False Carrier Count */
+
+
+/*
+ * Pause Bits (PHY_L_AN_ASP and PHY_L_AN_PC) encoding
+ */
+#define PHY_L_P_NO_PAUSE        (0<<10) /* Bit 11..10:  no Pause Mode */
+#define PHY_L_P_SYM_MD          (1<<10) /* Bit 11..10:  symmetric Pause Mode */
+#define PHY_L_P_ASYM_MD         (2<<10) /* Bit 11..10:  asymmetric Pause Mode */
+#define PHY_L_P_BOTH_MD         (3<<10) /* Bit 11..10:  both Pause Mode */
+
+
+/*
+ * National-Specific
+ */
+/*****  PHY_NAT_1000T_CTRL      16 bit r/w      1000Base-T Control Reg *****/
+#define PHY_N_1000C_TEST        (7<<13) /* Bit 15..13:  Test Modes */
+#define PHY_N_1000C_MSE         (1<<12) /* Bit 12:      Master/Slave Enable */
+#define PHY_N_1000C_MSC         (1<<11) /* Bit 11:      M/S Configuration */
+#define PHY_N_1000C_RD          (1<<10) /* Bit 10:      Repeater/DTE */
+#define PHY_N_1000C_AFD         (1<<9)  /* Bit  9:      Advertise Full Duplex */
+#define PHY_N_1000C_AHD         (1<<8)  /* Bit  8:      Advertise Half Duplex */
+#define PHY_N_1000C_APC         (1<<7)  /* Bit  7:      Asymmetric Pause Cap. */
+                                                                        /* Bit  6..0:   reserved */
+
+/*****  PHY_NAT_1000T_STAT      16 bit r/o      1000Base-T Status Reg *****/
+#define PHY_N_1000S_MSF         (1<<15) /* Bit 15:      Master/Slave Fault */
+#define PHY_N_1000S_MSR         (1<<14) /* Bit 14:      Master/Slave Result */
+#define PHY_N_1000S_LRS         (1<<13) /* Bit 13:      Local Receiver Status */
+#define PHY_N_1000S_RRS         (1<<12) /* Bit 12:      Remote Receiver Status*/
+#define PHY_N_1000S_LP_FD       (1<<11) /* Bit 11:      Link Partner can FD */
+#define PHY_N_1000S_LP_HD       (1<<10) /* Bit 10:      Link Partner can HD */
+#define PHY_N_1000C_LP_APC      (1<<9)  /* Bit  9:      LP Asym. Pause Cap. */
+                                                                        /* Bit  8:      reserved */
+#define PHY_N_1000S_IEC         0xff    /* Bit  7..0:   Idle Error Count */
+
+/*****  PHY_NAT_EXT_STAT        16 bit r/o      Extended Status Register *****/
+#define PHY_N_ES_X_FD_CAP       (1<<15) /* Bit 15:      1000Base-X FD capable */
+#define PHY_N_ES_X_HD_CAP       (1<<14) /* Bit 14:      1000Base-X HD capable */
+#define PHY_N_ES_T_FD_CAP       (1<<13) /* Bit 13:      1000Base-T FD capable */
+#define PHY_N_ES_T_HD_CAP       (1<<12) /* Bit 12:      1000Base-T HD capable */
+                                                                        /* Bit 11..0:   reserved */
+
+/* todo: those are still missing */
+/*****  PHY_NAT_EXT_CTRL1       16 bit r/o      Extended Control Reg1 *****/
+/*****  PHY_NAT_Q_STAT1         16 bit r/o      Quick Status Reg1 *****/
+/*****  PHY_NAT_10B_OP          16 bit r/o      10Base-T Operations Reg *****/
+/*****  PHY_NAT_EXT_CTRL2       16 bit r/o      Extended Control Reg1 *****/
+/*****  PHY_NAT_Q_STAT2         16 bit r/o      Quick Status Reg2 *****/
+/*****  PHY_NAT_PHY_ADDR        16 bit r/o      PHY Address Register *****/
+
+/*
+ * Marvell-Specific
+ */
+/*****  PHY_MARV_AUNE_ADV       16 bit r/w      Auto-Negotiation Advertisement *****/
+/*****  PHY_MARV_AUNE_LP        16 bit r/w      Link Part Ability Reg *****/
+#define PHY_M_AN_NXT_PG         BIT_15  /* Request Next Page */
+#define PHY_M_AN_ACK            BIT_14  /* (ro) Acknowledge Received */
+#define PHY_M_AN_RF                     BIT_13  /* Remote Fault */
+                                                                        /* Bit 12:      reserved */
+#define PHY_M_AN_ASP            BIT_11  /* Asymmetric Pause */
+#define PHY_M_AN_PC                     BIT_10  /* MAC Pause implemented */
+#define PHY_M_AN_100_FD         BIT_8   /* Advertise 100Base-TX Full Duplex */
+#define PHY_M_AN_100_HD         BIT_7   /* Advertise 100Base-TX Half Duplex */
+#define PHY_M_AN_10_FD          BIT_6   /* Advertise 10Base-TX Full Duplex */
+#define PHY_M_AN_10_HD          BIT_5   /* Advertise 10Base-TX Half Duplex */
+
+/* special defines for FIBER (88E1011S only) */
+#define PHY_M_AN_ASP_X          BIT_8   /* Asymmetric Pause */
+#define PHY_M_AN_PC_X           BIT_7   /* MAC Pause implemented */
+#define PHY_M_AN_1000X_AHD      BIT_6   /* Advertise 10000Base-X Half Duplex */
+#define PHY_M_AN_1000X_AFD      BIT_5   /* Advertise 10000Base-X Full Duplex */
+
+/* Pause Bits (PHY_M_AN_ASP_X and PHY_M_AN_PC_X) encoding */
+#define PHY_M_P_NO_PAUSE_X      (0<<7)  /* Bit  8.. 7:  no Pause Mode */
+#define PHY_M_P_SYM_MD_X        (1<<7)  /* Bit  8.. 7:  symmetric Pause Mode */
+#define PHY_M_P_ASYM_MD_X       (2<<7)  /* Bit  8.. 7:  asymmetric Pause Mode */
+#define PHY_M_P_BOTH_MD_X       (3<<7)  /* Bit  8.. 7:  both Pause Mode */
+
+/*****  PHY_MARV_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
+#define PHY_M_1000C_TEST        (7<<13) /* Bit 15..13:  Test Modes */
+#define PHY_M_1000C_MSE         (1<<12) /* Bit 12:      Manual Master/Slave Enable */
+#define PHY_M_1000C_MSC         (1<<11) /* Bit 11:      M/S Configuration (1=Master) */
+#define PHY_M_1000C_MPD         (1<<10) /* Bit 10:      Multi-Port Device */
+#define PHY_M_1000C_AFD         (1<<9)  /* Bit  9:      Advertise Full Duplex */
+#define PHY_M_1000C_AHD         (1<<8)  /* Bit  8:      Advertise Half Duplex */
+                                                                        /* 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 */
+#define PHY_M_PC_FL_GOOD        (1<<10) /* Bit 10:      Force Link Good */
+#define PHY_M_PC_EN_DET_MSK     (3<<8)  /* Bit  9.. 8:  Energy Detect Mask */
+#define PHY_M_PC_ENA_EXT_D      (1<<7)  /* Bit  7:      Enable Ext. Distance (10BT) */
+#define PHY_M_PC_MDIX_MSK       (3<<5)  /* Bit  6.. 5:  MDI/MDIX Config. Mask */
+#define PHY_M_PC_DIS_125CLK     (1<<4)  /* Bit  4:      Disable 125 CLK */
+#define PHY_M_PC_MAC_POW_UP     (1<<3)  /* Bit  3:      MAC Power up */
+#define PHY_M_PC_SQE_T_ENA      (1<<2)  /* Bit  2:      SQE Test Enabled */
+#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 */
+#define PHY_M_PC_ENA_AUTO       3               /* 11 = Enable Automatic Crossover */
+
+/*****  PHY_MARV_PHY_STAT       16 bit r/o      PHY Specific Status Reg *****/
+#define PHY_M_PS_SPEED_MSK      (3<<14) /* Bit 15..14:  Speed Mask */
+#define PHY_M_PS_SPEED_1000     (1<<15) /*       10 = 1000 Mbps */
+#define PHY_M_PS_SPEED_100      (1<<14) /*       01 =  100 Mbps */
+#define PHY_M_PS_SPEED_10       0               /*       00 =   10 Mbps */
+#define PHY_M_PS_FULL_DUP       (1<<13) /* Bit 13:      Full Duplex */
+#define PHY_M_PS_PAGE_REC       (1<<12) /* Bit 12:      Page Received */
+#define PHY_M_PS_SPDUP_RES      (1<<11) /* Bit 11:      Speed & Duplex Resolved */
+#define PHY_M_PS_LINK_UP        (1<<10) /* Bit 10:      Link Up */
+#define PHY_M_PS_CABLE_MSK      (3<<7)  /* Bit  9.. 7:  Cable Length Mask */
+#define PHY_M_PS_MDI_X_STAT     (1<<6)  /* Bit  6:      MDI Crossover Stat (1=MDIX) */
+#define PHY_M_PS_DOWNS_STAT     (1<<5)  /* Bit  5:      Downshift Status (1=downsh.) */
+#define PHY_M_PS_ENDET_STAT     (1<<4)  /* Bit  4:      Energy Detect Status (1=act) */
+#define PHY_M_PS_TX_P_EN        (1<<3)  /* Bit  3:      Tx Pause Enabled */
+#define PHY_M_PS_RX_P_EN        (1<<2)  /* Bit  2:      Rx Pause Enabled */
+#define PHY_M_PS_POL_REV        (1<<1)  /* Bit  1:      Polarity Reversed */
+#define PHY_M_PC_JABBER         (1<<0)  /* Bit  0:      Jabber */
+
+#define PHY_M_PS_PAUSE_MSK      (PHY_M_PS_TX_P_EN | PHY_M_PS_RX_P_EN)
+
+/*****  PHY_MARV_INT_MASK       16 bit r/w      Interrupt Mask Reg *****/
+/*****  PHY_MARV_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
+#define PHY_M_IS_AN_ERROR       (1<<15) /* Bit 15:      Auto-Negotiation Error */
+#define PHY_M_IS_LSP_CHANGE     (1<<14) /* Bit 14:      Link Speed Changed */
+#define PHY_M_IS_DUP_CHANGE     (1<<13) /* Bit 13:      Duplex Mode Changed */
+#define PHY_M_IS_AN_PR          (1<<12) /* Bit 12:      Page Received */
+#define PHY_M_IS_AN_COMPL       (1<<11) /* Bit 11:      Auto-Negotiation Completed */
+#define PHY_M_IS_LST_CHANGE     (1<<10) /* Bit 10:      Link Status Changed */
+#define PHY_M_IS_SYMB_ERROR     (1<<9)  /* Bit  9:      Symbol Error */
+#define PHY_M_IS_FALSE_CARR     (1<<8)  /* Bit  8:      False Carrier */
+#define PHY_M_IS_FIFO_ERROR     (1<<7)  /* Bit  7:      FIFO Overflow/Underrun Error */
+#define PHY_M_IS_MDI_CHANGE     (1<<6)  /* Bit  6:      MDI Crossover Changed */
+#define PHY_M_IS_DOWNSH_DET     (1<<5)  /* Bit  5:      Downshift Detected */
+#define PHY_M_IS_END_CHANGE     (1<<4)  /* Bit  4:      Energy Detect Changed */
+                                                                        /* Bit  3..2:   reserved */
+#define PHY_M_IS_POL_CHANGE     (1<<1)  /* Bit  1:      Polarity Changed */
+#define PHY_M_IS_JABBER         (1<<0)  /* Bit  0:      Jabber */
+
+#define PHY_M_DEF_MSK           (PHY_M_IS_AN_ERROR | PHY_M_IS_AN_PR | \
+                                                        PHY_M_IS_LST_CHANGE | PHY_M_IS_FIFO_ERROR)
+
+/*****  PHY_MARV_EXT_CTRL       16 bit r/w      Ext. PHY Specific Ctrl *****/
+#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 */
+#define PHY_M_EC_MAC_S(x)               SHIFT4(x)       /* 01X=0; 110=2.5; 111=25 (MHz) */
+
+#define MAC_TX_CLK_0_MHZ        2
+#define MAC_TX_CLK_2_5_MHZ      6
+#define MAC_TX_CLK_25_MHZ       7
+
+/*****  PHY_MARV_LED_CTRL       16 bit r/w      LED Control Reg *****/
+#define PHY_M_LEDC_DIS_LED      (1<<15) /* Bit 15:      Disable LED */
+#define PHY_M_LEDC_PULS_MSK     (7<<12) /* Bit 14..12:  Pulse Stretch Mask */
+#define PHY_M_LEDC_F_INT        (1<<11) /* Bit 11:      Force Interrupt */
+#define PHY_M_LEDC_BL_R_MSK     (7<<8)  /* Bit 10.. 8:  Blink Rate Mask */
+                                                                        /* Bit  7.. 5:  reserved */
+#define PHY_M_LEDC_LINK_MSK     (3<<3)  /* Bit  4.. 3:  Link Control Mask */
+#define PHY_M_LEDC_DP_CTRL      (1<<2)  /* Bit  2:      Duplex Control */
+#define PHY_M_LEDC_RX_CTRL      (1<<1)  /* Bit  1:      Rx activity / Link */
+#define PHY_M_LEDC_TX_CTRL      (1<<0)  /* Bit  0:      Tx activity / Link */
+
+#define PHY_M_LED_PULS_DUR(x)   SHIFT12(x)      /* Pulse Stretch Duration */
+
+#define PULS_NO_STR             0               /* no pulse stretching */
+#define PULS_21MS               1               /* 21 ms to 42 ms */
+#define PULS_42MS               2               /* 42 ms to 84 ms */
+#define PULS_84MS               3               /* 84 ms to 170 ms */
+#define PULS_170MS              4               /* 170 ms to 340 ms */
+#define PULS_340MS              5               /* 340 ms to 670 ms */
+#define PULS_670MS              6               /* 670 ms to 1.3 s */
+#define PULS_1300MS             7               /* 1.3 s to 2.7 s */
+
+#define PHY_M_LED_BLINK_RT(x)   SHIFT8(x)       /* Blink Rate */
+
+#define BLINK_42MS              0               /* 42 ms */
+#define BLINK_84MS              1               /* 84 ms */
+#define BLINK_170MS             2               /* 170 ms */
+#define BLINK_340MS             3               /* 340 ms */
+#define BLINK_670MS             4               /* 670 ms */
+                                                                /* values 5 - 7: reserved */
+
+/*****  PHY_MARV_LED_OVER       16 bit r/w      Manual LED Override Reg *****/
+#define PHY_M_LED_MO_DUP(x)             SHIFT10(x)      /* Bit 11..10:  Duplex */
+#define PHY_M_LED_MO_10(x)              SHIFT8(x)       /* Bit  9.. 8:  Link 10 */
+#define PHY_M_LED_MO_100(x)             SHIFT6(x)       /* Bit  7.. 6:  Link 100 */
+#define PHY_M_LED_MO_1000(x)    SHIFT4(x)       /* Bit  5.. 4:  Link 1000 */
+#define PHY_M_LED_MO_RX(x)              SHIFT2(x)       /* Bit  3.. 2:  Rx */
+#define PHY_M_LED_MO_TX(x)              SHIFT0(x)       /* Bit  1.. 0:  Tx */
+
+#define MO_LED_NORM                     0
+#define MO_LED_BLINK            1
+#define MO_LED_OFF                      2
+#define MO_LED_ON                       3
+
+/*****  PHY_MARV_EXT_CTRL_2     16 bit r/w      Ext. PHY Specific Ctrl 2 *****/
+                                                                        /* Bit 15.. 7:  reserved */
+#define PHY_M_EC2_FI_IMPED      (1<<6)  /* Bit  6:      Fiber Input  Impedance */
+#define PHY_M_EC2_FO_IMPED      (1<<5)  /* Bit  5:      Fiber Output Impedance */
+#define PHY_M_EC2_FO_M_CLK      (1<<4)  /* Bit  4:      Fiber Mode Clock Enable */
+#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 */
+                                                                        /* Bit 12.. 8:  reserved */
+#define PHY_M_CABD_DIST_MSK     0xff    /* Bit  7.. 0:  Distance */
+
+/* values for Cable Diagnostic Status (11=fail; 00=OK; 10=open; 01=short) */
+#define CABD_STAT_NORMAL        0
+#define CABD_STAT_SHORT         1
+#define CABD_STAT_OPEN          2
+#define CABD_STAT_FAIL          3
+
+
+/*
+ * GMAC registers
+ *
+ * The GMAC registers are 16 or 32 bits wide.
+ * The GMACs host processor interface is 16 bits wide,
+ * therefore ALL registers will be addressed with 16 bit accesses.
+ *
+ * The following macros are provided to access the GMAC registers
+ * GM_IN16(), GM_OUT16, GM_IN32(), GM_OUT32(), GM_INADR(), GM_OUTADR(),
+ * GM_INHASH(), and GM_OUTHASH().
+ * The macros are defined in SkGeHw.h.
+ *
+ * Note:        NA reg  = Network Address e.g DA, SA etc.
+ *
+ */
+
+/* Port Registers */
+#define GM_GP_STAT              0x0000          /* 16 bit r/o   General Purpose Status */
+#define GM_GP_CTRL              0x0004          /* 16 bit r/w   General Purpose Control */
+#define GM_TX_CTRL              0x0008          /* 16 bit r/w   Transmit Control Reg. */
+#define GM_RX_CTRL              0x000c          /* 16 bit r/w   Receive Control Reg. */
+#define GM_TX_FLOW_CTRL 0x0010          /* 16 bit r/w   Transmit Flow-Control */
+#define GM_TX_PARAM             0x0014          /* 16 bit r/w   Transmit Parameter Reg. */
+#define GM_SERIAL_MODE  0x0018          /* 16 bit r/w   Serial Mode Register */
+
+/* Source Address Registers */
+#define GM_SRC_ADDR_1L  0x001c          /* 16 bit r/w   Source Address 1 (low) */
+#define GM_SRC_ADDR_1M  0x0020          /* 16 bit r/w   Source Address 1 (middle) */
+#define GM_SRC_ADDR_1H  0x0024          /* 16 bit r/w   Source Address 1 (high) */
+#define GM_SRC_ADDR_2L  0x0028          /* 16 bit r/w   Source Address 2 (low) */
+#define GM_SRC_ADDR_2M  0x002c          /* 16 bit r/w   Source Address 2 (middle) */
+#define GM_SRC_ADDR_2H  0x0030          /* 16 bit r/w   Source Address 2 (high) */
+
+/* Multicast Address Hash Registers */
+#define GM_MC_ADDR_H1   0x0034          /* 16 bit r/w   Multicast Address Hash 1 */
+#define GM_MC_ADDR_H2   0x0038          /* 16 bit r/w   Multicast Address Hash 2 */
+#define GM_MC_ADDR_H3   0x003c          /* 16 bit r/w   Multicast Address Hash 3 */
+#define GM_MC_ADDR_H4   0x0040          /* 16 bit r/w   Multicast Address Hash 4 */
+
+/* Interrupt Source Registers */
+#define GM_TX_IRQ_SRC   0x0044          /* 16 bit r/o   Tx Overflow IRQ Source */
+#define GM_RX_IRQ_SRC   0x0048          /* 16 bit r/o   Rx Overflow IRQ Source */
+#define GM_TR_IRQ_SRC   0x004c          /* 16 bit r/o   Tx/Rx Over. IRQ Source */
+
+/* Interrupt Mask Registers */
+#define GM_TX_IRQ_MSK   0x0050          /* 16 bit r/w   Tx Overflow IRQ Mask */
+#define GM_RX_IRQ_MSK   0x0054          /* 16 bit r/w   Rx Overflow IRQ Mask */
+#define GM_TR_IRQ_MSK   0x0058          /* 16 bit r/w   Tx/Rx Over. IRQ Mask */
+
+/* Serial Management Interface (SMI) Registers */
+#define GM_SMI_CTRL             0x0080          /* 16 bit r/w   SMI Control Register */
+#define GM_SMI_DATA             0x0084          /* 16 bit r/w   SMI Data Register */
+#define GM_PHY_ADDR             0x0088          /* 16 bit r/w   GPHY Address Register */
+
+/* MIB Counters */
+#define GM_MIB_CNT_BASE 0x0100          /* Base Address of MIB Counters */
+#define GM_MIB_CNT_SIZE 44                      /* Number of MIB Counters */
+
+/*
+ * MIB Counters base address definitions (low word) -
+ * use offset 4 for access to high word (32 bit r/o)
+ */
+#define GM_RXF_UC_OK \
+                        (GM_MIB_CNT_BASE + 0)   /* Unicast Frames Received OK */
+#define GM_RXF_BC_OK \
+                        (GM_MIB_CNT_BASE + 8)   /* Broadcast Frames Received OK */
+#define GM_RXF_MPAUSE \
+                        (GM_MIB_CNT_BASE + 16)  /* Pause MAC Ctrl Frames Received */
+#define GM_RXF_MC_OK \
+                        (GM_MIB_CNT_BASE + 24)  /* Multicast Frames Received OK */
+#define GM_RXF_FCS_ERR \
+                        (GM_MIB_CNT_BASE + 32)  /* Rx Frame Check Seq. Error */
+        /* GM_MIB_CNT_BASE + 40:        reserved */
+#define GM_RXO_OK_LO \
+                        (GM_MIB_CNT_BASE + 48)  /* Octets Received OK Low */
+#define GM_RXO_OK_HI \
+                        (GM_MIB_CNT_BASE + 56)  /* Octets Received OK High */
+#define GM_RXO_ERR_LO \
+                        (GM_MIB_CNT_BASE + 64)  /* Octets Received Invalid Low */
+#define GM_RXO_ERR_HI \
+                        (GM_MIB_CNT_BASE + 72)  /* Octets Received Invalid High */
+#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 Received with FCS Err */
+#define GM_RXF_64B \
+                        (GM_MIB_CNT_BASE + 96)  /* 64 Byte Rx Frame */
+#define GM_RXF_127B \
+                        (GM_MIB_CNT_BASE + 104) /* 65-127 Byte Rx Frame */
+#define GM_RXF_255B \
+                        (GM_MIB_CNT_BASE + 112) /* 128-255 Byte Rx Frame */
+#define GM_RXF_511B \
+                        (GM_MIB_CNT_BASE + 120) /* 256-511 Byte Rx Frame */
+#define GM_RXF_1023B \
+                        (GM_MIB_CNT_BASE + 128) /* 512-1023 Byte Rx Frame */
+#define GM_RXF_1518B \
+                        (GM_MIB_CNT_BASE + 136) /* 1024-1518 Byte Rx Frame */
+#define GM_RXF_MAX_SZ \
+                        (GM_MIB_CNT_BASE + 144) /* 1519-MaxSize Byte Rx Frame */
+#define GM_RXF_LNG_ERR \
+                        (GM_MIB_CNT_BASE + 152) /* Rx Frame too Long Error */
+#define GM_RXF_JAB_PKT \
+                        (GM_MIB_CNT_BASE + 160) /* Rx Jabber Packet Frame */
+        /* GM_MIB_CNT_BASE + 168:       reserved */
+#define GM_RXE_FIFO_OV \
+                        (GM_MIB_CNT_BASE + 176) /* Rx FIFO overflow Event */
+        /* GM_MIB_CNT_BASE + 184:       reserved */
+#define GM_TXF_UC_OK \
+                        (GM_MIB_CNT_BASE + 192) /* Unicast Frames Xmitted OK */
+#define GM_TXF_BC_OK \
+                        (GM_MIB_CNT_BASE + 200) /* Broadcast Frames Xmitted OK */
+#define GM_TXF_MPAUSE \
+                        (GM_MIB_CNT_BASE + 208) /* Pause MAC Ctrl Frames Xmitted */
+#define GM_TXF_MC_OK \
+                        (GM_MIB_CNT_BASE + 216) /* Multicast Frames Xmitted OK */
+#define GM_TXO_OK_LO \
+                        (GM_MIB_CNT_BASE + 224) /* Octets Transmitted OK Low */
+#define GM_TXO_OK_HI \
+                        (GM_MIB_CNT_BASE + 232) /* Octets Transmitted OK High */
+#define GM_TXF_64B \
+                        (GM_MIB_CNT_BASE + 240) /* 64 Byte Tx Frame */
+#define GM_TXF_127B \
+                        (GM_MIB_CNT_BASE + 248) /* 65-127 Byte Tx Frame */
+#define GM_TXF_255B \
+                        (GM_MIB_CNT_BASE + 256) /* 128-255 Byte Tx Frame */
+#define GM_TXF_511B \
+                        (GM_MIB_CNT_BASE + 264) /* 256-511 Byte Tx Frame */
+#define GM_TXF_1023B \
+                        (GM_MIB_CNT_BASE + 272) /* 512-1023 Byte Tx Frame */
+#define GM_TXF_1518B \
+                        (GM_MIB_CNT_BASE + 280) /* 1024-1518 Byte Tx Frame */
+#define GM_TXF_MAX_SZ \
+                        (GM_MIB_CNT_BASE + 288) /* 1519-MaxSize Byte Tx Frame */
+        /* GM_MIB_CNT_BASE + 296:       reserved */
+#define GM_TXF_COL \
+                        (GM_MIB_CNT_BASE + 304) /* Tx Collision */
+#define GM_TXF_LAT_COL \
+                        (GM_MIB_CNT_BASE + 312) /* Tx Late Collision */
+#define GM_TXF_ABO_COL \
+                        (GM_MIB_CNT_BASE + 320) /* Tx aborted due to Exces. Col. */
+#define GM_TXF_MUL_COL \
+                        (GM_MIB_CNT_BASE + 328) /* Tx Multiple Collision */
+#define GM_TXF_SNG_COL \
+                        (GM_MIB_CNT_BASE + 336) /* Tx Single Collision */
+#define GM_TXE_FIFO_UR \
+                        (GM_MIB_CNT_BASE + 344) /* Tx FIFO Underrun Event */
+
+/*----------------------------------------------------------------------------*/
+/*
+ * GMAC Bit Definitions
+ *
+ * If the bit access behaviour differs from the register access behaviour
+ * (r/w, r/o) this is documented after the bit number.
+ * The following bit access behaviours are used:
+ *      (sc)    self clearing
+ *      (r/o)   read only
+ */
+
+/*      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 */
+#define GM_GPSR_LINK_UP         (1<<12) /* Bit 12:      Link Up Status */
+#define GM_GPSR_PAUSE           (1<<11) /* Bit 11:      Pause State */
+#define GM_GPSR_TX_ACTIVE       (1<<10) /* Bit 10:      Tx in Progress */
+#define GM_GPSR_EXC_COL         (1<<9)  /* Bit  9:      Excessive Collisions Occured */
+#define GM_GPSR_LAT_COL         (1<<8)  /* Bit  8:      Late Collisions Occured */
+                                                                /* Bit  7..6:   reserved */
+#define GM_GPSR_PHY_ST_CH       (1<<5)  /* Bit  5:      PHY Status Change */
+#define GM_GPSR_GIG_SPEED       (1<<4)  /* Bit  4:      Gigabit Speed (1 = 1000 Mbps) */
+#define GM_GPSR_PART_MODE       (1<<3)  /* Bit  3:      Partition mode */
+#define GM_GPSR_FC_RX_DIS       (1<<2)  /* Bit  2:      Rx Flow-Control Mode Disabled */
+#define GM_GPSR_PROM_EN         (1<<1)  /* Bit  1:      Promiscuous Mode Enabled */
+                                                                /* Bit  0:      reserved */
+        
+/*      GM_GP_CTRL      16 bit r/w      General Purpose Control Register */
+                                                                /* Bit 15:      reserved */
+#define GM_GPCR_PROM_ENA        (1<<14) /* Bit 14:      Enable Promiscuous Mode */
+#define GM_GPCR_FC_TX_DIS       (1<<13) /* Bit 13:      Disable Tx Flow-Control Mode */
+#define GM_GPCR_TX_ENA          (1<<12) /* Bit 12:      Enable Transmit */
+#define GM_GPCR_RX_ENA          (1<<11) /* Bit 11:      Enable Receive */
+#define GM_GPCR_BURST_ENA       (1<<10) /* Bit 10:      Enable Burst Mode */
+#define GM_GPCR_LOOP_ENA        (1<<9)  /* Bit  9:      Enable MAC Loopback Mode */
+#define GM_GPCR_PART_ENA        (1<<8)  /* Bit  8:      Enable Partition Mode */
+#define GM_GPCR_GIGS_ENA        (1<<7)  /* Bit  7:      Gigabit Speed (1000 Mbps) */
+#define GM_GPCR_FL_PASS         (1<<6)  /* Bit  6:      Force Link Pass */
+#define GM_GPCR_DUP_FULL        (1<<5)  /* Bit  5:      Full Duplex Mode */
+#define GM_GPCR_FC_RX_DIS       (1<<4)  /* Bit  4:      Disable Rx Flow-Control Mode */
+#define GM_GPCR_SPEED_100       (1<<3)  /* Bit  3:      Port Speed 100 Mbps */
+#define GM_GPCR_AU_DUP_DIS      (1<<2)  /* Bit  2:      Disable Auto-Update Duplex */
+#define GM_GPCR_AU_FCT_DIS      (1<<1)  /* Bit  1:      Disable Auto-Update Flow-C. */
+#define GM_GPCR_AU_SPD_DIS      (1<<0)  /* Bit  0:      Disable Auto-Update Speed */
+
+#define GM_GPCR_SPEED_1000      (GM_GPCR_GIGS_ENA | GM_GPCR_SPEED_100)
+#define GM_GPCR_AU_ALL_DIS      (GM_GPCR_AU_DUP_DIS | GM_GPCR_AU_FCT_DIS |\
+                                                         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_MSK     (7<<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 */
+#define GM_RXCR_MCF_ENA         (1<<14) /* Bit 14:      Enable Multicast filtering */
+#define GM_RXCR_CRC_DIS         (1<<13) /* Bit 13:      Remove 4-byte CRC */
+#define GM_RXCR_PASS_FC         (1<<12) /* Bit 12:      Pass FC packets to FIFO */
+        
+/*      GM_TX_PARAM                             16 bit r/w      Transmit Parameter Register */
+#define GM_TXPA_JAMLEN_MSK      (0x03<<14)      /* Bit 15..14:  Jam Length */
+#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 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 (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) & GM_SMOD_DATABL_MSK)
+#define DATA_BLIND_DEF          0x04
+
+#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_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 */
+        
+#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) */
+                                                                /* Bit   3..0:  reserved */
+        
+/* Receive Frame Status Encoding */
+#define GMR_FS_LEN      (0xffffUL<<16)  /* Bit 31..16:  Rx Frame Length */
+                                                                /* Bit  15..14: reserved */
+#define GMR_FS_VLAN             (1L<<13)        /* Bit 13:      VLAN Packet */
+#define GMR_FS_JABBER   (1L<<12)        /* Bit 12:      Jabber Packet */
+#define GMR_FS_UN_SIZE  (1L<<11)        /* Bit 11:      Undersize Packet */
+#define GMR_FS_MC               (1L<<10)        /* Bit 10:      Multicast Packet */
+#define GMR_FS_BC               (1L<<9)         /* Bit  9:      Broadcast Packet */
+#define GMR_FS_RX_OK    (1L<<8)         /* Bit  8:      Receive OK (Good Packet) */
+#define GMR_FS_GOOD_FC  (1L<<7)         /* Bit  7:      Good Flow-Control Packet */
+#define GMR_FS_BAD_FC   (1L<<6)         /* Bit  6:      Bad  Flow-Control Packet */
+#define GMR_FS_MII_ERR  (1L<<5)         /* Bit  5:      MII Error */
+#define GMR_FS_LONG_ERR (1L<<4)         /* Bit  4:      Too Long Packet */
+#define GMR_FS_FRAGMENT (1L<<3)         /* Bit  3:      Fragment */
+                                                                /* Bit  2:      reserved */
+#define GMR_FS_CRC_ERR  (1L<<1)         /* Bit  1:      CRC Error */
+#define GMR_FS_RX_FF_OV (1L<<0)         /* Bit  0:      Rx FIFO Overflow */
+
+/*
+ * GMR_FS_ANY_ERR (analogous to XMR_FS_ANY_ERR)
+ */
+#define GMR_FS_ANY_ERR  (GMR_FS_CRC_ERR | \
+                        GMR_FS_LONG_ERR | \
+                        GMR_FS_MII_ERR | \
+                        GMR_FS_BAD_FC | \
+                        GMR_FS_GOOD_FC | \
+                        GMR_FS_JABBER)
+
+/* Rx GMAC FIFO Flush Mask (default) */
+#define RX_FF_FL_DEF_MSK        (GMR_FS_CRC_ERR | \
+                        GMR_FS_RX_FF_OV | \
+                        GMR_FS_MII_ERR | \
+                        GMR_FS_BAD_FC | \
+                        GMR_FS_GOOD_FC | \
+                        GMR_FS_UN_SIZE | \
+                        GMR_FS_JABBER)
+
+/* typedefs *******************************************************************/
+
+
+/* function prototypes ********************************************************/
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif  /* __INC_XMAC_H */
diff --git a/drivers/net/sk98lin/skaddr.c b/drivers/net/sk98lin/skaddr.c
new file mode 100644
index 0000000000..6e6c56aa6d
--- /dev/null
+++ b/drivers/net/sk98lin/skaddr.c
@@ -0,0 +1,1788 @@
+/******************************************************************************
+ *
+ * Name:        skaddr.c
+ * Project:     Gigabit Ethernet Adapters, ADDR-Module
+ * Version:     $Revision: 1.52 $
+ * Date:        $Date: 2003/06/02 13:46:15 $
+ * Purpose:     Manage Addresses (Multicast and Unicast) and Promiscuous Mode.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * This module is intended to manage multicast addresses, address override,
+ * and promiscuous mode on GEnesis and Yukon adapters.
+ *
+ * Address Layout:
+ *      port address:           physical MAC address
+ *      1st exact match:        logical MAC address (GEnesis only)
+ *      2nd exact match:        RLMT multicast (GEnesis only)
+ *      exact match 3-13:       OS-specific multicasts (GEnesis only)
+ *
+ * Include File Hierarchy:
+ *
+ *      "skdrv1st.h"
+ *      "skdrv2nd.h"
+ *
+ ******************************************************************************/
+
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skaddr.c,v 1.52 2003/06/02 13:46:15 tschilli Exp $ (C) Marvell.";
+#endif /* DEBUG ||!LINT || !SK_SLIM */
+
+#define __SKADDR_C
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* cplusplus */
+
+#include "h/skdrv1st.h"
+#include "h/skdrv2nd.h"
+
+/* defines ********************************************************************/
+
+
+#define XMAC_POLY       0xEDB88320UL    /* CRC32-Poly - XMAC: Little Endian */
+#define GMAC_POLY       0x04C11DB7L     /* CRC16-Poly - GMAC: Little Endian */
+#define HASH_BITS       6                               /* #bits in hash */
+#define SK_MC_BIT       0x01
+
+/* Error numbers and messages. */
+
+#define SKERR_ADDR_E001         (SK_ERRBASE_ADDR + 0)
+#define SKERR_ADDR_E001MSG      "Bad Flags."
+#define SKERR_ADDR_E002         (SKERR_ADDR_E001 + 1)
+#define SKERR_ADDR_E002MSG      "New Error."
+
+/* typedefs *******************************************************************/
+
+/* None. */
+
+/* global variables ***********************************************************/
+
+/* 64-bit hash values with all bits set. */
+
+static const SK_U16     OnesHash[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
+
+/* local variables ************************************************************/
+
+#ifdef DEBUG
+static int      Next0[SK_MAX_MACS] = {0};
+#endif  /* DEBUG */
+
+static int SkAddrGmacMcAdd(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
+                           SK_MAC_ADDR *pMc, int Flags);
+static int SkAddrGmacMcClear(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
+                             int Flags);
+static int SkAddrGmacMcUpdate(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber);
+static int SkAddrGmacPromiscuousChange(SK_AC *pAC, SK_IOC IoC,
+                                       SK_U32 PortNumber, int NewPromMode);
+static int SkAddrXmacMcAdd(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
+                           SK_MAC_ADDR *pMc, int Flags);
+static int SkAddrXmacMcClear(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
+                             int Flags);
+static int SkAddrXmacMcUpdate(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber);
+static int SkAddrXmacPromiscuousChange(SK_AC *pAC, SK_IOC IoC,
+                                       SK_U32 PortNumber, int NewPromMode);
+
+/* functions ******************************************************************/
+
+/******************************************************************************
+ *
+ *      SkAddrInit - initialize data, set state to init
+ *
+ * Description:
+ *
+ *      SK_INIT_DATA
+ *      ============
+ *
+ *      This routine clears the multicast tables and resets promiscuous mode.
+ *      Some entries are reserved for the "logical MAC address", the
+ *      SK-RLMT multicast address, and the BPDU multicast address.
+ *
+ *
+ *      SK_INIT_IO
+ *      ==========
+ *
+ *      All permanent MAC addresses are read from EPROM.
+ *      If the current MAC addresses are not already set in software,
+ *      they are set to the values of the permanent addresses.
+ *      The current addresses are written to the corresponding MAC.
+ *
+ *
+ *      SK_INIT_RUN
+ *      ===========
+ *
+ *      Nothing.
+ *
+ * Context:
+ *      init, pageable
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS
+ */
+int     SkAddrInit(
+SK_AC   *pAC,   /* the adapter context */
+SK_IOC  IoC,    /* I/O context */
+int             Level)  /* initialization level */
+{
+        int                     j;
+        SK_U32          i;
+        SK_U8           *InAddr;
+        SK_U16          *OutAddr;
+        SK_ADDR_PORT    *pAPort;
+
+        switch (Level) {
+        case SK_INIT_DATA:
+                SK_MEMSET((char *) &pAC->Addr, (SK_U8) 0,
+            (SK_U16) sizeof(SK_ADDR));
+
+                for (i = 0; i < SK_MAX_MACS; i++) {
+                        pAPort = &pAC->Addr.Port[i];
+                        pAPort->PromMode = SK_PROM_MODE_NONE;
+                        
+                        pAPort->FirstExactMatchRlmt = SK_ADDR_FIRST_MATCH_RLMT;
+                        pAPort->FirstExactMatchDrv = SK_ADDR_FIRST_MATCH_DRV;
+                        pAPort->NextExactMatchRlmt = SK_ADDR_FIRST_MATCH_RLMT;
+                        pAPort->NextExactMatchDrv = SK_ADDR_FIRST_MATCH_DRV;
+                }
+#ifdef xDEBUG
+                for (i = 0; i < SK_MAX_MACS; i++) {
+                        if (pAC->Addr.Port[i].NextExactMatchRlmt <
+                                SK_ADDR_FIRST_MATCH_RLMT) {
+                                Next0[i] |= 4;
+                        }
+                }
+#endif  /* DEBUG */
+                /* pAC->Addr.InitDone = SK_INIT_DATA; */
+                break;
+
+    case SK_INIT_IO:
+#ifndef SK_NO_RLMT
+                for (i = 0; i < SK_MAX_NETS; i++) {
+                        pAC->Addr.Net[i].ActivePort = pAC->Rlmt.Net[i].ActivePort;
+                }
+#endif /* !SK_NO_RLMT */
+#ifdef xDEBUG
+                for (i = 0; i < SK_MAX_MACS; i++) {
+                        if (pAC->Addr.Port[i].NextExactMatchRlmt <
+                                SK_ADDR_FIRST_MATCH_RLMT) {
+                                Next0[i] |= 8;
+                        }
+                }
+#endif  /* DEBUG */
+                
+                /* Read permanent logical MAC address from Control Register File. */
+                for (j = 0; j < SK_MAC_ADDR_LEN; j++) {
+                        InAddr = (SK_U8 *) &pAC->Addr.Net[0].PermanentMacAddress.a[j];
+                        SK_IN8(IoC, B2_MAC_1 + j, InAddr);
+                }
+
+                if (!pAC->Addr.Net[0].CurrentMacAddressSet) {
+                        /* Set the current logical MAC address to the permanent one. */
+                        pAC->Addr.Net[0].CurrentMacAddress =
+                                pAC->Addr.Net[0].PermanentMacAddress;
+                        pAC->Addr.Net[0].CurrentMacAddressSet = SK_TRUE;
+                }
+
+                /* Set the current logical MAC address. */
+                pAC->Addr.Port[pAC->Addr.Net[0].ActivePort].Exact[0] =
+                        pAC->Addr.Net[0].CurrentMacAddress;
+#if SK_MAX_NETS > 1
+                /* Set logical MAC address for net 2 to (log | 3). */
+                if (!pAC->Addr.Net[1].CurrentMacAddressSet) {
+                        pAC->Addr.Net[1].PermanentMacAddress =
+                                pAC->Addr.Net[0].PermanentMacAddress;
+                        pAC->Addr.Net[1].PermanentMacAddress.a[5] |= 3;
+                        /* Set the current logical MAC address to the permanent one. */
+                        pAC->Addr.Net[1].CurrentMacAddress =
+                                pAC->Addr.Net[1].PermanentMacAddress;
+                        pAC->Addr.Net[1].CurrentMacAddressSet = SK_TRUE;
+                }
+#endif  /* SK_MAX_NETS > 1 */
+
+#ifdef DEBUG
+                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
+                                ("Permanent MAC Address (Net%d): %02X %02X %02X %02X %02X %02X\n",
+                                        i,
+                                        pAC->Addr.Net[i].PermanentMacAddress.a[0],
+                                        pAC->Addr.Net[i].PermanentMacAddress.a[1],
+                                        pAC->Addr.Net[i].PermanentMacAddress.a[2],
+                                        pAC->Addr.Net[i].PermanentMacAddress.a[3],
+                                        pAC->Addr.Net[i].PermanentMacAddress.a[4],
+                                        pAC->Addr.Net[i].PermanentMacAddress.a[5]))
+                        
+                        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
+                                ("Logical MAC Address (Net%d): %02X %02X %02X %02X %02X %02X\n",
+                                        i,
+                                        pAC->Addr.Net[i].CurrentMacAddress.a[0],
+                                        pAC->Addr.Net[i].CurrentMacAddress.a[1],
+                                        pAC->Addr.Net[i].CurrentMacAddress.a[2],
+                                        pAC->Addr.Net[i].CurrentMacAddress.a[3],
+                                        pAC->Addr.Net[i].CurrentMacAddress.a[4],
+                                        pAC->Addr.Net[i].CurrentMacAddress.a[5]))
+                }
+#endif  /* DEBUG */
+
+                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
+                        pAPort = &pAC->Addr.Port[i];
+
+                        /* Read permanent port addresses from Control Register File. */
+                        for (j = 0; j < SK_MAC_ADDR_LEN; j++) {
+                                InAddr = (SK_U8 *) &pAPort->PermanentMacAddress.a[j];
+                                SK_IN8(IoC, B2_MAC_2 + 8 * i + j, InAddr);
+                        }
+
+                        if (!pAPort->CurrentMacAddressSet) {
+                                /*
+                                 * Set the current and previous physical MAC address
+                                 * of this port to its permanent MAC address.
+                                 */
+                                pAPort->CurrentMacAddress = pAPort->PermanentMacAddress;
+                                pAPort->PreviousMacAddress = pAPort->PermanentMacAddress;
+                                pAPort->CurrentMacAddressSet = SK_TRUE;
+                        }
+
+                        /* Set port's current physical MAC address. */
+                        OutAddr = (SK_U16 *) &pAPort->CurrentMacAddress.a[0];
+#ifdef GENESIS
+                        if (pAC->GIni.GIGenesis) {
+                                XM_OUTADDR(IoC, i, XM_SA, OutAddr);
+                        }
+#endif /* GENESIS */
+#ifdef YUKON
+                        if (!pAC->GIni.GIGenesis) {
+                                GM_OUTADDR(IoC, i, GM_SRC_ADDR_1L, OutAddr);
+                        }
+#endif /* YUKON */
+#ifdef DEBUG
+                        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
+                                ("SkAddrInit: Permanent Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
+                                        pAPort->PermanentMacAddress.a[0],
+                                        pAPort->PermanentMacAddress.a[1],
+                                        pAPort->PermanentMacAddress.a[2],
+                                        pAPort->PermanentMacAddress.a[3],
+                                        pAPort->PermanentMacAddress.a[4],
+                                        pAPort->PermanentMacAddress.a[5]))
+                        
+                        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
+                                ("SkAddrInit: Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
+                                        pAPort->CurrentMacAddress.a[0],
+                                        pAPort->CurrentMacAddress.a[1],
+                                        pAPort->CurrentMacAddress.a[2],
+                                        pAPort->CurrentMacAddress.a[3],
+                                        pAPort->CurrentMacAddress.a[4],
+                                        pAPort->CurrentMacAddress.a[5]))
+#endif /* DEBUG */
+                }
+                /* pAC->Addr.InitDone = SK_INIT_IO; */
+                break;
+
+        case SK_INIT_RUN:
+#ifdef xDEBUG
+                for (i = 0; i < SK_MAX_MACS; i++) {
+                        if (pAC->Addr.Port[i].NextExactMatchRlmt <
+                                SK_ADDR_FIRST_MATCH_RLMT) {
+                                Next0[i] |= 16;
+                        }
+                }
+#endif  /* DEBUG */
+
+                /* pAC->Addr.InitDone = SK_INIT_RUN; */
+                break;
+
+        default:        /* error */
+                break;
+        }
+
+        return (SK_ADDR_SUCCESS);
+        
+}       /* SkAddrInit */
+
+#ifndef SK_SLIM
+
+/******************************************************************************
+ *
+ *      SkAddrMcClear - clear the multicast table
+ *
+ * Description:
+ *      This routine clears the multicast table.
+ *
+ *      If not suppressed by Flag SK_MC_SW_ONLY, the hardware is updated
+ *      immediately.
+ *
+ *      It calls either SkAddrXmacMcClear or SkAddrGmacMcClear, according
+ *      to the adapter in use. The real work is done there.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called starting with SK_INIT_DATA with flag SK_MC_SW_ONLY
+ *      may be called after SK_INIT_IO without limitation
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+int     SkAddrMcClear(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* I/O context */
+SK_U32  PortNumber,     /* Index of affected port */
+int             Flags)          /* permanent/non-perm, sw-only */
+{
+        int ReturnCode;
+        
+        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
+                return (SK_ADDR_ILLEGAL_PORT);
+        }
+        
+        if (pAC->GIni.GIGenesis) {
+                ReturnCode = SkAddrXmacMcClear(pAC, IoC, PortNumber, Flags);
+        }
+        else {
+                ReturnCode = SkAddrGmacMcClear(pAC, IoC, PortNumber, Flags);
+        }
+
+        return (ReturnCode);
+
+}       /* SkAddrMcClear */
+
+#endif /* !SK_SLIM */
+
+#ifndef SK_SLIM
+
+/******************************************************************************
+ *
+ *      SkAddrXmacMcClear - clear the multicast table
+ *
+ * Description:
+ *      This routine clears the multicast table
+ *      (either entry 2 or entries 3-16 and InexactFilter) of the given port.
+ *      If not suppressed by Flag SK_MC_SW_ONLY, the hardware is updated
+ *      immediately.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called starting with SK_INIT_DATA with flag SK_MC_SW_ONLY
+ *      may be called after SK_INIT_IO without limitation
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+static int      SkAddrXmacMcClear(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* I/O context */
+SK_U32  PortNumber,     /* Index of affected port */
+int             Flags)          /* permanent/non-perm, sw-only */
+{
+        int i;
+
+        if (Flags & SK_ADDR_PERMANENT) {        /* permanent => RLMT */
+
+                /* Clear RLMT multicast addresses. */
+                pAC->Addr.Port[PortNumber].NextExactMatchRlmt = SK_ADDR_FIRST_MATCH_RLMT;
+        }
+        else {  /* not permanent => DRV */
+
+                /* Clear InexactFilter */
+                for (i = 0; i < 8; i++) {
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0;
+                }
+
+                /* Clear DRV multicast addresses. */
+
+                pAC->Addr.Port[PortNumber].NextExactMatchDrv = SK_ADDR_FIRST_MATCH_DRV;
+        }
+
+        if (!(Flags & SK_MC_SW_ONLY)) {
+                (void) SkAddrXmacMcUpdate(pAC, IoC, PortNumber);
+        }
+
+        return (SK_ADDR_SUCCESS);
+        
+}       /* SkAddrXmacMcClear */
+
+#endif /* !SK_SLIM */
+
+#ifndef SK_SLIM
+
+/******************************************************************************
+ *
+ *      SkAddrGmacMcClear - clear the multicast table
+ *
+ * Description:
+ *      This routine clears the multicast hashing table (InexactFilter)
+ *      (either the RLMT or the driver bits) of the given port.
+ *
+ *      If not suppressed by Flag SK_MC_SW_ONLY, the hardware is updated
+ *      immediately.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called starting with SK_INIT_DATA with flag SK_MC_SW_ONLY
+ *      may be called after SK_INIT_IO without limitation
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+static int      SkAddrGmacMcClear(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* I/O context */
+SK_U32  PortNumber,     /* Index of affected port */
+int             Flags)          /* permanent/non-perm, sw-only */
+{
+        int i;
+
+#ifdef DEBUG
+        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("GMAC InexactFilter (not cleared): %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[1],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[2],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[3],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[4],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[5],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[6],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[7]))
+#endif  /* DEBUG */
+
+        /* Clear InexactFilter */
+        for (i = 0; i < 8; i++) {
+                pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0;
+        }
+        
+        if (Flags & SK_ADDR_PERMANENT) {        /* permanent => RLMT */
+                
+                /* Copy DRV bits to InexactFilter. */
+                for (i = 0; i < 8; i++) {
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] |=
+                                pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[i];
+                        
+                        /* Clear InexactRlmtFilter. */
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[i] = 0;
+
+                }               
+        }
+        else {  /* not permanent => DRV */
+                
+                /* Copy RLMT bits to InexactFilter. */
+                for (i = 0; i < 8; i++) {
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] |=
+                                pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[i];
+                        
+                        /* Clear InexactDrvFilter. */
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[i] = 0;
+                }
+        }
+        
+#ifdef DEBUG
+        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("GMAC InexactFilter (cleared): %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[1],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[2],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[3],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[4],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[5],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[6],
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[7]))
+#endif  /* DEBUG */
+        
+        if (!(Flags & SK_MC_SW_ONLY)) {
+                (void) SkAddrGmacMcUpdate(pAC, IoC, PortNumber);
+        }
+        
+        return (SK_ADDR_SUCCESS);
+
+}       /* SkAddrGmacMcClear */
+
+#ifndef SK_ADDR_CHEAT
+
+/******************************************************************************
+ *
+ *      SkXmacMcHash - hash multicast address
+ *
+ * Description:
+ *      This routine computes the hash value for a multicast address.
+ *      A CRC32 algorithm is used.
+ *
+ * Notes:
+ *      The code was adapted from the XaQti data sheet.
+ *
+ * Context:
+ *      runtime, pageable
+ *
+ * Returns:
+ *      Hash value of multicast address.
+ */
+static SK_U32 SkXmacMcHash(
+unsigned char *pMc)     /* Multicast address */
+{
+        SK_U32 Idx;
+        SK_U32 Bit;
+        SK_U32 Data;
+        SK_U32 Crc;
+
+        Crc = 0xFFFFFFFFUL;
+        for (Idx = 0; Idx < SK_MAC_ADDR_LEN; Idx++) {
+                Data = *pMc++;
+                for (Bit = 0; Bit < 8; Bit++, Data >>= 1) {
+                        Crc = (Crc >> 1) ^ (((Crc ^ Data) & 1) ? XMAC_POLY : 0);
+                }
+        }
+
+        return (Crc & ((1 << HASH_BITS) - 1));
+
+}       /* SkXmacMcHash */
+
+
+/******************************************************************************
+ *
+ *      SkGmacMcHash - hash multicast address
+ *
+ * Description:
+ *      This routine computes the hash value for a multicast address.
+ *      A CRC16 algorithm is used.
+ *
+ * Notes:
+ *
+ *
+ * Context:
+ *      runtime, pageable
+ *
+ * Returns:
+ *      Hash value of multicast address.
+ */
+static SK_U32 SkGmacMcHash(
+unsigned char *pMc)     /* Multicast address */
+{
+        SK_U32 Data;
+        SK_U32 TmpData;
+        SK_U32 Crc;
+        int Byte;
+        int Bit;
+
+        Crc = 0xFFFFFFFFUL;
+        for (Byte = 0; Byte < 6; Byte++) {
+                /* Get next byte. */
+                Data = (SK_U32) pMc[Byte];
+                
+                /* Change bit order in byte. */
+                TmpData = Data;
+                for (Bit = 0; Bit < 8; Bit++) {
+                        if (TmpData & 1L) {
+                                Data |=  1L << (7 - Bit);
+                        }
+                        else {
+                                Data &= ~(1L << (7 - Bit));
+                        }
+                        TmpData >>= 1;
+                }
+                
+                Crc ^= (Data << 24);
+                for (Bit = 0; Bit < 8; Bit++) {
+                        if (Crc & 0x80000000) {
+                                Crc = (Crc << 1) ^ GMAC_POLY;
+                        }
+                        else {
+                                Crc <<= 1;
+                        }
+                }
+        }
+        
+        return (Crc & ((1 << HASH_BITS) - 1));
+
+}       /* SkGmacMcHash */
+
+#endif  /* !SK_ADDR_CHEAT */
+
+/******************************************************************************
+ *
+ *      SkAddrMcAdd - add a multicast address to a port
+ *
+ * Description:
+ *      This routine enables reception for a given address on the given port.
+ *
+ *      It calls either SkAddrXmacMcAdd or SkAddrGmacMcAdd, according to the
+ *      adapter in use. The real work is done there.
+ *
+ * Notes:
+ *      The return code is only valid for SK_PROM_MODE_NONE.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_DATA
+ *
+ * Returns:
+ *      SK_MC_FILTERING_EXACT
+ *      SK_MC_FILTERING_INEXACT
+ *      SK_MC_ILLEGAL_ADDRESS
+ *      SK_MC_ILLEGAL_PORT
+ *      SK_MC_RLMT_OVERFLOW
+ */
+int     SkAddrMcAdd(
+SK_AC           *pAC,           /* adapter context */
+SK_IOC          IoC,            /* I/O context */
+SK_U32          PortNumber,     /* Port Number */
+SK_MAC_ADDR     *pMc,           /* multicast address to be added */
+int                     Flags)          /* permanent/non-permanent */
+{
+        int ReturnCode;
+        
+        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
+                return (SK_ADDR_ILLEGAL_PORT);
+        }
+        
+        if (pAC->GIni.GIGenesis) {
+                ReturnCode = SkAddrXmacMcAdd(pAC, IoC, PortNumber, pMc, Flags);
+        }
+        else {
+                ReturnCode = SkAddrGmacMcAdd(pAC, IoC, PortNumber, pMc, Flags);
+        }
+
+        return (ReturnCode);
+
+}       /* SkAddrMcAdd */
+
+
+/******************************************************************************
+ *
+ *      SkAddrXmacMcAdd - add a multicast address to a port
+ *
+ * Description:
+ *      This routine enables reception for a given address on the given port.
+ *
+ * Notes:
+ *      The return code is only valid for SK_PROM_MODE_NONE.
+ *
+ *      The multicast bit is only checked if there are no free exact match
+ *      entries.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_DATA
+ *
+ * Returns:
+ *      SK_MC_FILTERING_EXACT
+ *      SK_MC_FILTERING_INEXACT
+ *      SK_MC_ILLEGAL_ADDRESS
+ *      SK_MC_RLMT_OVERFLOW
+ */
+static int      SkAddrXmacMcAdd(
+SK_AC           *pAC,           /* adapter context */
+SK_IOC          IoC,            /* I/O context */
+SK_U32          PortNumber,     /* Port Number */
+SK_MAC_ADDR     *pMc,           /* multicast address to be added */
+int             Flags)          /* permanent/non-permanent */
+{
+        int     i;
+        SK_U8   Inexact;
+#ifndef SK_ADDR_CHEAT
+        SK_U32 HashBit;
+#endif  /* !defined(SK_ADDR_CHEAT) */
+
+        if (Flags & SK_ADDR_PERMANENT) {        /* permanent => RLMT */
+#ifdef xDEBUG
+                if (pAC->Addr.Port[PortNumber].NextExactMatchRlmt <
+                        SK_ADDR_FIRST_MATCH_RLMT) {
+                        Next0[PortNumber] |= 1;
+                        return (SK_MC_RLMT_OVERFLOW);
+                }
+#endif  /* DEBUG */
+                
+                if (pAC->Addr.Port[PortNumber].NextExactMatchRlmt >
+                        SK_ADDR_LAST_MATCH_RLMT) {
+                        return (SK_MC_RLMT_OVERFLOW);
+                }
+
+                /* Set a RLMT multicast address. */
+
+                pAC->Addr.Port[PortNumber].Exact[
+                        pAC->Addr.Port[PortNumber].NextExactMatchRlmt++] = *pMc;
+
+                return (SK_MC_FILTERING_EXACT);
+        }
+
+#ifdef xDEBUG
+        if (pAC->Addr.Port[PortNumber].NextExactMatchDrv <
+                SK_ADDR_FIRST_MATCH_DRV) {
+                        Next0[PortNumber] |= 2;
+                return (SK_MC_RLMT_OVERFLOW);
+        }
+#endif  /* DEBUG */
+        
+        if (pAC->Addr.Port[PortNumber].NextExactMatchDrv <= SK_ADDR_LAST_MATCH_DRV) {
+
+                /* Set exact match entry. */
+                pAC->Addr.Port[PortNumber].Exact[
+                        pAC->Addr.Port[PortNumber].NextExactMatchDrv++] = *pMc;
+
+                /* Clear InexactFilter */
+                for (i = 0; i < 8; i++) {
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0;
+                }
+        }
+        else {
+                if (!(pMc->a[0] & SK_MC_BIT)) {
+                        /* Hashing only possible with multicast addresses */
+                        return (SK_MC_ILLEGAL_ADDRESS);
+                }
+#ifndef SK_ADDR_CHEAT
+                /* Compute hash value of address. */
+                HashBit = 63 - SkXmacMcHash(&pMc->a[0]);
+
+                /* Add bit to InexactFilter. */
+                pAC->Addr.Port[PortNumber].InexactFilter.Bytes[HashBit / 8] |=
+                        1 << (HashBit % 8);
+#else   /* SK_ADDR_CHEAT */
+                /* Set all bits in InexactFilter. */
+                for (i = 0; i < 8; i++) {
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0xFF;
+                }
+#endif  /* SK_ADDR_CHEAT */
+        }
+
+        for (Inexact = 0, i = 0; i < 8; i++) {
+                Inexact |= pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i];
+        }
+
+        if (Inexact == 0 && pAC->Addr.Port[PortNumber].PromMode == 0) {
+                return (SK_MC_FILTERING_EXACT);
+        }
+        else {
+                return (SK_MC_FILTERING_INEXACT);
+        }
+
+}       /* SkAddrXmacMcAdd */
+
+
+/******************************************************************************
+ *
+ *      SkAddrGmacMcAdd - add a multicast address to a port
+ *
+ * Description:
+ *      This routine enables reception for a given address on the given port.
+ *
+ * Notes:
+ *      The return code is only valid for SK_PROM_MODE_NONE.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_DATA
+ *
+ * Returns:
+ *      SK_MC_FILTERING_INEXACT
+ *      SK_MC_ILLEGAL_ADDRESS
+ */
+static int      SkAddrGmacMcAdd(
+SK_AC           *pAC,           /* adapter context */
+SK_IOC          IoC,            /* I/O context */
+SK_U32          PortNumber,     /* Port Number */
+SK_MAC_ADDR     *pMc,           /* multicast address to be added */
+int             Flags)          /* permanent/non-permanent */
+{
+        int     i;
+#ifndef SK_ADDR_CHEAT
+        SK_U32 HashBit;
+#endif  /* !defined(SK_ADDR_CHEAT) */
+                
+        if (!(pMc->a[0] & SK_MC_BIT)) {
+                /* Hashing only possible with multicast addresses */
+                return (SK_MC_ILLEGAL_ADDRESS);
+        }
+        
+#ifndef SK_ADDR_CHEAT
+        
+        /* Compute hash value of address. */
+        HashBit = SkGmacMcHash(&pMc->a[0]);
+        
+        if (Flags & SK_ADDR_PERMANENT) {        /* permanent => RLMT */
+                
+                /* Add bit to InexactRlmtFilter. */
+                pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[HashBit / 8] |=
+                        1 << (HashBit % 8);
+                
+                /* Copy bit to InexactFilter. */
+                for (i = 0; i < 8; i++) {
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] |=
+                                pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[i];
+                }
+#ifdef DEBUG
+                SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("GMAC InexactRlmtFilter: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[0],
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[1],
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[2],
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[3],
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[4],
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[5],
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[6],
+                        pAC->Addr.Port[PortNumber].InexactRlmtFilter.Bytes[7]))
+#endif  /* DEBUG */
+        }
+        else {  /* not permanent => DRV */
+                
+                /* Add bit to InexactDrvFilter. */
+                pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[HashBit / 8] |=
+                        1 << (HashBit % 8);
+                
+                /* Copy bit to InexactFilter. */
+                for (i = 0; i < 8; i++) {
+                        pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] |=
+                                pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[i];
+                }
+#ifdef DEBUG
+                SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("GMAC InexactDrvFilter: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[0],
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[1],
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[2],
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[3],
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[4],
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[5],
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[6],
+                        pAC->Addr.Port[PortNumber].InexactDrvFilter.Bytes[7]))
+#endif  /* DEBUG */
+        }
+        
+#else   /* SK_ADDR_CHEAT */
+        
+        /* Set all bits in InexactFilter. */
+        for (i = 0; i < 8; i++) {
+                pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i] = 0xFF;
+        }
+#endif  /* SK_ADDR_CHEAT */
+                
+        return (SK_MC_FILTERING_INEXACT);
+        
+}       /* SkAddrGmacMcAdd */
+
+#endif /* !SK_SLIM */
+
+/******************************************************************************
+ *
+ *      SkAddrMcUpdate - update the HW MC address table and set the MAC address
+ *
+ * Description:
+ *      This routine enables reception of the addresses contained in a local
+ *      table for a given port.
+ *      It also programs the port's current physical MAC address.
+ *
+ *      It calls either SkAddrXmacMcUpdate or SkAddrGmacMcUpdate, according
+ *      to the adapter in use. The real work is done there.
+ *
+ * Notes:
+ *      The return code is only valid for SK_PROM_MODE_NONE.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      SK_MC_FILTERING_EXACT
+ *      SK_MC_FILTERING_INEXACT
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+int     SkAddrMcUpdate(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* I/O context */
+SK_U32  PortNumber)     /* Port Number */
+{
+        int ReturnCode = 0;
+#if (!defined(SK_SLIM) || defined(DEBUG))
+        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
+                return (SK_ADDR_ILLEGAL_PORT);
+        }
+#endif /* !SK_SLIM || DEBUG */
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                ReturnCode = SkAddrXmacMcUpdate(pAC, IoC, PortNumber);
+        }
+#endif /* GENESIS */
+#ifdef YUKON
+        if (!pAC->GIni.GIGenesis) {
+                ReturnCode = SkAddrGmacMcUpdate(pAC, IoC, PortNumber);
+        }
+#endif /* YUKON */
+        return (ReturnCode);
+
+}       /* SkAddrMcUpdate */
+
+
+#ifdef GENESIS
+
+/******************************************************************************
+ *
+ *      SkAddrXmacMcUpdate - update the HW MC address table and set the MAC address
+ *
+ * Description:
+ *      This routine enables reception of the addresses contained in a local
+ *      table for a given port.
+ *      It also programs the port's current physical MAC address.
+ *
+ * Notes:
+ *      The return code is only valid for SK_PROM_MODE_NONE.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      SK_MC_FILTERING_EXACT
+ *      SK_MC_FILTERING_INEXACT
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+static int      SkAddrXmacMcUpdate(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* I/O context */
+SK_U32  PortNumber)     /* Port Number */
+{
+        SK_U32          i;
+        SK_U8           Inexact;
+        SK_U16          *OutAddr;
+        SK_ADDR_PORT    *pAPort;
+
+        SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("SkAddrXmacMcUpdate on Port %u.\n", PortNumber))
+        
+        pAPort = &pAC->Addr.Port[PortNumber];
+
+#ifdef DEBUG
+        SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]))
+#endif /* DEBUG */
+
+        /* Start with 0 to also program the logical MAC address. */
+        for (i = 0; i < pAPort->NextExactMatchRlmt; i++) {
+                /* Set exact match address i on XMAC */
+                OutAddr = (SK_U16 *) &pAPort->Exact[i].a[0];
+                XM_OUTADDR(IoC, PortNumber, XM_EXM(i), OutAddr);
+        }
+
+        /* Clear other permanent exact match addresses on XMAC */
+        if (pAPort->NextExactMatchRlmt <= SK_ADDR_LAST_MATCH_RLMT) {
+                
+                SkXmClrExactAddr(pAC, IoC, PortNumber, pAPort->NextExactMatchRlmt,
+                        SK_ADDR_LAST_MATCH_RLMT);
+        }
+
+        for (i = pAPort->FirstExactMatchDrv; i < pAPort->NextExactMatchDrv; i++) {
+                OutAddr = (SK_U16 *) &pAPort->Exact[i].a[0];
+                XM_OUTADDR(IoC, PortNumber, XM_EXM(i), OutAddr);
+        }
+
+        /* Clear other non-permanent exact match addresses on XMAC */
+        if (pAPort->NextExactMatchDrv <= SK_ADDR_LAST_MATCH_DRV) {
+                
+                SkXmClrExactAddr(pAC, IoC, PortNumber, pAPort->NextExactMatchDrv,
+                        SK_ADDR_LAST_MATCH_DRV);
+        }
+
+        for (Inexact = 0, i = 0; i < 8; i++) {
+                Inexact |= pAPort->InexactFilter.Bytes[i];
+        }
+
+        if (pAPort->PromMode & SK_PROM_MODE_ALL_MC) {
+                
+                /* Set all bits in 64-bit hash register. */
+                XM_OUTHASH(IoC, PortNumber, XM_HSM, &OnesHash);
+                
+                /* Enable Hashing */
+                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+        else if (Inexact != 0) {
+                
+                /* Set 64-bit hash register to InexactFilter. */
+                XM_OUTHASH(IoC, PortNumber, XM_HSM, &pAPort->InexactFilter.Bytes[0]);
+                
+                /* Enable Hashing */
+                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+        else {
+                /* Disable Hashing */
+                SkMacHashing(pAC, IoC, (int) PortNumber, SK_FALSE);
+        }
+
+        if (pAPort->PromMode != SK_PROM_MODE_NONE) {
+                (void) SkAddrXmacPromiscuousChange(pAC, IoC, PortNumber, pAPort->PromMode);
+        }
+
+        /* Set port's current physical MAC address. */
+        OutAddr = (SK_U16 *) &pAPort->CurrentMacAddress.a[0];
+        
+        XM_OUTADDR(IoC, PortNumber, XM_SA, OutAddr);
+
+#ifdef xDEBUG
+        for (i = 0; i < pAPort->NextExactMatchRlmt; i++) {
+                SK_U8           InAddr8[6];
+                SK_U16          *InAddr;
+
+                /* Get exact match address i from port PortNumber. */
+                InAddr = (SK_U16 *) &InAddr8[0];
+                
+                XM_INADDR(IoC, PortNumber, XM_EXM(i), InAddr);
+                
+                SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                        ("SkAddrXmacMcUpdate: MC address %d on Port %u: ",
+                         "%02x %02x %02x %02x %02x %02x -- %02x %02x %02x %02x %02x %02x\n",
+                                i,
+                                PortNumber,
+                                InAddr8[0],
+                                InAddr8[1],
+                                InAddr8[2],
+                                InAddr8[3],
+                                InAddr8[4],
+                                InAddr8[5],
+                                pAPort->Exact[i].a[0],
+                                pAPort->Exact[i].a[1],
+                                pAPort->Exact[i].a[2],
+                                pAPort->Exact[i].a[3],
+                                pAPort->Exact[i].a[4],
+                                pAPort->Exact[i].a[5]))
+        }
+#endif /* DEBUG */
+
+        /* Determine return value. */
+        if (Inexact == 0 && pAPort->PromMode == 0) {
+                return (SK_MC_FILTERING_EXACT);
+        }
+        else {
+                return (SK_MC_FILTERING_INEXACT);
+        }
+        
+}       /* SkAddrXmacMcUpdate */
+
+#endif  /* GENESIS */
+
+#ifdef YUKON
+
+/******************************************************************************
+ *
+ *      SkAddrGmacMcUpdate - update the HW MC address table and set the MAC address
+ *
+ * Description:
+ *      This routine enables reception of the addresses contained in a local
+ *      table for a given port.
+ *      It also programs the port's current physical MAC address.
+ *
+ * Notes:
+ *      The return code is only valid for SK_PROM_MODE_NONE.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      SK_MC_FILTERING_EXACT
+ *      SK_MC_FILTERING_INEXACT
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+static int      SkAddrGmacMcUpdate(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* I/O context */
+SK_U32  PortNumber)     /* Port Number */
+{
+#ifndef SK_SLIM
+        SK_U32          i;
+        SK_U8           Inexact;
+#endif  /* not SK_SLIM */
+        SK_U16          *OutAddr;
+        SK_ADDR_PORT    *pAPort;
+
+        SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("SkAddrGmacMcUpdate on Port %u.\n", PortNumber))
+        
+        pAPort = &pAC->Addr.Port[PortNumber];
+
+#ifdef DEBUG
+        SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]))
+#endif /* DEBUG */
+        
+#ifndef SK_SLIM
+        for (Inexact = 0, i = 0; i < 8; i++) {
+                Inexact |= pAPort->InexactFilter.Bytes[i];
+        }
+        
+        /* Set 64-bit hash register to InexactFilter. */
+        GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1,
+                &pAPort->InexactFilter.Bytes[0]);
+        
+        if (pAPort->PromMode & SK_PROM_MODE_ALL_MC) {                           
+                
+                /* Set all bits in 64-bit hash register. */
+                GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
+                
+                /* Enable Hashing */
+                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+        else {  
+                /* Enable Hashing. */
+                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+        
+        if (pAPort->PromMode != SK_PROM_MODE_NONE) {
+                (void) SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, pAPort->PromMode);
+        }
+#else /* SK_SLIM */
+
+        /* Set all bits in 64-bit hash register. */
+        GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
+
+        /* Enable Hashing */
+        SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+        
+        (void) SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, pAPort->PromMode);
+        
+#endif /* SK_SLIM */
+        
+        /* Set port's current physical MAC address. */
+        OutAddr = (SK_U16 *) &pAPort->CurrentMacAddress.a[0];
+        GM_OUTADDR(IoC, PortNumber, GM_SRC_ADDR_1L, OutAddr);
+        
+        /* Set port's current logical MAC address. */
+        OutAddr = (SK_U16 *) &pAPort->Exact[0].a[0];
+        GM_OUTADDR(IoC, PortNumber, GM_SRC_ADDR_2L, OutAddr);
+        
+#ifdef DEBUG
+        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("SkAddrGmacMcUpdate: Permanent Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
+                        pAPort->Exact[0].a[0],
+                        pAPort->Exact[0].a[1],
+                        pAPort->Exact[0].a[2],
+                        pAPort->Exact[0].a[3],
+                        pAPort->Exact[0].a[4],
+                        pAPort->Exact[0].a[5]))
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                ("SkAddrGmacMcUpdate: Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
+                        pAPort->CurrentMacAddress.a[0],
+                        pAPort->CurrentMacAddress.a[1],
+                        pAPort->CurrentMacAddress.a[2],
+                        pAPort->CurrentMacAddress.a[3],
+                        pAPort->CurrentMacAddress.a[4],
+                        pAPort->CurrentMacAddress.a[5]))
+#endif /* DEBUG */
+        
+#ifndef SK_SLIM
+        /* Determine return value. */
+        if (Inexact == 0 && pAPort->PromMode == 0) {
+                return (SK_MC_FILTERING_EXACT);
+        }
+        else {
+                return (SK_MC_FILTERING_INEXACT);
+        }
+#else /* SK_SLIM */
+        return (SK_MC_FILTERING_INEXACT);
+#endif /* SK_SLIM */
+        
+}       /* SkAddrGmacMcUpdate */
+
+#endif /* YUKON */
+
+#ifndef SK_NO_MAO
+
+/******************************************************************************
+ *
+ *      SkAddrOverride - override a port's MAC address
+ *
+ * Description:
+ *      This routine overrides the MAC address of one port.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS if successful.
+ *      SK_ADDR_DUPLICATE_ADDRESS if duplicate MAC address.
+ *      SK_ADDR_MULTICAST_ADDRESS if multicast or broadcast address.
+ *      SK_ADDR_TOO_EARLY if SK_INIT_IO was not executed before.
+ */
+int     SkAddrOverride(
+SK_AC           *pAC,                           /* adapter context */
+SK_IOC          IoC,                            /* I/O context */
+SK_U32          PortNumber,                     /* Port Number */
+SK_MAC_ADDR     SK_FAR *pNewAddr,       /* new MAC address */
+int                     Flags)                          /* logical/physical MAC address */
+{
+#ifndef SK_NO_RLMT
+        SK_EVPARA       Para;
+#endif /* !SK_NO_RLMT */
+        SK_U32          NetNumber;
+        SK_U32          i;
+        SK_U16          SK_FAR *OutAddr;
+
+#ifndef SK_NO_RLMT
+        NetNumber = pAC->Rlmt.Port[PortNumber].Net->NetNumber;
+#else
+        NetNumber = 0;
+#endif /* SK_NO_RLMT */
+#if (!defined(SK_SLIM) || defined(DEBUG))
+        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
+                return (SK_ADDR_ILLEGAL_PORT);
+        }
+#endif /* !SK_SLIM || DEBUG */
+        if (pNewAddr != NULL && (pNewAddr->a[0] & SK_MC_BIT) != 0) {
+                return (SK_ADDR_MULTICAST_ADDRESS);
+        }
+
+        if (!pAC->Addr.Net[NetNumber].CurrentMacAddressSet) {
+                return (SK_ADDR_TOO_EARLY);
+        }
+
+        if (Flags & SK_ADDR_SET_LOGICAL) {      /* Activate logical MAC address. */
+                /* Parameter *pNewAddr is ignored. */
+                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
+                        if (!pAC->Addr.Port[i].CurrentMacAddressSet) {
+                                return (SK_ADDR_TOO_EARLY);
+                        }
+                }
+#ifndef SK_NO_RLMT
+                /* Set PortNumber to number of net's active port. */
+                PortNumber = pAC->Rlmt.Net[NetNumber].
+                        Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
+#endif /* !SK_NO_RLMT */
+                pAC->Addr.Port[PortNumber].Exact[0] =
+                        pAC->Addr.Net[NetNumber].CurrentMacAddress;
+
+                /* Write address to first exact match entry of active port. */
+                (void) SkAddrMcUpdate(pAC, IoC, PortNumber);
+        }
+        else if (Flags & SK_ADDR_CLEAR_LOGICAL) {
+                /* Deactivate logical MAC address. */
+                /* Parameter *pNewAddr is ignored. */
+                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
+                        if (!pAC->Addr.Port[i].CurrentMacAddressSet) {
+                                return (SK_ADDR_TOO_EARLY);
+                        }
+                }
+#ifndef SK_NO_RLMT
+                /* Set PortNumber to number of net's active port. */
+                PortNumber = pAC->Rlmt.Net[NetNumber].
+                        Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
+#endif /* !SK_NO_RLMT */
+                for (i = 0; i < SK_MAC_ADDR_LEN; i++ ) {
+                        pAC->Addr.Port[PortNumber].Exact[0].a[i] = 0;
+                }
+
+                /* Write address to first exact match entry of active port. */
+                (void) SkAddrMcUpdate(pAC, IoC, PortNumber);
+        }
+        else if (Flags & SK_ADDR_PHYSICAL_ADDRESS) {    /* Physical MAC address. */
+                if (SK_ADDR_EQUAL(pNewAddr->a,
+                        pAC->Addr.Net[NetNumber].CurrentMacAddress.a)) {
+                        return (SK_ADDR_DUPLICATE_ADDRESS);
+                }
+
+                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
+                        if (!pAC->Addr.Port[i].CurrentMacAddressSet) {
+                                return (SK_ADDR_TOO_EARLY);
+                        }
+
+                        if (SK_ADDR_EQUAL(pNewAddr->a,
+                                pAC->Addr.Port[i].CurrentMacAddress.a)) {
+                                if (i == PortNumber) {
+                                        return (SK_ADDR_SUCCESS);
+                                }
+                                else {
+                                        return (SK_ADDR_DUPLICATE_ADDRESS);
+                                }
+                        }
+                }
+
+                pAC->Addr.Port[PortNumber].PreviousMacAddress =
+                        pAC->Addr.Port[PortNumber].CurrentMacAddress;
+                pAC->Addr.Port[PortNumber].CurrentMacAddress = *pNewAddr;
+
+                /* Change port's physical MAC address. */
+                OutAddr = (SK_U16 SK_FAR *) pNewAddr;
+#ifdef GENESIS
+                if (pAC->GIni.GIGenesis) {
+                        XM_OUTADDR(IoC, PortNumber, XM_SA, OutAddr);
+                }
+#endif /* GENESIS */
+#ifdef YUKON
+                if (!pAC->GIni.GIGenesis) {
+                        GM_OUTADDR(IoC, PortNumber, GM_SRC_ADDR_1L, OutAddr);
+                }
+#endif /* YUKON */
+
+#ifndef SK_NO_RLMT
+                /* Report address change to RLMT. */
+                Para.Para32[0] = PortNumber;
+                Para.Para32[0] = -1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_PORT_ADDR, Para);
+#endif /* !SK_NO_RLMT */
+        }
+        else {  /* Logical MAC address. */
+                if (SK_ADDR_EQUAL(pNewAddr->a,
+                        pAC->Addr.Net[NetNumber].CurrentMacAddress.a)) {
+                        return (SK_ADDR_SUCCESS);
+                }
+                
+                for (i = 0; i < (SK_U32) pAC->GIni.GIMacsFound; i++) {
+                        if (!pAC->Addr.Port[i].CurrentMacAddressSet) {
+                                return (SK_ADDR_TOO_EARLY);
+                        }
+
+                        if (SK_ADDR_EQUAL(pNewAddr->a,
+                                pAC->Addr.Port[i].CurrentMacAddress.a)) {
+                                return (SK_ADDR_DUPLICATE_ADDRESS);
+                        }
+                }
+                
+                /*
+                 * In case that the physical and the logical MAC addresses are equal
+                 * we must also change the physical MAC address here.
+                 * In this case we have an adapter which initially was programmed with
+                 * two identical MAC addresses.
+                 */
+                if (SK_ADDR_EQUAL(pAC->Addr.Port[PortNumber].CurrentMacAddress.a,
+                                pAC->Addr.Port[PortNumber].Exact[0].a)) {
+                        
+                        pAC->Addr.Port[PortNumber].PreviousMacAddress =
+                                pAC->Addr.Port[PortNumber].CurrentMacAddress;
+                        pAC->Addr.Port[PortNumber].CurrentMacAddress = *pNewAddr;
+                        
+#ifndef SK_NO_RLMT
+                        /* Report address change to RLMT. */
+                        Para.Para32[0] = PortNumber;
+                        Para.Para32[0] = -1;
+                        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_PORT_ADDR, Para);
+#endif /* !SK_NO_RLMT */
+                }
+                
+#ifndef SK_NO_RLMT
+                /* Set PortNumber to number of net's active port. */
+                PortNumber = pAC->Rlmt.Net[NetNumber].
+                        Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
+#endif /* !SK_NO_RLMT */
+                pAC->Addr.Net[NetNumber].CurrentMacAddress = *pNewAddr;
+                pAC->Addr.Port[PortNumber].Exact[0] = *pNewAddr;
+#ifdef DEBUG
+                SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                        ("SkAddrOverride: Permanent MAC Address: %02X %02X %02X %02X %02X %02X\n",
+                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[0],
+                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[1],
+                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[2],
+                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[3],
+                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[4],
+                                pAC->Addr.Net[NetNumber].PermanentMacAddress.a[5]))
+                
+                SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
+                        ("SkAddrOverride: New logical MAC Address: %02X %02X %02X %02X %02X %02X\n",
+                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[0],
+                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[1],
+                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[2],
+                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[3],
+                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[4],
+                                pAC->Addr.Net[NetNumber].CurrentMacAddress.a[5]))
+#endif /* DEBUG */
+
+        /* Write address to first exact match entry of active port. */
+                (void) SkAddrMcUpdate(pAC, IoC, PortNumber);
+        }
+
+        return (SK_ADDR_SUCCESS);
+        
+}       /* SkAddrOverride */
+
+
+#endif /* SK_NO_MAO */
+
+/******************************************************************************
+ *
+ *      SkAddrPromiscuousChange - set promiscuous mode for given port
+ *
+ * Description:
+ *      This routine manages promiscuous mode:
+ *      - none
+ *      - all LLC frames
+ *      - all MC frames
+ *
+ *      It calls either SkAddrXmacPromiscuousChange or
+ *      SkAddrGmacPromiscuousChange, according to the adapter in use.
+ *      The real work is done there.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+int     SkAddrPromiscuousChange(
+SK_AC   *pAC,                   /* adapter context */
+SK_IOC  IoC,                    /* I/O context */
+SK_U32  PortNumber,             /* port whose promiscuous mode changes */
+int             NewPromMode)    /* new promiscuous mode */
+{
+        int ReturnCode = 0;
+#if (!defined(SK_SLIM) || defined(DEBUG))
+        if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
+                return (SK_ADDR_ILLEGAL_PORT);
+        }
+#endif /* !SK_SLIM || DEBUG */
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                ReturnCode =
+                        SkAddrXmacPromiscuousChange(pAC, IoC, PortNumber, NewPromMode);
+        }
+#endif /* GENESIS */
+#ifdef YUKON
+        if (!pAC->GIni.GIGenesis) {
+                ReturnCode =
+                        SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, NewPromMode);
+        }
+#endif /* YUKON */
+
+        return (ReturnCode);
+
+}       /* SkAddrPromiscuousChange */
+
+#ifdef GENESIS
+
+/******************************************************************************
+ *
+ *      SkAddrXmacPromiscuousChange - set promiscuous mode for given port
+ *
+ * Description:
+ *      This routine manages promiscuous mode:
+ *      - none
+ *      - all LLC frames
+ *      - all MC frames
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+static int      SkAddrXmacPromiscuousChange(
+SK_AC   *pAC,                   /* adapter context */
+SK_IOC  IoC,                    /* I/O context */
+SK_U32  PortNumber,             /* port whose promiscuous mode changes */
+int             NewPromMode)    /* new promiscuous mode */
+{
+        int                     i;
+        SK_BOOL         InexactModeBit;
+        SK_U8           Inexact;
+        SK_U8           HwInexact;
+        SK_FILTER64     HwInexactFilter;
+        SK_U16          LoMode;         /* Lower 16 bits of XMAC Mode Register. */
+        int                     CurPromMode = SK_PROM_MODE_NONE;
+
+        /* Read CurPromMode from Hardware. */
+        XM_IN16(IoC, PortNumber, XM_MODE, &LoMode);
+
+        if ((LoMode & XM_MD_ENA_PROM) != 0) {
+                /* Promiscuous mode! */
+                CurPromMode |= SK_PROM_MODE_LLC;
+        }
+        
+        for (Inexact = 0xFF, i = 0; i < 8; i++) {
+                Inexact &= pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i];
+        }
+        if (Inexact == 0xFF) {
+                CurPromMode |= (pAC->Addr.Port[PortNumber].PromMode & SK_PROM_MODE_ALL_MC);
+        }
+        else {
+                /* Get InexactModeBit (bit XM_MD_ENA_HASH in mode register) */
+                XM_IN16(IoC, PortNumber, XM_MODE, &LoMode);
+                
+                InexactModeBit = (LoMode & XM_MD_ENA_HASH) != 0;
+
+                /* Read 64-bit hash register from XMAC */
+                XM_INHASH(IoC, PortNumber, XM_HSM, &HwInexactFilter.Bytes[0]);
+
+                for (HwInexact = 0xFF, i = 0; i < 8; i++) {
+                        HwInexact &= HwInexactFilter.Bytes[i];
+                }
+
+                if (InexactModeBit && (HwInexact == 0xFF)) {
+                        CurPromMode |= SK_PROM_MODE_ALL_MC;
+                }
+        }
+
+        pAC->Addr.Port[PortNumber].PromMode = NewPromMode;
+
+        if (NewPromMode == CurPromMode) {
+                return (SK_ADDR_SUCCESS);
+        }
+
+        if ((NewPromMode & SK_PROM_MODE_ALL_MC) &&
+                !(CurPromMode & SK_PROM_MODE_ALL_MC)) { /* All MC. */
+                
+                /* Set all bits in 64-bit hash register. */
+                XM_OUTHASH(IoC, PortNumber, XM_HSM, &OnesHash);
+
+                /* Enable Hashing */
+                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+        else if ((CurPromMode & SK_PROM_MODE_ALL_MC) &&
+                !(NewPromMode & SK_PROM_MODE_ALL_MC)) { /* Norm MC. */
+                for (Inexact = 0, i = 0; i < 8; i++) {
+                        Inexact |= pAC->Addr.Port[PortNumber].InexactFilter.Bytes[i];
+                }
+                if (Inexact == 0) {
+                        /* Disable Hashing */
+                        SkMacHashing(pAC, IoC, (int) PortNumber, SK_FALSE);
+                }
+                else {
+                        /* Set 64-bit hash register to InexactFilter. */
+                        XM_OUTHASH(IoC, PortNumber, XM_HSM,
+                                &pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0]);
+
+                        /* Enable Hashing */
+                        SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+                }
+        }
+
+        if ((NewPromMode & SK_PROM_MODE_LLC) &&
+                !(CurPromMode & SK_PROM_MODE_LLC)) {    /* Prom. LLC */
+                /* Set the MAC in Promiscuous Mode */
+                SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+        else if ((CurPromMode & SK_PROM_MODE_LLC) &&
+                !(NewPromMode & SK_PROM_MODE_LLC)) {    /* Norm. LLC. */
+                /* Clear Promiscuous Mode */
+                SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_FALSE);
+        }
+        
+        return (SK_ADDR_SUCCESS);
+        
+}       /* SkAddrXmacPromiscuousChange */
+
+#endif /* GENESIS */
+
+#ifdef YUKON
+
+/******************************************************************************
+ *
+ *      SkAddrGmacPromiscuousChange - set promiscuous mode for given port
+ *
+ * Description:
+ *      This routine manages promiscuous mode:
+ *      - none
+ *      - all LLC frames
+ *      - all MC frames
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+static int      SkAddrGmacPromiscuousChange(
+SK_AC   *pAC,                   /* adapter context */
+SK_IOC  IoC,                    /* I/O context */
+SK_U32  PortNumber,             /* port whose promiscuous mode changes */
+int             NewPromMode)    /* new promiscuous mode */
+{
+        SK_U16          ReceiveControl; /* GMAC Receive Control Register */
+        int             CurPromMode = SK_PROM_MODE_NONE;
+
+        /* Read CurPromMode from Hardware. */
+        GM_IN16(IoC, PortNumber, GM_RX_CTRL, &ReceiveControl);
+
+        if ((ReceiveControl & (GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA)) == 0) {
+                /* Promiscuous mode! */
+                CurPromMode |= SK_PROM_MODE_LLC;
+        }
+
+        if ((ReceiveControl & GM_RXCR_MCF_ENA) == 0) {
+                /* All Multicast mode! */
+                CurPromMode |= (pAC->Addr.Port[PortNumber].PromMode & SK_PROM_MODE_ALL_MC);
+        }
+
+        pAC->Addr.Port[PortNumber].PromMode = NewPromMode;
+
+        if (NewPromMode == CurPromMode) {
+                return (SK_ADDR_SUCCESS);
+        }
+        
+        if ((NewPromMode & SK_PROM_MODE_ALL_MC) &&
+                !(CurPromMode & SK_PROM_MODE_ALL_MC)) { /* All MC */
+                
+                /* Set all bits in 64-bit hash register. */
+                GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
+                
+                /* Enable Hashing */
+                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+        
+        if ((CurPromMode & SK_PROM_MODE_ALL_MC) &&
+                !(NewPromMode & SK_PROM_MODE_ALL_MC)) { /* Norm. MC */
+
+                /* Set 64-bit hash register to InexactFilter. */
+                GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1,
+                        &pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0]);
+
+                /* Enable Hashing. */
+                SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+
+        if ((NewPromMode & SK_PROM_MODE_LLC) &&
+                !(CurPromMode & SK_PROM_MODE_LLC)) {    /* Prom. LLC */
+                
+                /* Set the MAC to Promiscuous Mode. */
+                SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_TRUE);
+        }
+        else if ((CurPromMode & SK_PROM_MODE_LLC) &&
+                !(NewPromMode & SK_PROM_MODE_LLC)) {    /* Norm. LLC */
+                
+                /* Clear Promiscuous Mode. */
+                SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_FALSE);
+        }
+
+        return (SK_ADDR_SUCCESS);
+        
+}       /* SkAddrGmacPromiscuousChange */
+
+#endif /* YUKON */
+
+#ifndef SK_SLIM
+
+/******************************************************************************
+ *
+ *      SkAddrSwap - swap address info
+ *
+ * Description:
+ *      This routine swaps address info of two ports.
+ *
+ * Context:
+ *      runtime, pageable
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      SK_ADDR_SUCCESS
+ *      SK_ADDR_ILLEGAL_PORT
+ */
+int     SkAddrSwap(
+SK_AC   *pAC,                   /* adapter context */
+SK_IOC  IoC,                    /* I/O context */
+SK_U32  FromPortNumber,         /* Port1 Index */
+SK_U32  ToPortNumber)           /* Port2 Index */
+{
+        int                     i;
+        SK_U8           Byte;
+        SK_MAC_ADDR     MacAddr;
+        SK_U32          DWord;
+
+        if (FromPortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
+                return (SK_ADDR_ILLEGAL_PORT);
+        }
+
+        if (ToPortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
+                return (SK_ADDR_ILLEGAL_PORT);
+        }
+
+        if (pAC->Rlmt.Port[FromPortNumber].Net != pAC->Rlmt.Port[ToPortNumber].Net) {
+                return (SK_ADDR_ILLEGAL_PORT);
+        }
+
+        /*
+         * Swap:
+         * - Exact Match Entries (GEnesis and Yukon)
+         *   Yukon uses first entry for the logical MAC
+         *   address (stored in the second GMAC register).
+         * - FirstExactMatchRlmt (GEnesis only)
+         * - NextExactMatchRlmt (GEnesis only)
+         * - FirstExactMatchDrv (GEnesis only)
+         * - NextExactMatchDrv (GEnesis only)
+         * - 64-bit filter (InexactFilter)
+         * - Promiscuous Mode
+         * of ports.
+         */
+
+        for (i = 0; i < SK_ADDR_EXACT_MATCHES; i++) {
+                MacAddr = pAC->Addr.Port[FromPortNumber].Exact[i];
+                pAC->Addr.Port[FromPortNumber].Exact[i] =
+                        pAC->Addr.Port[ToPortNumber].Exact[i];
+                pAC->Addr.Port[ToPortNumber].Exact[i] = MacAddr;
+        }
+
+        for (i = 0; i < 8; i++) {
+                Byte = pAC->Addr.Port[FromPortNumber].InexactFilter.Bytes[i];
+                pAC->Addr.Port[FromPortNumber].InexactFilter.Bytes[i] =
+                        pAC->Addr.Port[ToPortNumber].InexactFilter.Bytes[i];
+                pAC->Addr.Port[ToPortNumber].InexactFilter.Bytes[i] = Byte;
+        }
+        
+        i = pAC->Addr.Port[FromPortNumber].PromMode;
+        pAC->Addr.Port[FromPortNumber].PromMode = pAC->Addr.Port[ToPortNumber].PromMode;
+        pAC->Addr.Port[ToPortNumber].PromMode = i;
+        
+        if (pAC->GIni.GIGenesis) {
+                DWord = pAC->Addr.Port[FromPortNumber].FirstExactMatchRlmt;
+                pAC->Addr.Port[FromPortNumber].FirstExactMatchRlmt =
+                        pAC->Addr.Port[ToPortNumber].FirstExactMatchRlmt;
+                pAC->Addr.Port[ToPortNumber].FirstExactMatchRlmt = DWord;
+                
+                DWord = pAC->Addr.Port[FromPortNumber].NextExactMatchRlmt;
+                pAC->Addr.Port[FromPortNumber].NextExactMatchRlmt =
+                        pAC->Addr.Port[ToPortNumber].NextExactMatchRlmt;
+                pAC->Addr.Port[ToPortNumber].NextExactMatchRlmt = DWord;
+                
+                DWord = pAC->Addr.Port[FromPortNumber].FirstExactMatchDrv;
+                pAC->Addr.Port[FromPortNumber].FirstExactMatchDrv =
+                        pAC->Addr.Port[ToPortNumber].FirstExactMatchDrv;
+                pAC->Addr.Port[ToPortNumber].FirstExactMatchDrv = DWord;
+                
+                DWord = pAC->Addr.Port[FromPortNumber].NextExactMatchDrv;
+                pAC->Addr.Port[FromPortNumber].NextExactMatchDrv =
+                        pAC->Addr.Port[ToPortNumber].NextExactMatchDrv;
+                pAC->Addr.Port[ToPortNumber].NextExactMatchDrv = DWord;
+        }
+        
+        /* CAUTION: Solution works if only ports of one adapter are in use. */
+        for (i = 0; (SK_U32) i < pAC->Rlmt.Net[pAC->Rlmt.Port[ToPortNumber].
+                Net->NetNumber].NumPorts; i++) {
+                if (pAC->Rlmt.Net[pAC->Rlmt.Port[ToPortNumber].Net->NetNumber].
+                        Port[i]->PortNumber == ToPortNumber) {
+                        pAC->Addr.Net[pAC->Rlmt.Port[ToPortNumber].Net->NetNumber].
+                                ActivePort = i;
+                        /* 20001207 RA: Was "ToPortNumber;". */
+                }
+        }
+        
+        (void) SkAddrMcUpdate(pAC, IoC, FromPortNumber);
+        (void) SkAddrMcUpdate(pAC, IoC, ToPortNumber);
+
+        return (SK_ADDR_SUCCESS);
+        
+}       /* SkAddrSwap */
+
+#endif /* !SK_SLIM */
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
diff --git a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c
new file mode 100644
index 0000000000..37ce03fb8d
--- /dev/null
+++ b/drivers/net/sk98lin/skdim.c
@@ -0,0 +1,742 @@
+/******************************************************************************
+ *
+ * Name:        skdim.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.5 $
+ * Date:        $Date: 2003/11/28 12:55:40 $
+ * Purpose:     All functions to maintain interrupt moderation
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * This module is intended to manage the dynamic interrupt moderation on both   
+ * GEnesis and Yukon adapters.
+ *
+ * Include File Hierarchy:
+ *
+ *      "skdrv1st.h"
+ *      "skdrv2nd.h"
+ *
+ ******************************************************************************/
+
+#ifndef lint
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skdim.c,v 1.5 2003/11/28 12:55:40 rroesler Exp $ (C) SysKonnect.";
+#endif
+
+#define __SKADDR_C
+
+#ifdef __cplusplus
+#error C++ is not yet supported.
+extern "C" {
+#endif
+
+/*******************************************************************************
+**
+** Includes
+**
+*******************************************************************************/
+
+#ifndef __INC_SKDRV1ST_H
+#include "h/skdrv1st.h"
+#endif
+
+#ifndef __INC_SKDRV2ND_H
+#include "h/skdrv2nd.h"
+#endif
+
+#include        <linux/kernel_stat.h>
+
+/*******************************************************************************
+**
+** Defines
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+** Typedefs
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+** Local function prototypes 
+**
+*******************************************************************************/
+
+static unsigned int GetCurrentSystemLoad(SK_AC *pAC);
+static SK_U64       GetIsrCalls(SK_AC *pAC);
+static SK_BOOL      IsIntModEnabled(SK_AC *pAC);
+static void         SetCurrIntCtr(SK_AC *pAC);
+static void         EnableIntMod(SK_AC *pAC); 
+static void         DisableIntMod(SK_AC *pAC);
+static void         ResizeDimTimerDuration(SK_AC *pAC);
+static void         DisplaySelectedModerationType(SK_AC *pAC);
+static void         DisplaySelectedModerationMask(SK_AC *pAC);
+static void         DisplayDescrRatio(SK_AC *pAC);
+
+/*******************************************************************************
+**
+** Global variables
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+** Local variables
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+** Global functions 
+**
+*******************************************************************************/
+
+/*******************************************************************************
+** Function     : SkDimModerate
+** Description  : Called in every ISR to check if moderation is to be applied
+**                or not for the current number of interrupts
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : void (!)
+** Notes        : -
+*******************************************************************************/
+
+void 
+SkDimModerate(SK_AC *pAC) {
+    unsigned int CurrSysLoad    = 0;  /* expressed in percent */
+    unsigned int LoadIncrease   = 0;  /* expressed in percent */
+    SK_U64       ThresholdInts  = 0;
+    SK_U64       IsrCallsPerSec = 0;
+
+#define M_DIMINFO pAC->DynIrqModInfo
+
+    if (!IsIntModEnabled(pAC)) {
+        if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+            CurrSysLoad = GetCurrentSystemLoad(pAC);
+            if (CurrSysLoad > 75) {
+                    /* 
+                    ** More than 75% total system load! Enable the moderation 
+                    ** to shield the system against too many interrupts.
+                    */
+                    EnableIntMod(pAC);
+            } else if (CurrSysLoad > M_DIMINFO.PrevSysLoad) {
+                LoadIncrease = (CurrSysLoad - M_DIMINFO.PrevSysLoad);
+                if (LoadIncrease > ((M_DIMINFO.PrevSysLoad *
+                                         C_INT_MOD_ENABLE_PERCENTAGE) / 100)) {
+                    if (CurrSysLoad > 10) {
+                        /* 
+                        ** More than 50% increase with respect to the 
+                        ** previous load of the system. Most likely this 
+                        ** is due to our ISR-proc...
+                        */
+                        EnableIntMod(pAC);
+                    }
+                }
+            } else {
+                /*
+                ** Neither too much system load at all nor too much increase
+                ** with respect to the previous system load. Hence, we can leave
+                ** the ISR-handling like it is without enabling moderation.
+                */
+            }
+            M_DIMINFO.PrevSysLoad = CurrSysLoad;
+        }   
+    } else {
+        if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+            ThresholdInts  = ((M_DIMINFO.MaxModIntsPerSec *
+                                   C_INT_MOD_DISABLE_PERCENTAGE) / 100);
+            IsrCallsPerSec = GetIsrCalls(pAC);
+            if (IsrCallsPerSec <= ThresholdInts) {
+                /* 
+                ** The number of interrupts within the last second is 
+                ** lower than the disable_percentage of the desried 
+                ** maxrate. Therefore we can disable the moderation.
+                */
+                DisableIntMod(pAC);
+                M_DIMINFO.MaxModIntsPerSec = 
+                   (M_DIMINFO.MaxModIntsPerSecUpperLimit +
+                    M_DIMINFO.MaxModIntsPerSecLowerLimit) / 2;
+            } else {
+                /*
+                ** The number of interrupts per sec is the same as expected.
+                ** Evalulate the descriptor-ratio. If it has changed, a resize 
+                ** in the moderation timer might be useful
+                */
+                if (M_DIMINFO.AutoSizing) {
+                    ResizeDimTimerDuration(pAC);
+                }
+            }
+        }
+    }
+
+    /*
+    ** Some information to the log...
+    */
+    if (M_DIMINFO.DisplayStats) {
+        DisplaySelectedModerationType(pAC);
+        DisplaySelectedModerationMask(pAC);
+        DisplayDescrRatio(pAC);
+    }
+
+    M_DIMINFO.NbrProcessedDescr = 0; 
+    SetCurrIntCtr(pAC);
+}
+
+/*******************************************************************************
+** Function     : SkDimStartModerationTimer
+** Description  : Starts the audit-timer for the dynamic interrupt moderation
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : void (!)
+** Notes        : -
+*******************************************************************************/
+
+void 
+SkDimStartModerationTimer(SK_AC *pAC) {
+    SK_EVPARA    EventParam;   /* Event struct for timer event */
+ 
+    SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
+    EventParam.Para32[0] = SK_DRV_MODERATION_TIMER;
+    SkTimerStart(pAC, pAC->IoBase, &pAC->DynIrqModInfo.ModTimer,
+                 SK_DRV_MODERATION_TIMER_LENGTH,
+                 SKGE_DRV, SK_DRV_TIMER, EventParam);
+}
+
+/*******************************************************************************
+** Function     : SkDimEnableModerationIfNeeded
+** Description  : Either enables or disables moderation
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : void (!)
+** Notes        : This function is called when a particular adapter is opened
+**                There is no Disable function, because when all interrupts 
+**                might be disable, the moderation timer has no meaning at all
+******************************************************************************/
+
+void
+SkDimEnableModerationIfNeeded(SK_AC *pAC) {
+
+    if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_STATIC) {
+        EnableIntMod(pAC);   /* notification print in this function */
+    } else if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+        SkDimStartModerationTimer(pAC);
+        if (M_DIMINFO.DisplayStats) {
+            printk("Dynamic moderation has been enabled\n");
+        }
+    } else {
+        if (M_DIMINFO.DisplayStats) {
+            printk("No moderation has been enabled\n");
+        }
+    }
+}
+
+/*******************************************************************************
+** Function     : SkDimDisplayModerationSettings
+** Description  : Displays the current settings regarding interrupt moderation
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : void (!)
+** Notes        : -
+*******************************************************************************/
+
+void 
+SkDimDisplayModerationSettings(SK_AC *pAC) {
+    DisplaySelectedModerationType(pAC);
+    DisplaySelectedModerationMask(pAC);
+}
+
+/*******************************************************************************
+**
+** Local functions 
+**
+*******************************************************************************/
+
+/*******************************************************************************
+** Function     : GetCurrentSystemLoad
+** Description  : Retrieves the current system load of the system. This load
+**                is evaluated for all processors within the system.
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : unsigned int: load expressed in percentage
+** Notes        : The possible range being returned is from 0 up to 100.
+**                Whereas 0 means 'no load at all' and 100 'system fully loaded'
+**                It is impossible to determine what actually causes the system
+**                to be in 100%, but maybe that is due to too much interrupts.
+*******************************************************************************/
+
+static unsigned int
+GetCurrentSystemLoad(SK_AC *pAC) {
+        unsigned long jif         = jiffies;
+        unsigned int  UserTime    = 0;
+        unsigned int  SystemTime  = 0;
+        unsigned int  NiceTime    = 0;
+        unsigned int  IdleTime    = 0;
+        unsigned int  TotalTime   = 0;
+        unsigned int  UsedTime    = 0;
+        unsigned int  SystemLoad  = 0;
+
+        /* unsigned int  NbrCpu      = 0; */
+
+        /*
+        ** The following lines have been commented out, because
+        ** from kernel 2.5.44 onwards, the kernel-owned structure
+        **
+        **      struct kernel_stat kstat
+        **
+        ** 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 
+        ** dedicated macros kstat_cpu(i).cpustat.xxx is to be avoided.
+        **
+        ** The kstat-information might be added again in future 
+        ** versions of the 2.5.xx kernel, but for the time being, 
+        ** number of interrupts will serve as indication how much 
+        ** load we currently have... 
+        **
+        ** for (NbrCpu = 0; NbrCpu < num_online_cpus(); NbrCpu++) {
+        **      UserTime   = UserTime   + kstat_cpu(NbrCpu).cpustat.user;
+        **      NiceTime   = NiceTime   + kstat_cpu(NbrCpu).cpustat.nice;
+        **      SystemTime = SystemTime + kstat_cpu(NbrCpu).cpustat.system;
+        ** }
+        */
+        SK_U64 ThresholdInts  = 0;
+        SK_U64 IsrCallsPerSec = 0;
+
+        ThresholdInts  = ((M_DIMINFO.MaxModIntsPerSec *
+                           C_INT_MOD_ENABLE_PERCENTAGE) + 100);
+        IsrCallsPerSec = GetIsrCalls(pAC);
+        if (IsrCallsPerSec >= ThresholdInts) {
+            /*
+            ** We do not know how much the real CPU-load is!
+            ** Return 80% as a default in order to activate DIM
+            */
+            SystemLoad = 80;
+            return (SystemLoad);  
+        } 
+
+        UsedTime  = UserTime + NiceTime + SystemTime;
+
+        IdleTime  = jif * num_online_cpus() - UsedTime;
+        TotalTime = UsedTime + IdleTime;
+
+        SystemLoad = ( 100 * (UsedTime  - M_DIMINFO.PrevUsedTime) ) /
+                                                (TotalTime - M_DIMINFO.PrevTotalTime);
+
+        if (M_DIMINFO.DisplayStats) {
+                printk("Current system load is: %u\n", SystemLoad);
+        }
+
+        M_DIMINFO.PrevTotalTime = TotalTime;
+        M_DIMINFO.PrevUsedTime  = UsedTime;
+
+        return (SystemLoad);
+}
+
+/*******************************************************************************
+** Function     : GetIsrCalls
+** Description  : Depending on the selected moderation mask, this function will
+**                return the number of interrupts handled in the previous time-
+**                frame. This evaluated number is based on the current number 
+**                of interrupts stored in PNMI-context and the previous stored 
+**                interrupts.
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : int:   the number of interrupts being executed in the last
+**                       timeframe
+** Notes        : It makes only sense to call this function, when dynamic 
+**                interrupt moderation is applied
+*******************************************************************************/
+
+static SK_U64
+GetIsrCalls(SK_AC *pAC) {
+    SK_U64   RxPort0IntDiff = 0;
+    SK_U64   RxPort1IntDiff = 0;
+    SK_U64   TxPort0IntDiff = 0;
+    SK_U64   TxPort1IntDiff = 0;
+
+    if (pAC->DynIrqModInfo.MaskIrqModeration == IRQ_MASK_TX_ONLY) {
+        if (pAC->GIni.GIMacsFound == 2) {
+            TxPort1IntDiff = pAC->Pnmi.Port[1].TxIntrCts - 
+                             pAC->DynIrqModInfo.PrevPort1TxIntrCts;
+        }
+        TxPort0IntDiff = pAC->Pnmi.Port[0].TxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort0TxIntrCts;
+    } else if (pAC->DynIrqModInfo.MaskIrqModeration == IRQ_MASK_RX_ONLY) {
+        if (pAC->GIni.GIMacsFound == 2) {
+            RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
+                             pAC->DynIrqModInfo.PrevPort1RxIntrCts;
+        }
+        RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort0RxIntrCts;
+    } else {
+        if (pAC->GIni.GIMacsFound == 2) {
+            RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
+                             pAC->DynIrqModInfo.PrevPort1RxIntrCts;
+            TxPort1IntDiff = pAC->Pnmi.Port[1].TxIntrCts - 
+                             pAC->DynIrqModInfo.PrevPort1TxIntrCts;
+        } 
+        RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort0RxIntrCts;
+        TxPort0IntDiff = pAC->Pnmi.Port[0].TxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort0TxIntrCts;
+    }
+
+    return (RxPort0IntDiff + RxPort1IntDiff + TxPort0IntDiff + TxPort1IntDiff);
+}
+
+/*******************************************************************************
+** Function     : GetRxCalls
+** Description  : This function will return the number of times a receive inter-
+**                rupt was processed. This is needed to evaluate any resizing 
+**                factor.
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : SK_U64: the number of RX-ints being processed
+** Notes        : It makes only sense to call this function, when dynamic 
+**                interrupt moderation is applied
+*******************************************************************************/
+
+static SK_U64
+GetRxCalls(SK_AC *pAC) {
+    SK_U64   RxPort0IntDiff = 0;
+    SK_U64   RxPort1IntDiff = 0;
+
+    if (pAC->GIni.GIMacsFound == 2) {
+        RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort1RxIntrCts;
+    }
+    RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
+                     pAC->DynIrqModInfo.PrevPort0RxIntrCts;
+
+    return (RxPort0IntDiff + RxPort1IntDiff);
+}
+
+/*******************************************************************************
+** Function     : SetCurrIntCtr
+** Description  : Will store the current number orf occured interrupts in the 
+**                adapter context. This is needed to evaluated the number of 
+**                interrupts within a current timeframe.
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : void (!)
+** Notes        : -
+*******************************************************************************/
+
+static void
+SetCurrIntCtr(SK_AC *pAC) {
+    if (pAC->GIni.GIMacsFound == 2) {
+        pAC->DynIrqModInfo.PrevPort1RxIntrCts = pAC->Pnmi.Port[1].RxIntrCts;
+        pAC->DynIrqModInfo.PrevPort1TxIntrCts = pAC->Pnmi.Port[1].TxIntrCts;
+    } 
+    pAC->DynIrqModInfo.PrevPort0RxIntrCts = pAC->Pnmi.Port[0].RxIntrCts;
+    pAC->DynIrqModInfo.PrevPort0TxIntrCts = pAC->Pnmi.Port[0].TxIntrCts;
+}
+
+/*******************************************************************************
+** Function     : IsIntModEnabled()
+** Description  : Retrieves the current value of the interrupts moderation
+**                command register. Its content determines whether any 
+**                moderation is running or not.
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : SK_TRUE  : if mod timer running
+**                SK_FALSE : if no moderation is being performed
+** Notes        : -
+*******************************************************************************/
+
+static SK_BOOL
+IsIntModEnabled(SK_AC *pAC) {
+    unsigned long CtrCmd;
+
+    SK_IN32(pAC->IoBase, B2_IRQM_CTRL, &CtrCmd);
+    if ((CtrCmd & TIM_START) == TIM_START) {
+       return SK_TRUE;
+    } else {
+       return SK_FALSE;
+    }
+}
+
+/*******************************************************************************
+** Function     : EnableIntMod()
+** Description  : Enables the interrupt moderation using the values stored in
+**                in the pAC->DynIntMod data structure
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : -
+** Notes        : -
+*******************************************************************************/
+
+static void
+EnableIntMod(SK_AC *pAC) {
+    unsigned long ModBase;
+
+    if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+       ModBase = C_CLK_FREQ_GENESIS / pAC->DynIrqModInfo.MaxModIntsPerSec;
+    } else {
+       ModBase = C_CLK_FREQ_YUKON / pAC->DynIrqModInfo.MaxModIntsPerSec;
+    }
+
+    SK_OUT32(pAC->IoBase, B2_IRQM_INI,  ModBase);
+    SK_OUT32(pAC->IoBase, B2_IRQM_MSK,  pAC->DynIrqModInfo.MaskIrqModeration);
+    SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_START);
+    if (M_DIMINFO.DisplayStats) {
+        printk("Enabled interrupt moderation (%i ints/sec)\n",
+               M_DIMINFO.MaxModIntsPerSec);
+    }
+}
+
+/*******************************************************************************
+** Function     : DisableIntMod()
+** Description  : Disables the interrupt moderation independent of what inter-
+**                rupts are running or not
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : -
+** Notes        : -
+*******************************************************************************/
+
+static void 
+DisableIntMod(SK_AC *pAC) {
+
+    SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_STOP);
+    if (M_DIMINFO.DisplayStats) {
+        printk("Disabled interrupt moderation\n");
+    }
+} 
+
+/*******************************************************************************
+** Function     : ResizeDimTimerDuration();
+** Description  : Checks the current used descriptor ratio and resizes the 
+**                duration timer (longer/smaller) if possible. 
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : -
+** Notes        : There are both maximum and minimum timer duration value. 
+**                This function assumes that interrupt moderation is already
+**                enabled!
+*******************************************************************************/
+
+static void 
+ResizeDimTimerDuration(SK_AC *pAC) {
+    SK_BOOL IncreaseTimerDuration;
+    int     TotalMaxNbrDescr;
+    int     UsedDescrRatio;
+    int     RatioDiffAbs;
+    int     RatioDiffRel;
+    int     NewMaxModIntsPerSec;
+    int     ModAdjValue;
+    long    ModBase;
+
+    /*
+    ** Check first if we are allowed to perform any modification
+    */
+    if (IsIntModEnabled(pAC)) { 
+        if (M_DIMINFO.IntModTypeSelect != C_INT_MOD_DYNAMIC) {
+            return; 
+        } else {
+            if (M_DIMINFO.ModJustEnabled) {
+                M_DIMINFO.ModJustEnabled = SK_FALSE;
+                return;
+            }
+        }
+    }
+
+    /*
+    ** If we got until here, we have to evaluate the amount of the
+    ** descriptor ratio change...
+    */
+    TotalMaxNbrDescr = pAC->RxDescrPerRing * GetRxCalls(pAC);
+    UsedDescrRatio   = (M_DIMINFO.NbrProcessedDescr * 100) / TotalMaxNbrDescr;
+
+    if (UsedDescrRatio > M_DIMINFO.PrevUsedDescrRatio) {
+        RatioDiffAbs = (UsedDescrRatio - M_DIMINFO.PrevUsedDescrRatio);
+        RatioDiffRel = (RatioDiffAbs * 100) / UsedDescrRatio;
+        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
+        IncreaseTimerDuration = SK_FALSE;  /* in other words: DECREASE */
+    } else if (UsedDescrRatio < M_DIMINFO.PrevUsedDescrRatio) {
+        RatioDiffAbs = (M_DIMINFO.PrevUsedDescrRatio - UsedDescrRatio);
+        RatioDiffRel = (RatioDiffAbs * 100) / M_DIMINFO.PrevUsedDescrRatio;
+        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
+        IncreaseTimerDuration = SK_TRUE;   /* in other words: INCREASE */
+    } else {
+        RatioDiffAbs = (M_DIMINFO.PrevUsedDescrRatio - UsedDescrRatio);
+        RatioDiffRel = (RatioDiffAbs * 100) / M_DIMINFO.PrevUsedDescrRatio;
+        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
+        IncreaseTimerDuration = SK_TRUE;   /* in other words: INCREASE */
+    }
+
+    /*
+    ** Now we can determine the change in percent
+    */
+    if ((RatioDiffRel >= 0) && (RatioDiffRel <= 5) ) {
+       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
+    } else if ((RatioDiffRel > 5) && (RatioDiffRel <= 10) ) {
+       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
+    } else if ((RatioDiffRel > 10) && (RatioDiffRel <= 15) ) {
+       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
+    } else {
+       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
+    }
+
+    if (IncreaseTimerDuration) {
+       NewMaxModIntsPerSec =  M_DIMINFO.MaxModIntsPerSec +
+                             (M_DIMINFO.MaxModIntsPerSec * ModAdjValue) / 100;
+    } else {
+       NewMaxModIntsPerSec =  M_DIMINFO.MaxModIntsPerSec -
+                             (M_DIMINFO.MaxModIntsPerSec * ModAdjValue) / 100;
+    }
+
+    /* 
+    ** Check if we exceed boundaries...
+    */
+    if ( (NewMaxModIntsPerSec > M_DIMINFO.MaxModIntsPerSecUpperLimit) ||
+         (NewMaxModIntsPerSec < M_DIMINFO.MaxModIntsPerSecLowerLimit)) {
+        if (M_DIMINFO.DisplayStats) {
+            printk("Cannot change ModTim from %i to %i ints/sec\n",
+                   M_DIMINFO.MaxModIntsPerSec, NewMaxModIntsPerSec);
+        }
+        return;
+    } else {
+        if (M_DIMINFO.DisplayStats) {
+            printk("Resized ModTim from %i to %i ints/sec\n",
+                   M_DIMINFO.MaxModIntsPerSec, NewMaxModIntsPerSec);
+        }
+    }
+
+    M_DIMINFO.MaxModIntsPerSec = NewMaxModIntsPerSec;
+
+    if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+        ModBase = C_CLK_FREQ_GENESIS / pAC->DynIrqModInfo.MaxModIntsPerSec;
+    } else {
+        ModBase = C_CLK_FREQ_YUKON / pAC->DynIrqModInfo.MaxModIntsPerSec;
+    }
+
+    /* 
+    ** We do not need to touch any other registers
+    */
+    SK_OUT32(pAC->IoBase, B2_IRQM_INI, ModBase);
+} 
+
+/*******************************************************************************
+** Function     : DisplaySelectedModerationType()
+** Description  : Displays what type of moderation we have
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : void!
+** Notes        : -
+*******************************************************************************/
+
+static void
+DisplaySelectedModerationType(SK_AC *pAC) {
+
+    if (pAC->DynIrqModInfo.DisplayStats) {
+        if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_STATIC) {
+             printk("Static int moderation runs with %i INTS/sec\n",
+                    pAC->DynIrqModInfo.MaxModIntsPerSec);
+        } else if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+             if (IsIntModEnabled(pAC)) {
+                printk("Dynamic int moderation runs with %i INTS/sec\n",
+                       pAC->DynIrqModInfo.MaxModIntsPerSec);
+             } else {
+                printk("Dynamic int moderation currently not applied\n");
+             }
+        } else {
+             printk("No interrupt moderation selected!\n");
+        }
+    }
+}
+
+/*******************************************************************************
+** Function     : DisplaySelectedModerationMask()
+** Description  : Displays what interrupts are moderated
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : void!
+** Notes        : -
+*******************************************************************************/
+
+static void
+DisplaySelectedModerationMask(SK_AC *pAC) {
+
+    if (pAC->DynIrqModInfo.DisplayStats) {
+        if (pAC->DynIrqModInfo.IntModTypeSelect != C_INT_MOD_NONE) {
+            switch (pAC->DynIrqModInfo.MaskIrqModeration) {
+                case IRQ_MASK_TX_ONLY: 
+                   printk("Only Tx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_RX_ONLY: 
+                   printk("Only Rx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_SP_ONLY: 
+                   printk("Only special-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_TX_RX: 
+                   printk("Tx- and Rx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_SP_RX: 
+                   printk("Special- and Rx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_SP_TX: 
+                   printk("Special- and Tx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_RX_TX_SP:
+                   printk("All Rx-, Tx and special-interrupts are moderated\n");
+                   break;
+                default:
+                   printk("Don't know what is moderated\n");
+                   break;
+            }
+        } else {
+            printk("No specific interrupts masked for moderation\n");
+        }
+    } 
+}
+
+/*******************************************************************************
+** Function     : DisplayDescrRatio
+** Description  : Like the name states...
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : void!
+** Notes        : -
+*******************************************************************************/
+
+static void
+DisplayDescrRatio(SK_AC *pAC) {
+    int TotalMaxNbrDescr = 0;
+
+    if (pAC->DynIrqModInfo.DisplayStats) {
+        TotalMaxNbrDescr = pAC->RxDescrPerRing * GetRxCalls(pAC);
+        printk("Ratio descriptors: %i/%i\n",
+               M_DIMINFO.NbrProcessedDescr, TotalMaxNbrDescr);
+    }
+}
+
+/*******************************************************************************
+**
+** End of file
+**
+*******************************************************************************/
diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
new file mode 100644
index 0000000000..5a6da8950f
--- /dev/null
+++ b/drivers/net/sk98lin/skethtool.c
@@ -0,0 +1,627 @@
+/******************************************************************************
+ *
+ * Name:        skethtool.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.7 $
+ * Date:        $Date: 2004/09/29 13:32:07 $
+ * Purpose:     All functions regarding ethtool handling
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (C)Copyright 1998-2002 SysKonnect GmbH.
+ *      (C)Copyright 2002-2004 Marvell.
+ *
+ *      Driver for Marvell Yukon/2 chipset and SysKonnect Gigabit Ethernet 
+ *      Server Adapters.
+ *
+ *      Author: Ralph Roesler (rroesler@syskonnect.de)
+ *              Mirko Lindner (mlindner@syskonnect.de)
+ *
+ *      Address all question to: linux@syskonnect.de
+ *
+ *      The technical manual for the adapters is available from SysKonnect's
+ *      web pages: www.syskonnect.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.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ *****************************************************************************/
+
+#include "h/skdrv1st.h"
+#include "h/skdrv2nd.h"
+#include "h/skversion.h"
+
+#include <linux/ethtool.h>
+#include <linux/timer.h>
+#include <linux/delay.h>
+
+/******************************************************************************
+ *
+ * Defines
+ *
+ *****************************************************************************/
+
+#define SUPP_COPPER_ALL (SUPPORTED_10baseT_Half  | SUPPORTED_10baseT_Full  | \
+                         SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \
+                         SUPPORTED_1000baseT_Half| SUPPORTED_1000baseT_Full| \
+                         SUPPORTED_TP)
+
+#define ADV_COPPER_ALL  (ADVERTISED_10baseT_Half  | ADVERTISED_10baseT_Full  | \
+                         ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | \
+                         ADVERTISED_1000baseT_Half| ADVERTISED_1000baseT_Full| \
+                         ADVERTISED_TP)
+
+#define SUPP_FIBRE_ALL  (SUPPORTED_1000baseT_Full | \
+                         SUPPORTED_FIBRE          | \
+                         SUPPORTED_Autoneg)
+
+#define ADV_FIBRE_ALL   (ADVERTISED_1000baseT_Full | \
+                         ADVERTISED_FIBRE          | \
+                         ADVERTISED_Autoneg)
+
+
+/******************************************************************************
+ *
+ * Local Functions
+ *
+ *****************************************************************************/
+
+/*****************************************************************************
+ *
+ *      getSettings - retrieves the current settings of the selected adapter
+ *
+ * Description:
+ *      The current configuration of the selected adapter is returned.
+ *      This configuration involves a)speed, b)duplex and c)autoneg plus
+ *      a number of other variables.
+ *
+ * Returns:    always 0
+ *
+ */
+static int getSettings(struct net_device *dev, struct ethtool_cmd *ecmd)
+{
+        const DEV_NET *pNet = netdev_priv(dev);
+        int port = pNet->PortNr;
+        const SK_AC *pAC = pNet->pAC;
+        const SK_GEPORT *pPort = &pAC->GIni.GP[port];
+
+        static int DuplexAutoNegConfMap[9][3]= {
+                { -1                     , -1         , -1              },
+                { 0                      , -1         , -1              },
+                { SK_LMODE_HALF          , DUPLEX_HALF, AUTONEG_DISABLE },
+                { SK_LMODE_FULL          , DUPLEX_FULL, AUTONEG_DISABLE },
+                { SK_LMODE_AUTOHALF      , DUPLEX_HALF, AUTONEG_ENABLE  },
+                { SK_LMODE_AUTOFULL      , DUPLEX_FULL, AUTONEG_ENABLE  },
+                { SK_LMODE_AUTOBOTH      , DUPLEX_FULL, AUTONEG_ENABLE  },
+                { SK_LMODE_AUTOSENSE     , -1         , -1              },
+                { SK_LMODE_INDETERMINATED, -1         , -1              }
+        };
+        static int SpeedConfMap[6][2] = {
+                { 0                       , -1         },
+                { SK_LSPEED_AUTO          , -1         },
+                { SK_LSPEED_10MBPS        , SPEED_10   },
+                { SK_LSPEED_100MBPS       , SPEED_100  },
+                { SK_LSPEED_1000MBPS      , SPEED_1000 },
+                { SK_LSPEED_INDETERMINATED, -1         }
+        };
+        static int AdvSpeedMap[6][2] = {
+                { 0                       , -1         },
+                { SK_LSPEED_AUTO          , -1         },
+                { SK_LSPEED_10MBPS        , ADVERTISED_10baseT_Half   | ADVERTISED_10baseT_Full },
+                { SK_LSPEED_100MBPS       , ADVERTISED_100baseT_Half  | ADVERTISED_100baseT_Full },
+                { SK_LSPEED_1000MBPS      , ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full},
+                { SK_LSPEED_INDETERMINATED, -1         }
+        };
+
+        ecmd->phy_address = port;
+        ecmd->speed       = SpeedConfMap[pPort->PLinkSpeedUsed][1];
+        ecmd->duplex      = DuplexAutoNegConfMap[pPort->PLinkModeStatus][1];
+        ecmd->autoneg     = DuplexAutoNegConfMap[pPort->PLinkModeStatus][2];
+        ecmd->transceiver = XCVR_INTERNAL;
+
+        if (pAC->GIni.GICopperType) {
+                ecmd->port        = PORT_TP;
+                ecmd->supported   = (SUPP_COPPER_ALL|SUPPORTED_Autoneg);
+                if (pAC->GIni.GIGenesis) {
+                        ecmd->supported &= ~(SUPPORTED_10baseT_Half);
+                        ecmd->supported &= ~(SUPPORTED_10baseT_Full);
+                        ecmd->supported &= ~(SUPPORTED_100baseT_Half);
+                        ecmd->supported &= ~(SUPPORTED_100baseT_Full);
+                } else {
+                        if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
+                                ecmd->supported &= ~(SUPPORTED_1000baseT_Half);
+                        } 
+#ifdef CHIP_ID_YUKON_FE
+                        if (pAC->GIni.GIChipId == CHIP_ID_YUKON_FE) {
+                                ecmd->supported &= ~(SUPPORTED_1000baseT_Half);
+                                ecmd->supported &= ~(SUPPORTED_1000baseT_Full);
+                        }
+#endif
+                }
+                if (pAC->GIni.GP[0].PLinkSpeed != SK_LSPEED_AUTO) {
+                        ecmd->advertising = AdvSpeedMap[pPort->PLinkSpeed][1];
+                        if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
+                                ecmd->advertising &= ~(SUPPORTED_1000baseT_Half);
+                        } 
+                } else {
+                        ecmd->advertising = ecmd->supported;
+                }
+
+                if (ecmd->autoneg == AUTONEG_ENABLE) 
+                        ecmd->advertising |= ADVERTISED_Autoneg;
+        } else {
+                ecmd->port        = PORT_FIBRE;
+                ecmd->supported   = SUPP_FIBRE_ALL;
+                ecmd->advertising = ADV_FIBRE_ALL;
+        }
+        return 0;
+}
+
+/*
+ * MIB infrastructure uses instance value starting at 1
+ * based on board and port.
+ */
+static inline u32 pnmiInstance(const DEV_NET *pNet)
+{
+        return 1 + (pNet->pAC->RlmtNets == 2) + pNet->PortNr;
+}
+
+/*****************************************************************************
+ *
+ *      setSettings - configures the settings of a selected adapter
+ *
+ * Description:
+ *      Possible settings that may be altered are a)speed, b)duplex or 
+ *      c)autonegotiation.
+ *
+ * Returns:
+ *      0:      everything fine, no error
+ *      <0:     the return value is the error code of the failure 
+ */
+static int setSettings(struct net_device *dev, struct ethtool_cmd *ecmd)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+        u32 instance;
+        char buf[4];
+        int len = 1;
+
+        if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100 
+            && ecmd->speed != SPEED_1000)
+                return -EINVAL;
+
+        if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
+                return -EINVAL;
+
+        if (ecmd->autoneg != AUTONEG_DISABLE && ecmd->autoneg != AUTONEG_ENABLE)
+                return -EINVAL;
+
+        if (ecmd->autoneg == AUTONEG_DISABLE)
+                *buf = (ecmd->duplex == DUPLEX_FULL) 
+                        ? SK_LMODE_FULL : SK_LMODE_HALF;
+        else
+                *buf = (ecmd->duplex == DUPLEX_FULL) 
+                        ? SK_LMODE_AUTOFULL : SK_LMODE_AUTOHALF;
+        
+        instance = pnmiInstance(pNet);
+        if (SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_LINK_MODE, 
+                           &buf, &len, instance, pNet->NetNr) != SK_PNMI_ERR_OK)
+                return -EINVAL;
+
+        switch(ecmd->speed) {
+        case SPEED_1000:
+                *buf = SK_LSPEED_1000MBPS;
+                break;
+        case SPEED_100:
+                *buf = SK_LSPEED_100MBPS;
+                break;
+        case SPEED_10:
+                *buf = SK_LSPEED_10MBPS;
+        }
+
+        if (SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_SPEED_MODE, 
+                         &buf, &len, instance, pNet->NetNr) != SK_PNMI_ERR_OK)
+                return -EINVAL;
+
+        return 0;
+}
+
+/*****************************************************************************
+ *
+ *      getDriverInfo - returns generic driver and adapter information
+ *
+ * Description:
+ *      Generic driver information is returned via this function, such as
+ *      the name of the driver, its version and and firmware version.
+ *      In addition to this, the location of the selected adapter is 
+ *      returned as a bus info string (e.g. '01:05.0').
+ *      
+ * Returns:     N/A
+ *
+ */
+static void getDriverInfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+        const DEV_NET   *pNet = netdev_priv(dev);
+        const SK_AC *pAC = pNet->pAC;
+        char vers[32];
+
+        snprintf(vers, sizeof(vers)-1, VER_STRING "(v%d.%d)",
+                (pAC->GIni.GIPciHwRev >> 4) & 0xf, pAC->GIni.GIPciHwRev & 0xf);
+
+        strlcpy(info->driver, DRIVER_FILE_NAME, sizeof(info->driver));
+        strcpy(info->version, vers);
+        strcpy(info->fw_version, "N/A");
+        strlcpy(info->bus_info, pci_name(pAC->PciDev), ETHTOOL_BUSINFO_LEN);
+}
+
+/*
+ * Ethtool statistics support.
+ */
+static const char StringsStats[][ETH_GSTRING_LEN] = {
+        "rx_packets",   "tx_packets",
+        "rx_bytes",     "tx_bytes",
+        "rx_errors",    "tx_errors",    
+        "rx_dropped",   "tx_dropped",
+        "multicasts",   "collisions",   
+        "rx_length_errors",             "rx_buffer_overflow_errors",
+        "rx_crc_errors",                "rx_frame_errors",
+        "rx_too_short_errors",          "rx_too_long_errors",
+        "rx_carrier_extension_errors",  "rx_symbol_errors",
+        "rx_llc_mac_size_errors",       "rx_carrier_errors",    
+        "rx_jabber_errors",             "rx_missed_errors",
+        "tx_abort_collision_errors",    "tx_carrier_errors",
+        "tx_buffer_underrun_errors",    "tx_heartbeat_errors",
+        "tx_window_errors",
+};
+
+static int getStatsCount(struct net_device *dev)
+{
+        return ARRAY_SIZE(StringsStats);
+}
+
+static void getStrings(struct net_device *dev, u32 stringset, u8 *data)
+{
+        switch(stringset) {
+        case ETH_SS_STATS:
+                memcpy(data, *StringsStats, sizeof(StringsStats));
+                break;
+        }
+}
+
+static void getEthtoolStats(struct net_device *dev,
+                            struct ethtool_stats *stats, u64 *data)
+{
+        const DEV_NET   *pNet = netdev_priv(dev);
+        const SK_AC *pAC = pNet->pAC;
+        const SK_PNMI_STRUCT_DATA *pPnmiStruct = &pAC->PnmiStruct;
+
+        *data++ = pPnmiStruct->Stat[0].StatRxOkCts;
+        *data++ = pPnmiStruct->Stat[0].StatTxOkCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxOctetsOkCts;
+        *data++ = pPnmiStruct->Stat[0].StatTxOctetsOkCts;
+        *data++ = pPnmiStruct->InErrorsCts;
+        *data++ = pPnmiStruct->Stat[0].StatTxSingleCollisionCts;
+        *data++ = pPnmiStruct->RxNoBufCts;
+        *data++ = pPnmiStruct->TxNoBufCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxMulticastOkCts;
+        *data++ = pPnmiStruct->Stat[0].StatTxSingleCollisionCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxRuntCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxFifoOverflowCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxFcsCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxFramingCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxShortsCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxTooLongCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxCextCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxSymbolCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxIRLengthCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxCarrierCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxJabberCts;
+        *data++ = pPnmiStruct->Stat[0].StatRxMissedCts;
+        *data++ = pAC->stats.tx_aborted_errors;
+        *data++ = pPnmiStruct->Stat[0].StatTxCarrierCts;
+        *data++ = pPnmiStruct->Stat[0].StatTxFifoUnderrunCts;
+        *data++ = pPnmiStruct->Stat[0].StatTxCarrierCts;
+        *data++ = pAC->stats.tx_window_errors;
+}
+
+
+/*****************************************************************************
+ *
+ *      toggleLeds - Changes the LED state of an adapter
+ *
+ * Description:
+ *      This function changes the current state of all LEDs of an adapter so
+ *      that it can be located by a user. 
+ *
+ * Returns:     N/A
+ *
+ */
+static void toggleLeds(DEV_NET *pNet, int on)
+{
+        SK_AC *pAC = pNet->pAC;
+        int port = pNet->PortNr;
+        void __iomem *io = pAC->IoBase;
+
+        if (pAC->GIni.GIGenesis) {
+                SK_OUT8(io, MR_ADDR(port,LNK_LED_REG), 
+                        on ? SK_LNK_ON : SK_LNK_OFF);
+                SkGeYellowLED(pAC, io, 
+                              on ? (LED_ON >> 1) : (LED_OFF >> 1));
+                SkGeXmitLED(pAC, io, MR_ADDR(port,RX_LED_INI),
+                            on ? SK_LED_TST : SK_LED_DIS);
+
+                if (pAC->GIni.GP[port].PhyType == SK_PHY_BCOM)
+                        SkXmPhyWrite(pAC, io, port, PHY_BCOM_P_EXT_CTRL, 
+                                     on ? PHY_B_PEC_LED_ON : PHY_B_PEC_LED_OFF);
+                else if (pAC->GIni.GP[port].PhyType == SK_PHY_LONE)
+                        SkXmPhyWrite(pAC, io, port, PHY_LONE_LED_CFG,
+                                     on ? 0x0800 : PHY_L_LC_LEDT);
+                else
+                        SkGeXmitLED(pAC, io, MR_ADDR(port,TX_LED_INI),
+                                    on ? SK_LED_TST : SK_LED_DIS);
+        } else {
+                const u16 YukLedOn = (PHY_M_LED_MO_DUP(MO_LED_ON)  |
+                                      PHY_M_LED_MO_10(MO_LED_ON)   |
+                                      PHY_M_LED_MO_100(MO_LED_ON)  |
+                                      PHY_M_LED_MO_1000(MO_LED_ON) | 
+                                      PHY_M_LED_MO_RX(MO_LED_ON));
+                const u16  YukLedOff = (PHY_M_LED_MO_DUP(MO_LED_OFF)  |
+                                        PHY_M_LED_MO_10(MO_LED_OFF)   |
+                                        PHY_M_LED_MO_100(MO_LED_OFF)  |
+                                        PHY_M_LED_MO_1000(MO_LED_OFF) | 
+                                        PHY_M_LED_MO_RX(MO_LED_OFF));
+        
+
+                SkGmPhyWrite(pAC,io,port,PHY_MARV_LED_CTRL,0);
+                SkGmPhyWrite(pAC,io,port,PHY_MARV_LED_OVER, 
+                             on ? YukLedOn : YukLedOff);
+        }
+}
+
+/*****************************************************************************
+ *
+ *      skGeBlinkTimer - Changes the LED state of an adapter
+ *
+ * Description:
+ *      This function changes the current state of all LEDs of an adapter so
+ *      that it can be located by a user. If the requested time interval for
+ *      this test has elapsed, this function cleans up everything that was 
+ *      temporarily setup during the locate NIC test. This involves of course
+ *      also closing or opening any adapter so that the initial board state 
+ *      is recovered.
+ *
+ * Returns:     N/A
+ *
+ */
+void SkGeBlinkTimer(unsigned long data)
+{
+        struct net_device *dev = (struct net_device *) data;
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+
+        toggleLeds(pNet, pAC->LedsOn);
+
+        pAC->LedsOn = !pAC->LedsOn;
+        mod_timer(&pAC->BlinkTimer, jiffies + HZ/4);
+}
+
+/*****************************************************************************
+ *
+ *      locateDevice - start the locate NIC feature of the elected adapter 
+ *
+ * Description:
+ *      This function is used if the user want to locate a particular NIC.
+ *      All LEDs are regularly switched on and off, so the NIC can easily
+ *      be identified.
+ *
+ * Returns:     
+ *      ==0:    everything fine, no error, locateNIC test was started
+ *      !=0:    one locateNIC test runs already
+ *
+ */
+static int locateDevice(struct net_device *dev, u32 data)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+
+        if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
+                data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
+
+        /* start blinking */
+        pAC->LedsOn = 0;
+        mod_timer(&pAC->BlinkTimer, jiffies);
+        msleep_interruptible(data * 1000);
+        del_timer_sync(&pAC->BlinkTimer);
+        toggleLeds(pNet, 0);
+
+        return 0;
+}
+
+/*****************************************************************************
+ *
+ *      getPauseParams - retrieves the pause parameters
+ *
+ * Description:
+ *      All current pause parameters of a selected adapter are placed 
+ *      in the passed ethtool_pauseparam structure and are returned.
+ *
+ * Returns:     N/A
+ *
+ */
+static void getPauseParams(struct net_device *dev, struct ethtool_pauseparam *epause) 
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+        SK_GEPORT *pPort = &pAC->GIni.GP[pNet->PortNr];
+
+        epause->rx_pause = (pPort->PFlowCtrlMode == SK_FLOW_MODE_SYMMETRIC) ||
+                  (pPort->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM);
+
+        epause->tx_pause = epause->rx_pause || (pPort->PFlowCtrlMode == SK_FLOW_MODE_LOC_SEND);
+        epause->autoneg = epause->rx_pause || epause->tx_pause;
+}
+
+/*****************************************************************************
+ *
+ *      setPauseParams - configures the pause parameters of an adapter
+ *
+ * Description:
+ *      This function sets the Rx or Tx pause parameters 
+ *
+ * Returns:
+ *      ==0:    everything fine, no error
+ *      !=0:    the return value is the error code of the failure 
+ */
+static int setPauseParams(struct net_device *dev , struct ethtool_pauseparam *epause)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+        SK_GEPORT *pPort = &pAC->GIni.GP[pNet->PortNr];
+        u32     instance = pnmiInstance(pNet);
+        struct ethtool_pauseparam old;
+        u8      oldspeed = pPort->PLinkSpeedUsed;
+        char    buf[4];
+        int     len = 1;
+        int ret;
+
+        /*
+        ** we have to determine the current settings to see if 
+        ** the operator requested any modification of the flow 
+        ** control parameters...
+        */
+        getPauseParams(dev, &old);
+
+        /*
+        ** perform modifications regarding the changes 
+        ** requested by the operator
+        */
+        if (epause->autoneg != old.autoneg) 
+                *buf = epause->autoneg ? SK_FLOW_MODE_NONE : SK_FLOW_MODE_SYMMETRIC;
+        else {
+                if (epause->rx_pause && epause->tx_pause) 
+                        *buf = SK_FLOW_MODE_SYMMETRIC;
+                else if (epause->rx_pause && !epause->tx_pause)
+                        *buf =  SK_FLOW_MODE_SYM_OR_REM;
+                else if (!epause->rx_pause && epause->tx_pause)
+                        *buf =  SK_FLOW_MODE_LOC_SEND;
+                else
+                        *buf = SK_FLOW_MODE_NONE;
+        }
+
+        ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_FLOWCTRL_MODE,
+                         &buf, &len, instance, pNet->NetNr);
+
+        if (ret != SK_PNMI_ERR_OK) {
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_CTRL,
+                           ("ethtool (sk98lin): error changing rx/tx pause (%i)\n", ret));
+                goto err;
+        }
+
+        /*
+        ** It may be that autoneg has been disabled! Therefore
+        ** set the speed to the previously used value...
+        */
+        if (!epause->autoneg) {
+                len = 1;
+                ret = SkPnmiSetVar(pAC, pAC->IoBase, OID_SKGE_SPEED_MODE, 
+                                   &oldspeed, &len, instance, pNet->NetNr);
+                if (ret != SK_PNMI_ERR_OK) 
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_CTRL,
+                                   ("ethtool (sk98lin): error setting speed (%i)\n", ret));
+        }
+ err:
+        return ret ? -EIO : 0;
+}
+
+/* Only Yukon supports checksum offload. */
+static int setScatterGather(struct net_device *dev, u32 data)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+
+        if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
+                return -EOPNOTSUPP;
+        return ethtool_op_set_sg(dev, data);
+}
+
+static int setTxCsum(struct net_device *dev, u32 data)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+
+        if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
+                return -EOPNOTSUPP;
+
+        return ethtool_op_set_tx_csum(dev, data);
+}
+
+static u32 getRxCsum(struct net_device *dev)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+
+        return pAC->RxPort[pNet->PortNr].RxCsum;
+}
+
+static int setRxCsum(struct net_device *dev, u32 data)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+
+        if (pAC->GIni.GIChipId == CHIP_ID_GENESIS)
+                return -EOPNOTSUPP;
+
+        pAC->RxPort[pNet->PortNr].RxCsum = data != 0;
+        return 0;
+}
+
+static int getRegsLen(struct net_device *dev)
+{
+        return 0x4000;
+}
+
+/*
+ * Returns copy of whole control register region
+ * Note: skip RAM address register because accessing it will
+ *       cause bus hangs!
+ */
+static void getRegs(struct net_device *dev, struct ethtool_regs *regs,
+                          void *p)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        const void __iomem *io = pNet->pAC->IoBase;
+
+        regs->version = 1;
+        memset(p, 0, regs->len);
+        memcpy_fromio(p, io, B3_RAM_ADDR);
+
+        memcpy_fromio(p + B3_RI_WTO_R1, io + B3_RI_WTO_R1,
+                      regs->len - B3_RI_WTO_R1);
+}
+
+const struct ethtool_ops SkGeEthtoolOps = {
+        .get_settings           = getSettings,
+        .set_settings           = setSettings,
+        .get_drvinfo            = getDriverInfo,
+        .get_strings            = getStrings,
+        .get_stats_count        = getStatsCount,
+        .get_ethtool_stats      = getEthtoolStats,
+        .phys_id                = locateDevice,
+        .get_pauseparam         = getPauseParams,
+        .set_pauseparam         = setPauseParams,
+        .get_link               = ethtool_op_get_link,
+        .get_sg                 = ethtool_op_get_sg,
+        .set_sg                 = setScatterGather,
+        .get_tx_csum            = ethtool_op_get_tx_csum,
+        .set_tx_csum            = setTxCsum,
+        .get_rx_csum            = getRxCsum,
+        .set_rx_csum            = setRxCsum,
+        .get_regs               = getRegs,
+        .get_regs_len           = getRegsLen,
+};
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
new file mode 100644
index 0000000000..7dc9c9ebf5
--- /dev/null
+++ b/drivers/net/sk98lin/skge.c
@@ -0,0 +1,5219 @@
+/******************************************************************************
+ *
+ * Name:        skge.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.45 $
+ * Date:        $Date: 2004/02/12 14:41:02 $
+ * Purpose:     The main driver source module
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (C)Copyright 1998-2002 SysKonnect GmbH.
+ *      (C)Copyright 2002-2003 Marvell.
+ *
+ *      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
+ *      Author: Christoph Goos (cgoos@syskonnect.de)
+ *              Mirko Lindner (mlindner@syskonnect.de)
+ *
+ *      Address all question to: linux@syskonnect.de
+ *
+ *      The technical manual for the adapters is available from SysKonnect's
+ *      web pages: www.syskonnect.com
+ *      Goto "Support" and search Knowledge Base for "manual".
+ *      
+ *      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.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Possible compiler options (#define xxx / -Dxxx):
+ *
+ *      debugging can be enable by changing SK_DEBUG_CHKMOD and
+ *      SK_DEBUG_CHKCAT in makefile (described there).
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ *      This is the main module of the Linux GE driver.
+ *      
+ *      All source files except skge.c, skdrv1st.h, skdrv2nd.h and sktypes.h
+ *      are part of SysKonnect's COMMON MODULES for the SK-98xx adapters.
+ *      Those are used for drivers on multiple OS', so some thing may seem
+ *      unnecessary complicated on Linux. Please do not try to 'clean up'
+ *      them without VERY good reasons, because this will make it more
+ *      difficult to keep the Linux driver in synchronisation with the
+ *      other versions.
+ *
+ * Include file hierarchy:
+ *
+ *      <linux/module.h>
+ *
+ *      "h/skdrv1st.h"
+ *              <linux/types.h>
+ *              <linux/kernel.h>
+ *              <linux/string.h>
+ *              <linux/errno.h>
+ *              <linux/ioport.h>
+ *              <linux/slab.h>
+ *              <linux/interrupt.h>
+ *              <linux/pci.h>
+ *              <linux/bitops.h>
+ *              <asm/byteorder.h>
+ *              <asm/io.h>
+ *              <linux/netdevice.h>
+ *              <linux/etherdevice.h>
+ *              <linux/skbuff.h>
+ *          those three depending on kernel version used:
+ *              <linux/bios32.h>
+ *              <linux/init.h>
+ *              <asm/uaccess.h>
+ *              <net/checksum.h>
+ *
+ *              "h/skerror.h"
+ *              "h/skdebug.h"
+ *              "h/sktypes.h"
+ *              "h/lm80.h"
+ *              "h/xmac_ii.h"
+ *
+ *      "h/skdrv2nd.h"
+ *              "h/skqueue.h"
+ *              "h/skgehwt.h"
+ *              "h/sktimer.h"
+ *              "h/ski2c.h"
+ *              "h/skgepnmi.h"
+ *              "h/skvpd.h"
+ *              "h/skgehw.h"
+ *              "h/skgeinit.h"
+ *              "h/skaddr.h"
+ *              "h/skgesirq.h"
+ *              "h/skrlmt.h"
+ *
+ ******************************************************************************/
+
+#include        "h/skversion.h"
+
+#include        <linux/in.h>
+#include        <linux/module.h>
+#include        <linux/moduleparam.h>
+#include        <linux/init.h>
+#include        <linux/dma-mapping.h>
+#include        <linux/ip.h>
+#include        <linux/mii.h>
+#include        <linux/mm.h>
+
+#include        "h/skdrv1st.h"
+#include        "h/skdrv2nd.h"
+
+/*******************************************************************************
+ *
+ * Defines
+ *
+ ******************************************************************************/
+
+/* for debuging on x86 only */
+/* #define BREAKPOINT() asm(" int $3"); */
+
+/* use the transmit hw checksum driver functionality */
+#define USE_SK_TX_CHECKSUM
+
+/* use the receive hw checksum driver functionality */
+#define USE_SK_RX_CHECKSUM
+
+/* use the scatter-gather functionality with sendfile() */
+#define SK_ZEROCOPY
+
+/* use of a transmit complete interrupt */
+#define USE_TX_COMPLETE
+
+/*
+ * threshold for copying small receive frames
+ * set to 0 to avoid copying, set to 9001 to copy all frames
+ */
+#define SK_COPY_THRESHOLD       50
+
+/* number of adapters that can be configured via command line params */
+#define SK_MAX_CARD_PARAM       16
+
+
+
+/*
+ * use those defines for a compile-in version of the driver instead
+ * of command line parameters
+ */
+// #define LINK_SPEED_A {"Auto", }
+// #define LINK_SPEED_B {"Auto", }
+// #define AUTO_NEG_A   {"Sense", }
+// #define AUTO_NEG_B   {"Sense", }
+// #define DUP_CAP_A    {"Both", }
+// #define DUP_CAP_B    {"Both", }
+// #define FLOW_CTRL_A  {"SymOrRem", }
+// #define FLOW_CTRL_B  {"SymOrRem", }
+// #define ROLE_A       {"Auto", }
+// #define ROLE_B       {"Auto", }
+// #define PREF_PORT    {"A", }
+// #define CON_TYPE     {"Auto", }
+// #define RLMT_MODE    {"CheckLinkState", }
+
+#define DEV_KFREE_SKB(skb) dev_kfree_skb(skb)
+#define DEV_KFREE_SKB_IRQ(skb) dev_kfree_skb_irq(skb)
+#define DEV_KFREE_SKB_ANY(skb) dev_kfree_skb_any(skb)
+
+
+/* Set blink mode*/
+#define OEM_CONFIG_VALUE (      SK_ACT_LED_BLINK | \
+                                SK_DUP_LED_NORMAL | \
+                                SK_LED_LINK100_ON)
+
+
+/* Isr return value */
+#define SkIsrRetVar     irqreturn_t
+#define SkIsrRetNone    IRQ_NONE
+#define SkIsrRetHandled IRQ_HANDLED
+
+
+/*******************************************************************************
+ *
+ * Local Function Prototypes
+ *
+ ******************************************************************************/
+
+static void     FreeResources(struct SK_NET_DEVICE *dev);
+static int      SkGeBoardInit(struct SK_NET_DEVICE *dev, SK_AC *pAC);
+static SK_BOOL  BoardAllocMem(SK_AC *pAC);
+static void     BoardFreeMem(SK_AC *pAC);
+static void     BoardInitMem(SK_AC *pAC);
+static void     SetupRing(SK_AC*, void*, uintptr_t, RXD**, RXD**, RXD**, int*, SK_BOOL);
+static SkIsrRetVar      SkGeIsr(int irq, void *dev_id);
+static SkIsrRetVar      SkGeIsrOnePort(int irq, void *dev_id);
+static int      SkGeOpen(struct SK_NET_DEVICE *dev);
+static int      SkGeClose(struct SK_NET_DEVICE *dev);
+static int      SkGeXmit(struct sk_buff *skb, struct SK_NET_DEVICE *dev);
+static int      SkGeSetMacAddr(struct SK_NET_DEVICE *dev, void *p);
+static void     SkGeSetRxMode(struct SK_NET_DEVICE *dev);
+static struct   net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev);
+static int      SkGeIoctl(struct SK_NET_DEVICE *dev, struct ifreq *rq, int cmd);
+static void     GetConfiguration(SK_AC*);
+static int      XmitFrame(SK_AC*, TX_PORT*, struct sk_buff*);
+static void     FreeTxDescriptors(SK_AC*pAC, TX_PORT*);
+static void     FillRxRing(SK_AC*, RX_PORT*);
+static SK_BOOL  FillRxDescriptor(SK_AC*, RX_PORT*);
+static void     ReceiveIrq(SK_AC*, RX_PORT*, SK_BOOL);
+static void     ClearAndStartRx(SK_AC*, int);
+static void     ClearTxIrq(SK_AC*, int, int);
+static void     ClearRxRing(SK_AC*, RX_PORT*);
+static void     ClearTxRing(SK_AC*, TX_PORT*);
+static int      SkGeChangeMtu(struct SK_NET_DEVICE *dev, int new_mtu);
+static void     PortReInitBmu(SK_AC*, int);
+static int      SkGeIocMib(DEV_NET*, unsigned int, int);
+static int      SkGeInitPCI(SK_AC *pAC);
+static void     StartDrvCleanupTimer(SK_AC *pAC);
+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
+ *
+ ******************************************************************************/
+extern void SkDimEnableModerationIfNeeded(SK_AC *pAC);  
+extern void SkDimDisplayModerationSettings(SK_AC *pAC);
+extern void SkDimStartModerationTimer(SK_AC *pAC);
+extern void SkDimModerate(SK_AC *pAC);
+extern void SkGeBlinkTimer(unsigned long data);
+
+#ifdef DEBUG
+static void     DumpMsg(struct sk_buff*, char*);
+static void     DumpData(char*, int);
+static void     DumpLong(char*, int);
+#endif
+
+/* global variables *********************************************************/
+static SK_BOOL DoPrintInterfaceChange = SK_TRUE;
+extern const struct ethtool_ops SkGeEthtoolOps;
+
+/* local variables **********************************************************/
+static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780, 0x700}};
+static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};
+
+/*****************************************************************************
+ *
+ *      SkPciWriteCfgDWord - write a 32 bit value to pci config space
+ *
+ * Description:
+ *      This routine writes a 32 bit value to the pci configuration
+ *      space.
+ *
+ * Returns:
+ *      0 - indicate everything worked ok.
+ *      != 0 - error indication
+ */
+static inline int SkPciWriteCfgDWord(
+SK_AC *pAC,     /* Adapter Control structure pointer */
+int PciAddr,            /* PCI register address */
+SK_U32 Val)             /* pointer to store the read value */
+{
+        pci_write_config_dword(pAC->PciDev, PciAddr, Val);
+        return(0);
+} /* SkPciWriteCfgDWord */
+
+/*****************************************************************************
+ *
+ *      SkGeInitPCI - Init the PCI resources
+ *
+ * Description:
+ *      This function initialize the PCI resources and IO
+ *
+ * Returns:
+ *      0 - indicate everything worked ok.
+ *      != 0 - error indication
+ */
+static __devinit int SkGeInitPCI(SK_AC *pAC)
+{
+        struct SK_NET_DEVICE *dev = pAC->dev[0];
+        struct pci_dev *pdev = pAC->PciDev;
+        int retval;
+
+        dev->mem_start = pci_resource_start (pdev, 0);
+        pci_set_master(pdev);
+
+        retval = pci_request_regions(pdev, "sk98lin");
+        if (retval)
+                goto out;
+
+#ifdef SK_BIG_ENDIAN
+        /*
+         * On big endian machines, we use the adapter's aibility of
+         * reading the descriptors as big endian.
+         */
+        {
+                SK_U32          our2;
+                SkPciReadCfgDWord(pAC, PCI_OUR_REG_2, &our2);
+                our2 |= PCI_REV_DESC;
+                SkPciWriteCfgDWord(pAC, PCI_OUR_REG_2, our2);
+        }
+#endif
+
+        /*
+         * Remap the regs into kernel space.
+         */
+        pAC->IoBase = ioremap_nocache(dev->mem_start, 0x4000);
+        if (!pAC->IoBase) {
+                retval = -EIO;
+                goto out_release;
+        }
+
+        return 0;
+
+ out_release:
+        pci_release_regions(pdev);
+ out:
+        return retval;
+}
+
+
+/*****************************************************************************
+ *
+ *      FreeResources - release resources allocated for adapter
+ *
+ * Description:
+ *      This function releases the IRQ, unmaps the IO and
+ *      frees the desriptor ring.
+ *
+ * Returns: N/A
+ *      
+ */
+static void FreeResources(struct SK_NET_DEVICE *dev)
+{
+SK_U32 AllocFlag;
+DEV_NET         *pNet;
+SK_AC           *pAC;
+
+        pNet = netdev_priv(dev);
+        pAC = pNet->pAC;
+        AllocFlag = pAC->AllocFlag;
+        if (pAC->PciDev) {
+                pci_release_regions(pAC->PciDev);
+        }
+        if (AllocFlag & SK_ALLOC_IRQ) {
+                free_irq(dev->irq, dev);
+        }
+        if (pAC->IoBase) {
+                iounmap(pAC->IoBase);
+        }
+        if (pAC->pDescrMem) {
+                BoardFreeMem(pAC);
+        }
+        
+} /* FreeResources */
+
+MODULE_AUTHOR("Mirko Lindner <mlindner@syskonnect.de>");
+MODULE_DESCRIPTION("SysKonnect SK-NET Gigabit Ethernet SK-98xx driver");
+MODULE_LICENSE("GPL");
+
+#ifdef LINK_SPEED_A
+static char *Speed_A[SK_MAX_CARD_PARAM] = LINK_SPEED;
+#else
+static char *Speed_A[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef LINK_SPEED_B
+static char *Speed_B[SK_MAX_CARD_PARAM] = LINK_SPEED;
+#else
+static char *Speed_B[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef AUTO_NEG_A
+static char *AutoNeg_A[SK_MAX_CARD_PARAM] = AUTO_NEG_A;
+#else
+static char *AutoNeg_A[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef DUP_CAP_A
+static char *DupCap_A[SK_MAX_CARD_PARAM] = DUP_CAP_A;
+#else
+static char *DupCap_A[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef FLOW_CTRL_A
+static char *FlowCtrl_A[SK_MAX_CARD_PARAM] = FLOW_CTRL_A;
+#else
+static char *FlowCtrl_A[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef ROLE_A
+static char *Role_A[SK_MAX_CARD_PARAM] = ROLE_A;
+#else
+static char *Role_A[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef AUTO_NEG_B
+static char *AutoNeg_B[SK_MAX_CARD_PARAM] = AUTO_NEG_B;
+#else
+static char *AutoNeg_B[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef DUP_CAP_B
+static char *DupCap_B[SK_MAX_CARD_PARAM] = DUP_CAP_B;
+#else
+static char *DupCap_B[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef FLOW_CTRL_B
+static char *FlowCtrl_B[SK_MAX_CARD_PARAM] = FLOW_CTRL_B;
+#else
+static char *FlowCtrl_B[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef ROLE_B
+static char *Role_B[SK_MAX_CARD_PARAM] = ROLE_B;
+#else
+static char *Role_B[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef CON_TYPE
+static char *ConType[SK_MAX_CARD_PARAM] = CON_TYPE;
+#else
+static char *ConType[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef PREF_PORT
+static char *PrefPort[SK_MAX_CARD_PARAM] = PREF_PORT;
+#else
+static char *PrefPort[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+#ifdef RLMT_MODE
+static char *RlmtMode[SK_MAX_CARD_PARAM] = RLMT_MODE;
+#else
+static char *RlmtMode[SK_MAX_CARD_PARAM] = {"", };
+#endif
+
+static int   IntsPerSec[SK_MAX_CARD_PARAM];
+static char *Moderation[SK_MAX_CARD_PARAM];
+static char *ModerationMask[SK_MAX_CARD_PARAM];
+static char *AutoSizing[SK_MAX_CARD_PARAM];
+static char *Stats[SK_MAX_CARD_PARAM];
+
+module_param_array(Speed_A, charp, NULL, 0);
+module_param_array(Speed_B, charp, NULL, 0);
+module_param_array(AutoNeg_A, charp, NULL, 0);
+module_param_array(AutoNeg_B, charp, NULL, 0);
+module_param_array(DupCap_A, charp, NULL, 0);
+module_param_array(DupCap_B, charp, NULL, 0);
+module_param_array(FlowCtrl_A, charp, NULL, 0);
+module_param_array(FlowCtrl_B, charp, NULL, 0);
+module_param_array(Role_A, charp, NULL, 0);
+module_param_array(Role_B, charp, NULL, 0);
+module_param_array(ConType, charp, NULL, 0);
+module_param_array(PrefPort, charp, NULL, 0);
+module_param_array(RlmtMode, charp, NULL, 0);
+/* used for interrupt moderation */
+module_param_array(IntsPerSec, int, NULL, 0);
+module_param_array(Moderation, charp, NULL, 0);
+module_param_array(Stats, charp, NULL, 0);
+module_param_array(ModerationMask, charp, NULL, 0);
+module_param_array(AutoSizing, charp, NULL, 0);
+
+/*****************************************************************************
+ *
+ *      SkGeBoardInit - do level 0 and 1 initialization
+ *
+ * Description:
+ *      This function prepares the board hardware for running. The desriptor
+ *      ring is set up, the IRQ is allocated and the configuration settings
+ *      are examined.
+ *
+ * Returns:
+ *      0, if everything is ok
+ *      !=0, on error
+ */
+static int __devinit SkGeBoardInit(struct SK_NET_DEVICE *dev, SK_AC *pAC)
+{
+short   i;
+unsigned long Flags;
+char    *DescrString = "sk98lin: Driver for Linux"; /* this is given to PNMI */
+char    *VerStr = VER_STRING;
+int     Ret;                    /* return code of request_irq */
+SK_BOOL DualNet;
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("IoBase: %08lX\n", (unsigned long)pAC->IoBase));
+        for (i=0; i<SK_MAX_MACS; i++) {
+                pAC->TxPort[i][0].HwAddr = pAC->IoBase + TxQueueAddr[i][0];
+                pAC->TxPort[i][0].PortIndex = i;
+                pAC->RxPort[i].HwAddr = pAC->IoBase + RxQueueAddr[i];
+                pAC->RxPort[i].PortIndex = i;
+        }
+
+        /* Initialize the mutexes */
+        for (i=0; i<SK_MAX_MACS; i++) {
+                spin_lock_init(&pAC->TxPort[i][0].TxDesRingLock);
+                spin_lock_init(&pAC->RxPort[i].RxDesRingLock);
+        }
+        spin_lock_init(&pAC->SlowPathLock);
+
+        /* setup phy_id blink timer */
+        pAC->BlinkTimer.function = SkGeBlinkTimer;
+        pAC->BlinkTimer.data = (unsigned long) dev;
+        init_timer(&pAC->BlinkTimer);
+
+        /* level 0 init common modules here */
+        
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+        /* Does a RESET on board ...*/
+        if (SkGeInit(pAC, pAC->IoBase, SK_INIT_DATA) != 0) {
+                printk("HWInit (0) failed.\n");
+                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+                return -EIO;
+        }
+        SkI2cInit(  pAC, pAC->IoBase, SK_INIT_DATA);
+        SkEventInit(pAC, pAC->IoBase, SK_INIT_DATA);
+        SkPnmiInit( pAC, pAC->IoBase, SK_INIT_DATA);
+        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;
+
+        SK_PNMI_SET_DRIVER_DESCR(pAC, DescrString);
+        SK_PNMI_SET_DRIVER_VER(pAC, VerStr);
+
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+
+        /* level 1 init common modules here (HW init) */
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+        if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
+                printk("sk98lin: HWInit (1) failed.\n");
+                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+                return -EIO;
+        }
+        SkI2cInit(  pAC, pAC->IoBase, SK_INIT_IO);
+        SkEventInit(pAC, pAC->IoBase, SK_INIT_IO);
+        SkPnmiInit( pAC, pAC->IoBase, SK_INIT_IO);
+        SkAddrInit( pAC, pAC->IoBase, SK_INIT_IO);
+        SkRlmtInit( pAC, pAC->IoBase, SK_INIT_IO);
+        SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
+
+        /* Set chipset type support */
+        pAC->ChipsetType = 0;
+        if ((pAC->GIni.GIChipId == CHIP_ID_YUKON) ||
+                (pAC->GIni.GIChipId == CHIP_ID_YUKON_LITE)) {
+                pAC->ChipsetType = 1;
+        }
+
+        GetConfiguration(pAC);
+        if (pAC->RlmtNets == 2) {
+                pAC->GIni.GIPortUsage = SK_MUL_LINK;
+        }
+
+        pAC->BoardLevel = SK_INIT_IO;
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+
+        if (pAC->GIni.GIMacsFound == 2) {
+                 Ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);
+        } else if (pAC->GIni.GIMacsFound == 1) {
+                Ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED,
+                        "sk98lin", dev);
+        } else {
+                printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
+                       pAC->GIni.GIMacsFound);
+                return -EIO;
+        }
+
+        if (Ret) {
+                printk(KERN_WARNING "sk98lin: Requested IRQ %d is busy.\n",
+                       dev->irq);
+                return Ret;
+        }
+        pAC->AllocFlag |= SK_ALLOC_IRQ;
+
+        /* Alloc memory for this board (Mem for RxD/TxD) : */
+        if(!BoardAllocMem(pAC)) {
+                printk("No memory for descriptor rings.\n");
+                return -ENOMEM;
+        }
+
+        BoardInitMem(pAC);
+        /* tschilling: New common function with minimum size check. */
+        DualNet = SK_FALSE;
+        if (pAC->RlmtNets == 2) {
+                DualNet = SK_TRUE;
+        }
+        
+        if (SkGeInitAssignRamToQueues(
+                pAC,
+                pAC->ActivePort,
+                DualNet)) {
+                BoardFreeMem(pAC);
+                printk("sk98lin: SkGeInitAssignRamToQueues failed.\n");
+                return -EIO;
+        }
+
+        return (0);
+} /* SkGeBoardInit */
+
+
+/*****************************************************************************
+ *
+ *      BoardAllocMem - allocate the memory for the descriptor rings
+ *
+ * Description:
+ *      This function allocates the memory for all descriptor rings.
+ *      Each ring is aligned for the desriptor alignment and no ring
+ *      has a 4 GByte boundary in it (because the upper 32 bit must
+ *      be constant for all descriptiors in one rings).
+ *
+ * Returns:
+ *      SK_TRUE, if all memory could be allocated
+ *      SK_FALSE, if not
+ */
+static __devinit SK_BOOL BoardAllocMem(SK_AC    *pAC)
+{
+caddr_t         pDescrMem;      /* pointer to descriptor memory area */
+size_t          AllocLength;    /* length of complete descriptor area */
+int             i;              /* loop counter */
+unsigned long   BusAddr;
+
+        
+        /* rings plus one for alignment (do not cross 4 GB boundary) */
+        /* RX_RING_SIZE is assumed bigger than TX_RING_SIZE */
+#if (BITS_PER_LONG == 32)
+        AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound + 8;
+#else
+        AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound
+                + RX_RING_SIZE + 8;
+#endif
+
+        pDescrMem = pci_alloc_consistent(pAC->PciDev, AllocLength,
+                                         &pAC->pDescrMemDMA);
+
+        if (pDescrMem == NULL) {
+                return (SK_FALSE);
+        }
+        pAC->pDescrMem = pDescrMem;
+        BusAddr = (unsigned long) pAC->pDescrMemDMA;
+
+        /* Descriptors need 8 byte alignment, and this is ensured
+         * by pci_alloc_consistent.
+         */
+        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+                        ("TX%d/A: pDescrMem: %lX,   PhysDescrMem: %lX\n",
+                        i, (unsigned long) pDescrMem,
+                        BusAddr));
+                pAC->TxPort[i][0].pTxDescrRing = pDescrMem;
+                pAC->TxPort[i][0].VTxDescrRing = BusAddr;
+                pDescrMem += TX_RING_SIZE;
+                BusAddr += TX_RING_SIZE;
+        
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+                        ("RX%d: pDescrMem: %lX,   PhysDescrMem: %lX\n",
+                        i, (unsigned long) pDescrMem,
+                        (unsigned long)BusAddr));
+                pAC->RxPort[i].pRxDescrRing = pDescrMem;
+                pAC->RxPort[i].VRxDescrRing = BusAddr;
+                pDescrMem += RX_RING_SIZE;
+                BusAddr += RX_RING_SIZE;
+        } /* for */
+        
+        return (SK_TRUE);
+} /* BoardAllocMem */
+
+
+/****************************************************************************
+ *
+ *      BoardFreeMem - reverse of BoardAllocMem
+ *
+ * Description:
+ *      Free all memory allocated in BoardAllocMem: adapter context,
+ *      descriptor rings, locks.
+ *
+ * Returns:     N/A
+ */
+static void BoardFreeMem(
+SK_AC           *pAC)
+{
+size_t          AllocLength;    /* length of complete descriptor area */
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("BoardFreeMem\n"));
+#if (BITS_PER_LONG == 32)
+        AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound + 8;
+#else
+        AllocLength = (RX_RING_SIZE + TX_RING_SIZE) * pAC->GIni.GIMacsFound
+                + RX_RING_SIZE + 8;
+#endif
+
+        pci_free_consistent(pAC->PciDev, AllocLength,
+                            pAC->pDescrMem, pAC->pDescrMemDMA);
+        pAC->pDescrMem = NULL;
+} /* BoardFreeMem */
+
+
+/*****************************************************************************
+ *
+ *      BoardInitMem - initiate the descriptor rings
+ *
+ * Description:
+ *      This function sets the descriptor rings up in memory.
+ *      The adapter is initialized with the descriptor start addresses.
+ *
+ * Returns:     N/A
+ */
+static __devinit void BoardInitMem(SK_AC *pAC)
+{
+int     i;              /* loop counter */
+int     RxDescrSize;    /* the size of a rx descriptor rounded up to alignment*/
+int     TxDescrSize;    /* the size of a tx descriptor rounded up to alignment*/
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("BoardInitMem\n"));
+
+        RxDescrSize = (((sizeof(RXD) - 1) / DESCR_ALIGN) + 1) * DESCR_ALIGN;
+        pAC->RxDescrPerRing = RX_RING_SIZE / RxDescrSize;
+        TxDescrSize = (((sizeof(TXD) - 1) / DESCR_ALIGN) + 1) * DESCR_ALIGN;
+        pAC->TxDescrPerRing = TX_RING_SIZE / RxDescrSize;
+        
+        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+                SetupRing(
+                        pAC,
+                        pAC->TxPort[i][0].pTxDescrRing,
+                        pAC->TxPort[i][0].VTxDescrRing,
+                        (RXD**)&pAC->TxPort[i][0].pTxdRingHead,
+                        (RXD**)&pAC->TxPort[i][0].pTxdRingTail,
+                        (RXD**)&pAC->TxPort[i][0].pTxdRingPrev,
+                        &pAC->TxPort[i][0].TxdRingFree,
+                        SK_TRUE);
+                SetupRing(
+                        pAC,
+                        pAC->RxPort[i].pRxDescrRing,
+                        pAC->RxPort[i].VRxDescrRing,
+                        &pAC->RxPort[i].pRxdRingHead,
+                        &pAC->RxPort[i].pRxdRingTail,
+                        &pAC->RxPort[i].pRxdRingPrev,
+                        &pAC->RxPort[i].RxdRingFree,
+                        SK_FALSE);
+        }
+} /* BoardInitMem */
+
+
+/*****************************************************************************
+ *
+ *      SetupRing - create one descriptor ring
+ *
+ * Description:
+ *      This function creates one descriptor ring in the given memory area.
+ *      The head, tail and number of free descriptors in the ring are set.
+ *
+ * Returns:
+ *      none
+ */
+static void SetupRing(
+SK_AC           *pAC,
+void            *pMemArea,      /* a pointer to the memory area for the ring */
+uintptr_t       VMemArea,       /* the virtual bus address of the memory area */
+RXD             **ppRingHead,   /* address where the head should be written */
+RXD             **ppRingTail,   /* address where the tail should be written */
+RXD             **ppRingPrev,   /* address where the tail should be written */
+int             *pRingFree,     /* address where the # of free descr. goes */
+SK_BOOL         IsTx)           /* flag: is this a tx ring */
+{
+int     i;              /* loop counter */
+int     DescrSize;      /* the size of a descriptor rounded up to alignment*/
+int     DescrNum;       /* number of descriptors per ring */
+RXD     *pDescr;        /* pointer to a descriptor (receive or transmit) */
+RXD     *pNextDescr;    /* pointer to the next descriptor */
+RXD     *pPrevDescr;    /* pointer to the previous descriptor */
+uintptr_t VNextDescr;   /* the virtual bus address of the next descriptor */
+
+        if (IsTx == SK_TRUE) {
+                DescrSize = (((sizeof(TXD) - 1) / DESCR_ALIGN) + 1) *
+                        DESCR_ALIGN;
+                DescrNum = TX_RING_SIZE / DescrSize;
+        } else {
+                DescrSize = (((sizeof(RXD) - 1) / DESCR_ALIGN) + 1) *
+                        DESCR_ALIGN;
+                DescrNum = RX_RING_SIZE / DescrSize;
+        }
+        
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS,
+                ("Descriptor size: %d   Descriptor Number: %d\n",
+                DescrSize,DescrNum));
+        
+        pDescr = (RXD*) pMemArea;
+        pPrevDescr = NULL;
+        pNextDescr = (RXD*) (((char*)pDescr) + DescrSize);
+        VNextDescr = VMemArea + DescrSize;
+        for(i=0; i<DescrNum; i++) {
+                /* set the pointers right */
+                pDescr->VNextRxd = VNextDescr & 0xffffffffULL;
+                pDescr->pNextRxd = pNextDescr;
+                if (!IsTx) pDescr->TcpSumStarts = ETH_HLEN << 16 | ETH_HLEN;
+
+                /* advance one step */
+                pPrevDescr = pDescr;
+                pDescr = pNextDescr;
+                pNextDescr = (RXD*) (((char*)pDescr) + DescrSize);
+                VNextDescr += DescrSize;
+        }
+        pPrevDescr->pNextRxd = (RXD*) pMemArea;
+        pPrevDescr->VNextRxd = VMemArea;
+        pDescr = (RXD*) pMemArea;
+        *ppRingHead = (RXD*) pMemArea;
+        *ppRingTail = *ppRingHead;
+        *ppRingPrev = pPrevDescr;
+        *pRingFree = DescrNum;
+} /* SetupRing */
+
+
+/*****************************************************************************
+ *
+ *      PortReInitBmu - re-initiate the descriptor rings for one port
+ *
+ * Description:
+ *      This function reinitializes the descriptor rings of one port
+ *      in memory. The port must be stopped before.
+ *      The HW is initialized with the descriptor start addresses.
+ *
+ * Returns:
+ *      none
+ */
+static void PortReInitBmu(
+SK_AC   *pAC,           /* pointer to adapter context */
+int     PortIndex)      /* index of the port for which to re-init */
+{
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("PortReInitBmu "));
+
+        /* set address of first descriptor of ring in BMU */
+        SK_OUT32(pAC->IoBase, TxQueueAddr[PortIndex][TX_PRIO_LOW]+ Q_DA_L,
+                (uint32_t)(((caddr_t)
+                (pAC->TxPort[PortIndex][TX_PRIO_LOW].pTxdRingHead) -
+                pAC->TxPort[PortIndex][TX_PRIO_LOW].pTxDescrRing +
+                pAC->TxPort[PortIndex][TX_PRIO_LOW].VTxDescrRing) &
+                0xFFFFFFFF));
+        SK_OUT32(pAC->IoBase, TxQueueAddr[PortIndex][TX_PRIO_LOW]+ Q_DA_H,
+                (uint32_t)(((caddr_t)
+                (pAC->TxPort[PortIndex][TX_PRIO_LOW].pTxdRingHead) -
+                pAC->TxPort[PortIndex][TX_PRIO_LOW].pTxDescrRing +
+                pAC->TxPort[PortIndex][TX_PRIO_LOW].VTxDescrRing) >> 32));
+        SK_OUT32(pAC->IoBase, RxQueueAddr[PortIndex]+Q_DA_L,
+                (uint32_t)(((caddr_t)(pAC->RxPort[PortIndex].pRxdRingHead) -
+                pAC->RxPort[PortIndex].pRxDescrRing +
+                pAC->RxPort[PortIndex].VRxDescrRing) & 0xFFFFFFFF));
+        SK_OUT32(pAC->IoBase, RxQueueAddr[PortIndex]+Q_DA_H,
+                (uint32_t)(((caddr_t)(pAC->RxPort[PortIndex].pRxdRingHead) -
+                pAC->RxPort[PortIndex].pRxDescrRing +
+                pAC->RxPort[PortIndex].VRxDescrRing) >> 32));
+} /* PortReInitBmu */
+
+
+/****************************************************************************
+ *
+ *      SkGeIsr - handle adapter interrupts
+ *
+ * Description:
+ *      The interrupt routine is called when the network adapter
+ *      generates an interrupt. It may also be called if another device
+ *      shares this interrupt vector with the driver.
+ *
+ * Returns: N/A
+ *
+ */
+static SkIsrRetVar SkGeIsr(int irq, void *dev_id)
+{
+struct SK_NET_DEVICE *dev = (struct SK_NET_DEVICE *)dev_id;
+DEV_NET         *pNet;
+SK_AC           *pAC;
+SK_U32          IntSrc;         /* interrupts source register contents */       
+
+        pNet = netdev_priv(dev);
+        pAC = pNet->pAC;
+        
+        /*
+         * Check and process if its our interrupt
+         */
+        SK_IN32(pAC->IoBase, B0_SP_ISRC, &IntSrc);
+        if (IntSrc == 0) {
+                return SkIsrRetNone;
+        }
+
+        while (((IntSrc & IRQ_MASK) & ~SPECIAL_IRQS) != 0) {
+#if 0 /* software irq currently not used */
+                if (IntSrc & IS_IRQ_SW) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("Software IRQ\n"));
+                }
+#endif
+                if (IntSrc & IS_R1_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF RX1 IRQ\n"));
+                        ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
+                        SK_PNMI_CNT_RX_INTR(pAC, 0);
+                }
+                if (IntSrc & IS_R2_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF RX2 IRQ\n"));
+                        ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
+                        SK_PNMI_CNT_RX_INTR(pAC, 1);
+                }
+#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
+                if (IntSrc & IS_XA1_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF AS TX1 IRQ\n"));
+                        SK_PNMI_CNT_TX_INTR(pAC, 0);
+                        spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
+                        FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
+                        spin_unlock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
+                }
+                if (IntSrc & IS_XA2_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF AS TX2 IRQ\n"));
+                        SK_PNMI_CNT_TX_INTR(pAC, 1);
+                        spin_lock(&pAC->TxPort[1][TX_PRIO_LOW].TxDesRingLock);
+                        FreeTxDescriptors(pAC, &pAC->TxPort[1][TX_PRIO_LOW]);
+                        spin_unlock(&pAC->TxPort[1][TX_PRIO_LOW].TxDesRingLock);
+                }
+#if 0 /* only if sync. queues used */
+                if (IntSrc & IS_XS1_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF SY TX1 IRQ\n"));
+                        SK_PNMI_CNT_TX_INTR(pAC, 1);
+                        spin_lock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
+                        FreeTxDescriptors(pAC, 0, TX_PRIO_HIGH);
+                        spin_unlock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
+                        ClearTxIrq(pAC, 0, TX_PRIO_HIGH);
+                }
+                if (IntSrc & IS_XS2_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF SY TX2 IRQ\n"));
+                        SK_PNMI_CNT_TX_INTR(pAC, 1);
+                        spin_lock(&pAC->TxPort[1][TX_PRIO_HIGH].TxDesRingLock);
+                        FreeTxDescriptors(pAC, 1, TX_PRIO_HIGH);
+                        spin_unlock(&pAC->TxPort[1][TX_PRIO_HIGH].TxDesRingLock);
+                        ClearTxIrq(pAC, 1, TX_PRIO_HIGH);
+                }
+#endif
+#endif
+
+                /* do all IO at once */
+                if (IntSrc & IS_R1_F)
+                        ClearAndStartRx(pAC, 0);
+                if (IntSrc & IS_R2_F)
+                        ClearAndStartRx(pAC, 1);
+#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
+                if (IntSrc & IS_XA1_F)
+                        ClearTxIrq(pAC, 0, TX_PRIO_LOW);
+                if (IntSrc & IS_XA2_F)
+                        ClearTxIrq(pAC, 1, TX_PRIO_LOW);
+#endif
+                SK_IN32(pAC->IoBase, B0_ISRC, &IntSrc);
+        } /* while (IntSrc & IRQ_MASK != 0) */
+
+        IntSrc &= pAC->GIni.GIValIrqMask;
+        if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+                        ("SPECIAL IRQ DP-Cards => %x\n", IntSrc));
+                pAC->CheckQueue = SK_FALSE;
+                spin_lock(&pAC->SlowPathLock);
+                if (IntSrc & SPECIAL_IRQS)
+                        SkGeSirqIsr(pAC, pAC->IoBase, IntSrc);
+
+                SkEventDispatcher(pAC, pAC->IoBase);
+                spin_unlock(&pAC->SlowPathLock);
+        }
+        /*
+         * do it all again is case we cleared an interrupt that
+         * came in after handling the ring (OUTs may be delayed
+         * in hardware buffers, but are through after IN)
+         *
+         * rroesler: has been commented out and shifted to
+         *           SkGeDrvEvent(), because it is timer
+         *           guarded now
+         *
+        ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
+        ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
+         */
+
+        if (pAC->CheckQueue) {
+                pAC->CheckQueue = SK_FALSE;
+                spin_lock(&pAC->SlowPathLock);
+                SkEventDispatcher(pAC, pAC->IoBase);
+                spin_unlock(&pAC->SlowPathLock);
+        }
+
+        /* IRQ is processed - Enable IRQs again*/
+        SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+
+                return SkIsrRetHandled;
+} /* SkGeIsr */
+
+
+/****************************************************************************
+ *
+ *      SkGeIsrOnePort - handle adapter interrupts for single port adapter
+ *
+ * Description:
+ *      The interrupt routine is called when the network adapter
+ *      generates an interrupt. It may also be called if another device
+ *      shares this interrupt vector with the driver.
+ *      This is the same as above, but handles only one port.
+ *
+ * Returns: N/A
+ *
+ */
+static SkIsrRetVar SkGeIsrOnePort(int irq, void *dev_id)
+{
+struct SK_NET_DEVICE *dev = (struct SK_NET_DEVICE *)dev_id;
+DEV_NET         *pNet;
+SK_AC           *pAC;
+SK_U32          IntSrc;         /* interrupts source register contents */       
+
+        pNet = netdev_priv(dev);
+        pAC = pNet->pAC;
+        
+        /*
+         * Check and process if its our interrupt
+         */
+        SK_IN32(pAC->IoBase, B0_SP_ISRC, &IntSrc);
+        if (IntSrc == 0) {
+                return SkIsrRetNone;
+        }
+        
+        while (((IntSrc & IRQ_MASK) & ~SPECIAL_IRQS) != 0) {
+#if 0 /* software irq currently not used */
+                if (IntSrc & IS_IRQ_SW) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("Software IRQ\n"));
+                }
+#endif
+                if (IntSrc & IS_R1_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF RX1 IRQ\n"));
+                        ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
+                        SK_PNMI_CNT_RX_INTR(pAC, 0);
+                }
+#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
+                if (IntSrc & IS_XA1_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF AS TX1 IRQ\n"));
+                        SK_PNMI_CNT_TX_INTR(pAC, 0);
+                        spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
+                        FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
+                        spin_unlock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
+                }
+#if 0 /* only if sync. queues used */
+                if (IntSrc & IS_XS1_F) {
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_INT_SRC,
+                                ("EOF SY TX1 IRQ\n"));
+                        SK_PNMI_CNT_TX_INTR(pAC, 0);
+                        spin_lock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
+                        FreeTxDescriptors(pAC, 0, TX_PRIO_HIGH);
+                        spin_unlock(&pAC->TxPort[0][TX_PRIO_HIGH].TxDesRingLock);
+                        ClearTxIrq(pAC, 0, TX_PRIO_HIGH);
+                }
+#endif
+#endif
+
+                /* do all IO at once */
+                if (IntSrc & IS_R1_F)
+                        ClearAndStartRx(pAC, 0);
+#ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
+                if (IntSrc & IS_XA1_F)
+                        ClearTxIrq(pAC, 0, TX_PRIO_LOW);
+#endif
+                SK_IN32(pAC->IoBase, B0_ISRC, &IntSrc);
+        } /* while (IntSrc & IRQ_MASK != 0) */
+        
+        IntSrc &= pAC->GIni.GIValIrqMask;
+        if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
+                        ("SPECIAL IRQ SP-Cards => %x\n", IntSrc));
+                pAC->CheckQueue = SK_FALSE;
+                spin_lock(&pAC->SlowPathLock);
+                if (IntSrc & SPECIAL_IRQS)
+                        SkGeSirqIsr(pAC, pAC->IoBase, IntSrc);
+
+                SkEventDispatcher(pAC, pAC->IoBase);
+                spin_unlock(&pAC->SlowPathLock);
+        }
+        /*
+         * do it all again is case we cleared an interrupt that
+         * came in after handling the ring (OUTs may be delayed
+         * in hardware buffers, but are through after IN)
+         *
+         * rroesler: has been commented out and shifted to
+         *           SkGeDrvEvent(), because it is timer
+         *           guarded now
+         *
+        ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
+         */
+
+        /* IRQ is processed - Enable IRQs again*/
+        SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+
+                return SkIsrRetHandled;
+} /* SkGeIsrOnePort */
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/****************************************************************************
+ *
+ *      SkGePollController - polling receive, for netconsole
+ *
+ * Description:
+ *      Polling receive - used by netconsole and other diagnostic tools
+ *      to allow network i/o with interrupts disabled.
+ *
+ * Returns: N/A
+ */
+static void SkGePollController(struct net_device *dev)
+{
+        disable_irq(dev->irq);
+        SkGeIsr(dev->irq, dev);
+        enable_irq(dev->irq);
+}
+#endif
+
+/****************************************************************************
+ *
+ *      SkGeOpen - handle start of initialized adapter
+ *
+ * Description:
+ *      This function starts the initialized adapter.
+ *      The board level variable is set and the adapter is
+ *      brought to full functionality.
+ *      The device flags are set for operation.
+ *      Do all necessary level 2 initialization, enable interrupts and
+ *      give start command to RLMT.
+ *
+ * Returns:
+ *      0 on success
+ *      != 0 on error
+ */
+static int SkGeOpen(
+struct SK_NET_DEVICE    *dev)
+{
+        DEV_NET                 *pNet;
+        SK_AC                   *pAC;
+        unsigned long   Flags;          /* for spin lock */
+        int                             i;
+        SK_EVPARA               EvPara;         /* an event parameter union */
+
+        pNet = netdev_priv(dev);
+        pAC = pNet->pAC;
+        
+        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
+
+        /* Set blink mode */
+        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) {
+                        printk("%s: HWInit (1) failed.\n", pAC->dev[pNet->PortNr]->name);
+                        return (-1);
+                }
+                SkI2cInit       (pAC, pAC->IoBase, SK_INIT_IO);
+                SkEventInit     (pAC, pAC->IoBase, SK_INIT_IO);
+                SkPnmiInit      (pAC, pAC->IoBase, SK_INIT_IO);
+                SkAddrInit      (pAC, pAC->IoBase, SK_INIT_IO);
+                SkRlmtInit      (pAC, pAC->IoBase, SK_INIT_IO);
+                SkTimerInit     (pAC, pAC->IoBase, SK_INIT_IO);
+                pAC->BoardLevel = SK_INIT_IO;
+        }
+
+        if (pAC->BoardLevel != SK_INIT_RUN) {
+                /* tschilling: Level 2 init modules here, check return value. */
+                if (SkGeInit(pAC, pAC->IoBase, SK_INIT_RUN) != 0) {
+                        printk("%s: HWInit (2) failed.\n", pAC->dev[pNet->PortNr]->name);
+                        return (-1);
+                }
+                SkI2cInit       (pAC, pAC->IoBase, SK_INIT_RUN);
+                SkEventInit     (pAC, pAC->IoBase, SK_INIT_RUN);
+                SkPnmiInit      (pAC, pAC->IoBase, SK_INIT_RUN);
+                SkAddrInit      (pAC, pAC->IoBase, SK_INIT_RUN);
+                SkRlmtInit      (pAC, pAC->IoBase, SK_INIT_RUN);
+                SkTimerInit     (pAC, pAC->IoBase, SK_INIT_RUN);
+                pAC->BoardLevel = SK_INIT_RUN;
+        }
+
+        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+                /* Enable transmit descriptor polling. */
+                SkGePollTxD(pAC, pAC->IoBase, i, SK_TRUE);
+                FillRxRing(pAC, &pAC->RxPort[i]);
+        }
+        SkGeYellowLED(pAC, pAC->IoBase, 1);
+
+        StartDrvCleanupTimer(pAC);
+        SkDimEnableModerationIfNeeded(pAC);     
+        SkDimDisplayModerationSettings(pAC);
+
+        pAC->GIni.GIValIrqMask &= IRQ_MASK;
+
+        /* enable Interrupts */
+        SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+        SK_OUT32(pAC->IoBase, B0_HWE_IMSK, IRQ_HWE_MASK);
+
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+
+        if ((pAC->RlmtMode != 0) && (pAC->MaxPorts == 0)) {
+                EvPara.Para32[0] = pAC->RlmtNets;
+                EvPara.Para32[1] = -1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_SET_NETS,
+                        EvPara);
+                EvPara.Para32[0] = pAC->RlmtMode;
+                EvPara.Para32[1] = 0;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_MODE_CHANGE,
+                        EvPara);
+        }
+
+        EvPara.Para32[0] = pNet->NetNr;
+        EvPara.Para32[1] = -1;
+        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
+        SkEventDispatcher(pAC, pAC->IoBase);
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+
+        pAC->MaxPorts++;
+
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("SkGeOpen suceeded\n"));
+
+        return (0);
+} /* SkGeOpen */
+
+
+/****************************************************************************
+ *
+ *      SkGeClose - Stop initialized adapter
+ *
+ * Description:
+ *      Close initialized adapter.
+ *
+ * Returns:
+ *      0 - on success
+ *      error code - on error
+ */
+static int SkGeClose(
+struct SK_NET_DEVICE    *dev)
+{
+        DEV_NET         *pNet;
+        DEV_NET         *newPtrNet;
+        SK_AC           *pAC;
+
+        unsigned long   Flags;          /* for spin lock */
+        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));
+
+        pNet = netdev_priv(dev);
+        pAC = pNet->pAC;
+
+#ifdef SK_DIAG_SUPPORT
+        if (pAC->DiagModeActive == DIAG_ACTIVE) {
+                if (pAC->DiagFlowCtrl == SK_FALSE) {
+                        /* 
+                        ** notify that the interface which has been closed
+                        ** by operator interaction must not be started up 
+                        ** again when the DIAG has finished. 
+                        */
+                        newPtrNet = netdev_priv(pAC->dev[0]);
+                        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;
+
+        StopDrvCleanupTimer(pAC);
+
+        /*
+         * Clear multicast table, promiscuous mode ....
+         */
+        SkAddrMcClear(pAC, pAC->IoBase, PortIdx, 0);
+        SkAddrPromiscuousChange(pAC, pAC->IoBase, PortIdx,
+                SK_PROM_MODE_NONE);
+
+        if (pAC->MaxPorts == 1) {
+                spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+                /* disable interrupts */
+                SK_OUT32(pAC->IoBase, B0_IMSK, 0);
+                EvPara.Para32[0] = pNet->NetNr;
+                EvPara.Para32[1] = -1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+                SkEventDispatcher(pAC, pAC->IoBase);
+                SK_OUT32(pAC->IoBase, B0_IMSK, 0);
+                /* stop the hardware */
+                SkGeDeInit(pAC, pAC->IoBase);
+                pAC->BoardLevel = SK_INIT_DATA;
+                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+        } else {
+
+                spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+                EvPara.Para32[0] = pNet->NetNr;
+                EvPara.Para32[1] = -1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+                SkPnmiEvent(pAC, pAC->IoBase, SK_PNMI_EVT_XMAC_RESET, EvPara);
+                SkEventDispatcher(pAC, pAC->IoBase);
+                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+                
+                /* Stop port */
+                spin_lock_irqsave(&pAC->TxPort[pNet->PortNr]
+                        [TX_PRIO_LOW].TxDesRingLock, Flags);
+                SkGeStopPort(pAC, pAC->IoBase, pNet->PortNr,
+                        SK_STOP_ALL, SK_HARD_RST);
+                spin_unlock_irqrestore(&pAC->TxPort[pNet->PortNr]
+                        [TX_PRIO_LOW].TxDesRingLock, Flags);
+        }
+
+        if (pAC->RlmtNets == 1) {
+                /* clear all descriptor rings */
+                for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+                        ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE);
+                        ClearRxRing(pAC, &pAC->RxPort[i]);
+                        ClearTxRing(pAC, &pAC->TxPort[i][TX_PRIO_LOW]);
+                }
+        } else {
+                /* clear port descriptor rings */
+                ReceiveIrq(pAC, &pAC->RxPort[pNet->PortNr], SK_TRUE);
+                ClearRxRing(pAC, &pAC->RxPort[pNet->PortNr]);
+                ClearTxRing(pAC, &pAC->TxPort[pNet->PortNr][TX_PRIO_LOW]);
+        }
+
+        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--;
+
+        return (0);
+} /* SkGeClose */
+
+
+/*****************************************************************************
+ *
+ *      SkGeXmit - Linux frame transmit function
+ *
+ * Description:
+ *      The system calls this function to send frames onto the wire.
+ *      It puts the frame in the tx descriptor ring. If the ring is
+ *      full then, the 'tbusy' flag is set.
+ *
+ * Returns:
+ *      0, if everything is ok
+ *      !=0, on error
+ * WARNING: returning 1 in 'tbusy' case caused system crashes (double
+ *      allocated skb's) !!!
+ */
+static int SkGeXmit(struct sk_buff *skb, struct SK_NET_DEVICE *dev)
+{
+DEV_NET         *pNet;
+SK_AC           *pAC;
+int                     Rc;     /* return code of XmitFrame */
+
+        pNet = netdev_priv(dev);
+        pAC = pNet->pAC;
+
+        if ((!skb_shinfo(skb)->nr_frags) ||
+                (pAC->GIni.GIChipId == CHIP_ID_GENESIS)) {
+                /* Don't activate scatter-gather and hardware checksum */
+
+                if (pAC->RlmtNets == 2)
+                        Rc = XmitFrame(
+                                pAC,
+                                &pAC->TxPort[pNet->PortNr][TX_PRIO_LOW],
+                                skb);
+                else
+                        Rc = XmitFrame(
+                                pAC,
+                                &pAC->TxPort[pAC->ActivePort][TX_PRIO_LOW],
+                                skb);
+        } else {
+                /* scatter-gather and hardware TCP checksumming anabled*/
+                if (pAC->RlmtNets == 2)
+                        Rc = XmitFrameSG(
+                                pAC,
+                                &pAC->TxPort[pNet->PortNr][TX_PRIO_LOW],
+                                skb);
+                else
+                        Rc = XmitFrameSG(
+                                pAC,
+                                &pAC->TxPort[pAC->ActivePort][TX_PRIO_LOW],
+                                skb);
+        }
+
+        /* Transmitter out of resources? */
+        if (Rc <= 0) {
+                netif_stop_queue(dev);
+        }
+
+        /* If not taken, give buffer ownership back to the
+         * queueing layer.
+         */
+        if (Rc < 0)
+                return (1);
+
+        dev->trans_start = jiffies;
+        return (0);
+} /* SkGeXmit */
+
+
+/*****************************************************************************
+ *
+ *      XmitFrame - fill one socket buffer into the transmit ring
+ *
+ * Description:
+ *      This function puts a message into the transmit descriptor ring
+ *      if there is a descriptors left.
+ *      Linux skb's consist of only one continuous buffer.
+ *      The first step locks the ring. It is held locked
+ *      all time to avoid problems with SWITCH_../PORT_RESET.
+ *      Then the descriptoris allocated.
+ *      The second part is linking the buffer to the descriptor.
+ *      At the very last, the Control field of the descriptor
+ *      is made valid for the BMU and a start TX command is given
+ *      if necessary.
+ *
+ * Returns:
+ *      > 0 - on succes: the number of bytes in the message
+ *      = 0 - on resource shortage: this frame sent or dropped, now
+ *              the ring is full ( -> set tbusy)
+ *      < 0 - on failure: other problems ( -> return failure to upper layers)
+ */
+static int XmitFrame(
+SK_AC           *pAC,           /* pointer to adapter context           */
+TX_PORT         *pTxPort,       /* pointer to struct of port to send to */
+struct sk_buff  *pMessage)      /* pointer to send-message              */
+{
+        TXD             *pTxd;          /* the rxd to fill */
+        TXD             *pOldTxd;
+        unsigned long    Flags;
+        SK_U64           PhysAddr;
+        int              BytesSend = pMessage->len;
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_TX_PROGRESS, ("X"));
+
+        spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
+#ifndef USE_TX_COMPLETE
+        FreeTxDescriptors(pAC, pTxPort);
+#endif
+        if (pTxPort->TxdRingFree == 0) {
+                /* 
+                ** no enough free descriptors in ring at the moment.
+                ** Maybe free'ing some old one help?
+                */
+                FreeTxDescriptors(pAC, pTxPort);
+                if (pTxPort->TxdRingFree == 0) {
+                        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
+                        SK_PNMI_CNT_NO_TX_BUF(pAC, pTxPort->PortIndex);
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_TX_PROGRESS,
+                                ("XmitFrame failed\n"));
+                        /* 
+                        ** the desired message can not be sent
+                        ** Because tbusy seems to be set, the message 
+                        ** should not be freed here. It will be used 
+                        ** by the scheduler of the ethernet handler 
+                        */
+                        return (-1);
+                }
+        }
+
+        /*
+        ** If the passed socket buffer is of smaller MTU-size than 60,
+        ** copy everything into new buffer and fill all bytes between
+        ** the original packet end and the new packet end of 60 with 0x00.
+        ** This is to resolve faulty padding by the HW with 0xaa bytes.
+        */
+        if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
+                if (skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) {
+                        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
+                        return 0;
+                }
+                pMessage->len = C_LEN_ETHERNET_MINSIZE;
+        }
+
+        /* 
+        ** advance head counter behind descriptor needed for this frame, 
+        ** so that needed descriptor is reserved from that on. The next
+        ** action will be to add the passed buffer to the TX-descriptor
+        */
+        pTxd = pTxPort->pTxdRingHead;
+        pTxPort->pTxdRingHead = pTxd->pNextTxd;
+        pTxPort->TxdRingFree--;
+
+#ifdef SK_DUMP_TX
+        DumpMsg(pMessage, "XmitFrame");
+#endif
+
+        /* 
+        ** First step is to map the data to be sent via the adapter onto
+        ** the DMA memory. Kernel 2.2 uses virt_to_bus(), but kernels 2.4
+        ** and 2.6 need to use pci_map_page() for that mapping.
+        */
+        PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
+                                        virt_to_page(pMessage->data),
+                                        ((unsigned long) pMessage->data & ~PAGE_MASK),
+                                        pMessage->len,
+                                        PCI_DMA_TODEVICE);
+        pTxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
+        pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
+        pTxd->pMBuf     = pMessage;
+
+        if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
+                u16 hdrlen = skb_transport_offset(pMessage);
+                u16 offset = hdrlen + pMessage->csum_offset;
+
+                if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&
+                        (pAC->GIni.GIChipRev == 0) &&
+                        (pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
+                        pTxd->TBControl = BMU_TCP_CHECK;
+                } else {
+                        pTxd->TBControl = BMU_UDP_CHECK;
+                }
+
+                pTxd->TcpSumOfs = 0;
+                pTxd->TcpSumSt  = hdrlen;
+                pTxd->TcpSumWr  = offset;
+
+                pTxd->TBControl |= BMU_OWN | BMU_STF | 
+                                   BMU_SW  | BMU_EOF |
+#ifdef USE_TX_COMPLETE
+                                   BMU_IRQ_EOF |
+#endif
+                                   pMessage->len;
+        } else {
+                pTxd->TBControl = BMU_OWN | BMU_STF | BMU_CHECK | 
+                                  BMU_SW  | BMU_EOF |
+#ifdef USE_TX_COMPLETE
+                                   BMU_IRQ_EOF |
+#endif
+                        pMessage->len;
+        }
+
+        /* 
+        ** If previous descriptor already done, give TX start cmd 
+        */
+        pOldTxd = xchg(&pTxPort->pTxdRingPrev, pTxd);
+        if ((pOldTxd->TBControl & BMU_OWN) == 0) {
+                SK_OUT8(pTxPort->HwAddr, Q_CSR, CSR_START);
+        }       
+
+        /* 
+        ** after releasing the lock, the skb may immediately be free'd 
+        */
+        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
+        if (pTxPort->TxdRingFree != 0) {
+                return (BytesSend);
+        } else {
+                return (0);
+        }
+
+} /* XmitFrame */
+
+/*****************************************************************************
+ *
+ *      XmitFrameSG - fill one socket buffer into the transmit ring
+ *                (use SG and TCP/UDP hardware checksumming)
+ *
+ * Description:
+ *      This function puts a message into the transmit descriptor ring
+ *      if there is a descriptors left.
+ *
+ * Returns:
+ *      > 0 - on succes: the number of bytes in the message
+ *      = 0 - on resource shortage: this frame sent or dropped, now
+ *              the ring is full ( -> set tbusy)
+ *      < 0 - on failure: other problems ( -> return failure to upper layers)
+ */
+static int XmitFrameSG(
+SK_AC           *pAC,           /* pointer to adapter context           */
+TX_PORT         *pTxPort,       /* pointer to struct of port to send to */
+struct sk_buff  *pMessage)      /* pointer to send-message              */
+{
+
+        TXD             *pTxd;
+        TXD             *pTxdFst;
+        TXD             *pTxdLst;
+        int              CurrFrag;
+        int              BytesSend;
+        skb_frag_t      *sk_frag;
+        SK_U64           PhysAddr;
+        unsigned long    Flags;
+        SK_U32           Control;
+
+        spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
+#ifndef USE_TX_COMPLETE
+        FreeTxDescriptors(pAC, pTxPort);
+#endif
+        if ((skb_shinfo(pMessage)->nr_frags +1) > pTxPort->TxdRingFree) {
+                FreeTxDescriptors(pAC, pTxPort);
+                if ((skb_shinfo(pMessage)->nr_frags + 1) > pTxPort->TxdRingFree) {
+                        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
+                        SK_PNMI_CNT_NO_TX_BUF(pAC, pTxPort->PortIndex);
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_TX_PROGRESS,
+                                ("XmitFrameSG failed - Ring full\n"));
+                                /* this message can not be sent now */
+                        return(-1);
+                }
+        }
+
+        pTxd      = pTxPort->pTxdRingHead;
+        pTxdFst   = pTxd;
+        pTxdLst   = pTxd;
+        BytesSend = 0;
+
+        /* 
+        ** Map the first fragment (header) into the DMA-space
+        */
+        PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
+                        virt_to_page(pMessage->data),
+                        ((unsigned long) pMessage->data & ~PAGE_MASK),
+                        skb_headlen(pMessage),
+                        PCI_DMA_TODEVICE);
+
+        pTxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
+        pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
+
+        /* 
+        ** Does the HW need to evaluate checksum for TCP or UDP packets? 
+        */
+        if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
+                u16 hdrlen = skb_transport_offset(pMessage);
+                u16 offset = hdrlen + pMessage->csum_offset;
+
+                Control = BMU_STFWD;
+
+                /* 
+                ** We have to use the opcode for tcp here,  because the
+                ** opcode for udp is not working in the hardware yet 
+                ** (Revision 2.0)
+                */
+                if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&
+                        (pAC->GIni.GIChipRev == 0) &&
+                        (pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
+                        Control |= BMU_TCP_CHECK;
+                } else {
+                        Control |= BMU_UDP_CHECK;
+                }
+
+                pTxd->TcpSumOfs = 0;
+                pTxd->TcpSumSt  = hdrlen;
+                pTxd->TcpSumWr  = offset;
+        } else
+                Control = BMU_CHECK | BMU_SW;
+
+        pTxd->TBControl = BMU_STF | Control | skb_headlen(pMessage);
+
+        pTxd = pTxd->pNextTxd;
+        pTxPort->TxdRingFree--;
+        BytesSend += skb_headlen(pMessage);
+
+        /* 
+        ** Browse over all SG fragments and map each of them into the DMA space
+        */
+        for (CurrFrag = 0; CurrFrag < skb_shinfo(pMessage)->nr_frags; CurrFrag++) {
+                sk_frag = &skb_shinfo(pMessage)->frags[CurrFrag];
+                /* 
+                ** we already have the proper value in entry
+                */
+                PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
+                                                 sk_frag->page,
+                                                 sk_frag->page_offset,
+                                                 sk_frag->size,
+                                                 PCI_DMA_TODEVICE);
+
+                pTxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
+                pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
+                pTxd->pMBuf     = pMessage;
+                
+                pTxd->TBControl = Control | BMU_OWN | sk_frag->size;
+
+                /* 
+                ** Do we have the last fragment? 
+                */
+                if( (CurrFrag+1) == skb_shinfo(pMessage)->nr_frags )  {
+#ifdef USE_TX_COMPLETE
+                        pTxd->TBControl |= BMU_EOF | BMU_IRQ_EOF;
+#else
+                        pTxd->TBControl |= BMU_EOF;
+#endif
+                        pTxdFst->TBControl |= BMU_OWN | BMU_SW;
+                }
+                pTxdLst = pTxd;
+                pTxd    = pTxd->pNextTxd;
+                pTxPort->TxdRingFree--;
+                BytesSend += sk_frag->size;
+        }
+
+        /* 
+        ** If previous descriptor already done, give TX start cmd 
+        */
+        if ((pTxPort->pTxdRingPrev->TBControl & BMU_OWN) == 0) {
+                SK_OUT8(pTxPort->HwAddr, Q_CSR, CSR_START);
+        }
+
+        pTxPort->pTxdRingPrev = pTxdLst;
+        pTxPort->pTxdRingHead = pTxd;
+
+        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
+
+        if (pTxPort->TxdRingFree > 0) {
+                return (BytesSend);
+        } else {
+                return (0);
+        }
+}
+
+/*****************************************************************************
+ *
+ *      FreeTxDescriptors - release descriptors from the descriptor ring
+ *
+ * Description:
+ *      This function releases descriptors from a transmit ring if they
+ *      have been sent by the BMU.
+ *      If a descriptors is sent, it can be freed and the message can
+ *      be freed, too.
+ *      The SOFTWARE controllable bit is used to prevent running around a
+ *      completely free ring for ever. If this bit is no set in the
+ *      frame (by XmitFrame), this frame has never been sent or is
+ *      already freed.
+ *      The Tx descriptor ring lock must be held while calling this function !!!
+ *
+ * Returns:
+ *      none
+ */
+static void FreeTxDescriptors(
+SK_AC   *pAC,           /* pointer to the adapter context */
+TX_PORT *pTxPort)       /* pointer to destination port structure */
+{
+TXD     *pTxd;          /* pointer to the checked descriptor */
+TXD     *pNewTail;      /* pointer to 'end' of the ring */
+SK_U32  Control;        /* TBControl field of descriptor */
+SK_U64  PhysAddr;       /* address of DMA mapping */
+
+        pNewTail = pTxPort->pTxdRingTail;
+        pTxd     = pNewTail;
+        /*
+        ** loop forever; exits if BMU_SW bit not set in start frame
+        ** or BMU_OWN bit set in any frame
+        */
+        while (1) {
+                Control = pTxd->TBControl;
+                if ((Control & BMU_SW) == 0) {
+                        /*
+                        ** software controllable bit is set in first
+                        ** fragment when given to BMU. Not set means that
+                        ** this fragment was never sent or is already
+                        ** freed ( -> ring completely free now).
+                        */
+                        pTxPort->pTxdRingTail = pTxd;
+                        netif_wake_queue(pAC->dev[pTxPort->PortIndex]);
+                        return;
+                }
+                if (Control & BMU_OWN) {
+                        pTxPort->pTxdRingTail = pTxd;
+                        if (pTxPort->TxdRingFree > 0) {
+                                netif_wake_queue(pAC->dev[pTxPort->PortIndex]);
+                        }
+                        return;
+                }
+                
+                /* 
+                ** release the DMA mapping, because until not unmapped
+                ** this buffer is considered being under control of the
+                ** adapter card!
+                */
+                PhysAddr = ((SK_U64) pTxd->VDataHigh) << (SK_U64) 32;
+                PhysAddr |= (SK_U64) pTxd->VDataLow;
+                pci_unmap_page(pAC->PciDev, PhysAddr,
+                                 pTxd->pMBuf->len,
+                                 PCI_DMA_TODEVICE);
+
+                if (Control & BMU_EOF)
+                        DEV_KFREE_SKB_ANY(pTxd->pMBuf); /* free message */
+
+                pTxPort->TxdRingFree++;
+                pTxd->TBControl &= ~BMU_SW;
+                pTxd = pTxd->pNextTxd; /* point behind fragment with EOF */
+        } /* while(forever) */
+} /* FreeTxDescriptors */
+
+/*****************************************************************************
+ *
+ *      FillRxRing - fill the receive ring with valid descriptors
+ *
+ * Description:
+ *      This function fills the receive ring descriptors with data
+ *      segments and makes them valid for the BMU.
+ *      The active ring is filled completely, if possible.
+ *      The non-active ring is filled only partial to save memory.
+ *
+ * Description of rx ring structure:
+ *      head - points to the descriptor which will be used next by the BMU
+ *      tail - points to the next descriptor to give to the BMU
+ *      
+ * Returns:     N/A
+ */
+static void FillRxRing(
+SK_AC           *pAC,           /* pointer to the adapter context */
+RX_PORT         *pRxPort)       /* ptr to port struct for which the ring
+                                   should be filled */
+{
+unsigned long   Flags;
+
+        spin_lock_irqsave(&pRxPort->RxDesRingLock, Flags);
+        while (pRxPort->RxdRingFree > pRxPort->RxFillLimit) {
+                if(!FillRxDescriptor(pAC, pRxPort))
+                        break;
+        }
+        spin_unlock_irqrestore(&pRxPort->RxDesRingLock, Flags);
+} /* FillRxRing */
+
+
+/*****************************************************************************
+ *
+ *      FillRxDescriptor - fill one buffer into the receive ring
+ *
+ * Description:
+ *      The function allocates a new receive buffer and
+ *      puts it into the next descriptor.
+ *
+ * Returns:
+ *      SK_TRUE - a buffer was added to the ring
+ *      SK_FALSE - a buffer could not be added
+ */
+static SK_BOOL FillRxDescriptor(
+SK_AC           *pAC,           /* pointer to the adapter context struct */
+RX_PORT         *pRxPort)       /* ptr to port struct of ring to fill */
+{
+struct sk_buff  *pMsgBlock;     /* pointer to a new message block */
+RXD             *pRxd;          /* the rxd to fill */
+SK_U16          Length;         /* data fragment length */
+SK_U64          PhysAddr;       /* physical address of a rx buffer */
+
+        pMsgBlock = alloc_skb(pAC->RxBufSize, GFP_ATOMIC);
+        if (pMsgBlock == NULL) {
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                        SK_DBGCAT_DRV_ENTRY,
+                        ("%s: Allocation of rx buffer failed !\n",
+                        pAC->dev[pRxPort->PortIndex]->name));
+                SK_PNMI_CNT_NO_RX_BUF(pAC, pRxPort->PortIndex);
+                return(SK_FALSE);
+        }
+        skb_reserve(pMsgBlock, 2); /* to align IP frames */
+        /* skb allocated ok, so add buffer */
+        pRxd = pRxPort->pRxdRingTail;
+        pRxPort->pRxdRingTail = pRxd->pNextRxd;
+        pRxPort->RxdRingFree--;
+        Length = pAC->RxBufSize;
+        PhysAddr = (SK_U64) pci_map_page(pAC->PciDev,
+                virt_to_page(pMsgBlock->data),
+                ((unsigned long) pMsgBlock->data &
+                ~PAGE_MASK),
+                pAC->RxBufSize - 2,
+                PCI_DMA_FROMDEVICE);
+
+        pRxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
+        pRxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
+        pRxd->pMBuf     = pMsgBlock;
+        pRxd->RBControl = BMU_OWN       | 
+                          BMU_STF       | 
+                          BMU_IRQ_EOF   | 
+                          BMU_TCP_CHECK | 
+                          Length;
+        return (SK_TRUE);
+
+} /* FillRxDescriptor */
+
+
+/*****************************************************************************
+ *
+ *      ReQueueRxBuffer - fill one buffer back into the receive ring
+ *
+ * Description:
+ *      Fill a given buffer back into the rx ring. The buffer
+ *      has been previously allocated and aligned, and its phys.
+ *      address calculated, so this is no more necessary.
+ *
+ * Returns: N/A
+ */
+static void ReQueueRxBuffer(
+SK_AC           *pAC,           /* pointer to the adapter context struct */
+RX_PORT         *pRxPort,       /* ptr to port struct of ring to fill */
+struct sk_buff  *pMsg,          /* pointer to the buffer */
+SK_U32          PhysHigh,       /* phys address high dword */
+SK_U32          PhysLow)        /* phys address low dword */
+{
+RXD             *pRxd;          /* the rxd to fill */
+SK_U16          Length;         /* data fragment length */
+
+        pRxd = pRxPort->pRxdRingTail;
+        pRxPort->pRxdRingTail = pRxd->pNextRxd;
+        pRxPort->RxdRingFree--;
+        Length = pAC->RxBufSize;
+
+        pRxd->VDataLow  = PhysLow;
+        pRxd->VDataHigh = PhysHigh;
+        pRxd->pMBuf     = pMsg;
+        pRxd->RBControl = BMU_OWN       | 
+                          BMU_STF       |
+                          BMU_IRQ_EOF   | 
+                          BMU_TCP_CHECK | 
+                          Length;
+        return;
+} /* ReQueueRxBuffer */
+
+/*****************************************************************************
+ *
+ *      ReceiveIrq - handle a receive IRQ
+ *
+ * Description:
+ *      This function is called when a receive IRQ is set.
+ *      It walks the receive descriptor ring and sends up all
+ *      frames that are complete.
+ *
+ * Returns:     N/A
+ */
+static void ReceiveIrq(
+        SK_AC           *pAC,                   /* pointer to adapter context */
+        RX_PORT         *pRxPort,               /* pointer to receive port struct */
+        SK_BOOL         SlowPathLock)   /* indicates if SlowPathLock is needed */
+{
+RXD                             *pRxd;                  /* pointer to receive descriptors */
+SK_U32                  Control;                /* control field of descriptor */
+struct sk_buff  *pMsg;                  /* pointer to message holding frame */
+struct sk_buff  *pNewMsg;               /* pointer to a new message for copying frame */
+int                             FrameLength;    /* total length of received frame */
+SK_MBUF                 *pRlmtMbuf;             /* ptr to a buffer for giving a frame to rlmt */
+SK_EVPARA               EvPara;                 /* an event parameter union */  
+unsigned long   Flags;                  /* for spin lock */
+int                             PortIndex = pRxPort->PortIndex;
+unsigned int    Offset;
+unsigned int    NumBytes;
+unsigned int    ForRlmt;
+SK_BOOL                 IsBc;
+SK_BOOL                 IsMc;
+SK_BOOL  IsBadFrame;                    /* Bad frame */
+
+SK_U32                  FrameStat;
+SK_U64                  PhysAddr;
+
+rx_start:       
+        /* do forever; exit if BMU_OWN found */
+        for ( pRxd = pRxPort->pRxdRingHead ;
+                  pRxPort->RxdRingFree < pAC->RxDescrPerRing ;
+                  pRxd = pRxd->pNextRxd,
+                  pRxPort->pRxdRingHead = pRxd,
+                  pRxPort->RxdRingFree ++) {
+
+                /*
+                 * For a better understanding of this loop
+                 * Go through every descriptor beginning at the head
+                 * Please note: the ring might be completely received so the OWN bit
+                 * set is not a good crirteria to leave that loop.
+                 * Therefore the RingFree counter is used.
+                 * On entry of this loop pRxd is a pointer to the Rxd that needs
+                 * to be checked next.
+                 */
+
+                Control = pRxd->RBControl;
+        
+                /* check if this descriptor is ready */
+                if ((Control & BMU_OWN) != 0) {
+                        /* this descriptor is not yet ready */
+                        /* This is the usual end of the loop */
+                        /* We don't need to start the ring again */
+                        FillRxRing(pAC, pRxPort);
+                        return;
+                }
+                pAC->DynIrqModInfo.NbrProcessedDescr++;
+
+                /* get length of frame and check it */
+                FrameLength = Control & BMU_BBC;
+                if (FrameLength > pAC->RxBufSize) {
+                        goto rx_failed;
+                }
+
+                /* check for STF and EOF */
+                if ((Control & (BMU_STF | BMU_EOF)) != (BMU_STF | BMU_EOF)) {
+                        goto rx_failed;
+                }
+
+                /* here we have a complete frame in the ring */
+                pMsg = pRxd->pMBuf;
+
+                FrameStat = pRxd->FrameStat;
+
+                /* check for frame length mismatch */
+#define XMR_FS_LEN_SHIFT        18
+#define GMR_FS_LEN_SHIFT        16
+                if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+                        if (FrameLength != (SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)) {
+                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                        SK_DBGCAT_DRV_RX_PROGRESS,
+                                        ("skge: Frame length mismatch (%u/%u).\n",
+                                        FrameLength,
+                                        (SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)));
+                                goto rx_failed;
+                        }
+                }
+                else {
+                        if (FrameLength != (SK_U32) (FrameStat >> GMR_FS_LEN_SHIFT)) {
+                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                        SK_DBGCAT_DRV_RX_PROGRESS,
+                                        ("skge: Frame length mismatch (%u/%u).\n",
+                                        FrameLength,
+                                        (SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)));
+                                goto rx_failed;
+                        }
+                }
+
+                /* Set Rx Status */
+                if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+                        IsBc = (FrameStat & XMR_FS_BC) != 0;
+                        IsMc = (FrameStat & XMR_FS_MC) != 0;
+                        IsBadFrame = (FrameStat &
+                                (XMR_FS_ANY_ERR | XMR_FS_2L_VLAN)) != 0;
+                } else {
+                        IsBc = (FrameStat & GMR_FS_BC) != 0;
+                        IsMc = (FrameStat & GMR_FS_MC) != 0;
+                        IsBadFrame = (((FrameStat & GMR_FS_ANY_ERR) != 0) ||
+                                                        ((FrameStat & GMR_FS_RX_OK) == 0));
+                }
+
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 0,
+                        ("Received frame of length %d on port %d\n",
+                        FrameLength, PortIndex));
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 0,
+                        ("Number of free rx descriptors: %d\n",
+                        pRxPort->RxdRingFree));
+/* DumpMsg(pMsg, "Rx"); */
+
+                if ((Control & BMU_STAT_VAL) != BMU_STAT_VAL || (IsBadFrame)) {
+#if 0
+                        (FrameStat & (XMR_FS_ANY_ERR | XMR_FS_2L_VLAN)) != 0) {
+#endif
+                        /* there is a receive error in this frame */
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_RX_PROGRESS,
+                                ("skge: Error in received frame, dropped!\n"
+                                "Control: %x\nRxStat: %x\n",
+                                Control, FrameStat));
+
+                        ReQueueRxBuffer(pAC, pRxPort, pMsg,
+                                pRxd->VDataHigh, pRxd->VDataLow);
+
+                        continue;
+                }
+
+                /*
+                 * if short frame then copy data to reduce memory waste
+                 */
+                if ((FrameLength < SK_COPY_THRESHOLD) &&
+                        ((pNewMsg = alloc_skb(FrameLength+2, GFP_ATOMIC)) != NULL)) {
+                        /*
+                         * Short frame detected and allocation successfull
+                         */
+                        /* use new skb and copy data */
+                        skb_reserve(pNewMsg, 2);
+                        skb_put(pNewMsg, FrameLength);
+                        PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
+                        PhysAddr |= (SK_U64) pRxd->VDataLow;
+
+                        pci_dma_sync_single_for_cpu(pAC->PciDev,
+                                                    (dma_addr_t) PhysAddr,
+                                                    FrameLength,
+                                                    PCI_DMA_FROMDEVICE);
+                        skb_copy_to_linear_data(pNewMsg, pMsg, FrameLength);
+
+                        pci_dma_sync_single_for_device(pAC->PciDev,
+                                                       (dma_addr_t) PhysAddr,
+                                                       FrameLength,
+                                                       PCI_DMA_FROMDEVICE);
+                        ReQueueRxBuffer(pAC, pRxPort, pMsg,
+                                pRxd->VDataHigh, pRxd->VDataLow);
+
+                        pMsg = pNewMsg;
+
+                }
+                else {
+                        /*
+                         * if large frame, or SKB allocation failed, pass
+                         * the SKB directly to the networking
+                         */
+
+                        PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
+                        PhysAddr |= (SK_U64) pRxd->VDataLow;
+
+                        /* release the DMA mapping */
+                        pci_unmap_single(pAC->PciDev,
+                                         PhysAddr,
+                                         pAC->RxBufSize - 2,
+                                         PCI_DMA_FROMDEVICE);
+
+                        /* set length in message */
+                        skb_put(pMsg, FrameLength);
+                } /* frame > SK_COPY_TRESHOLD */
+
+#ifdef USE_SK_RX_CHECKSUM
+                pMsg->csum = pRxd->TcpSums & 0xffff;
+                pMsg->ip_summed = CHECKSUM_COMPLETE;
+#else
+                pMsg->ip_summed = CHECKSUM_NONE;
+#endif
+
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("V"));
+                ForRlmt = SK_RLMT_RX_PROTOCOL;
+#if 0
+                IsBc = (FrameStat & XMR_FS_BC)==XMR_FS_BC;
+#endif
+                SK_RLMT_PRE_LOOKAHEAD(pAC, PortIndex, FrameLength,
+                        IsBc, &Offset, &NumBytes);
+                if (NumBytes != 0) {
+#if 0
+                        IsMc = (FrameStat & XMR_FS_MC)==XMR_FS_MC;
+#endif
+                        SK_RLMT_LOOKAHEAD(pAC, PortIndex,
+                                &pMsg->data[Offset],
+                                IsBc, IsMc, &ForRlmt);
+                }
+                if (ForRlmt == SK_RLMT_RX_PROTOCOL) {
+                                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("W"));
+                        /* send up only frames from active port */
+                        if ((PortIndex == pAC->ActivePort) ||
+                                (pAC->RlmtNets == 2)) {
+                                /* frame for upper layer */
+                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("U"));
+#ifdef xDEBUG
+                                DumpMsg(pMsg, "Rx");
+#endif
+                                SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,
+                                        FrameLength, pRxPort->PortIndex);
+
+                                pMsg->protocol = eth_type_trans(pMsg,
+                                        pAC->dev[pRxPort->PortIndex]);
+                                netif_rx(pMsg);
+                                pAC->dev[pRxPort->PortIndex]->last_rx = jiffies;
+                        }
+                        else {
+                                /* drop frame */
+                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                        SK_DBGCAT_DRV_RX_PROGRESS,
+                                        ("D"));
+                                DEV_KFREE_SKB(pMsg);
+                        }
+                        
+                } /* if not for rlmt */
+                else {
+                        /* packet for rlmt */
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                SK_DBGCAT_DRV_RX_PROGRESS, ("R"));
+                        pRlmtMbuf = SkDrvAllocRlmtMbuf(pAC,
+                                pAC->IoBase, FrameLength);
+                        if (pRlmtMbuf != NULL) {
+                                pRlmtMbuf->pNext = NULL;
+                                pRlmtMbuf->Length = FrameLength;
+                                pRlmtMbuf->PortIdx = PortIndex;
+                                EvPara.pParaPtr = pRlmtMbuf;
+                                memcpy((char*)(pRlmtMbuf->pData),
+                                           (char*)(pMsg->data),
+                                           FrameLength);
+
+                                /* SlowPathLock needed? */
+                                if (SlowPathLock == SK_TRUE) {
+                                        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+                                        SkEventQueue(pAC, SKGE_RLMT,
+                                                SK_RLMT_PACKET_RECEIVED,
+                                                EvPara);
+                                        pAC->CheckQueue = SK_TRUE;
+                                        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+                                } else {
+                                        SkEventQueue(pAC, SKGE_RLMT,
+                                                SK_RLMT_PACKET_RECEIVED,
+                                                EvPara);
+                                        pAC->CheckQueue = SK_TRUE;
+                                }
+
+                                SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+                                        SK_DBGCAT_DRV_RX_PROGRESS,
+                                        ("Q"));
+                        }
+                        if ((pAC->dev[pRxPort->PortIndex]->flags &
+                                (IFF_PROMISC | IFF_ALLMULTI)) != 0 ||
+                                (ForRlmt & SK_RLMT_RX_PROTOCOL) ==
+                                SK_RLMT_RX_PROTOCOL) {
+                                pMsg->protocol = eth_type_trans(pMsg,
+                                        pAC->dev[pRxPort->PortIndex]);
+                                netif_rx(pMsg);
+                                pAC->dev[pRxPort->PortIndex]->last_rx = jiffies;
+                        }
+                        else {
+                                DEV_KFREE_SKB(pMsg);
+                        }
+
+                } /* if packet for rlmt */
+        } /* for ... scanning the RXD ring */
+
+        /* RXD ring is empty -> fill and restart */
+        FillRxRing(pAC, pRxPort);
+        /* do not start if called from Close */
+        if (pAC->BoardLevel > SK_INIT_DATA) {
+                ClearAndStartRx(pAC, PortIndex);
+        }
+        return;
+
+rx_failed:
+        /* remove error frame */
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ERROR,
+                ("Schrottdescriptor, length: 0x%x\n", FrameLength));
+
+        /* release the DMA mapping */
+
+        PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
+        PhysAddr |= (SK_U64) pRxd->VDataLow;
+        pci_unmap_page(pAC->PciDev,
+                         PhysAddr,
+                         pAC->RxBufSize - 2,
+                         PCI_DMA_FROMDEVICE);
+        DEV_KFREE_SKB_IRQ(pRxd->pMBuf);
+        pRxd->pMBuf = NULL;
+        pRxPort->RxdRingFree++;
+        pRxPort->pRxdRingHead = pRxd->pNextRxd;
+        goto rx_start;
+
+} /* ReceiveIrq */
+
+
+/*****************************************************************************
+ *
+ *      ClearAndStartRx - give a start receive command to BMU, clear IRQ
+ *
+ * Description:
+ *      This function sends a start command and a clear interrupt
+ *      command for one receive queue to the BMU.
+ *
+ * Returns: N/A
+ *      none
+ */
+static void ClearAndStartRx(
+SK_AC   *pAC,           /* pointer to the adapter context */
+int     PortIndex)      /* index of the receive port (XMAC) */
+{
+        SK_OUT8(pAC->IoBase,
+                RxQueueAddr[PortIndex]+Q_CSR,
+                CSR_START | CSR_IRQ_CL_F);
+} /* ClearAndStartRx */
+
+
+/*****************************************************************************
+ *
+ *      ClearTxIrq - give a clear transmit IRQ command to BMU
+ *
+ * Description:
+ *      This function sends a clear tx IRQ command for one
+ *      transmit queue to the BMU.
+ *
+ * Returns: N/A
+ */
+static void ClearTxIrq(
+SK_AC   *pAC,           /* pointer to the adapter context */
+int     PortIndex,      /* index of the transmit port (XMAC) */
+int     Prio)           /* priority or normal queue */
+{
+        SK_OUT8(pAC->IoBase, 
+                TxQueueAddr[PortIndex][Prio]+Q_CSR,
+                CSR_IRQ_CL_F);
+} /* ClearTxIrq */
+
+
+/*****************************************************************************
+ *
+ *      ClearRxRing - remove all buffers from the receive ring
+ *
+ * Description:
+ *      This function removes all receive buffers from the ring.
+ *      The receive BMU must be stopped before calling this function.
+ *
+ * Returns: N/A
+ */
+static void ClearRxRing(
+SK_AC   *pAC,           /* pointer to adapter context */
+RX_PORT *pRxPort)       /* pointer to rx port struct */
+{
+RXD             *pRxd;  /* pointer to the current descriptor */
+unsigned long   Flags;
+SK_U64          PhysAddr;
+
+        if (pRxPort->RxdRingFree == pAC->RxDescrPerRing) {
+                return;
+        }
+        spin_lock_irqsave(&pRxPort->RxDesRingLock, Flags);
+        pRxd = pRxPort->pRxdRingHead;
+        do {
+                if (pRxd->pMBuf != NULL) {
+
+                        PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
+                        PhysAddr |= (SK_U64) pRxd->VDataLow;
+                        pci_unmap_page(pAC->PciDev,
+                                         PhysAddr,
+                                         pAC->RxBufSize - 2,
+                                         PCI_DMA_FROMDEVICE);
+                        DEV_KFREE_SKB(pRxd->pMBuf);
+                        pRxd->pMBuf = NULL;
+                }
+                pRxd->RBControl &= BMU_OWN;
+                pRxd = pRxd->pNextRxd;
+                pRxPort->RxdRingFree++;
+        } while (pRxd != pRxPort->pRxdRingTail);
+        pRxPort->pRxdRingTail = pRxPort->pRxdRingHead;
+        spin_unlock_irqrestore(&pRxPort->RxDesRingLock, Flags);
+} /* ClearRxRing */
+
+/*****************************************************************************
+ *
+ *      ClearTxRing - remove all buffers from the transmit ring
+ *
+ * Description:
+ *      This function removes all transmit buffers from the ring.
+ *      The transmit BMU must be stopped before calling this function
+ *      and transmitting at the upper level must be disabled.
+ *      The BMU own bit of all descriptors is cleared, the rest is
+ *      done by calling FreeTxDescriptors.
+ *
+ * Returns: N/A
+ */
+static void ClearTxRing(
+SK_AC   *pAC,           /* pointer to adapter context */
+TX_PORT *pTxPort)       /* pointer to tx prt struct */
+{
+TXD             *pTxd;          /* pointer to the current descriptor */
+int             i;
+unsigned long   Flags;
+
+        spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
+        pTxd = pTxPort->pTxdRingHead;
+        for (i=0; i<pAC->TxDescrPerRing; i++) {
+                pTxd->TBControl &= ~BMU_OWN;
+                pTxd = pTxd->pNextTxd;
+        }
+        FreeTxDescriptors(pAC, pTxPort);
+        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
+} /* ClearTxRing */
+
+/*****************************************************************************
+ *
+ *      SkGeSetMacAddr - Set the hardware MAC address
+ *
+ * Description:
+ *      This function sets the MAC address used by the adapter.
+ *
+ * Returns:
+ *      0, if everything is ok
+ *      !=0, on error
+ */
+static int SkGeSetMacAddr(struct SK_NET_DEVICE *dev, void *p)
+{
+
+DEV_NET *pNet = netdev_priv(dev);
+SK_AC   *pAC = pNet->pAC;
+
+struct sockaddr *addr = p;
+unsigned long   Flags;
+        
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("SkGeSetMacAddr starts now...\n"));
+        if(netif_running(dev))
+                return -EBUSY;
+
+        memcpy(dev->dev_addr, addr->sa_data,dev->addr_len);
+        
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+
+        if (pAC->RlmtNets == 2)
+                SkAddrOverride(pAC, pAC->IoBase, pNet->NetNr,
+                        (SK_MAC_ADDR*)dev->dev_addr, SK_ADDR_VIRTUAL_ADDRESS);
+        else
+                SkAddrOverride(pAC, pAC->IoBase, pAC->ActivePort,
+                        (SK_MAC_ADDR*)dev->dev_addr, SK_ADDR_VIRTUAL_ADDRESS);
+
+        
+        
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+        return 0;
+} /* SkGeSetMacAddr */
+
+
+/*****************************************************************************
+ *
+ *      SkGeSetRxMode - set receive mode
+ *
+ * Description:
+ *      This function sets the receive mode of an adapter. The adapter
+ *      supports promiscuous mode, allmulticast mode and a number of
+ *      multicast addresses. If more multicast addresses the available
+ *      are selected, a hash function in the hardware is used.
+ *
+ * Returns:
+ *      0, if everything is ok
+ *      !=0, on error
+ */
+static void SkGeSetRxMode(struct SK_NET_DEVICE *dev)
+{
+
+DEV_NET         *pNet;
+SK_AC           *pAC;
+
+struct dev_mc_list      *pMcList;
+int                     i;
+int                     PortIdx;
+unsigned long           Flags;
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("SkGeSetRxMode starts now... "));
+
+        pNet = netdev_priv(dev);
+        pAC = pNet->pAC;
+        if (pAC->RlmtNets == 1)
+                PortIdx = pAC->ActivePort;
+        else
+                PortIdx = pNet->NetNr;
+
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+        if (dev->flags & IFF_PROMISC) {
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                        ("PROMISCUOUS mode\n"));
+                SkAddrPromiscuousChange(pAC, pAC->IoBase, PortIdx,
+                        SK_PROM_MODE_LLC);
+        } else if (dev->flags & IFF_ALLMULTI) {
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                        ("ALLMULTI mode\n"));
+                SkAddrPromiscuousChange(pAC, pAC->IoBase, PortIdx,
+                        SK_PROM_MODE_ALL_MC);
+        } else {
+                SkAddrPromiscuousChange(pAC, pAC->IoBase, PortIdx,
+                        SK_PROM_MODE_NONE);
+                SkAddrMcClear(pAC, pAC->IoBase, PortIdx, 0);
+
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                        ("Number of MC entries: %d ", dev->mc_count));
+                
+                pMcList = dev->mc_list;
+                for (i=0; i<dev->mc_count; i++, pMcList = pMcList->next) {
+                        SkAddrMcAdd(pAC, pAC->IoBase, PortIdx,
+                                (SK_MAC_ADDR*)pMcList->dmi_addr, 0);
+                        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_MCA,
+                                ("%02x:%02x:%02x:%02x:%02x:%02x\n",
+                                pMcList->dmi_addr[0],
+                                pMcList->dmi_addr[1],
+                                pMcList->dmi_addr[2],
+                                pMcList->dmi_addr[3],
+                                pMcList->dmi_addr[4],
+                                pMcList->dmi_addr[5]));
+                }
+                SkAddrMcUpdate(pAC, pAC->IoBase, PortIdx);
+        }
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+        
+        return;
+} /* SkGeSetRxMode */
+
+
+/*****************************************************************************
+ *
+ *      SkGeChangeMtu - set the MTU to another value
+ *
+ * Description:
+ *      This function sets is called whenever the MTU size is changed
+ *      (ifconfig mtu xxx dev ethX). If the MTU is bigger than standard
+ *      ethernet MTU size, long frame support is activated.
+ *
+ * Returns:
+ *      0, if everything is ok
+ *      !=0, on error
+ */
+static int SkGeChangeMtu(struct SK_NET_DEVICE *dev, int NewMtu)
+{
+DEV_NET         *pNet;
+struct net_device *pOtherDev;
+SK_AC           *pAC;
+unsigned long   Flags;
+int             i;
+SK_EVPARA       EvPara;
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("SkGeChangeMtu starts now...\n"));
+
+        pNet = netdev_priv(dev);
+        pAC  = pNet->pAC;
+
+        if ((NewMtu < 68) || (NewMtu > SK_JUMBO_MTU)) {
+                return -EINVAL;
+        }
+
+        if(pAC->BoardLevel != SK_INIT_RUN) {
+                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
+
+        pOtherDev = pAC->dev[1 - pNet->NetNr];
+
+        if ( netif_running(pOtherDev) && (pOtherDev->mtu > 1500)
+             && (NewMtu <= 1500))
+                return 0;
+
+        pAC->RxBufSize = NewMtu + 32;
+        dev->mtu = NewMtu;
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("New MTU: %d\n", NewMtu));
+
+        /* 
+        ** Prevent any reconfiguration while changing the MTU 
+        ** by disabling any interrupts 
+        */
+        SK_OUT32(pAC->IoBase, B0_IMSK, 0);
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+
+        /* 
+        ** Notify RLMT that any ports are to be stopped
+        */
+        EvPara.Para32[0] =  0;
+        EvPara.Para32[1] = -1;
+        if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+                EvPara.Para32[0] =  1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+        } else {
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+        }
+
+        /*
+        ** After calling the SkEventDispatcher(), RLMT is aware about
+        ** the stopped ports -> configuration can take place!
+        */
+        SkEventDispatcher(pAC, pAC->IoBase);
+
+        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+                spin_lock(&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock);
+                netif_stop_queue(pAC->dev[i]);
+
+        }
+
+        /*
+        ** Depending on the desired MTU size change, a different number of 
+        ** RX buffers need to be allocated
+        */
+        if (NewMtu > 1500) {
+            /* 
+            ** Use less rx buffers 
+            */
+            for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+                if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
+                    pAC->RxPort[i].RxFillLimit =  pAC->RxDescrPerRing -
+                                                 (pAC->RxDescrPerRing / 4);
+                } else {
+                    if (i == pAC->ActivePort) {
+                        pAC->RxPort[i].RxFillLimit = pAC->RxDescrPerRing - 
+                                                    (pAC->RxDescrPerRing / 4);
+                    } else {
+                        pAC->RxPort[i].RxFillLimit = pAC->RxDescrPerRing - 
+                                                    (pAC->RxDescrPerRing / 10);
+                    }
+                }
+            }
+        } else {
+            /* 
+            ** Use the normal amount of rx buffers 
+            */
+            for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+                if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
+                    pAC->RxPort[i].RxFillLimit = 1;
+                } else {
+                    if (i == pAC->ActivePort) {
+                        pAC->RxPort[i].RxFillLimit = 1;
+                    } else {
+                        pAC->RxPort[i].RxFillLimit = pAC->RxDescrPerRing -
+                                                    (pAC->RxDescrPerRing / 4);
+                    }
+                }
+            }
+        }
+        
+        SkGeDeInit(pAC, pAC->IoBase);
+
+        /*
+        ** enable/disable hardware support for long frames
+        */
+        if (NewMtu > 1500) {
+// pAC->JumboActivated = SK_TRUE; /* is never set back !!! */
+                pAC->GIni.GIPortUsage = SK_JUMBO_LINK;
+        } else {
+            if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
+                pAC->GIni.GIPortUsage = SK_MUL_LINK;
+            } else {
+                pAC->GIni.GIPortUsage = SK_RED_LINK;
+            }
+        }
+
+        SkGeInit(   pAC, pAC->IoBase, SK_INIT_IO);
+        SkI2cInit(  pAC, pAC->IoBase, SK_INIT_IO);
+        SkEventInit(pAC, pAC->IoBase, SK_INIT_IO);
+        SkPnmiInit( pAC, pAC->IoBase, SK_INIT_IO);
+        SkAddrInit( pAC, pAC->IoBase, SK_INIT_IO);
+        SkRlmtInit( pAC, pAC->IoBase, SK_INIT_IO);
+        SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
+        
+        /*
+        ** tschilling:
+        ** Speed and others are set back to default in level 1 init!
+        */
+        GetConfiguration(pAC);
+        
+        SkGeInit(   pAC, pAC->IoBase, SK_INIT_RUN);
+        SkI2cInit(  pAC, pAC->IoBase, SK_INIT_RUN);
+        SkEventInit(pAC, pAC->IoBase, SK_INIT_RUN);
+        SkPnmiInit( pAC, pAC->IoBase, SK_INIT_RUN);
+        SkAddrInit( pAC, pAC->IoBase, SK_INIT_RUN);
+        SkRlmtInit( pAC, pAC->IoBase, SK_INIT_RUN);
+        SkTimerInit(pAC, pAC->IoBase, SK_INIT_RUN);
+
+        /*
+        ** clear and reinit the rx rings here
+        */
+        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
+                ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE);
+                ClearRxRing(pAC, &pAC->RxPort[i]);
+                FillRxRing(pAC, &pAC->RxPort[i]);
+
+                /* 
+                ** Enable transmit descriptor polling
+                */
+                SkGePollTxD(pAC, pAC->IoBase, i, SK_TRUE);
+                FillRxRing(pAC, &pAC->RxPort[i]);
+        };
+
+        SkGeYellowLED(pAC, pAC->IoBase, 1);
+        SkDimEnableModerationIfNeeded(pAC);     
+        SkDimDisplayModerationSettings(pAC);
+
+        netif_start_queue(pAC->dev[pNet->PortNr]);
+        for (i=pAC->GIni.GIMacsFound-1; i>=0; i--) {
+                spin_unlock(&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock);
+        }
+
+        /* 
+        ** Enable Interrupts again 
+        */
+        SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
+        SK_OUT32(pAC->IoBase, B0_HWE_IMSK, IRQ_HWE_MASK);
+
+        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
+        SkEventDispatcher(pAC, pAC->IoBase);
+
+        /* 
+        ** Notify RLMT about the changing and restarting one (or more) ports
+        */
+        if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
+                EvPara.Para32[0] = pAC->RlmtNets;
+                EvPara.Para32[1] = -1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_SET_NETS, EvPara);
+                EvPara.Para32[0] = pNet->PortNr;
+                EvPara.Para32[1] = -1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
+                        
+                if (netif_running(pOtherDev)) {
+                        DEV_NET *pOtherNet = netdev_priv(pOtherDev);
+                        EvPara.Para32[0] = pOtherNet->PortNr;
+                        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
+                }
+        } else {
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
+        }
+
+        SkEventDispatcher(pAC, pAC->IoBase);
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+        
+        /*
+        ** While testing this driver with latest kernel 2.5 (2.5.70), it 
+        ** seems as if upper layers have a problem to handle a successful
+        ** return value of '0'. If such a zero is returned, the complete 
+        ** system hangs for several minutes (!), which is in acceptable.
+        **
+        ** Currently it is not clear, what the exact reason for this problem
+        ** is. The implemented workaround for 2.5 is to return the desired 
+        ** new MTU size if all needed changes for the new MTU size where 
+        ** performed. In kernels 2.2 and 2.4, a zero value is returned,
+        ** which indicates the successful change of the mtu-size.
+        */
+        return NewMtu;
+
+} /* SkGeChangeMtu */
+
+
+/*****************************************************************************
+ *
+ *      SkGeStats - return ethernet device statistics
+ *
+ * Description:
+ *      This function return statistic data about the ethernet device
+ *      to the operating system.
+ *
+ * Returns:
+ *      pointer to the statistic structure.
+ */
+static struct net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev)
+{
+DEV_NET *pNet = netdev_priv(dev);
+SK_AC   *pAC = pNet->pAC;
+SK_PNMI_STRUCT_DATA *pPnmiStruct;       /* structure for all Pnmi-Data */
+SK_PNMI_STAT    *pPnmiStat;             /* pointer to virtual XMAC stat. data */
+SK_PNMI_CONF    *pPnmiConf;             /* pointer to virtual link config. */
+unsigned int    Size;                   /* size of pnmi struct */
+unsigned long   Flags;                  /* for spin lock */
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("SkGeStats starts now...\n"));
+        pPnmiStruct = &pAC->PnmiStruct;
+
+#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];
+
+        pAC->stats.rx_packets = (SK_U32) pPnmiStruct->RxDeliveredCts & 0xFFFFFFFF;
+        pAC->stats.tx_packets = (SK_U32) pPnmiStat->StatTxOkCts & 0xFFFFFFFF;
+        pAC->stats.rx_bytes = (SK_U32) pPnmiStruct->RxOctetsDeliveredCts;
+        pAC->stats.tx_bytes = (SK_U32) pPnmiStat->StatTxOctetsOkCts;
+        
+        if (dev->mtu <= 1500) {
+                pAC->stats.rx_errors = (SK_U32) pPnmiStruct->InErrorsCts & 0xFFFFFFFF;
+        } else {
+                pAC->stats.rx_errors = (SK_U32) ((pPnmiStruct->InErrorsCts -
+                        pPnmiStat->StatRxTooLongCts) & 0xFFFFFFFF);
+        }
+
+
+        if (pAC->GIni.GP[0].PhyType == SK_PHY_XMAC && pAC->HWRevision < 12)
+                pAC->stats.rx_errors = pAC->stats.rx_errors - pPnmiStat->StatRxShortsCts;
+
+        pAC->stats.tx_errors = (SK_U32) pPnmiStat->StatTxSingleCollisionCts & 0xFFFFFFFF;
+        pAC->stats.rx_dropped = (SK_U32) pPnmiStruct->RxNoBufCts & 0xFFFFFFFF;
+        pAC->stats.tx_dropped = (SK_U32) pPnmiStruct->TxNoBufCts & 0xFFFFFFFF;
+        pAC->stats.multicast = (SK_U32) pPnmiStat->StatRxMulticastOkCts & 0xFFFFFFFF;
+        pAC->stats.collisions = (SK_U32) pPnmiStat->StatTxSingleCollisionCts & 0xFFFFFFFF;
+
+        /* detailed rx_errors: */
+        pAC->stats.rx_length_errors = (SK_U32) pPnmiStat->StatRxRuntCts & 0xFFFFFFFF;
+        pAC->stats.rx_over_errors = (SK_U32) pPnmiStat->StatRxFifoOverflowCts & 0xFFFFFFFF;
+        pAC->stats.rx_crc_errors = (SK_U32) pPnmiStat->StatRxFcsCts & 0xFFFFFFFF;
+        pAC->stats.rx_frame_errors = (SK_U32) pPnmiStat->StatRxFramingCts & 0xFFFFFFFF;
+        pAC->stats.rx_fifo_errors = (SK_U32) pPnmiStat->StatRxFifoOverflowCts & 0xFFFFFFFF;
+        pAC->stats.rx_missed_errors = (SK_U32) pPnmiStat->StatRxMissedCts & 0xFFFFFFFF;
+
+        /* detailed tx_errors */
+        pAC->stats.tx_aborted_errors = (SK_U32) 0;
+        pAC->stats.tx_carrier_errors = (SK_U32) pPnmiStat->StatTxCarrierCts & 0xFFFFFFFF;
+        pAC->stats.tx_fifo_errors = (SK_U32) pPnmiStat->StatTxFifoUnderrunCts & 0xFFFFFFFF;
+        pAC->stats.tx_heartbeat_errors = (SK_U32) pPnmiStat->StatTxCarrierCts & 0xFFFFFFFF;
+        pAC->stats.tx_window_errors = (SK_U32) 0;
+
+        return(&pAC->stats);
+} /* SkGeStats */
+
+/*
+ * Basic MII register access
+ */
+static int SkGeMiiIoctl(struct net_device *dev,
+                        struct mii_ioctl_data *data, int cmd)
+{
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+        SK_IOC IoC = pAC->IoBase;
+        int Port = pNet->PortNr;
+        SK_GEPORT *pPrt = &pAC->GIni.GP[Port];
+        unsigned long Flags;
+        int err = 0;
+        int reg = data->reg_num & 0x1f;
+        SK_U16 val = data->val_in;
+
+        if (!netif_running(dev))
+                return -ENODEV; /* Phy still in reset */
+
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+        switch(cmd) {
+        case SIOCGMIIPHY:
+                data->phy_id = pPrt->PhyAddr;
+
+                /* fallthru */
+        case SIOCGMIIREG:
+                if (pAC->GIni.GIGenesis)
+                        SkXmPhyRead(pAC, IoC, Port, reg, &val);
+                else
+                        SkGmPhyRead(pAC, IoC, Port, reg, &val);
+
+                data->val_out = val;
+                break;
+
+        case SIOCSMIIREG:
+                if (!capable(CAP_NET_ADMIN))
+                        err = -EPERM;
+
+                else if (pAC->GIni.GIGenesis)
+                        SkXmPhyWrite(pAC, IoC, Port, reg, val);
+                else
+                        SkGmPhyWrite(pAC, IoC, Port, reg, val);
+                break;
+        default:
+                err = -EOPNOTSUPP;
+        }
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+        return err;
+}
+
+
+/*****************************************************************************
+ *
+ *      SkGeIoctl - IO-control function
+ *
+ * Description:
+ *      This function is called if an ioctl is issued on the device.
+ *      There are three subfunction for reading, writing and test-writing
+ *      the private MIB data structure (useful for SysKonnect-internal tools).
+ *
+ * Returns:
+ *      0, if everything is ok
+ *      !=0, on error
+ */
+static int SkGeIoctl(struct SK_NET_DEVICE *dev, struct ifreq *rq, int cmd)
+{
+DEV_NET         *pNet;
+SK_AC           *pAC;
+void            *pMemBuf;
+struct pci_dev  *pdev = NULL;
+SK_GE_IOCTL     Ioctl;
+unsigned int    Err = 0;
+int             Size = 0;
+int             Ret = 0;
+unsigned int    Length = 0;
+int             HeaderLength = sizeof(SK_U32) + sizeof(SK_U32);
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("SkGeIoctl starts now...\n"));
+
+        pNet = netdev_priv(dev);
+        pAC = pNet->pAC;
+        
+        if (cmd == SIOCGMIIPHY || cmd == SIOCSMIIREG || cmd == SIOCGMIIREG)
+            return SkGeMiiIoctl(dev, if_mii(rq), cmd);
+
+        if(copy_from_user(&Ioctl, rq->ifr_data, sizeof(SK_GE_IOCTL))) {
+                return -EFAULT;
+        }
+
+        switch(cmd) {
+        case SK_IOCTL_SETMIB:
+        case SK_IOCTL_PRESETMIB:
+                if (!capable(CAP_NET_ADMIN)) return -EPERM;
+        case SK_IOCTL_GETMIB:
+                if(copy_from_user(&pAC->PnmiStruct, Ioctl.pData,
+                        Ioctl.Len<sizeof(pAC->PnmiStruct)?
+                        Ioctl.Len : sizeof(pAC->PnmiStruct))) {
+                        return -EFAULT;
+                }
+                Size = SkGeIocMib(pNet, Ioctl.Len, cmd);
+                if(copy_to_user(Ioctl.pData, &pAC->PnmiStruct,
+                        Ioctl.Len<Size? Ioctl.Len : Size)) {
+                        return -EFAULT;
+                }
+                Ioctl.Len = Size;
+                if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) {
+                        return -EFAULT;
+                }
+                break;
+        case SK_IOCTL_GEN:
+                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_gen;
+                }
+                if ((Ret = SkPnmiGenIoctl(pAC, pAC->IoBase, pMemBuf, &Length, 0)) < 0) {
+                        Err = -EFAULT;
+                        goto fault_gen;
+                }
+                if(copy_to_user(Ioctl.pData, pMemBuf, Length) ) {
+                        Err = -EFAULT;
+                        goto fault_gen;
+                }
+                Ioctl.Len = Length;
+                if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) {
+                        Err = -EFAULT;
+                        goto fault_gen;
+                }
+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(pci_name(pdev));
+                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;
+        }
+
+        return(Err);
+
+} /* SkGeIoctl */
+
+
+/*****************************************************************************
+ *
+ *      SkGeIocMib - handle a GetMib, SetMib- or PresetMib-ioctl message
+ *
+ * Description:
+ *      This function reads/writes the MIB data using PNMI (Private Network
+ *      Management Interface).
+ *      The destination for the data must be provided with the
+ *      ioctl call and is given to the driver in the form of
+ *      a user space address.
+ *      Copying from the user-provided data area into kernel messages
+ *      and back is done by copy_from_user and copy_to_user calls in
+ *      SkGeIoctl.
+ *
+ * Returns:
+ *      returned size from PNMI call
+ */
+static int SkGeIocMib(
+DEV_NET         *pNet,  /* pointer to the adapter context */
+unsigned int    Size,   /* length of ioctl data */
+int             mode)   /* flag for set/preset */
+{
+unsigned long   Flags;  /* for spin lock */
+SK_AC           *pAC;
+
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("SkGeIocMib starts now...\n"));
+        pAC = pNet->pAC;
+        /* access MIB */
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+        switch(mode) {
+        case SK_IOCTL_GETMIB:
+                SkPnmiGetStruct(pAC, pAC->IoBase, &pAC->PnmiStruct, &Size,
+                        pNet->NetNr);
+                break;
+        case SK_IOCTL_PRESETMIB:
+                SkPnmiPreSetStruct(pAC, pAC->IoBase, &pAC->PnmiStruct, &Size,
+                        pNet->NetNr);
+                break;
+        case SK_IOCTL_SETMIB:
+                SkPnmiSetStruct(pAC, pAC->IoBase, &pAC->PnmiStruct, &Size,
+                        pNet->NetNr);
+                break;
+        default:
+                break;
+        }
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+                ("MIB data access succeeded\n"));
+        return (Size);
+} /* SkGeIocMib */
+
+
+/*****************************************************************************
+ *
+ *      GetConfiguration - read configuration information
+ *
+ * Description:
+ *      This function reads per-adapter configuration information from
+ *      the options provided on the command line.
+ *
+ * Returns:
+ *      none
+ */
+static void GetConfiguration(
+SK_AC   *pAC)   /* pointer to the adapter context structure */
+{
+SK_I32  Port;           /* preferred port */
+SK_BOOL AutoSet;
+SK_BOOL DupSet;
+int     LinkSpeed          = SK_LSPEED_AUTO;    /* Link speed */
+int     AutoNeg            = 1;                 /* autoneg off (0) or on (1) */
+int     DuplexCap          = 0;                 /* 0=both,1=full,2=half */
+int     FlowCtrl           = SK_FLOW_MODE_SYM_OR_REM;   /* FlowControl  */
+int     MSMode             = SK_MS_MODE_AUTO;   /* master/slave mode    */
+
+SK_BOOL IsConTypeDefined   = SK_TRUE;
+SK_BOOL IsLinkSpeedDefined = SK_TRUE;
+SK_BOOL IsFlowCtrlDefined  = SK_TRUE;
+SK_BOOL IsRoleDefined      = SK_TRUE;
+SK_BOOL IsModeDefined      = SK_TRUE;
+/*
+ *      The two parameters AutoNeg. and DuplexCap. map to one configuration
+ *      parameter. The mapping is described by this table:
+ *      DuplexCap ->    |       both    |       full    |       half    |
+ *      AutoNeg         |               |               |               |
+ *      -----------------------------------------------------------------
+ *      Off             |    illegal    |       Full    |       Half    |
+ *      -----------------------------------------------------------------
+ *      On              |   AutoBoth    |   AutoFull    |   AutoHalf    |
+ *      -----------------------------------------------------------------
+ *      Sense           |   AutoSense   |   AutoSense   |   AutoSense   |
+ */
+int     Capabilities[3][3] =
+                { {                -1, SK_LMODE_FULL     , SK_LMODE_HALF     },
+                  {SK_LMODE_AUTOBOTH , SK_LMODE_AUTOFULL , SK_LMODE_AUTOHALF },
+                  {SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE} };
+
+#define DC_BOTH 0
+#define DC_FULL 1
+#define DC_HALF 2
+#define AN_OFF  0
+#define AN_ON   1
+#define AN_SENS 2
+#define M_CurrPort pAC->GIni.GP[Port]
+
+
+        /*
+        ** Set the default values first for both ports!
+        */
+        for (Port = 0; Port < SK_MAX_MACS; Port++) {
+                M_CurrPort.PLinkModeConf = Capabilities[AN_ON][DC_BOTH];
+                M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_SYM_OR_REM;
+                M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
+                M_CurrPort.PLinkSpeed    = SK_LSPEED_AUTO;
+        }
+
+        /*
+        ** Check merged parameter ConType. If it has not been used,
+        ** verify any other parameter (e.g. AutoNeg) and use default values. 
+        **
+        ** Stating both ConType and other lowlevel link parameters is also
+        ** possible. If this is the case, the passed ConType-parameter is 
+        ** overwritten by the lowlevel link parameter.
+        **
+        ** The following settings are used for a merged ConType-parameter:
+        **
+        ** ConType   DupCap   AutoNeg   FlowCtrl      Role      Speed
+        ** -------   ------   -------   --------   ----------   -----
+        **  Auto      Both      On      SymOrRem      Auto       Auto
+        **  100FD     Full      Off       None      <ignored>    100
+        **  100HD     Half      Off       None      <ignored>    100
+        **  10FD      Full      Off       None      <ignored>    10
+        **  10HD      Half      Off       None      <ignored>    10
+        ** 
+        ** This ConType parameter is used for all ports of the adapter!
+        */
+        if ( (ConType != NULL)                && 
+             (pAC->Index < SK_MAX_CARD_PARAM) &&
+             (ConType[pAC->Index] != NULL) ) {
+
+                        /* Check chipset family */
+                        if ((!pAC->ChipsetType) && 
+                                (strcmp(ConType[pAC->Index],"Auto")!=0) &&
+                                (strcmp(ConType[pAC->Index],"")!=0)) {
+                                /* Set the speed parameter back */
+                                        printk("sk98lin: Illegal value \"%s\" " 
+                                                        "for ConType."
+                                                        " Using Auto.\n", 
+                                                        ConType[pAC->Index]);
+
+                                        sprintf(ConType[pAC->Index], "Auto");   
+                        }
+
+                                if (strcmp(ConType[pAC->Index],"")==0) {
+                        IsConTypeDefined = SK_FALSE; /* No ConType defined */
+                                } else if (strcmp(ConType[pAC->Index],"Auto")==0) {
+                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
+                        M_CurrPort.PLinkModeConf = Capabilities[AN_ON][DC_BOTH];
+                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_SYM_OR_REM;
+                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
+                        M_CurrPort.PLinkSpeed    = SK_LSPEED_AUTO;
+                    }
+                } else if (strcmp(ConType[pAC->Index],"100FD")==0) {
+                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
+                        M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_FULL];
+                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
+                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
+                        M_CurrPort.PLinkSpeed    = SK_LSPEED_100MBPS;
+                    }
+                } else if (strcmp(ConType[pAC->Index],"100HD")==0) {
+                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
+                        M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_HALF];
+                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
+                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
+                        M_CurrPort.PLinkSpeed    = SK_LSPEED_100MBPS;
+                    }
+                } else if (strcmp(ConType[pAC->Index],"10FD")==0) {
+                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
+                        M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_FULL];
+                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
+                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
+                        M_CurrPort.PLinkSpeed    = SK_LSPEED_10MBPS;
+                    }
+                } else if (strcmp(ConType[pAC->Index],"10HD")==0) {
+                    for (Port = 0; Port < SK_MAX_MACS; Port++) {
+                        M_CurrPort.PLinkModeConf = Capabilities[AN_OFF][DC_HALF];
+                        M_CurrPort.PFlowCtrlMode = SK_FLOW_MODE_NONE;
+                        M_CurrPort.PMSMode       = SK_MS_MODE_AUTO;
+                        M_CurrPort.PLinkSpeed    = SK_LSPEED_10MBPS;
+                    }
+                } else { 
+                    printk("sk98lin: Illegal value \"%s\" for ConType\n", 
+                        ConType[pAC->Index]);
+                    IsConTypeDefined = SK_FALSE; /* Wrong ConType defined */
+                }
+        } else {
+            IsConTypeDefined = SK_FALSE; /* No ConType defined */
+        }
+
+        /*
+        ** Parse any parameter settings for port A:
+        ** a) any LinkSpeed stated?
+        */
+        if (Speed_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                Speed_A[pAC->Index] != NULL) {
+                if (strcmp(Speed_A[pAC->Index],"")==0) {
+                    IsLinkSpeedDefined = SK_FALSE;
+                } else if (strcmp(Speed_A[pAC->Index],"Auto")==0) {
+                    LinkSpeed = SK_LSPEED_AUTO;
+                } else if (strcmp(Speed_A[pAC->Index],"10")==0) {
+                    LinkSpeed = SK_LSPEED_10MBPS;
+                } else if (strcmp(Speed_A[pAC->Index],"100")==0) {
+                    LinkSpeed = SK_LSPEED_100MBPS;
+                } else if (strcmp(Speed_A[pAC->Index],"1000")==0) {
+                    LinkSpeed = SK_LSPEED_1000MBPS;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for Speed_A\n",
+                        Speed_A[pAC->Index]);
+                    IsLinkSpeedDefined = SK_FALSE;
+                }
+        } else {
+            IsLinkSpeedDefined = SK_FALSE;
+        }
+
+        /* 
+        ** Check speed parameter: 
+        **    Only copper type adapter and GE V2 cards 
+        */
+        if (((!pAC->ChipsetType) || (pAC->GIni.GICopperType != SK_TRUE)) &&
+                ((LinkSpeed != SK_LSPEED_AUTO) &&
+                (LinkSpeed != SK_LSPEED_1000MBPS))) {
+                printk("sk98lin: Illegal value for Speed_A. "
+                        "Not a copper card or GE V2 card\n    Using "
+                        "speed 1000\n");
+                LinkSpeed = SK_LSPEED_1000MBPS;
+        }
+        
+        /*      
+        ** Decide whether to set new config value if somethig valid has
+        ** been received.
+        */
+        if (IsLinkSpeedDefined) {
+                pAC->GIni.GP[0].PLinkSpeed = LinkSpeed;
+        } 
+
+        /* 
+        ** b) Any Autonegotiation and DuplexCapabilities set?
+        **    Please note that both belong together...
+        */
+        AutoNeg = AN_ON; /* tschilling: Default: Autonegotiation on! */
+        AutoSet = SK_FALSE;
+        if (AutoNeg_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                AutoNeg_A[pAC->Index] != NULL) {
+                AutoSet = SK_TRUE;
+                if (strcmp(AutoNeg_A[pAC->Index],"")==0) {
+                    AutoSet = SK_FALSE;
+                } else if (strcmp(AutoNeg_A[pAC->Index],"On")==0) {
+                    AutoNeg = AN_ON;
+                } else if (strcmp(AutoNeg_A[pAC->Index],"Off")==0) {
+                    AutoNeg = AN_OFF;
+                } else if (strcmp(AutoNeg_A[pAC->Index],"Sense")==0) {
+                    AutoNeg = AN_SENS;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for AutoNeg_A\n",
+                        AutoNeg_A[pAC->Index]);
+                }
+        }
+
+        DuplexCap = DC_BOTH;
+        DupSet    = SK_FALSE;
+        if (DupCap_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                DupCap_A[pAC->Index] != NULL) {
+                DupSet = SK_TRUE;
+                if (strcmp(DupCap_A[pAC->Index],"")==0) {
+                    DupSet = SK_FALSE;
+                } else if (strcmp(DupCap_A[pAC->Index],"Both")==0) {
+                    DuplexCap = DC_BOTH;
+                } else if (strcmp(DupCap_A[pAC->Index],"Full")==0) {
+                    DuplexCap = DC_FULL;
+                } else if (strcmp(DupCap_A[pAC->Index],"Half")==0) {
+                    DuplexCap = DC_HALF;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for DupCap_A\n",
+                        DupCap_A[pAC->Index]);
+                }
+        }
+
+        /* 
+        ** Check for illegal combinations 
+        */
+        if ((LinkSpeed == SK_LSPEED_1000MBPS) &&
+                ((DuplexCap == SK_LMODE_STAT_AUTOHALF) ||
+                (DuplexCap == SK_LMODE_STAT_HALF)) &&
+                (pAC->ChipsetType)) {
+                    printk("sk98lin: Half Duplex not possible with Gigabit speed!\n"
+                                        "    Using Full Duplex.\n");
+                                DuplexCap = DC_FULL;
+        }
+
+        if ( AutoSet && AutoNeg==AN_SENS && DupSet) {
+                printk("sk98lin, Port A: DuplexCapabilities"
+                        " ignored using Sense mode\n");
+        }
+
+        if (AutoSet && AutoNeg==AN_OFF && DupSet && DuplexCap==DC_BOTH){
+                printk("sk98lin: Port A: Illegal combination"
+                        " of values AutoNeg. and DuplexCap.\n    Using "
+                        "Full Duplex\n");
+                DuplexCap = DC_FULL;
+        }
+
+        if (AutoSet && AutoNeg==AN_OFF && !DupSet) {
+                DuplexCap = DC_FULL;
+        }
+        
+        if (!AutoSet && DupSet) {
+                printk("sk98lin: Port A: Duplex setting not"
+                        " possible in\n    default AutoNegotiation mode"
+                        " (Sense).\n    Using AutoNegotiation On\n");
+                AutoNeg = AN_ON;
+        }
+        
+        /* 
+        ** set the desired mode 
+        */
+        if (AutoSet || DupSet) {
+            pAC->GIni.GP[0].PLinkModeConf = Capabilities[AutoNeg][DuplexCap];
+        }
+        
+        /* 
+        ** c) Any Flowcontrol-parameter set?
+        */
+        if (FlowCtrl_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                FlowCtrl_A[pAC->Index] != NULL) {
+                if (strcmp(FlowCtrl_A[pAC->Index],"") == 0) {
+                    IsFlowCtrlDefined = SK_FALSE;
+                } else if (strcmp(FlowCtrl_A[pAC->Index],"SymOrRem") == 0) {
+                    FlowCtrl = SK_FLOW_MODE_SYM_OR_REM;
+                } else if (strcmp(FlowCtrl_A[pAC->Index],"Sym")==0) {
+                    FlowCtrl = SK_FLOW_MODE_SYMMETRIC;
+                } else if (strcmp(FlowCtrl_A[pAC->Index],"LocSend")==0) {
+                    FlowCtrl = SK_FLOW_MODE_LOC_SEND;
+                } else if (strcmp(FlowCtrl_A[pAC->Index],"None")==0) {
+                    FlowCtrl = SK_FLOW_MODE_NONE;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for FlowCtrl_A\n",
+                        FlowCtrl_A[pAC->Index]);
+                    IsFlowCtrlDefined = SK_FALSE;
+                }
+        } else {
+           IsFlowCtrlDefined = SK_FALSE;
+        }
+
+        if (IsFlowCtrlDefined) {
+            if ((AutoNeg == AN_OFF) && (FlowCtrl != SK_FLOW_MODE_NONE)) {
+                printk("sk98lin: Port A: FlowControl"
+                        " impossible without AutoNegotiation,"
+                        " disabled\n");
+                FlowCtrl = SK_FLOW_MODE_NONE;
+            }
+            pAC->GIni.GP[0].PFlowCtrlMode = FlowCtrl;
+        }
+
+        /*
+        ** d) What is with the RoleParameter?
+        */
+        if (Role_A != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                Role_A[pAC->Index] != NULL) {
+                if (strcmp(Role_A[pAC->Index],"")==0) {
+                   IsRoleDefined = SK_FALSE;
+                } else if (strcmp(Role_A[pAC->Index],"Auto")==0) {
+                    MSMode = SK_MS_MODE_AUTO;
+                } else if (strcmp(Role_A[pAC->Index],"Master")==0) {
+                    MSMode = SK_MS_MODE_MASTER;
+                } else if (strcmp(Role_A[pAC->Index],"Slave")==0) {
+                    MSMode = SK_MS_MODE_SLAVE;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for Role_A\n",
+                        Role_A[pAC->Index]);
+                    IsRoleDefined = SK_FALSE;
+                }
+        } else {
+           IsRoleDefined = SK_FALSE;
+        }
+
+        if (IsRoleDefined == SK_TRUE) {
+            pAC->GIni.GP[0].PMSMode = MSMode;
+        }
+        
+
+        
+        /* 
+        ** Parse any parameter settings for port B:
+        ** a) any LinkSpeed stated?
+        */
+        IsConTypeDefined   = SK_TRUE;
+        IsLinkSpeedDefined = SK_TRUE;
+        IsFlowCtrlDefined  = SK_TRUE;
+        IsModeDefined      = SK_TRUE;
+
+        if (Speed_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                Speed_B[pAC->Index] != NULL) {
+                if (strcmp(Speed_B[pAC->Index],"")==0) {
+                    IsLinkSpeedDefined = SK_FALSE;
+                } else if (strcmp(Speed_B[pAC->Index],"Auto")==0) {
+                    LinkSpeed = SK_LSPEED_AUTO;
+                } else if (strcmp(Speed_B[pAC->Index],"10")==0) {
+                    LinkSpeed = SK_LSPEED_10MBPS;
+                } else if (strcmp(Speed_B[pAC->Index],"100")==0) {
+                    LinkSpeed = SK_LSPEED_100MBPS;
+                } else if (strcmp(Speed_B[pAC->Index],"1000")==0) {
+                    LinkSpeed = SK_LSPEED_1000MBPS;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for Speed_B\n",
+                        Speed_B[pAC->Index]);
+                    IsLinkSpeedDefined = SK_FALSE;
+                }
+        } else {
+            IsLinkSpeedDefined = SK_FALSE;
+        }
+
+        /* 
+        ** Check speed parameter:
+        **    Only copper type adapter and GE V2 cards 
+        */
+        if (((!pAC->ChipsetType) || (pAC->GIni.GICopperType != SK_TRUE)) &&
+                ((LinkSpeed != SK_LSPEED_AUTO) &&
+                (LinkSpeed != SK_LSPEED_1000MBPS))) {
+                printk("sk98lin: Illegal value for Speed_B. "
+                        "Not a copper card or GE V2 card\n    Using "
+                        "speed 1000\n");
+                LinkSpeed = SK_LSPEED_1000MBPS;
+        }
+
+        /*      
+        ** Decide whether to set new config value if somethig valid has
+        ** been received.
+        */
+        if (IsLinkSpeedDefined) {
+            pAC->GIni.GP[1].PLinkSpeed = LinkSpeed;
+        }
+
+        /* 
+        ** b) Any Autonegotiation and DuplexCapabilities set?
+        **    Please note that both belong together...
+        */
+        AutoNeg = AN_SENS; /* default: do auto Sense */
+        AutoSet = SK_FALSE;
+        if (AutoNeg_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                AutoNeg_B[pAC->Index] != NULL) {
+                AutoSet = SK_TRUE;
+                if (strcmp(AutoNeg_B[pAC->Index],"")==0) {
+                    AutoSet = SK_FALSE;
+                } else if (strcmp(AutoNeg_B[pAC->Index],"On")==0) {
+                    AutoNeg = AN_ON;
+                } else if (strcmp(AutoNeg_B[pAC->Index],"Off")==0) {
+                    AutoNeg = AN_OFF;
+                } else if (strcmp(AutoNeg_B[pAC->Index],"Sense")==0) {
+                    AutoNeg = AN_SENS;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for AutoNeg_B\n",
+                        AutoNeg_B[pAC->Index]);
+                }
+        }
+
+        DuplexCap = DC_BOTH;
+        DupSet    = SK_FALSE;
+        if (DupCap_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                DupCap_B[pAC->Index] != NULL) {
+                DupSet = SK_TRUE;
+                if (strcmp(DupCap_B[pAC->Index],"")==0) {
+                    DupSet = SK_FALSE;
+                } else if (strcmp(DupCap_B[pAC->Index],"Both")==0) {
+                    DuplexCap = DC_BOTH;
+                } else if (strcmp(DupCap_B[pAC->Index],"Full")==0) {
+                    DuplexCap = DC_FULL;
+                } else if (strcmp(DupCap_B[pAC->Index],"Half")==0) {
+                    DuplexCap = DC_HALF;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for DupCap_B\n",
+                        DupCap_B[pAC->Index]);
+                }
+        }
+
+        
+        /* 
+        ** Check for illegal combinations 
+        */
+        if ((LinkSpeed == SK_LSPEED_1000MBPS) &&
+                ((DuplexCap == SK_LMODE_STAT_AUTOHALF) ||
+                (DuplexCap == SK_LMODE_STAT_HALF)) &&
+                (pAC->ChipsetType)) {
+                    printk("sk98lin: Half Duplex not possible with Gigabit speed!\n"
+                                        "    Using Full Duplex.\n");
+                                DuplexCap = DC_FULL;
+        }
+
+        if (AutoSet && AutoNeg==AN_SENS && DupSet) {
+                printk("sk98lin, Port B: DuplexCapabilities"
+                        " ignored using Sense mode\n");
+        }
+
+        if (AutoSet && AutoNeg==AN_OFF && DupSet && DuplexCap==DC_BOTH){
+                printk("sk98lin: Port B: Illegal combination"
+                        " of values AutoNeg. and DuplexCap.\n    Using "
+                        "Full Duplex\n");
+                DuplexCap = DC_FULL;
+        }
+
+        if (AutoSet && AutoNeg==AN_OFF && !DupSet) {
+                DuplexCap = DC_FULL;
+        }
+        
+        if (!AutoSet && DupSet) {
+                printk("sk98lin: Port B: Duplex setting not"
+                        " possible in\n    default AutoNegotiation mode"
+                        " (Sense).\n    Using AutoNegotiation On\n");
+                AutoNeg = AN_ON;
+        }
+
+        /* 
+        ** set the desired mode 
+        */
+        if (AutoSet || DupSet) {
+            pAC->GIni.GP[1].PLinkModeConf = Capabilities[AutoNeg][DuplexCap];
+        }
+
+        /*
+        ** c) Any FlowCtrl parameter set?
+        */
+        if (FlowCtrl_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                FlowCtrl_B[pAC->Index] != NULL) {
+                if (strcmp(FlowCtrl_B[pAC->Index],"") == 0) {
+                    IsFlowCtrlDefined = SK_FALSE;
+                } else if (strcmp(FlowCtrl_B[pAC->Index],"SymOrRem") == 0) {
+                    FlowCtrl = SK_FLOW_MODE_SYM_OR_REM;
+                } else if (strcmp(FlowCtrl_B[pAC->Index],"Sym")==0) {
+                    FlowCtrl = SK_FLOW_MODE_SYMMETRIC;
+                } else if (strcmp(FlowCtrl_B[pAC->Index],"LocSend")==0) {
+                    FlowCtrl = SK_FLOW_MODE_LOC_SEND;
+                } else if (strcmp(FlowCtrl_B[pAC->Index],"None")==0) {
+                    FlowCtrl = SK_FLOW_MODE_NONE;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for FlowCtrl_B\n",
+                        FlowCtrl_B[pAC->Index]);
+                    IsFlowCtrlDefined = SK_FALSE;
+                }
+        } else {
+                IsFlowCtrlDefined = SK_FALSE;
+        }
+
+        if (IsFlowCtrlDefined) {
+            if ((AutoNeg == AN_OFF) && (FlowCtrl != SK_FLOW_MODE_NONE)) {
+                printk("sk98lin: Port B: FlowControl"
+                        " impossible without AutoNegotiation,"
+                        " disabled\n");
+                FlowCtrl = SK_FLOW_MODE_NONE;
+            }
+            pAC->GIni.GP[1].PFlowCtrlMode = FlowCtrl;
+        }
+
+        /*
+        ** d) What is the RoleParameter?
+        */
+        if (Role_B != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                Role_B[pAC->Index] != NULL) {
+                if (strcmp(Role_B[pAC->Index],"")==0) {
+                    IsRoleDefined = SK_FALSE;
+                } else if (strcmp(Role_B[pAC->Index],"Auto")==0) {
+                    MSMode = SK_MS_MODE_AUTO;
+                } else if (strcmp(Role_B[pAC->Index],"Master")==0) {
+                    MSMode = SK_MS_MODE_MASTER;
+                } else if (strcmp(Role_B[pAC->Index],"Slave")==0) {
+                    MSMode = SK_MS_MODE_SLAVE;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for Role_B\n",
+                        Role_B[pAC->Index]);
+                    IsRoleDefined = SK_FALSE;
+                }
+        } else {
+            IsRoleDefined = SK_FALSE;
+        }
+
+        if (IsRoleDefined) {
+            pAC->GIni.GP[1].PMSMode = MSMode;
+        }
+        
+        /*
+        ** Evaluate settings for both ports
+        */
+        pAC->ActivePort = 0;
+        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;
+                } 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;
+                } else if (strcmp(PrefPort[pAC->Index],"B") == 0) {
+                        /*
+                        ** 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("sk98lin: Illegal value \"%s\" for PrefPort\n",
+                        PrefPort[pAC->Index]);
+                }
+        }
+
+        pAC->RlmtNets = 1;
+
+        if (RlmtMode != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+                RlmtMode[pAC->Index] != NULL) {
+                if (strcmp(RlmtMode[pAC->Index], "") == 0) {
+                        pAC->RlmtMode = 0;
+                } else if (strcmp(RlmtMode[pAC->Index], "CheckLinkState") == 0) {
+                        pAC->RlmtMode = SK_RLMT_CHECK_LINK;
+                } else if (strcmp(RlmtMode[pAC->Index], "CheckLocalPort") == 0) {
+                        pAC->RlmtMode = SK_RLMT_CHECK_LINK |
+                                        SK_RLMT_CHECK_LOC_LINK;
+                } else if (strcmp(RlmtMode[pAC->Index], "CheckSeg") == 0) {
+                        pAC->RlmtMode = SK_RLMT_CHECK_LINK     |
+                                        SK_RLMT_CHECK_LOC_LINK |
+                                        SK_RLMT_CHECK_SEG;
+                } else if ((strcmp(RlmtMode[pAC->Index], "DualNet") == 0) &&
+                        (pAC->GIni.GIMacsFound == 2)) {
+                        pAC->RlmtMode = SK_RLMT_CHECK_LINK;
+                        pAC->RlmtNets = 2;
+                } else {
+                    printk("sk98lin: Illegal value \"%s\" for"
+                        " RlmtMode, using default\n", 
+                        RlmtMode[pAC->Index]);
+                        pAC->RlmtMode = 0;
+                }
+        } else {
+                pAC->RlmtMode = 0;
+        }
+        
+        /*
+        ** Check the interrupt moderation parameters
+        */
+        if (Moderation[pAC->Index] != NULL) {
+                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;
+        }
+
+        if (Stats[pAC->Index] != NULL) {
+                if (strcmp(Stats[pAC->Index], "Yes") == 0) {
+                        pAC->DynIrqModInfo.DisplayStats = SK_TRUE;
+                } else {
+                        pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
+                }
+        } else {
+                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 (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.PrevTimeVal = jiffies;  /* initial value */
+
+
+} /* GetConfiguration */
+
+
+/*****************************************************************************
+ *
+ *      ProductStr - return a adapter identification string from vpd
+ *
+ * Description:
+ *      This function reads the product name string from the vpd area
+ *      and puts it the field pAC->DeviceString.
+ *
+ * Returns: N/A
+ */
+static inline int ProductStr(
+        SK_AC   *pAC,           /* pointer to adapter context */
+        char    *DeviceStr,     /* result string */
+        int      StrLen         /* length of the string */
+)
+{
+char    Keyword[] = VPD_NAME;   /* vpd productname identifier */
+int     ReturnCode;             /* return code from vpd_read */
+unsigned long Flags;
+
+        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+        ReturnCode = VpdRead(pAC, pAC->IoBase, Keyword, DeviceStr, &StrLen);
+        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+
+        return ReturnCode;
+} /* ProductStr */
+
+/*****************************************************************************
+ *
+ *      StartDrvCleanupTimer - Start timer to check for descriptors which
+ *                             might be placed in descriptor ring, but
+ *                             havent been handled up to now
+ *
+ * Description:
+ *      This function requests a HW-timer fo the Yukon card. The actions to
+ *      perform when this timer expires, are located in the SkDrvEvent().
+ *
+ * Returns: N/A
+ */
+static void
+StartDrvCleanupTimer(SK_AC *pAC) {
+    SK_EVPARA    EventParam;   /* Event struct for timer event */
+
+    SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
+    EventParam.Para32[0] = SK_DRV_RX_CLEANUP_TIMER;
+    SkTimerStart(pAC, pAC->IoBase, &pAC->DrvCleanupTimer,
+                 SK_DRV_RX_CLEANUP_TIMER_LENGTH,
+                 SKGE_DRV, SK_DRV_TIMER, EventParam);
+}
+
+/*****************************************************************************
+ *
+ *      StopDrvCleanupTimer - Stop timer to check for descriptors
+ *
+ * Description:
+ *      This function requests a HW-timer fo the Yukon card. The actions to
+ *      perform when this timer expires, are located in the SkDrvEvent().
+ *
+ * Returns: N/A
+ */
+static void
+StopDrvCleanupTimer(SK_AC *pAC) {
+    SkTimerStop(pAC, pAC->IoBase, &pAC->DrvCleanupTimer);
+    SK_MEMSET((char *) &pAC->DrvCleanupTimer, 0, sizeof(SK_TIMER));
+}
+
+/****************************************************************************/
+/* functions for common modules *********************************************/
+/****************************************************************************/
+
+
+/*****************************************************************************
+ *
+ *      SkDrvAllocRlmtMbuf - allocate an RLMT mbuf
+ *
+ * Description:
+ *      This routine returns an RLMT mbuf or NULL. The RLMT Mbuf structure
+ *      is embedded into a socket buff data area.
+ *
+ * Context:
+ *      runtime
+ *
+ * Returns:
+ *      NULL or pointer to Mbuf.
+ */
+SK_MBUF *SkDrvAllocRlmtMbuf(
+SK_AC           *pAC,           /* pointer to adapter context */
+SK_IOC          IoC,            /* the IO-context */
+unsigned        BufferSize)     /* size of the requested buffer */
+{
+SK_MBUF         *pRlmtMbuf;     /* pointer to a new rlmt-mbuf structure */
+struct sk_buff  *pMsgBlock;     /* pointer to a new message block */
+
+        pMsgBlock = alloc_skb(BufferSize + sizeof(SK_MBUF), GFP_ATOMIC);
+        if (pMsgBlock == NULL) {
+                return (NULL);
+        }
+        pRlmtMbuf = (SK_MBUF*) pMsgBlock->data;
+        skb_reserve(pMsgBlock, sizeof(SK_MBUF));
+        pRlmtMbuf->pNext = NULL;
+        pRlmtMbuf->pOs = pMsgBlock;
+        pRlmtMbuf->pData = pMsgBlock->data;     /* Data buffer. */
+        pRlmtMbuf->Size = BufferSize;           /* Data buffer size. */
+        pRlmtMbuf->Length = 0;          /* Length of packet (<= Size). */
+        return (pRlmtMbuf);
+
+} /* SkDrvAllocRlmtMbuf */
+
+
+/*****************************************************************************
+ *
+ *      SkDrvFreeRlmtMbuf - free an RLMT mbuf
+ *
+ * Description:
+ *      This routine frees one or more RLMT mbuf(s).
+ *
+ * Context:
+ *      runtime
+ *
+ * Returns:
+ *      Nothing
+ */
+void  SkDrvFreeRlmtMbuf(
+SK_AC           *pAC,           /* pointer to adapter context */
+SK_IOC          IoC,            /* the IO-context */
+SK_MBUF         *pMbuf)         /* size of the requested buffer */
+{
+SK_MBUF         *pFreeMbuf;
+SK_MBUF         *pNextMbuf;
+
+        pFreeMbuf = pMbuf;
+        do {
+                pNextMbuf = pFreeMbuf->pNext;
+                DEV_KFREE_SKB_ANY(pFreeMbuf->pOs);
+                pFreeMbuf = pNextMbuf;
+        } while ( pFreeMbuf != NULL );
+} /* SkDrvFreeRlmtMbuf */
+
+
+/*****************************************************************************
+ *
+ *      SkOsGetTime - provide a time value
+ *
+ * Description:
+ *      This routine provides a time value. The unit is 1/HZ (defined by Linux).
+ *      It is not used for absolute time, but only for time differences.
+ *
+ *
+ * Returns:
+ *      Time value
+ */
+SK_U64 SkOsGetTime(SK_AC *pAC)
+{
+        SK_U64  PrivateJiffies;
+        SkOsGetTimeCurrent(pAC, &PrivateJiffies);
+        return PrivateJiffies;
+} /* SkOsGetTime */
+
+
+/*****************************************************************************
+ *
+ *      SkPciReadCfgDWord - read a 32 bit value from pci config space
+ *
+ * Description:
+ *      This routine reads a 32 bit value from the pci configuration
+ *      space.
+ *
+ * Returns:
+ *      0 - indicate everything worked ok.
+ *      != 0 - error indication
+ */
+int SkPciReadCfgDWord(
+SK_AC *pAC,             /* Adapter Control structure pointer */
+int PciAddr,            /* PCI register address */
+SK_U32 *pVal)           /* pointer to store the read value */
+{
+        pci_read_config_dword(pAC->PciDev, PciAddr, pVal);
+        return(0);
+} /* SkPciReadCfgDWord */
+
+
+/*****************************************************************************
+ *
+ *      SkPciReadCfgWord - read a 16 bit value from pci config space
+ *
+ * Description:
+ *      This routine reads a 16 bit value from the pci configuration
+ *      space.
+ *
+ * Returns:
+ *      0 - indicate everything worked ok.
+ *      != 0 - error indication
+ */
+int SkPciReadCfgWord(
+SK_AC *pAC,     /* Adapter Control structure pointer */
+int PciAddr,            /* PCI register address */
+SK_U16 *pVal)           /* pointer to store the read value */
+{
+        pci_read_config_word(pAC->PciDev, PciAddr, pVal);
+        return(0);
+} /* SkPciReadCfgWord */
+
+
+/*****************************************************************************
+ *
+ *      SkPciReadCfgByte - read a 8 bit value from pci config space
+ *
+ * Description:
+ *      This routine reads a 8 bit value from the pci configuration
+ *      space.
+ *
+ * Returns:
+ *      0 - indicate everything worked ok.
+ *      != 0 - error indication
+ */
+int SkPciReadCfgByte(
+SK_AC *pAC,     /* Adapter Control structure pointer */
+int PciAddr,            /* PCI register address */
+SK_U8 *pVal)            /* pointer to store the read value */
+{
+        pci_read_config_byte(pAC->PciDev, PciAddr, pVal);
+        return(0);
+} /* SkPciReadCfgByte */
+
+
+/*****************************************************************************
+ *
+ *      SkPciWriteCfgWord - write a 16 bit value to pci config space
+ *
+ * Description:
+ *      This routine writes a 16 bit value to the pci configuration
+ *      space. The flag PciConfigUp indicates whether the config space
+ *      is accesible or must be set up first.
+ *
+ * Returns:
+ *      0 - indicate everything worked ok.
+ *      != 0 - error indication
+ */
+int SkPciWriteCfgWord(
+SK_AC *pAC,     /* Adapter Control structure pointer */
+int PciAddr,            /* PCI register address */
+SK_U16 Val)             /* pointer to store the read value */
+{
+        pci_write_config_word(pAC->PciDev, PciAddr, Val);
+        return(0);
+} /* SkPciWriteCfgWord */
+
+
+/*****************************************************************************
+ *
+ *      SkPciWriteCfgWord - write a 8 bit value to pci config space
+ *
+ * Description:
+ *      This routine writes a 8 bit value to the pci configuration
+ *      space. The flag PciConfigUp indicates whether the config space
+ *      is accesible or must be set up first.
+ *
+ * Returns:
+ *      0 - indicate everything worked ok.
+ *      != 0 - error indication
+ */
+int SkPciWriteCfgByte(
+SK_AC *pAC,     /* Adapter Control structure pointer */
+int PciAddr,            /* PCI register address */
+SK_U8 Val)              /* pointer to store the read value */
+{
+        pci_write_config_byte(pAC->PciDev, PciAddr, Val);
+        return(0);
+} /* SkPciWriteCfgByte */
+
+
+/*****************************************************************************
+ *
+ *      SkDrvEvent - handle driver events
+ *
+ * Description:
+ *      This function handles events from all modules directed to the driver
+ *
+ * Context:
+ *      Is called under protection of slow path lock.
+ *
+ * Returns:
+ *      0 if everything ok
+ *      < 0  on error
+ *      
+ */
+int SkDrvEvent(
+SK_AC *pAC,             /* pointer to adapter context */
+SK_IOC IoC,             /* io-context */
+SK_U32 Event,           /* event-id */
+SK_EVPARA Param)        /* event-parameter */
+{
+SK_MBUF         *pRlmtMbuf;     /* pointer to a rlmt-mbuf structure */
+struct sk_buff  *pMsg;          /* pointer to a message block */
+int             FromPort;       /* the port from which we switch away */
+int             ToPort;         /* the port we switch to */
+SK_EVPARA       NewPara;        /* parameter for further events */
+int             Stat;
+unsigned long   Flags;
+SK_BOOL         DualNet;
+
+        switch (Event) {
+        case SK_DRV_ADAP_FAIL:
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+                        ("ADAPTER FAIL EVENT\n"));
+                printk("%s: Adapter failed.\n", pAC->dev[0]->name);
+                /* disable interrupts */
+                SK_OUT32(pAC->IoBase, B0_IMSK, 0);
+                /* cgoos */
+                break;
+        case SK_DRV_PORT_FAIL:
+                FromPort = Param.Para32[0];
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+                        ("PORT FAIL EVENT, Port: %d\n", FromPort));
+                if (FromPort == 0) {
+                        printk("%s: Port A failed.\n", pAC->dev[0]->name);
+                } else {
+                        printk("%s: Port B failed.\n", pAC->dev[1]->name);
+                }
+                /* cgoos */
+                break;
+        case SK_DRV_PORT_RESET:  /* SK_U32 PortIdx */
+                /* action list 4 */
+                FromPort = Param.Para32[0];
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+                        ("PORT RESET EVENT, Port: %d ", FromPort));
+                NewPara.Para64 = FromPort;
+                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_XMAC_RESET, NewPara);
+                spin_lock_irqsave(
+                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                        Flags);
+
+                SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST);
+                netif_carrier_off(pAC->dev[Param.Para32[0]]);
+                spin_unlock_irqrestore(
+                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                        Flags);
+                
+                /* clear rx ring from received frames */
+                ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE);
+                
+                ClearTxRing(pAC, &pAC->TxPort[FromPort][TX_PRIO_LOW]);
+                spin_lock_irqsave(
+                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                        Flags);
+                
+                /* tschilling: Handling of return value inserted. */
+                if (SkGeInitPort(pAC, IoC, FromPort)) {
+                        if (FromPort == 0) {
+                                printk("%s: SkGeInitPort A failed.\n", pAC->dev[0]->name);
+                        } else {
+                                printk("%s: SkGeInitPort B failed.\n", pAC->dev[1]->name);
+                        }
+                }
+                SkAddrMcUpdate(pAC,IoC, FromPort);
+                PortReInitBmu(pAC, FromPort);
+                SkGePollTxD(pAC, IoC, FromPort, SK_TRUE);
+                ClearAndStartRx(pAC, FromPort);
+                spin_unlock_irqrestore(
+                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                        Flags);
+                break;
+        case SK_DRV_NET_UP:      /* SK_U32 PortIdx */
+        {       struct net_device *dev = pAC->dev[Param.Para32[0]];
+                /* action list 5 */
+                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]);
+
+                /* tschilling: Values changed according to LinkSpeedUsed. */
+                Stat = pAC->GIni.GP[FromPort].PLinkSpeedUsed;
+                if (Stat == SK_LSPEED_STAT_10MBPS) {
+                        printk("    speed:           10\n");
+                } else if (Stat == SK_LSPEED_STAT_100MBPS) {
+                        printk("    speed:           100\n");
+                } else if (Stat == SK_LSPEED_STAT_1000MBPS) {
+                        printk("    speed:           1000\n");
+                } else {
+                        printk("    speed:           unknown\n");
+                }
+
+
+                Stat = pAC->GIni.GP[FromPort].PLinkModeStatus;
+                if (Stat == SK_LMODE_STAT_AUTOHALF ||
+                        Stat == SK_LMODE_STAT_AUTOFULL) {
+                        printk("    autonegotiation: yes\n");
+                }
+                else {
+                        printk("    autonegotiation: no\n");
+                }
+                if (Stat == SK_LMODE_STAT_AUTOHALF ||
+                        Stat == SK_LMODE_STAT_HALF) {
+                        printk("    duplex mode:     half\n");
+                }
+                else {
+                        printk("    duplex mode:     full\n");
+                }
+                Stat = pAC->GIni.GP[FromPort].PFlowCtrlStatus;
+                if (Stat == SK_FLOW_STAT_REM_SEND ) {
+                        printk("    flowctrl:        remote send\n");
+                }
+                else if (Stat == SK_FLOW_STAT_LOC_SEND ){
+                        printk("    flowctrl:        local send\n");
+                }
+                else if (Stat == SK_FLOW_STAT_SYMMETRIC ){
+                        printk("    flowctrl:        symmetric\n");
+                }
+                else {
+                        printk("    flowctrl:        none\n");
+                }
+                
+                /* tschilling: Check against CopperType now. */
+                if ((pAC->GIni.GICopperType == SK_TRUE) &&
+                        (pAC->GIni.GP[FromPort].PLinkSpeedUsed ==
+                        SK_LSPEED_STAT_1000MBPS)) {
+                        Stat = pAC->GIni.GP[FromPort].PMSStatus;
+                        if (Stat == SK_MS_STAT_MASTER ) {
+                                printk("    role:            master\n");
+                        }
+                        else if (Stat == SK_MS_STAT_SLAVE ) {
+                                printk("    role:            slave\n");
+                        }
+                        else {
+                                printk("    role:            ???\n");
+                        }
+                }
+
+                /* 
+                   Display dim (dynamic interrupt moderation) 
+                   informations
+                 */
+                if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_STATIC)
+                        printk("    irq moderation:  static (%d ints/sec)\n",
+                                        pAC->DynIrqModInfo.MaxModIntsPerSec);
+                else if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_DYNAMIC)
+                        printk("    irq moderation:  dynamic (%d ints/sec)\n",
+                                        pAC->DynIrqModInfo.MaxModIntsPerSec);
+                else
+                        printk("    irq moderation:  disabled\n");
+
+
+                printk("    scatter-gather:  %s\n",
+                       (dev->features & NETIF_F_SG) ? "enabled" : "disabled");
+                printk("    tx-checksum:     %s\n",
+                       (dev->features & NETIF_F_IP_CSUM) ? "enabled" : "disabled");
+                printk("    rx-checksum:     %s\n",
+                       pAC->RxPort[Param.Para32[0]].RxCsum ? "enabled" : "disabled");
+
+                } else {
+                        DoPrintInterfaceChange = SK_TRUE;
+                }
+        
+                if ((Param.Para32[0] != pAC->ActivePort) &&
+                        (pAC->RlmtNets == 1)) {
+                        NewPara.Para32[0] = pAC->ActivePort;
+                        NewPara.Para32[1] = Param.Para32[0];
+                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_SWITCH_INTERN,
+                                NewPara);
+                }
+
+                /* Inform the world that link protocol is up. */
+                netif_carrier_on(dev);
+                break;
+        }
+        case SK_DRV_NET_DOWN:    /* SK_U32 Reason */
+                /* action list 7 */
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+                        ("NET DOWN EVENT "));
+                if (DoPrintInterfaceChange) {
+                        printk("%s: network connection down\n", 
+                                pAC->dev[Param.Para32[1]]->name);
+                } else {
+                        DoPrintInterfaceChange = SK_TRUE;
+                }
+                netif_carrier_off(pAC->dev[Param.Para32[1]]);
+                break;
+        case SK_DRV_SWITCH_HARD: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+                        ("PORT SWITCH HARD "));
+        case SK_DRV_SWITCH_SOFT: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
+        /* action list 6 */
+                printk("%s: switching to port %c\n", pAC->dev[0]->name,
+                        'A'+Param.Para32[1]);
+        case SK_DRV_SWITCH_INTERN: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
+                FromPort = Param.Para32[0];
+                ToPort = Param.Para32[1];
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+                        ("PORT SWITCH EVENT, From: %d  To: %d (Pref %d) ",
+                        FromPort, ToPort, pAC->Rlmt.Net[0].PrefPort));
+                NewPara.Para64 = FromPort;
+                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_XMAC_RESET, NewPara);
+                NewPara.Para64 = ToPort;
+                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_XMAC_RESET, NewPara);
+                spin_lock_irqsave(
+                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                        Flags);
+                spin_lock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
+                SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_SOFT_RST);
+                SkGeStopPort(pAC, IoC, ToPort, SK_STOP_ALL, SK_SOFT_RST);
+                spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
+                spin_unlock_irqrestore(
+                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                        Flags);
+
+                ReceiveIrq(pAC, &pAC->RxPort[FromPort], SK_FALSE); /* clears rx ring */
+                ReceiveIrq(pAC, &pAC->RxPort[ToPort], SK_FALSE); /* clears rx ring */
+                
+                ClearTxRing(pAC, &pAC->TxPort[FromPort][TX_PRIO_LOW]);
+                ClearTxRing(pAC, &pAC->TxPort[ToPort][TX_PRIO_LOW]);
+                spin_lock_irqsave(
+                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                        Flags);
+                spin_lock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
+                pAC->ActivePort = ToPort;
+#if 0
+                SetQueueSizes(pAC);
+#else
+                /* tschilling: New common function with minimum size check. */
+                DualNet = SK_FALSE;
+                if (pAC->RlmtNets == 2) {
+                        DualNet = SK_TRUE;
+                }
+                
+                if (SkGeInitAssignRamToQueues(
+                        pAC,
+                        pAC->ActivePort,
+                        DualNet)) {
+                        spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
+                        spin_unlock_irqrestore(
+                                &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                                Flags);
+                        printk("SkGeInitAssignRamToQueues failed.\n");
+                        break;
+                }
+#endif
+                /* tschilling: Handling of return values inserted. */
+                if (SkGeInitPort(pAC, IoC, FromPort) ||
+                        SkGeInitPort(pAC, IoC, ToPort)) {
+                        printk("%s: SkGeInitPort failed.\n", pAC->dev[0]->name);
+                }
+                if (Event == SK_DRV_SWITCH_SOFT) {
+                        SkMacRxTxEnable(pAC, IoC, FromPort);
+                }
+                SkMacRxTxEnable(pAC, IoC, ToPort);
+                SkAddrSwap(pAC, IoC, FromPort, ToPort);
+                SkAddrMcUpdate(pAC, IoC, FromPort);
+                SkAddrMcUpdate(pAC, IoC, ToPort);
+                PortReInitBmu(pAC, FromPort);
+                PortReInitBmu(pAC, ToPort);
+                SkGePollTxD(pAC, IoC, FromPort, SK_TRUE);
+                SkGePollTxD(pAC, IoC, ToPort, SK_TRUE);
+                ClearAndStartRx(pAC, FromPort);
+                ClearAndStartRx(pAC, ToPort);
+                spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
+                spin_unlock_irqrestore(
+                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
+                        Flags);
+                break;
+        case SK_DRV_RLMT_SEND:   /* SK_MBUF *pMb */
+                SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+                        ("RLS "));
+                pRlmtMbuf = (SK_MBUF*) Param.pParaPtr;
+                pMsg = (struct sk_buff*) pRlmtMbuf->pOs;
+                skb_put(pMsg, pRlmtMbuf->Length);
+                if (XmitFrame(pAC, &pAC->TxPort[pRlmtMbuf->PortIdx][TX_PRIO_LOW],
+                        pMsg) < 0)
+
+                        DEV_KFREE_SKB_ANY(pMsg);
+                break;
+        case SK_DRV_TIMER:
+                if (Param.Para32[0] == SK_DRV_MODERATION_TIMER) {
+                        /*
+                        ** expiration of the moderation timer implies that
+                        ** dynamic moderation is to be applied
+                        */
+                        SkDimStartModerationTimer(pAC);
+                        SkDimModerate(pAC);
+                        if (pAC->DynIrqModInfo.DisplayStats) {
+                            SkDimDisplayModerationSettings(pAC);
+                        }
+                } else if (Param.Para32[0] == SK_DRV_RX_CLEANUP_TIMER) {
+                        /*
+                        ** check if we need to check for descriptors which
+                        ** haven't been handled the last millisecs
+                        */
+                        StartDrvCleanupTimer(pAC);
+                        if (pAC->GIni.GIMacsFound == 2) {
+                                ReceiveIrq(pAC, &pAC->RxPort[1], SK_FALSE);
+                        }
+                        ReceiveIrq(pAC, &pAC->RxPort[0], SK_FALSE);
+                } else {
+                        printk("Expiration of unknown timer\n");
+                }
+                break;
+        default:
+                break;
+        }
+        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+                ("END EVENT "));
+        
+        return (0);
+} /* SkDrvEvent */
+
+
+/*****************************************************************************
+ *
+ *      SkErrorLog - log errors
+ *
+ * Description:
+ *      This function logs errors to the system buffer and to the console
+ *
+ * Returns:
+ *      0 if everything ok
+ *      < 0  on error
+ *      
+ */
+void SkErrorLog(
+SK_AC   *pAC,
+int     ErrClass,
+int     ErrNum,
+char    *pErrorMsg)
+{
+char    ClassStr[80];
+
+        switch (ErrClass) {
+        case SK_ERRCL_OTHER:
+                strcpy(ClassStr, "Other error");
+                break;
+        case SK_ERRCL_CONFIG:
+                strcpy(ClassStr, "Configuration error");
+                break;
+        case SK_ERRCL_INIT:
+                strcpy(ClassStr, "Initialization error");
+                break;
+        case SK_ERRCL_NORES:
+                strcpy(ClassStr, "Out of resources error");
+                break;
+        case SK_ERRCL_SW:
+                strcpy(ClassStr, "internal Software error");
+                break;
+        case SK_ERRCL_HW:
+                strcpy(ClassStr, "Hardware failure");
+                break;
+        case SK_ERRCL_COMM:
+                strcpy(ClassStr, "Communication error");
+                break;
+        }
+        printk(KERN_INFO "%s: -- ERROR --\n        Class:  %s\n"
+                "        Nr:  0x%x\n        Msg:  %s\n", pAC->dev[0]->name,
+                ClassStr, ErrNum, pErrorMsg);
+
+} /* 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 */
+{
+        DEV_NET *pNet = netdev_priv(pAc->dev[0]);
+        SK_AC   *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 (netif_running(pAC->dev[0])) {
+                        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 != netdev_priv(pAC->dev[1])) {
+                        pNet = netdev_priv(pAC->dev[1]);
+                        if (netif_running(pAC->dev[1])) {
+                                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];
+
+        /* On Linux 2.6 the network driver does NOT mess with reference
+        ** counts.  The driver MUST be able to be unloaded at any time
+        ** due to the possibility of hotplug.
+        */
+        if (SkGeClose(dev) != 0) {
+                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);
+        }
+
+        /*
+        ** 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 *****************************************************/
+/****************************************************************************/
+
+
+/*****************************************************************************
+ *
+ *      DumpMsg - print a frame
+ *
+ * Description:
+ *      This function prints frames to the system logfile/to the console.
+ *
+ * Returns: N/A
+ *      
+ */
+static void DumpMsg(struct sk_buff *skb, char *str)
+{
+        int     msglen;
+
+        if (skb == NULL) {
+                printk("DumpMsg(): NULL-Message\n");
+                return;
+        }
+
+        if (skb->data == NULL) {
+                printk("DumpMsg(): Message empty\n");
+                return;
+        }
+
+        msglen = skb->len;
+        if (msglen > 64)
+                msglen = 64;
+
+        printk("--- Begin of message from %s , len %d (from %d) ----\n", str, msglen, skb->len);
+
+        DumpData((char *)skb->data, msglen);
+
+        printk("------- End of message ---------\n");
+} /* DumpMsg */
+
+
+
+/*****************************************************************************
+ *
+ *      DumpData - print a data area
+ *
+ * Description:
+ *      This function prints a area of data to the system logfile/to the
+ *      console.
+ *
+ * Returns: N/A
+ *      
+ */
+static void DumpData(char *p, int size)
+{
+register int    i;
+int     haddr, addr;
+char    hex_buffer[180];
+char    asc_buffer[180];
+char    HEXCHAR[] = "0123456789ABCDEF";
+
+        addr = 0;
+        haddr = 0;
+        hex_buffer[0] = 0;
+        asc_buffer[0] = 0;
+        for (i=0; i < size; ) {
+                if (*p >= '0' && *p <='z')
+                        asc_buffer[addr] = *p;
+                else
+                        asc_buffer[addr] = '.';
+                addr++;
+                asc_buffer[addr] = 0;
+                hex_buffer[haddr] = HEXCHAR[(*p & 0xf0) >> 4];
+                haddr++;
+                hex_buffer[haddr] = HEXCHAR[*p & 0x0f];
+                haddr++;
+                hex_buffer[haddr] = ' ';
+                haddr++;
+                hex_buffer[haddr] = 0;
+                p++;
+                i++;
+                if (i%16 == 0) {
+                        printk("%s  %s\n", hex_buffer, asc_buffer);
+                        addr = 0;
+                        haddr = 0;
+                }
+        }
+} /* DumpData */
+
+
+/*****************************************************************************
+ *
+ *      DumpLong - print a data area as long values
+ *
+ * Description:
+ *      This function prints a area of data to the system logfile/to the
+ *      console.
+ *
+ * Returns: N/A
+ *      
+ */
+static void DumpLong(char *pc, int size)
+{
+register int    i;
+int     haddr, addr;
+char    hex_buffer[180];
+char    asc_buffer[180];
+char    HEXCHAR[] = "0123456789ABCDEF";
+long    *p;
+int     l;
+
+        addr = 0;
+        haddr = 0;
+        hex_buffer[0] = 0;
+        asc_buffer[0] = 0;
+        p = (long*) pc;
+        for (i=0; i < size; ) {
+                l = (long) *p;
+                hex_buffer[haddr] = HEXCHAR[(l >> 28) & 0xf];
+                haddr++;
+                hex_buffer[haddr] = HEXCHAR[(l >> 24) & 0xf];
+                haddr++;
+                hex_buffer[haddr] = HEXCHAR[(l >> 20) & 0xf];
+                haddr++;
+                hex_buffer[haddr] = HEXCHAR[(l >> 16) & 0xf];
+                haddr++;
+                hex_buffer[haddr] = HEXCHAR[(l >> 12) & 0xf];
+                haddr++;
+                hex_buffer[haddr] = HEXCHAR[(l >> 8) & 0xf];
+                haddr++;
+                hex_buffer[haddr] = HEXCHAR[(l >> 4) & 0xf];
+                haddr++;
+                hex_buffer[haddr] = HEXCHAR[l & 0x0f];
+                haddr++;
+                hex_buffer[haddr] = ' ';
+                haddr++;
+                hex_buffer[haddr] = 0;
+                p++;
+                i++;
+                if (i%8 == 0) {
+                        printk("%4x %s\n", (i-8)*4, hex_buffer);
+                        haddr = 0;
+                }
+        }
+        printk("------------------------\n");
+} /* DumpLong */
+
+#endif
+
+static int __devinit skge_probe_one(struct pci_dev *pdev,
+                const struct pci_device_id *ent)
+{
+        SK_AC                   *pAC;
+        DEV_NET                 *pNet = NULL;
+        struct net_device       *dev = NULL;
+        static int boards_found = 0;
+        int error = -ENODEV;
+        int using_dac = 0;
+        char DeviceStr[80];
+
+        if (pci_enable_device(pdev))
+                goto out;
+ 
+        /* Configure DMA attributes. */
+        if (sizeof(dma_addr_t) > sizeof(u32) &&
+            !(error = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {
+                using_dac = 1;
+                error = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                if (error < 0) {
+                        printk(KERN_ERR "sk98lin %s unable to obtain 64 bit DMA "
+                               "for consistent allocations\n", pci_name(pdev));
+                        goto out_disable_device;
+                }
+        } else {
+                error = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                if (error) {
+                        printk(KERN_ERR "sk98lin %s no usable DMA configuration\n",
+                               pci_name(pdev));
+                        goto out_disable_device;
+                }
+        }
+
+        error = -ENOMEM;
+        dev = alloc_etherdev(sizeof(DEV_NET));
+        if (!dev) {
+                printk(KERN_ERR "sk98lin: unable to allocate etherdev "
+                       "structure!\n");
+                goto out_disable_device;
+        }
+
+        pNet = netdev_priv(dev);
+        pNet->pAC = kzalloc(sizeof(SK_AC), GFP_KERNEL);
+        if (!pNet->pAC) {
+                printk(KERN_ERR "sk98lin: unable to allocate adapter "
+                       "structure!\n");
+                goto out_free_netdev;
+        }
+
+        pAC = pNet->pAC;
+        pAC->PciDev = pdev;
+
+        pAC->dev[0] = dev;
+        pAC->dev[1] = dev;
+        pAC->CheckQueue = SK_FALSE;
+
+        dev->irq = pdev->irq;
+
+        error = SkGeInitPCI(pAC);
+        if (error) {
+                printk(KERN_ERR "sk98lin: PCI setup failed: %i\n", error);
+                goto out_free_netdev;
+        }
+
+        SET_MODULE_OWNER(dev);
+        dev->open =             &SkGeOpen;
+        dev->stop =             &SkGeClose;
+        dev->hard_start_xmit =  &SkGeXmit;
+        dev->get_stats =        &SkGeStats;
+        dev->set_multicast_list = &SkGeSetRxMode;
+        dev->set_mac_address =  &SkGeSetMacAddr;
+        dev->do_ioctl =         &SkGeIoctl;
+        dev->change_mtu =       &SkGeChangeMtu;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller =  &SkGePollController;
+#endif
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
+
+        /* Use only if yukon hardware */
+        if (pAC->ChipsetType) {
+#ifdef USE_SK_TX_CHECKSUM
+                dev->features |= NETIF_F_IP_CSUM;
+#endif
+#ifdef SK_ZEROCOPY
+                dev->features |= NETIF_F_SG;
+#endif
+#ifdef USE_SK_RX_CHECKSUM
+                pAC->RxPort[0].RxCsum = 1;
+#endif
+        }
+
+        if (using_dac)
+                dev->features |= NETIF_F_HIGHDMA;
+
+        pAC->Index = boards_found++;
+
+        error = SkGeBoardInit(dev, pAC);
+        if (error)
+                goto out_free_netdev;
+
+        /* Read Adapter name from VPD */
+        if (ProductStr(pAC, DeviceStr, sizeof(DeviceStr)) != 0) {
+                error = -EIO;
+                printk(KERN_ERR "sk98lin: Could not read VPD data.\n");
+                goto out_free_resources;
+        }
+
+        /* Register net device */
+        error = register_netdev(dev);
+        if (error) {
+                printk(KERN_ERR "sk98lin: Could not register device.\n");
+                goto out_free_resources;
+        }
+
+        /* Print adapter specific string from vpd */
+        printk("%s: %s\n", dev->name, 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(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6);
+        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+
+        pNet->PortNr = 0;
+        pNet->NetNr  = 0;
+
+        boards_found++;
+
+        pci_set_drvdata(pdev, dev);
+
+        /* More then one port found */
+        if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
+                dev = alloc_etherdev(sizeof(DEV_NET));
+                if (!dev) {
+                        printk(KERN_ERR "sk98lin: unable to allocate etherdev "
+                                "structure!\n");
+                        goto single_port;
+                }
+
+                pNet          = netdev_priv(dev);
+                pNet->PortNr  = 1;
+                pNet->NetNr   = 1;
+                pNet->pAC     = pAC;
+
+                dev->open               = &SkGeOpen;
+                dev->stop               = &SkGeClose;
+                dev->hard_start_xmit    = &SkGeXmit;
+                dev->get_stats          = &SkGeStats;
+                dev->set_multicast_list = &SkGeSetRxMode;
+                dev->set_mac_address    = &SkGeSetMacAddr;
+                dev->do_ioctl           = &SkGeIoctl;
+                dev->change_mtu         = &SkGeChangeMtu;
+                SET_NETDEV_DEV(dev, &pdev->dev);
+                SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
+
+                if (pAC->ChipsetType) {
+#ifdef USE_SK_TX_CHECKSUM
+                        dev->features |= NETIF_F_IP_CSUM;
+#endif
+#ifdef SK_ZEROCOPY
+                        dev->features |= NETIF_F_SG;
+#endif
+#ifdef USE_SK_RX_CHECKSUM
+                        pAC->RxPort[1].RxCsum = 1;
+#endif
+                }
+
+                if (using_dac)
+                        dev->features |= NETIF_F_HIGHDMA;
+
+                error = register_netdev(dev);
+                if (error) {
+                        printk(KERN_ERR "sk98lin: Could not register device"
+                               " for second port. (%d)\n", error);
+                        free_netdev(dev);
+                        goto single_port;
+                }
+
+                pAC->dev[1]   = dev;
+                memcpy(&dev->dev_addr,
+                       &pAC->Addr.Net[1].CurrentMacAddress, 6);
+                memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+
+                printk("%s: %s\n", dev->name, DeviceStr);
+                printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
+        }
+
+single_port:
+
+        /* 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;
+
+        memset(&pAC->PnmiBackup, 0, sizeof(SK_PNMI_STRUCT_DATA));
+        memcpy(&pAC->PnmiBackup, &pAC->PnmiStruct, sizeof(SK_PNMI_STRUCT_DATA));
+
+        return 0;
+
+ out_free_resources:
+        FreeResources(dev);
+ out_free_netdev:
+        free_netdev(dev);
+ out_disable_device:
+        pci_disable_device(pdev);
+ out:
+        return error;
+}
+
+static void __devexit skge_remove_one(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+        struct net_device *otherdev = pAC->dev[1];
+
+        unregister_netdev(dev);
+
+        SkGeYellowLED(pAC, pAC->IoBase, 0);
+
+        if (pAC->BoardLevel == SK_INIT_RUN) {
+                SK_EVPARA EvPara;
+                unsigned long Flags;
+
+                /* board is still alive */
+                spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+                EvPara.Para32[0] = 0;
+                EvPara.Para32[1] = -1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+                EvPara.Para32[0] = 1;
+                EvPara.Para32[1] = -1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+                SkEventDispatcher(pAC, pAC->IoBase);
+                /* disable interrupts */
+                SK_OUT32(pAC->IoBase, B0_IMSK, 0);
+                SkGeDeInit(pAC, pAC->IoBase);
+                spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+                pAC->BoardLevel = SK_INIT_DATA;
+                /* We do NOT check here, if IRQ was pending, of course*/
+        }
+
+        if (pAC->BoardLevel == SK_INIT_IO) {
+                /* board is still alive */
+                SkGeDeInit(pAC, pAC->IoBase);
+                pAC->BoardLevel = SK_INIT_DATA;
+        }
+
+        FreeResources(dev);
+        free_netdev(dev);
+        if (otherdev != dev)
+                free_netdev(otherdev);
+        kfree(pAC);
+}
+
+#ifdef CONFIG_PM
+static int skge_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+        struct net_device *otherdev = pAC->dev[1];
+
+        if (netif_running(dev)) {
+                netif_carrier_off(dev);
+                DoPrintInterfaceChange = SK_FALSE;
+                SkDrvDeInitAdapter(pAC, 0);  /* performs SkGeClose */
+                netif_device_detach(dev);
+        }
+        if (otherdev != dev) {
+                if (netif_running(otherdev)) {
+                        netif_carrier_off(otherdev);
+                        DoPrintInterfaceChange = SK_FALSE;
+                        SkDrvDeInitAdapter(pAC, 1);  /* performs SkGeClose */
+                        netif_device_detach(otherdev);
+                }
+        }
+
+        pci_save_state(pdev);
+        pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
+        if (pAC->AllocFlag & SK_ALLOC_IRQ) {
+                free_irq(dev->irq, dev);
+        }
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+        return 0;
+}
+
+static int skge_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        DEV_NET *pNet = netdev_priv(dev);
+        SK_AC *pAC = pNet->pAC;
+        struct net_device *otherdev = pAC->dev[1];
+        int ret;
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        ret = pci_enable_device(pdev);
+        if (ret) {
+                printk(KERN_WARNING "sk98lin: unable to enable device %s "
+                                "in resume\n", dev->name);
+                goto err_out;
+        }
+        pci_set_master(pdev);
+        if (pAC->GIni.GIMacsFound == 2)
+                ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);
+        else
+                ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED, "sk98lin", dev);
+        if (ret) {
+                printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
+                ret = -EBUSY;
+                goto err_out_disable_pdev;
+        }
+
+        netif_device_attach(dev);
+        if (netif_running(dev)) {
+                DoPrintInterfaceChange = SK_FALSE;
+                SkDrvInitAdapter(pAC, 0);    /* first device  */
+        }
+        if (otherdev != dev) {
+                netif_device_attach(otherdev);
+                if (netif_running(otherdev)) {
+                        DoPrintInterfaceChange = SK_FALSE;
+                        SkDrvInitAdapter(pAC, 1);    /* second device  */
+                }
+        }
+
+        return 0;
+
+err_out_disable_pdev:
+        pci_disable_device(pdev);
+err_out:
+        pAC->AllocFlag &= ~SK_ALLOC_IRQ;
+        dev->irq = 0;
+        return ret;
+}
+#else
+#define skge_suspend NULL
+#define skge_resume NULL
+#endif
+
+static struct pci_device_id skge_pci_tbl[] = {
+#ifdef SK98LIN_ALL_DEVICES
+        { PCI_VENDOR_ID_3COM, 0x1700, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        { PCI_VENDOR_ID_3COM, 0x80eb, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+#endif
+#ifdef GENESIS
+        /* Generic SysKonnect SK-98xx Gigabit Ethernet Server Adapter */        
+        { PCI_VENDOR_ID_SYSKONNECT, 0x4300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+#endif
+        /* Generic SysKonnect SK-98xx V2.0 Gigabit Ethernet Adapter */  
+        { PCI_VENDOR_ID_SYSKONNECT, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+#ifdef SK98LIN_ALL_DEVICES
+/* DLink card does not have valid VPD so this driver gags
+ *      { PCI_VENDOR_ID_DLINK, 0x4c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ */
+        { PCI_VENDOR_ID_MARVELL, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        { PCI_VENDOR_ID_MARVELL, 0x5005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        { PCI_VENDOR_ID_CNET, 0x434e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0015, },
+        { PCI_VENDOR_ID_LINKSYS, 0x1064, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+#endif
+        { 0 }
+};
+
+MODULE_DEVICE_TABLE(pci, skge_pci_tbl);
+
+static struct pci_driver skge_driver = {
+        .name           = "sk98lin",
+        .id_table       = skge_pci_tbl,
+        .probe          = skge_probe_one,
+        .remove         = __devexit_p(skge_remove_one),
+        .suspend        = skge_suspend,
+        .resume         = skge_resume,
+};
+
+static int __init skge_init(void)
+{
+        printk(KERN_NOTICE "sk98lin: driver has been replaced by the skge driver"
+               " and is scheduled for removal\n");
+
+        return pci_register_driver(&skge_driver);
+}
+
+static void __exit skge_exit(void)
+{
+        pci_unregister_driver(&skge_driver);
+}
+
+module_init(skge_init);
+module_exit(skge_exit);
diff --git a/drivers/net/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c
new file mode 100644
index 0000000000..db670993c2
--- /dev/null
+++ b/drivers/net/sk98lin/skgehwt.c
@@ -0,0 +1,171 @@
+/******************************************************************************
+ *
+ * Name:        skgehwt.c
+ * Project:     Gigabit Ethernet Adapters, Event Scheduler Module
+ * Version:     $Revision: 1.15 $
+ * Date:        $Date: 2003/09/16 13:41:23 $
+ * Purpose:     Hardware Timer
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ *      Event queue and dispatcher
+ */
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skgehwt.c,v 1.15 2003/09/16 13:41:23 rschmidt Exp $ (C) Marvell.";
+#endif
+
+#include "h/skdrv1st.h"         /* Driver Specific Definitions */
+#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
+
+#ifdef __C2MAN__
+/*
+ *   Hardware Timer function queue management.
+ */
+intro()
+{}
+#endif
+
+/*
+ * Prototypes of local functions.
+ */
+#define SK_HWT_MAX      (65000)
+
+/* correction factor */
+#define SK_HWT_FAC      (1000 * (SK_U32)pAC->GIni.GIHstClkFact / 100)
+
+/*
+ * Initialize hardware timer.
+ *
+ * Must be called during init level 1.
+ */
+void    SkHwtInit(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  Ioc)    /* IoContext */
+{
+        pAC->Hwt.TStart = 0 ;
+        pAC->Hwt.TStop  = 0 ;
+        pAC->Hwt.TActive = SK_FALSE;
+
+        SkHwtStop(pAC, Ioc);
+}
+
+/*
+ *
+ * Start hardware timer (clock ticks are 16us).
+ *
+ */
+void    SkHwtStart(
+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;
+
+        if (Time > SK_HWT_MAX)
+                Time = SK_HWT_MAX;
+
+        pAC->Hwt.TStart = Time;
+        pAC->Hwt.TStop = 0L;
+
+        Cnt = Time;
+
+        /*
+         * if time < 16 us
+         *      time = 16 us
+         */
+        if (!Cnt) {
+                Cnt++;
+        }
+
+        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;
+}
+
+/*
+ * Stop hardware timer.
+ * and clear the timer IRQ
+ */
+void    SkHwtStop(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  Ioc)    /* IoContext */
+{
+        SK_OUT16(Ioc, B2_TI_CTRL, TIM_STOP);
+        
+        SK_OUT16(Ioc, B2_TI_CTRL, TIM_CLR_IRQ);
+
+        pAC->Hwt.TActive = SK_FALSE;
+}
+
+
+/*
+ *      Stop hardware timer and read time elapsed since last start.
+ *
+ * returns
+ *      The elapsed time since last start in units of 16us.
+ *
+ */
+SK_U32  SkHwtRead(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  Ioc)    /* IoContext */
+{
+        SK_U32  TRead;
+        SK_U32  IStatus;
+
+        if (pAC->Hwt.TActive) {
+                
+                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 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;
+                }
+        }
+        return(pAC->Hwt.TStop);
+}
+
+/*
+ * interrupt source= timer
+ */
+void    SkHwtIsr(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  Ioc)    /* IoContext */
+{
+        SkHwtStop(pAC, Ioc);
+        
+        pAC->Hwt.TStop = pAC->Hwt.TStart;
+        
+        SkTimerDone(pAC, Ioc);
+}
+
+/* End of file */
diff --git a/drivers/net/sk98lin/skgeinit.c b/drivers/net/sk98lin/skgeinit.c
new file mode 100644
index 0000000000..67f1d6a5c1
--- /dev/null
+++ b/drivers/net/sk98lin/skgeinit.c
@@ -0,0 +1,2005 @@
+/******************************************************************************
+ *
+ * Name:        skgeinit.c
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.97 $
+ * Date:        $Date: 2003/10/02 16:45:31 $
+ * Purpose:     Contains functions to initialize the adapter
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#include "h/skdrv1st.h"
+#include "h/skdrv2nd.h"
+
+/* global variables ***********************************************************/
+
+/* local variables ************************************************************/
+
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skgeinit.c,v 1.97 2003/10/02 16:45:31 rschmidt Exp $ (C) Marvell.";
+#endif
+
+struct s_QOffTab {
+        int     RxQOff;         /* Receive Queue Address Offset */
+        int     XsQOff;         /* Sync Tx Queue Address Offset */
+        int     XaQOff;         /* Async Tx Queue Address Offset */
+};
+static struct s_QOffTab QOffTab[] = {
+        {Q_R1, Q_XS1, Q_XA1}, {Q_R2, Q_XS2, Q_XA2}
+};
+
+struct s_Config {
+        char    ScanString[8];
+        SK_U32  Value;
+};
+
+static struct s_Config OemConfig = {
+        {'O','E','M','_','C','o','n','f'},
+#ifdef SK_OEM_CONFIG
+        OEM_CONFIG_VALUE,
+#else
+        0,
+#endif
+};
+
+/******************************************************************************
+ *
+ *      SkGePollTxD() - Enable / Disable Descriptor Polling of TxD Rings
+ *
+ * Description:
+ *      Enable or disable the descriptor polling of the transmit descriptor
+ *      ring(s) (TxD) for port 'Port'.
+ *      The new configuration is *not* saved over any SkGeStopPort() and
+ *      SkGeInitPort() calls.
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGePollTxD(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_BOOL PollTxD)        /* SK_TRUE (enable pol.), SK_FALSE (disable pol.) */
+{
+        SK_GEPORT *pPrt;
+        SK_U32  DWord;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        DWord = (SK_U32)(PollTxD ? CSR_ENA_POL : CSR_DIS_POL);
+
+        if (pPrt->PXSQSize != 0) {
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), DWord);
+        }
+        
+        if (pPrt->PXAQSize != 0) {
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), DWord);
+        }
+}       /* SkGePollTxD */
+
+
+/******************************************************************************
+ *
+ *      SkGeYellowLED() - Switch the yellow LED on or off.
+ *
+ * Description:
+ *      Switch the yellow LED on or off.
+ *
+ * Note:
+ *      This function may be called any time after SkGeInit(Level 1).
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGeYellowLED(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             State)          /* yellow LED state, 0 = OFF, 0 != ON */
+{
+        if (State == 0) {
+                /* Switch yellow LED OFF */
+                SK_OUT8(IoC, B0_LED, LED_STAT_OFF);
+        }
+        else {
+                /* Switch yellow LED ON */
+                SK_OUT8(IoC, B0_LED, LED_STAT_ON);
+        }
+}       /* SkGeYellowLED */
+
+
+#if (!defined(SK_SLIM) || defined(GENESIS))
+/******************************************************************************
+ *
+ *      SkGeXmitLED() - Modify the Operational Mode of a transmission LED.
+ *
+ * Description:
+ *      The Rx or Tx LED which is specified by 'Led' will be
+ *      enabled, disabled or switched on in test mode.
+ *
+ * Note:
+ *      'Led' must contain the address offset of the LEDs INI register.
+ *
+ * Usage:
+ *      SkGeXmitLED(pAC, IoC, MR_ADDR(Port, TX_LED_INI), SK_LED_ENA);
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGeXmitLED(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Led,            /* offset to the LED Init Value register */
+int             Mode)           /* Mode may be SK_LED_DIS, SK_LED_ENA, SK_LED_TST */
+{
+        SK_U32  LedIni;
+
+        switch (Mode) {
+        case SK_LED_ENA:
+                LedIni = SK_XMIT_DUR * (SK_U32)pAC->GIni.GIHstClkFact / 100;
+                SK_OUT32(IoC, Led + XMIT_LED_INI, LedIni);
+                SK_OUT8(IoC, Led + XMIT_LED_CTRL, LED_START);
+                break;
+        case SK_LED_TST:
+                SK_OUT8(IoC, Led + XMIT_LED_TST, LED_T_ON);
+                SK_OUT32(IoC, Led + XMIT_LED_CNT, 100);
+                SK_OUT8(IoC, Led + XMIT_LED_CTRL, LED_START);
+                break;
+        case SK_LED_DIS:
+        default:
+                /*
+                 * Do NOT stop the LED Timer here. The LED might be
+                 * in on state. But it needs to go off.
+                 */
+                SK_OUT32(IoC, Led + XMIT_LED_CNT, 0);
+                SK_OUT8(IoC, Led + XMIT_LED_TST, LED_T_OFF);
+                break;
+        }
+                        
+        /*
+         * 1000BT: The Transmit LED is driven by the PHY.
+         * But the default LED configuration is used for
+         * Level One and Broadcom PHYs.
+         * (Broadcom: It may be that PHY_B_PEC_EN_LTR has to be set.)
+         * (In this case it has to be added here. But we will see. XXX)
+         */
+}       /* SkGeXmitLED */
+#endif  /* !SK_SLIM || GENESIS */
+
+
+/******************************************************************************
+ *
+ *      DoCalcAddr() - Calculates the start and the end address of a queue.
+ *
+ * Description:
+ *      This function calculates the start and the end address of a queue.
+ *  Afterwards the 'StartVal' is incremented to the next start position.
+ *      If the port is already initialized the calculated values
+ *      will be checked against the configured values and an
+ *      error will be returned, if they are not equal.
+ *      If the port is not initialized the values will be written to
+ *      *StartAdr and *EndAddr.
+ *
+ * Returns:
+ *      0:      success
+ *      1:      configuration error
+ */
+static int DoCalcAddr(
+SK_AC           *pAC,                           /* adapter context */
+SK_GEPORT       SK_FAR *pPrt,           /* port index */
+int                     QuSize,                         /* size of the queue to configure in kB */
+SK_U32          SK_FAR *StartVal,       /* start value for address calculation */
+SK_U32          SK_FAR *QuStartAddr,/* start addr to calculate */
+SK_U32          SK_FAR *QuEndAddr)      /* end address to calculate */
+{
+        SK_U32  EndVal;
+        SK_U32  NextStart;
+        int             Rtv;
+
+        Rtv = 0;
+        if (QuSize == 0) {
+                EndVal = *StartVal;
+                NextStart = EndVal;
+        }
+        else {
+                EndVal = *StartVal + ((SK_U32)QuSize * 1024) - 1;
+                NextStart = EndVal + 1;
+        }
+
+        if (pPrt->PState >= SK_PRT_INIT) {
+                if (*StartVal != *QuStartAddr || EndVal != *QuEndAddr) {
+                        Rtv = 1;
+                }
+        }
+        else {
+                *QuStartAddr = *StartVal;
+                *QuEndAddr = EndVal;
+        }
+
+        *StartVal = NextStart;
+        return(Rtv);
+}       /* DoCalcAddr */
+
+/******************************************************************************
+ *
+ *      SkGeInitAssignRamToQueues() - allocate default queue sizes
+ *
+ * Description:
+ *      This function assigns the memory to the different queues and ports.
+ *      When DualNet is set to SK_TRUE all ports get the same amount of memory.
+ *  Otherwise the first port gets most of the memory and all the
+ *      other ports just the required minimum.
+ *      This function can only be called when pAC->GIni.GIRamSize and
+ *      pAC->GIni.GIMacsFound have been initialized, usually this happens
+ *      at init level 1
+ *
+ * Returns:
+ *      0 - ok
+ *      1 - invalid input values
+ *      2 - not enough memory
+ */
+
+int SkGeInitAssignRamToQueues(
+SK_AC   *pAC,                   /* Adapter context */
+int             ActivePort,             /* Active Port in RLMT mode */
+SK_BOOL DualNet)                /* adapter context */
+{
+        int     i;
+        int     UsedKilobytes;                  /* memory already assigned */
+        int     ActivePortKilobytes;    /* memory available for active port */
+        SK_GEPORT *pGePort;
+
+        UsedKilobytes = 0;
+
+        if (ActivePort >= pAC->GIni.GIMacsFound) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+                        ("SkGeInitAssignRamToQueues: ActivePort (%d) invalid\n",
+                        ActivePort));
+                return(1);
+        }
+        if (((pAC->GIni.GIMacsFound * (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE)) +
+                ((RAM_QUOTA_SYNC == 0) ? 0 : SK_MIN_TXQ_SIZE)) > pAC->GIni.GIRamSize) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+                        ("SkGeInitAssignRamToQueues: Not enough memory (%d)\n",
+                         pAC->GIni.GIRamSize));
+                return(2);
+        }
+
+        if (DualNet) {
+                /* every port gets the same amount of memory */
+                ActivePortKilobytes = pAC->GIni.GIRamSize / pAC->GIni.GIMacsFound;
+                for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+
+                        pGePort = &pAC->GIni.GP[i];
+                        
+                        /* take away the minimum memory for active queues */
+                        ActivePortKilobytes -= (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE);
+
+                        /* receive queue gets the minimum + 80% of the rest */
+                        pGePort->PRxQSize = (int) (ROUND_QUEUE_SIZE_KB((
+                                ActivePortKilobytes * (unsigned long) RAM_QUOTA_RX) / 100))
+                                + SK_MIN_RXQ_SIZE;
+
+                        ActivePortKilobytes -= (pGePort->PRxQSize - SK_MIN_RXQ_SIZE);
+
+                        /* synchronous transmit queue */
+                        pGePort->PXSQSize = 0;
+
+                        /* asynchronous transmit queue */
+                        pGePort->PXAQSize = (int) ROUND_QUEUE_SIZE_KB(ActivePortKilobytes +
+                                SK_MIN_TXQ_SIZE);
+                }
+        }
+        else {  
+                /* Rlmt Mode or single link adapter */
+
+                /* Set standby queue size defaults for all standby ports */
+                for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+
+                        if (i != ActivePort) {
+                                pGePort = &pAC->GIni.GP[i];
+
+                                pGePort->PRxQSize = SK_MIN_RXQ_SIZE;
+                                pGePort->PXAQSize = SK_MIN_TXQ_SIZE;
+                                pGePort->PXSQSize = 0;
+
+                                /* Count used RAM */
+                                UsedKilobytes += pGePort->PRxQSize + pGePort->PXAQSize;
+                        }
+                }
+                /* what's left? */
+                ActivePortKilobytes = pAC->GIni.GIRamSize - UsedKilobytes;
+
+                /* assign it to the active port */
+                /* first take away the minimum memory */
+                ActivePortKilobytes -= (SK_MIN_RXQ_SIZE + SK_MIN_TXQ_SIZE);
+                pGePort = &pAC->GIni.GP[ActivePort];
+
+                /* receive queue get's the minimum + 80% of the rest */
+                pGePort->PRxQSize = (int) (ROUND_QUEUE_SIZE_KB((ActivePortKilobytes *
+                        (unsigned long) RAM_QUOTA_RX) / 100)) + SK_MIN_RXQ_SIZE;
+
+                ActivePortKilobytes -= (pGePort->PRxQSize - SK_MIN_RXQ_SIZE);
+
+                /* synchronous transmit queue */
+                pGePort->PXSQSize = 0;
+
+                /* asynchronous transmit queue */
+                pGePort->PXAQSize = (int) ROUND_QUEUE_SIZE_KB(ActivePortKilobytes) +
+                        SK_MIN_TXQ_SIZE;
+        }
+#ifdef VCPU
+        VCPUprintf(0, "PRxQSize=%u, PXSQSize=%u, PXAQSize=%u\n",
+                pGePort->PRxQSize, pGePort->PXSQSize, pGePort->PXAQSize);
+#endif /* VCPU */
+
+        return(0);
+}       /* SkGeInitAssignRamToQueues */
+
+/******************************************************************************
+ *
+ *      SkGeCheckQSize() - Checks the Adapters Queue Size Configuration
+ *
+ * Description:
+ *      This function verifies the Queue Size Configuration specified
+ *      in the variables PRxQSize, PXSQSize, and PXAQSize of all
+ *      used ports.
+ *      This requirements must be fullfilled to have a valid configuration:
+ *              - The size of all queues must not exceed GIRamSize.
+ *              - The queue sizes must be specified in units of 8 kB.
+ *              - The size of Rx queues of available ports must not be
+ *                smaller than 16 kB.
+ *              - The size of at least one Tx queue (synch. or asynch.)
+ *        of available ports must not be smaller than 16 kB
+ *        when Jumbo Frames are used.
+ *              - The RAM start and end addresses must not be changed
+ *                for ports which are already initialized.
+ *      Furthermore SkGeCheckQSize() defines the Start and End Addresses
+ *  of all ports and stores them into the HWAC port     structure.
+ *
+ * Returns:
+ *      0:      Queue Size Configuration valid
+ *      1:      Queue Size Configuration invalid
+ */
+static int SkGeCheckQSize(
+SK_AC    *pAC,          /* adapter context */
+int              Port)          /* port index */
+{
+        SK_GEPORT *pPrt;
+        int     i;
+        int     Rtv;
+        int     Rtv2;
+        SK_U32  StartAddr;
+#ifndef SK_SLIM
+        int     UsedMem;        /* total memory used (max. found ports) */
+#endif  
+
+        Rtv = 0;
+        
+#ifndef SK_SLIM
+
+        UsedMem = 0;
+        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+                pPrt = &pAC->GIni.GP[i];
+
+                if ((pPrt->PRxQSize & QZ_UNITS) != 0 ||
+                        (pPrt->PXSQSize & QZ_UNITS) != 0 ||
+                        (pPrt->PXAQSize & QZ_UNITS) != 0) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E012, SKERR_HWI_E012MSG);
+                        return(1);
+                }
+
+                if (i == Port && pPrt->PRxQSize < SK_MIN_RXQ_SIZE) {
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E011, SKERR_HWI_E011MSG);
+                        return(1);
+                }
+                
+                /*
+                 * the size of at least one Tx queue (synch. or asynch.) has to be > 0.
+                 * if Jumbo Frames are used, this size has to be >= 16 kB.
+                 */
+                if ((i == Port && pPrt->PXSQSize == 0 && pPrt->PXAQSize == 0) ||
+                        (pAC->GIni.GIPortUsage == SK_JUMBO_LINK &&
+            ((pPrt->PXSQSize > 0 && pPrt->PXSQSize < SK_MIN_TXQ_SIZE) ||
+                         (pPrt->PXAQSize > 0 && pPrt->PXAQSize < SK_MIN_TXQ_SIZE)))) {
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E023, SKERR_HWI_E023MSG);
+                                return(1);
+                }
+                
+                UsedMem += pPrt->PRxQSize + pPrt->PXSQSize + pPrt->PXAQSize;
+        }
+        
+        if (UsedMem > pAC->GIni.GIRamSize) {
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E012, SKERR_HWI_E012MSG);
+                return(1);
+        }
+#endif  /* !SK_SLIM */
+
+        /* Now start address calculation */
+        StartAddr = pAC->GIni.GIRamOffs;
+        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+                pPrt = &pAC->GIni.GP[i];
+
+                /* Calculate/Check values for the receive queue */
+                Rtv2 = DoCalcAddr(pAC, pPrt, pPrt->PRxQSize, &StartAddr,
+                        &pPrt->PRxQRamStart, &pPrt->PRxQRamEnd);
+                Rtv |= Rtv2;
+
+                /* Calculate/Check values for the synchronous Tx queue */
+                Rtv2 = DoCalcAddr(pAC, pPrt, pPrt->PXSQSize, &StartAddr,
+                        &pPrt->PXsQRamStart, &pPrt->PXsQRamEnd);
+                Rtv |= Rtv2;
+
+                /* Calculate/Check values for the asynchronous Tx queue */
+                Rtv2 = DoCalcAddr(pAC, pPrt, pPrt->PXAQSize, &StartAddr,
+                        &pPrt->PXaQRamStart, &pPrt->PXaQRamEnd);
+                Rtv |= Rtv2;
+
+                if (Rtv) {
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E013, SKERR_HWI_E013MSG);
+                        return(1);
+                }
+        }
+
+        return(0);
+}       /* SkGeCheckQSize */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkGeInitMacArb() - Initialize the MAC Arbiter
+ *
+ * Description:
+ *      This function initializes the MAC Arbiter.
+ *      It must not be called if there is still an
+ *      initialized or active port.
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGeInitMacArb(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC)            /* IO context */
+{
+        /* release local reset */
+        SK_OUT16(IoC, B3_MA_TO_CTRL, MA_RST_CLR);
+
+        /* configure timeout values */
+        SK_OUT8(IoC, B3_MA_TOINI_RX1, SK_MAC_TO_53);
+        SK_OUT8(IoC, B3_MA_TOINI_RX2, SK_MAC_TO_53);
+        SK_OUT8(IoC, B3_MA_TOINI_TX1, SK_MAC_TO_53);
+        SK_OUT8(IoC, B3_MA_TOINI_TX2, SK_MAC_TO_53);
+
+        SK_OUT8(IoC, B3_MA_RCINI_RX1, 0);
+        SK_OUT8(IoC, B3_MA_RCINI_RX2, 0);
+        SK_OUT8(IoC, B3_MA_RCINI_TX1, 0);
+        SK_OUT8(IoC, B3_MA_RCINI_TX2, 0);
+
+        /* recovery values are needed for XMAC II Rev. B2 only */
+        /* Fast Output Enable Mode was intended to use with Rev. B2, but now? */
+
+        /*
+         * There is no start or enable button to push, therefore
+         * the MAC arbiter is configured and enabled now.
+         */
+}       /* SkGeInitMacArb */
+
+
+/******************************************************************************
+ *
+ *      SkGeInitPktArb() - Initialize the Packet Arbiter
+ *
+ * Description:
+ *      This function initializes the Packet Arbiter.
+ *      It must not be called if there is still an
+ *      initialized or active port.
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGeInitPktArb(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC)            /* IO context */
+{
+        /* release local reset */
+        SK_OUT16(IoC, B3_PA_CTRL, PA_RST_CLR);
+
+        /* configure timeout values */
+        SK_OUT16(IoC, B3_PA_TOINI_RX1, SK_PKT_TO_MAX);
+        SK_OUT16(IoC, B3_PA_TOINI_RX2, SK_PKT_TO_MAX);
+        SK_OUT16(IoC, B3_PA_TOINI_TX1, SK_PKT_TO_MAX);
+        SK_OUT16(IoC, B3_PA_TOINI_TX2, SK_PKT_TO_MAX);
+
+        /*
+         * enable timeout timers if jumbo frames not used
+         * NOTE: the packet arbiter timeout interrupt is needed for
+         * half duplex hangup workaround
+         */
+        if (pAC->GIni.GIPortUsage != SK_JUMBO_LINK) {
+                if (pAC->GIni.GIMacsFound == 1) {
+                        SK_OUT16(IoC, B3_PA_CTRL, PA_ENA_TO_TX1);
+                }
+                else {
+                        SK_OUT16(IoC, B3_PA_CTRL, PA_ENA_TO_TX1 | PA_ENA_TO_TX2);
+                }
+        }
+}       /* SkGeInitPktArb */
+#endif /* GENESIS */
+
+
+/******************************************************************************
+ *
+ *      SkGeInitMacFifo() - Initialize the MAC FIFOs
+ *
+ * Description:
+ *      Initialize all MAC FIFOs of the specified port
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGeInitMacFifo(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_U16  Word;
+#ifdef VCPU
+        SK_U32  DWord;
+#endif /* VCPU */
+        /*
+         * For each FIFO:
+         *      - release local reset
+         *      - use default value for MAC FIFO size
+         *      - setup defaults for the control register
+         *      - enable the FIFO
+         */
+        
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                /* Configure Rx MAC FIFO */
+                SK_OUT8(IoC, MR_ADDR(Port, RX_MFF_CTRL2), MFF_RST_CLR);
+                SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_RX_CTRL_DEF);
+                SK_OUT8(IoC, MR_ADDR(Port, RX_MFF_CTRL2), MFF_ENA_OP_MD);
+        
+                /* Configure Tx MAC FIFO */
+                SK_OUT8(IoC, MR_ADDR(Port, TX_MFF_CTRL2), MFF_RST_CLR);
+                SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_TX_CTRL_DEF);
+                SK_OUT8(IoC, MR_ADDR(Port, TX_MFF_CTRL2), MFF_ENA_OP_MD);
+        
+                /* Enable frame flushing if jumbo frames used */
+                if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK) {
+                        SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_ENA_FLUSH);
+                }
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /* 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) {
+
+                        Word &= ~GMF_RX_F_FL_ON;
+                }
+                
+                /* Configure Rx MAC FIFO */
+                SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_RST_CLR);
+                SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), Word);
+                
+                /* set Rx GMAC FIFO Flush Threshold (default: 0x0a -> 56 bytes) */
+                SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_FL_THR), RX_GMF_FL_THR_DEF);
+                
+                /* Configure Tx MAC FIFO */
+                SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_RST_CLR);
+                SK_OUT16(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U16)GMF_TX_CTRL_DEF);
+                
+#ifdef VCPU
+                SK_IN32(IoC, MR_ADDR(Port, RX_GMF_AF_THR), &DWord);
+                SK_IN32(IoC, MR_ADDR(Port, TX_GMF_AE_THR), &DWord);
+#endif /* VCPU */
+                
+                /* set Tx GMAC FIFO Almost Empty Threshold */
+/*              SK_OUT32(IoC, MR_ADDR(Port, TX_GMF_AE_THR), 0); */
+        }
+#endif /* YUKON */
+
+}       /* SkGeInitMacFifo */
+
+#ifdef  SK_LNK_SYNC_CNT
+/******************************************************************************
+ *
+ *      SkGeLoadLnkSyncCnt() - Load the Link Sync Counter and starts counting
+ *
+ * Description:
+ *      This function starts the Link Sync Counter of the specified
+ *      port and enables the generation of an Link Sync IRQ.
+ *      The Link Sync Counter may be used to detect an active link,
+ *      if autonegotiation is not used.
+ *
+ * Note:
+ *      o To ensure receiving the Link Sync Event the LinkSyncCounter
+ *        should be initialized BEFORE clearing the XMAC's reset!
+ *      o Enable IS_LNK_SYNC_M1 and IS_LNK_SYNC_M2 after calling this
+ *        function.
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGeLoadLnkSyncCnt(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_U32  CntVal)         /* Counter value */
+{
+        SK_U32  OrgIMsk;
+        SK_U32  NewIMsk;
+        SK_U32  ISrc;
+        SK_BOOL IrqPend;
+
+        /* stop counter */
+        SK_OUT8(IoC, MR_ADDR(Port, LNK_SYNC_CTRL), LED_STOP);
+
+        /*
+         * ASIC problem:
+         * Each time starting the Link Sync Counter an IRQ is generated
+         * by the adapter. See problem report entry from 21.07.98
+         *
+         * Workaround:  Disable Link Sync IRQ and clear the unexpeced IRQ
+         *              if no IRQ is already pending.
+         */
+        IrqPend = SK_FALSE;
+        SK_IN32(IoC, B0_ISRC, &ISrc);
+        SK_IN32(IoC, B0_IMSK, &OrgIMsk);
+        if (Port == MAC_1) {
+                NewIMsk = OrgIMsk & ~IS_LNK_SYNC_M1;
+                if ((ISrc & IS_LNK_SYNC_M1) != 0) {
+                        IrqPend = SK_TRUE;
+                }
+        }
+        else {
+                NewIMsk = OrgIMsk & ~IS_LNK_SYNC_M2;
+                if ((ISrc & IS_LNK_SYNC_M2) != 0) {
+                        IrqPend = SK_TRUE;
+                }
+        }
+        if (!IrqPend) {
+                SK_OUT32(IoC, B0_IMSK, NewIMsk);
+        }
+
+        /* load counter */
+        SK_OUT32(IoC, MR_ADDR(Port, LNK_SYNC_INI), CntVal);
+
+        /* start counter */
+        SK_OUT8(IoC, MR_ADDR(Port, LNK_SYNC_CTRL), LED_START);
+
+        if (!IrqPend) {
+                /* clear the unexpected IRQ, and restore the interrupt mask */
+                SK_OUT8(IoC, MR_ADDR(Port, LNK_SYNC_CTRL), LED_CLR_IRQ);
+                SK_OUT32(IoC, B0_IMSK, OrgIMsk);
+        }
+}       /* SkGeLoadLnkSyncCnt*/
+#endif  /* SK_LNK_SYNC_CNT */
+
+#if defined(SK_DIAG) || defined(SK_CFG_SYNC)
+/******************************************************************************
+ *
+ *      SkGeCfgSync() - Configure synchronous bandwidth for this port.
+ *
+ * Description:
+ *      This function may be used to configure synchronous bandwidth
+ *      to the specified port. This may be done any time after
+ *      initializing the port. The configuration values are NOT saved
+ *      in the HWAC port structure and will be overwritten any
+ *      time when stopping and starting the port.
+ *      Any values for the synchronous configuration will be ignored
+ *      if the size of the synchronous queue is zero!
+ *
+ *      The default configuration for the synchronous service is
+ *      TXA_ENA_FSYNC. This means if the size of
+ *      the synchronous queue is unequal zero but no specific
+ *      synchronous bandwidth is configured, the synchronous queue
+ *      will always have the 'unlimited' transmit priority!
+ *
+ *      This mode will be restored if the synchronous bandwidth is
+ *      deallocated ('IntTime' = 0 and 'LimCount' = 0).
+ *
+ * Returns:
+ *      0:      success
+ *      1:      parameter configuration error
+ *      2:      try to configure quality of service although no
+ *              synchronous queue is configured
+ */
+int SkGeCfgSync(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_U32  IntTime,        /* Interval Timer Value in units of 8ns */
+SK_U32  LimCount,       /* Number of bytes to transfer during IntTime */
+int             SyncMode)       /* Sync Mode: TXA_ENA_ALLOC | TXA_DIS_ALLOC | 0 */
+{
+        int Rtv;
+
+        Rtv = 0;
+
+        /* check the parameters */
+        if (LimCount > IntTime ||
+                (LimCount == 0 && IntTime != 0) ||
+                (LimCount != 0 && IntTime == 0)) {
+
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E010, SKERR_HWI_E010MSG);
+                return(1);
+        }
+        
+        if (pAC->GIni.GP[Port].PXSQSize == 0) {
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E009, SKERR_HWI_E009MSG);
+                return(2);
+        }
+        
+        /* calculate register values */
+        IntTime = (IntTime / 2) * pAC->GIni.GIHstClkFact / 100;
+        LimCount = LimCount / 8;
+        
+        if (IntTime > TXA_MAX_VAL || LimCount > TXA_MAX_VAL) {
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E010, SKERR_HWI_E010MSG);
+                return(1);
+        }
+
+        /*
+         * - Enable 'Force Sync' to ensure the synchronous queue
+         *   has the priority while configuring the new values.
+         * - Also 'disable alloc' to ensure the settings complies
+         *   to the SyncMode parameter.
+         * - Disable 'Rate Control' to configure the new values.
+         * - write IntTime and LimCount
+         * - start 'Rate Control' and disable 'Force Sync'
+         *   if Interval Timer or Limit Counter not zero.
+         */
+        SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL),
+                TXA_ENA_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);
+        
+        SK_OUT32(IoC, MR_ADDR(Port, TXA_ITI_INI), IntTime);
+        SK_OUT32(IoC, MR_ADDR(Port, TXA_LIM_INI), LimCount);
+        
+        SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL),
+                (SK_U8)(SyncMode & (TXA_ENA_ALLOC | TXA_DIS_ALLOC)));
+        
+        if (IntTime != 0 || LimCount != 0) {
+                SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL), TXA_DIS_FSYNC | TXA_START_RC);
+        }
+
+        return(0);
+}       /* SkGeCfgSync */
+#endif /* SK_DIAG || SK_CFG_SYNC*/
+
+
+/******************************************************************************
+ *
+ *      DoInitRamQueue() - Initialize the RAM Buffer Address of a single Queue
+ *
+ * Desccription:
+ *      If the queue is used, enable and initialize it.
+ *      Make sure the queue is still reset, if it is not used.
+ *
+ * Returns:
+ *      nothing
+ */
+static void DoInitRamQueue(
+SK_AC   *pAC,                   /* adapter context */
+SK_IOC  IoC,                    /* IO context */
+int             QuIoOffs,               /* Queue IO Address Offset */
+SK_U32  QuStartAddr,    /* Queue Start Address */
+SK_U32  QuEndAddr,              /* Queue End Address */
+int             QuType)                 /* Queue Type (SK_RX_SRAM_Q|SK_RX_BRAM_Q|SK_TX_RAM_Q) */
+{
+        SK_U32  RxUpThresVal;
+        SK_U32  RxLoThresVal;
+
+        if (QuStartAddr != QuEndAddr) {
+                /* calculate thresholds, assume we have a big Rx queue */
+                RxUpThresVal = (QuEndAddr + 1 - QuStartAddr - SK_RB_ULPP) / 8;
+                RxLoThresVal = (QuEndAddr + 1 - QuStartAddr - SK_RB_LLPP_B)/8;
+
+                /* build HW address format */
+                QuStartAddr = QuStartAddr / 8;
+                QuEndAddr = QuEndAddr / 8;
+
+                /* release local reset */
+                SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_RST_CLR);
+
+                /* configure addresses */
+                SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_START), QuStartAddr);
+                SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_END), QuEndAddr);
+                SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_WP), QuStartAddr);
+                SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_RP), QuStartAddr);
+
+                switch (QuType) {
+                case SK_RX_SRAM_Q:
+                        /* configure threshold for small Rx Queue */
+                        RxLoThresVal += (SK_RB_LLPP_B - SK_RB_LLPP_S) / 8;
+
+                        /* continue with SK_RX_BRAM_Q */
+                case SK_RX_BRAM_Q:
+                        /* write threshold for Rx Queue */
+
+                        SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_RX_UTPP), RxUpThresVal);
+                        SK_OUT32(IoC, RB_ADDR(QuIoOffs, RB_RX_LTPP), RxLoThresVal);
+
+                        /* the high priority threshold not used */
+                        break;
+                case SK_TX_RAM_Q:
+                        /*
+                         * Do NOT use Store & Forward under normal operation due to
+                         * performance optimization (GENESIS only).
+                         * But if Jumbo Frames are configured (XMAC Tx FIFO is only 4 kB)
+                         * or YUKON is used ((GMAC Tx FIFO is only 1 kB)
+                         * we NEED Store & Forward of the RAM buffer.
+                         */
+                        if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK ||
+                                pAC->GIni.GIYukon) {
+                                /* enable Store & Forward Mode for the Tx Side */
+                                SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_ENA_STFWD);
+                        }
+                        break;
+                }
+
+                /* set queue operational */
+                SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_ENA_OP_MD);
+        }
+        else {
+                /* ensure the queue is still disabled */
+                SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_RST_SET);
+        }
+}       /* DoInitRamQueue */
+
+
+/******************************************************************************
+ *
+ *      SkGeInitRamBufs() - Initialize the RAM Buffer Queues
+ *
+ * Description:
+ *      Initialize all RAM Buffer Queues of the specified port
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGeInitRamBufs(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT *pPrt;
+        int RxQType;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PRxQSize == SK_MIN_RXQ_SIZE) {
+                RxQType = SK_RX_SRAM_Q;         /* small Rx Queue */
+        }
+        else {
+                RxQType = SK_RX_BRAM_Q;         /* big Rx Queue */
+        }
+
+        DoInitRamQueue(pAC, IoC, pPrt->PRxQOff, pPrt->PRxQRamStart,
+                pPrt->PRxQRamEnd, RxQType);
+        
+        DoInitRamQueue(pAC, IoC, pPrt->PXsQOff, pPrt->PXsQRamStart,
+                pPrt->PXsQRamEnd, SK_TX_RAM_Q);
+        
+        DoInitRamQueue(pAC, IoC, pPrt->PXaQOff, pPrt->PXaQRamStart,
+                pPrt->PXaQRamEnd, SK_TX_RAM_Q);
+
+}       /* SkGeInitRamBufs */
+
+
+/******************************************************************************
+ *
+ *      SkGeInitRamIface() - Initialize the RAM Interface
+ *
+ * Description:
+ *      This function initializes the Adapters RAM Interface.
+ *
+ * Note:
+ *      This function is used in the diagnostics.
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGeInitRamIface(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC)            /* IO context */
+{
+        /* release local reset */
+        SK_OUT16(IoC, B3_RI_CTRL, RI_RST_CLR);
+
+        /* configure timeout values */
+        SK_OUT8(IoC, B3_RI_WTO_R1, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_WTO_XA1, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_WTO_XS1, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_RTO_R1, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_RTO_XA1, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_RTO_XS1, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_WTO_R2, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_WTO_XA2, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_WTO_XS2, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_RTO_R2, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_RTO_XA2, SK_RI_TO_53);
+        SK_OUT8(IoC, B3_RI_RTO_XS2, SK_RI_TO_53);
+
+}       /* SkGeInitRamIface */
+
+
+/******************************************************************************
+ *
+ *      SkGeInitBmu() - Initialize the BMU state machines
+ *
+ * Description:
+ *      Initialize all BMU state machines of the specified port
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGeInitBmu(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U32          RxWm;
+        SK_U32          TxWm;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        RxWm = SK_BMU_RX_WM;
+        TxWm = SK_BMU_TX_WM;
+        
+        if (!pAC->GIni.GIPciSlot64 && !pAC->GIni.GIPciClock66) {
+                /* for better performance */
+                RxWm /= 2;
+                TxWm /= 2;
+        }
+
+        /* Rx Queue: Release all local resets and set the watermark */
+        SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_CLR_RESET);
+        SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_F), RxWm);
+
+        /*
+         * Tx Queue: Release all local resets if the queue is used !
+         *              set watermark
+         */
+        if (pPrt->PXSQSize != 0) {
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_CLR_RESET);
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_F), TxWm);
+        }
+        
+        if (pPrt->PXAQSize != 0) {
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_CLR_RESET);
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_F), TxWm);
+        }
+        /*
+         * Do NOT enable the descriptor poll timers here, because
+         * the descriptor addresses are not specified yet.
+         */
+}       /* SkGeInitBmu */
+
+
+/******************************************************************************
+ *
+ *      TestStopBit() - Test the stop bit of the queue
+ *
+ * Description:
+ *      Stopping a queue is not as simple as it seems to be.
+ *      If descriptor polling is enabled, it may happen
+ *      that RX/TX stop is done and SV idle is NOT set.
+ *      In this case we have to issue another stop command.
+ *
+ * Returns:
+ *      The queues control status register
+ */
+static SK_U32 TestStopBit(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO Context */
+int             QuIoOffs)       /* Queue IO Address Offset */
+{
+        SK_U32  QuCsr;  /* CSR contents */
+
+        SK_IN32(IoC, Q_ADDR(QuIoOffs, Q_CSR), &QuCsr);
+        
+        if ((QuCsr & (CSR_STOP | CSR_SV_IDLE)) == 0) {
+                /* Stop Descriptor overridden by start command */
+                SK_OUT32(IoC, Q_ADDR(QuIoOffs, Q_CSR), CSR_STOP);
+
+                SK_IN32(IoC, Q_ADDR(QuIoOffs, Q_CSR), &QuCsr);
+        }
+        
+        return(QuCsr);
+}       /* TestStopBit */
+
+
+/******************************************************************************
+ *
+ *      SkGeStopPort() - Stop the Rx/Tx activity of the port 'Port'.
+ *
+ * Description:
+ *      After calling this function the descriptor rings and Rx and Tx
+ *      queues of this port may be reconfigured.
+ *
+ *      It is possible to stop the receive and transmit path separate or
+ *      both together.
+ *
+ *      Dir =   SK_STOP_TX      Stops the transmit path only and resets the MAC.
+ *                              The receive queue is still active and
+ *                              the pending Rx frames may be still transferred
+ *                              into the RxD.
+ *              SK_STOP_RX      Stop the receive path. The tansmit path
+ *                              has to be stopped once before.
+ *              SK_STOP_ALL     SK_STOP_TX + SK_STOP_RX
+ *
+ *      RstMode = SK_SOFT_RST   Resets the MAC. The PHY is still alive.
+ *                      SK_HARD_RST     Resets the MAC and the PHY.
+ *
+ * Example:
+ *      1) A Link Down event was signaled for a port. Therefore the activity
+ *      of this port should be stopped and a hardware reset should be issued
+ *      to enable the workaround of XMAC Errata #2. But the received frames
+ *      should not be discarded.
+ *              ...
+ *              SkGeStopPort(pAC, IoC, Port, SK_STOP_TX, SK_HARD_RST);
+ *              (transfer all pending Rx frames)
+ *              SkGeStopPort(pAC, IoC, Port, SK_STOP_RX, SK_HARD_RST);
+ *              ...
+ *
+ *      2) An event was issued which request the driver to switch
+ *      the 'virtual active' link to an other already active port
+ *      as soon as possible. The frames in the receive queue of this
+ *      port may be lost. But the PHY must not be reset during this
+ *      event.
+ *              ...
+ *              SkGeStopPort(pAC, IoC, Port, SK_STOP_ALL, SK_SOFT_RST);
+ *              ...
+ *
+ * Extended Description:
+ *      If SK_STOP_TX is set,
+ *              o disable the MAC's receive and transmitter to prevent
+ *                from sending incomplete frames
+ *              o stop the port's transmit queues before terminating the
+ *                BMUs to prevent from performing incomplete PCI cycles
+ *                on the PCI bus
+ *              - The network Rx and Tx activity and PCI Tx transfer is
+ *                disabled now.
+ *              o reset the MAC depending on the RstMode
+ *              o Stop Interval Timer and Limit Counter of Tx Arbiter,
+ *                also disable Force Sync bit and Enable Alloc bit.
+ *              o perform a local reset of the port's Tx path
+ *                      - reset the PCI FIFO of the async Tx queue
+ *                      - reset the PCI FIFO of the sync Tx queue
+ *                      - reset the RAM Buffer async Tx queue
+ *                      - reset the RAM Buffer sync Tx queue
+ *                      - reset the MAC Tx FIFO
+ *              o switch Link and Tx LED off, stop the LED counters
+ *
+ *      If SK_STOP_RX is set,
+ *              o stop the port's receive queue
+ *              - The path data transfer activity is fully stopped now.
+ *              o perform a local reset of the port's Rx path
+ *                      - reset the PCI FIFO of the Rx queue
+ *                      - reset the RAM Buffer receive queue
+ *                      - reset the MAC Rx FIFO
+ *              o switch Rx LED off, stop the LED counter
+ *
+ *      If all ports are stopped,
+ *              o reset the RAM Interface.
+ *
+ * Notes:
+ *      o This function may be called during the driver states RESET_PORT and
+ *        SWITCH_PORT.
+ */
+void SkGeStopPort(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* I/O context */
+int             Port,   /* port to stop (MAC_1 + n) */
+int             Dir,    /* Direction to Stop (SK_STOP_RX, SK_STOP_TX, SK_STOP_ALL) */
+int             RstMode)/* Reset Mode (SK_SOFT_RST, SK_HARD_RST) */
+{
+#ifndef SK_DIAG
+        SK_EVPARA Para;
+#endif /* !SK_DIAG */
+        SK_GEPORT *pPrt;
+        SK_U32  DWord;
+        SK_U32  XsCsr;
+        SK_U32  XaCsr;
+        SK_U64  ToutStart;
+        int             i;
+        int             ToutCnt;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if ((Dir & SK_STOP_TX) != 0) {
+                /* disable receiver and transmitter */
+                SkMacRxTxDisable(pAC, IoC, Port);
+                
+                /* stop both transmit queues */
+                /*
+                 * If the BMU is in the reset state CSR_STOP will terminate
+                 * immediately.
+                 */
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_STOP);
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_STOP);
+
+                ToutStart = SkOsGetTime(pAC);
+                ToutCnt = 0;
+                do {
+                        /*
+                         * Clear packet arbiter timeout to make sure
+                         * this loop will terminate.
+                         */
+                        SK_OUT16(IoC, B3_PA_CTRL, (SK_U16)((Port == MAC_1) ?
+                                PA_CLR_TO_TX1 : PA_CLR_TO_TX2));
+
+                        /*
+                         * If the transfer stucks at the MAC the STOP command will not
+                         * terminate if we don't flush the XMAC's transmit FIFO !
+                         */
+                        SkMacFlushTxFifo(pAC, IoC, Port);
+
+                        XsCsr = TestStopBit(pAC, IoC, pPrt->PXsQOff);
+                        XaCsr = TestStopBit(pAC, IoC, pPrt->PXaQOff);
+
+                        if (SkOsGetTime(pAC) - ToutStart > (SK_TICKS_PER_SEC / 18)) {
+                                /*
+                                 * Timeout of 1/18 second reached.
+                                 * This needs to be checked at 1/18 sec only.
+                                 */
+                                ToutCnt++;
+                                if (ToutCnt > 1) {
+                                        /* Might be a problem when the driver event handler
+                                         * calls StopPort again. XXX.
+                                         */
+
+                                        /* Fatal Error, Loop aborted */
+                                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E018,
+                                                SKERR_HWI_E018MSG);
+#ifndef SK_DIAG
+                                        Para.Para64 = Port;
+                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+#endif /* !SK_DIAG */
+                                        return;
+                                }
+                                /*
+                                 * Cache incoherency workaround: Assume a start command
+                                 * has been lost while sending the frame.
+                                 */
+                                ToutStart = SkOsGetTime(pAC);
+
+                                if ((XsCsr & CSR_STOP) != 0) {
+                                        SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_START);
+                                }
+                                if ((XaCsr & CSR_STOP) != 0) {
+                                        SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_START);
+                                }
+                        }
+
+                        /*
+                         * Because of the ASIC problem report entry from 21.08.1998 it is
+                         * required to wait until CSR_STOP is reset and CSR_SV_IDLE is set.
+                         */
+                } while ((XsCsr & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE ||
+                                 (XaCsr & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE);
+
+                /* Reset the MAC depending on the RstMode */
+                if (RstMode == SK_SOFT_RST) {
+                        SkMacSoftRst(pAC, IoC, Port);
+                }
+                else {
+                        SkMacHardRst(pAC, IoC, Port);
+                }
+                
+                /* Disable Force Sync bit and Enable Alloc bit */
+                SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL),
+                        TXA_DIS_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);
+                
+                /* Stop Interval Timer and Limit Counter of Tx Arbiter */
+                SK_OUT32(IoC, MR_ADDR(Port, TXA_ITI_INI), 0L);
+                SK_OUT32(IoC, MR_ADDR(Port, TXA_LIM_INI), 0L);
+
+                /* Perform a local reset of the port's Tx path */
+
+                /* Reset the PCI FIFO of the async Tx queue */
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXaQOff, Q_CSR), CSR_SET_RESET);
+                /* Reset the PCI FIFO of the sync Tx queue */
+                SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_SET_RESET);
+                /* Reset the RAM Buffer async Tx queue */
+                SK_OUT8(IoC, RB_ADDR(pPrt->PXaQOff, RB_CTRL), RB_RST_SET);
+                /* Reset the RAM Buffer sync Tx queue */
+                SK_OUT8(IoC, RB_ADDR(pPrt->PXsQOff, RB_CTRL), RB_RST_SET);
+                
+                /* Reset Tx MAC FIFO */
+#ifdef GENESIS
+                if (pAC->GIni.GIGenesis) {
+                        /* Note: MFF_RST_SET does NOT reset the XMAC ! */
+                        SK_OUT8(IoC, MR_ADDR(Port, TX_MFF_CTRL2), MFF_RST_SET);
+
+                        /* switch Link and Tx LED off, stop the LED counters */
+                        /* Link LED is switched off by the RLMT and the Diag itself */
+                        SkGeXmitLED(pAC, IoC, MR_ADDR(Port, TX_LED_INI), SK_LED_DIS);
+                }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+                if (pAC->GIni.GIYukon) {
+                        /* Reset TX MAC FIFO */
+                        SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_RST_SET);
+                }
+#endif /* YUKON */
+        }
+
+        if ((Dir & SK_STOP_RX) != 0) {
+                /*
+                 * The RX Stop Command will not terminate if no buffers
+                 * are queued in the RxD ring. But it will always reach
+                 * the Idle state. Therefore we can use this feature to
+                 * stop the transfer of received packets.
+                 */
+                /* stop the port's receive queue */
+                SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_STOP);
+                
+                i = 100;
+                do {
+                        /*
+                         * Clear packet arbiter timeout to make sure
+                         * this loop will terminate
+                         */
+                        SK_OUT16(IoC, B3_PA_CTRL, (SK_U16)((Port == MAC_1) ?
+                                PA_CLR_TO_RX1 : PA_CLR_TO_RX2));
+
+                        DWord = TestStopBit(pAC, IoC, pPrt->PRxQOff);
+
+                        /* timeout if i==0 (bug fix for #10748) */
+                        if (--i == 0) {
+                                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E024,
+                                        SKERR_HWI_E024MSG);
+                                break;
+                        }
+                        /*
+                         * because of the ASIC problem report entry from 21.08.98
+                         * it is required to wait until CSR_STOP is reset and
+                         * CSR_SV_IDLE is set.
+                         */
+                } while ((DWord & (CSR_STOP | CSR_SV_IDLE)) != CSR_SV_IDLE);
+
+                /* The path data transfer activity is fully stopped now */
+
+                /* Perform a local reset of the port's Rx path */
+
+                 /*     Reset the PCI FIFO of the Rx queue */
+                SK_OUT32(IoC, Q_ADDR(pPrt->PRxQOff, Q_CSR), CSR_SET_RESET);
+                /* Reset the RAM Buffer receive queue */
+                SK_OUT8(IoC, RB_ADDR(pPrt->PRxQOff, RB_CTRL), RB_RST_SET);
+
+                /* Reset Rx MAC FIFO */
+#ifdef GENESIS
+                if (pAC->GIni.GIGenesis) {
+                        
+                        SK_OUT8(IoC, MR_ADDR(Port, RX_MFF_CTRL2), MFF_RST_SET);
+
+                        /* switch Rx LED off, stop the LED counter */
+                        SkGeXmitLED(pAC, IoC, MR_ADDR(Port, RX_LED_INI), SK_LED_DIS);
+                }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+                if (pAC->GIni.GIYukon) {
+                        /* Reset Rx MAC FIFO */
+                        SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_RST_SET);
+                }
+#endif /* YUKON */
+        }
+}       /* SkGeStopPort */
+
+
+/******************************************************************************
+ *
+ *      SkGeInit0() - Level 0 Initialization
+ *
+ * Description:
+ *      - Initialize the BMU address offsets
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGeInit0(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC)            /* IO context */
+{
+        int i;
+        SK_GEPORT *pPrt;
+
+        for (i = 0; i < SK_MAX_MACS; i++) {
+                pPrt = &pAC->GIni.GP[i];
+
+                pPrt->PState = SK_PRT_RESET;
+                pPrt->PRxQOff = QOffTab[i].RxQOff;
+                pPrt->PXsQOff = QOffTab[i].XsQOff;
+                pPrt->PXaQOff = QOffTab[i].XaQOff;
+                pPrt->PCheckPar = SK_FALSE;
+                pPrt->PIsave = 0;
+                pPrt->PPrevShorts = 0;
+                pPrt->PLinkResCt = 0;
+                pPrt->PAutoNegTOCt = 0;
+                pPrt->PPrevRx = 0;
+                pPrt->PPrevFcs = 0;
+                pPrt->PRxLim = SK_DEF_RX_WA_LIM;
+                pPrt->PLinkMode = (SK_U8)SK_LMODE_AUTOFULL;
+                pPrt->PLinkSpeedCap = (SK_U8)SK_LSPEED_CAP_1000MBPS;
+                pPrt->PLinkSpeed = (SK_U8)SK_LSPEED_1000MBPS;
+                pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_UNKNOWN;
+                pPrt->PLinkModeConf = (SK_U8)SK_LMODE_AUTOSENSE;
+                pPrt->PFlowCtrlMode = (SK_U8)SK_FLOW_MODE_SYM_OR_REM;
+                pPrt->PLinkCap = (SK_U8)(SK_LMODE_CAP_HALF | SK_LMODE_CAP_FULL |
+                        SK_LMODE_CAP_AUTOHALF | SK_LMODE_CAP_AUTOFULL);
+                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+                pPrt->PFlowCtrlCap = (SK_U8)SK_FLOW_MODE_SYM_OR_REM;
+                pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
+                pPrt->PMSCap = 0;
+                pPrt->PMSMode = (SK_U8)SK_MS_MODE_AUTO;
+                pPrt->PMSStatus = (SK_U8)SK_MS_STAT_UNSET;
+                pPrt->PLipaAutoNeg = (SK_U8)SK_LIPA_UNKNOWN;
+                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;
+        pAC->GIni.GILedBlinkCtrl = (SK_U16)OemConfig.Value;
+        pAC->GIni.GIValIrqMask = IS_ALL_MSK;
+
+}       /* SkGeInit0*/
+
+
+/******************************************************************************
+ *
+ *      SkGeInit1() - Level 1 Initialization
+ *
+ * Description:
+ *      o Do a software reset.
+ *      o Clear all reset bits.
+ *      o Verify that the detected hardware is present.
+ *        Return an error if not.
+ *      o Get the hardware configuration
+ *              + Read the number of MACs/Ports.
+ *              + Read the RAM size.
+ *              + Read the PCI Revision Id.
+ *              + Find out the adapters host clock speed
+ *              + Read and check the PHY type
+ *
+ * Returns:
+ *      0:      success
+ *      5:      Unexpected PHY type detected
+ *      6:      HW self test failed
+ */
+static int SkGeInit1(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC)            /* IO context */
+{
+        SK_U8   Byte;
+        SK_U16  Word;
+        SK_U16  CtrlStat;
+        SK_U32  DWord;
+        int     RetVal;
+        int     i;
+
+        RetVal = 0;
+
+        /* save CLK_RUN bits (YUKON-Lite) */
+        SK_IN16(IoC, B0_CTST, &CtrlStat);
+
+        /* do the SW-reset */
+        SK_OUT8(IoC, B0_CTST, CS_RST_SET);
+
+        /* release the SW-reset */
+        SK_OUT8(IoC, B0_CTST, CS_RST_CLR);
+
+        /* reset all error bits in the PCI STATUS register */
+        /*
+         * Note: PCI Cfg cycles cannot be used, because they are not
+         *               available on some platforms after 'boot time'.
+         */
+        SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
+        
+        SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+        SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
+        SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+
+        /* release Master Reset */
+        SK_OUT8(IoC, B0_CTST, CS_MRST_CLR);
+
+#ifdef CLK_RUN
+        CtrlStat |= CS_CLK_RUN_ENA;
+#endif /* CLK_RUN */
+
+        /* 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;
+        
+        /* read number of MACs */
+        SK_IN8(IoC, B2_MAC_CFG, &Byte);
+        pAC->GIni.GIMacsFound = (Byte & CFG_SNG_MAC) ? 1 : 2;
+        
+        /* get Chip Revision Number */
+        pAC->GIni.GIChipRev = (SK_U8)((Byte & CFG_CHIP_R_MSK) >> 4);
+
+        /* get diff. PCI parameters */
+        SK_IN16(IoC, B0_CTST, &CtrlStat);
+        
+        /* read the adapters RAM size */
+        SK_IN8(IoC, B2_E_0, &Byte);
+        
+        pAC->GIni.GIGenesis = SK_FALSE;
+        pAC->GIni.GIYukon = SK_FALSE;
+        pAC->GIni.GIYukonLite = SK_FALSE;
+
+#ifdef GENESIS
+        if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+
+                pAC->GIni.GIGenesis = SK_TRUE;
+
+                if (Byte == (SK_U8)3) {                                         
+                        /* special case: 4 x 64k x 36, offset = 0x80000 */
+                        pAC->GIni.GIRamSize = 1024;
+                        pAC->GIni.GIRamOffs = (SK_U32)512 * 1024;
+                }
+                else {
+                        pAC->GIni.GIRamSize = (int)Byte * 512;
+                        pAC->GIni.GIRamOffs = 0;
+                }
+                /* all GE adapters work with 53.125 MHz host clock */
+                pAC->GIni.GIHstClkFact = SK_FACT_53;
+                
+                /* set Descr. Poll Timer Init Value to 250 ms */
+                pAC->GIni.GIPollTimerVal =
+                        SK_DPOLL_DEF * (SK_U32)pAC->GIni.GIHstClkFact / 100;
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIChipId != CHIP_ID_GENESIS) {
+                
+                pAC->GIni.GIYukon = SK_TRUE;
+                
+                pAC->GIni.GIRamSize = (Byte == (SK_U8)0) ? 128 : (int)Byte * 4;
+                
+                pAC->GIni.GIRamOffs = 0;
+                
+                /* WA for chip Rev. A */
+                pAC->GIni.GIWolOffs = (pAC->GIni.GIChipId == CHIP_ID_YUKON &&
+                        pAC->GIni.GIChipRev == 0) ? WOL_REG_OFFS : 0;
+                
+                /* get PM Capabilities of PCI config space */
+                SK_IN16(IoC, PCI_C(PCI_PM_CAP_REG), &Word);
+
+                /* check if VAUX is available */
+                if (((CtrlStat & CS_VAUX_AVAIL) != 0) &&
+                        /* check also if PME from D3cold is set */
+                        ((Word & PCI_PME_D3C_SUP) != 0)) {
+                        /* set entry in GE init struct */
+                        pAC->GIni.GIVauxAvail = SK_TRUE;
+                }
+                
+                if (pAC->GIni.GIChipId == CHIP_ID_YUKON_LITE) {
+                        /* this is Rev. A1 */
+                        pAC->GIni.GIYukonLite = SK_TRUE;
+                }
+                else {
+                        /* save Flash-Address Register */
+                        SK_IN32(IoC, B2_FAR, &DWord);
+
+                        /* test Flash-Address Register */
+                        SK_OUT8(IoC, B2_FAR + 3, 0xff);
+                        SK_IN8(IoC, B2_FAR + 3, &Byte);
+
+                        if (Byte != 0) {
+                                /* this is Rev. A0 */
+                                pAC->GIni.GIYukonLite = SK_TRUE;
+
+                                /* restore Flash-Address Register */
+                                SK_OUT32(IoC, B2_FAR, DWord);
+                        }
+                }
+
+                /* 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);
+                
+                if ((DWord & IS_HW_ERR) != 0) {
+                        /* read the HW Error Interrupt source */
+                        SK_IN32(IoC, B0_HWE_ISRC, &DWord);
+                        
+                        if ((DWord & IS_IRQ_SENSOR) != 0) {
+                                /* disable HW Error IRQ */
+                                pAC->GIni.GIValIrqMask &= ~IS_HW_ERR;
+                        }
+                }
+                
+                for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+                        /* set GMAC Link Control reset */
+                        SK_OUT16(IoC, MR_ADDR(i, GMAC_LINK_CTRL), GMLC_RST_SET);
+
+                        /* clear GMAC Link Control reset */
+                        SK_OUT16(IoC, MR_ADDR(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
+                }
+                /* all YU chips work with 78.125 MHz host clock */
+                pAC->GIni.GIHstClkFact = SK_FACT_78;
+                
+                pAC->GIni.GIPollTimerVal = SK_DPOLL_MAX;        /* 215 ms */
+        }
+#endif /* YUKON */
+
+        /* check if 64-bit PCI Slot is present */
+        pAC->GIni.GIPciSlot64 = (SK_BOOL)((CtrlStat & CS_BUS_SLOT_SZ) != 0);
+        
+        /* check if 66 MHz PCI Clock is active */
+        pAC->GIni.GIPciClock66 = (SK_BOOL)((CtrlStat & CS_BUS_CLOCK) != 0);
+
+        /* read PCI HW Revision Id. */
+        SK_IN8(IoC, PCI_C(PCI_REV_ID), &Byte);
+        pAC->GIni.GIPciHwRev = Byte;
+
+        /* read the PMD type */
+        SK_IN8(IoC, B2_PMD_TYP, &Byte);
+        pAC->GIni.GICopperType = (SK_U8)(Byte == 'T');
+
+        /* read the PHY type */
+        SK_IN8(IoC, B2_E_1, &Byte);
+
+        Byte &= 0x0f;   /* the PHY type is stored in the lower nibble */
+        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+                
+#ifdef GENESIS
+                if (pAC->GIni.GIGenesis) {
+                        switch (Byte) {
+                        case SK_PHY_XMAC:
+                                pAC->GIni.GP[i].PhyAddr = PHY_ADDR_XMAC;
+                                break;
+                        case SK_PHY_BCOM:
+                                pAC->GIni.GP[i].PhyAddr = PHY_ADDR_BCOM;
+                                pAC->GIni.GP[i].PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
+                                        SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE);
+                                break;
+#ifdef OTHER_PHY
+                        case SK_PHY_LONE:
+                                pAC->GIni.GP[i].PhyAddr = PHY_ADDR_LONE;
+                                break;
+                        case SK_PHY_NAT:
+                                pAC->GIni.GP[i].PhyAddr = PHY_ADDR_NAT;
+                                break;
+#endif /* OTHER_PHY */
+                        default:
+                                /* ERROR: unexpected PHY type detected */
+                                RetVal = 5;
+                                break;
+                        }
+                }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+                if (pAC->GIni.GIYukon) {
+                        
+                        if (Byte < (SK_U8)SK_PHY_MARV_COPPER) {
+                                /* if this field is not initialized */
+                                Byte = (SK_U8)SK_PHY_MARV_COPPER;
+                                
+                                pAC->GIni.GICopperType = SK_TRUE;
+                        }
+                        
+                        pAC->GIni.GP[i].PhyAddr = PHY_ADDR_MARV;
+                        
+                        if (pAC->GIni.GICopperType) {
+
+                                pAC->GIni.GP[i].PLinkSpeedCap = (SK_U8)(SK_LSPEED_CAP_AUTO |
+                                        SK_LSPEED_CAP_10MBPS | SK_LSPEED_CAP_100MBPS |
+                                        SK_LSPEED_CAP_1000MBPS);
+                                
+                                pAC->GIni.GP[i].PLinkSpeed = (SK_U8)SK_LSPEED_AUTO;
+                                
+                                pAC->GIni.GP[i].PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
+                                        SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE);
+                        }
+                        else {
+                                Byte = (SK_U8)SK_PHY_MARV_FIBER;
+                        }
+                }
+#endif /* YUKON */
+                
+                pAC->GIni.GP[i].PhyType = (int)Byte;
+                
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+                        ("PHY type: %d  PHY addr: %04x\n", Byte,
+                        pAC->GIni.GP[i].PhyAddr));
+        }
+        
+        /* get MAC Type & set function pointers dependent on */
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                pAC->GIni.GIMacType = SK_MAC_XMAC;
+
+                pAC->GIni.GIFunc.pFnMacUpdateStats      = SkXmUpdateStats;
+                pAC->GIni.GIFunc.pFnMacStatistic        = SkXmMacStatistic;
+                pAC->GIni.GIFunc.pFnMacResetCounter     = SkXmResetCounter;
+                pAC->GIni.GIFunc.pFnMacOverflow         = SkXmOverflowStatus;
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                pAC->GIni.GIMacType = SK_MAC_GMAC;
+
+                pAC->GIni.GIFunc.pFnMacUpdateStats      = SkGmUpdateStats;
+                pAC->GIni.GIFunc.pFnMacStatistic        = SkGmMacStatistic;
+                pAC->GIni.GIFunc.pFnMacResetCounter     = SkGmResetCounter;
+                pAC->GIni.GIFunc.pFnMacOverflow         = SkGmOverflowStatus;
+
+#ifdef SPECIAL_HANDLING
+                if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
+                        /* check HW self test result */
+                        SK_IN8(IoC, B2_E_3, &Byte);
+                        if (Byte & B2_E3_RES_MASK) {
+                                RetVal = 6;
+                        }
+                }
+#endif
+        }
+#endif /* YUKON */
+        
+        return(RetVal);
+}       /* SkGeInit1 */
+
+
+/******************************************************************************
+ *
+ *      SkGeInit2() - Level 2 Initialization
+ *
+ * Description:
+ *      - start the Blink Source Counter
+ *      - start the Descriptor Poll Timer
+ *      - configure the MAC-Arbiter
+ *      - configure the Packet-Arbiter
+ *      - enable the Tx Arbiters
+ *      - enable the RAM Interface Arbiter
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGeInit2(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC)            /* IO context */
+{
+#ifdef GENESIS
+        SK_U32  DWord;
+#endif /* GENESIS */
+        int             i;
+
+        /* start the Descriptor Poll Timer */
+        if (pAC->GIni.GIPollTimerVal != 0) {
+                if (pAC->GIni.GIPollTimerVal > SK_DPOLL_MAX) {
+                        pAC->GIni.GIPollTimerVal = SK_DPOLL_MAX;
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E017, SKERR_HWI_E017MSG);
+                }
+                SK_OUT32(IoC, B28_DPT_INI, pAC->GIni.GIPollTimerVal);
+                SK_OUT8(IoC, B28_DPT_CTRL, DPT_START);
+        }
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                /* start the Blink Source Counter */
+                DWord = SK_BLK_DUR * (SK_U32)pAC->GIni.GIHstClkFact / 100;
+
+                SK_OUT32(IoC, B2_BSC_INI, DWord);
+                SK_OUT8(IoC, B2_BSC_CTRL, BSC_START);
+
+                /*
+                 * Configure the MAC Arbiter and the Packet Arbiter.
+                 * They will be started once and never be stopped.
+                 */
+                SkGeInitMacArb(pAC, IoC);
+
+                SkGeInitPktArb(pAC, IoC);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /* start Time Stamp Timer */
+                SK_OUT8(IoC, GMAC_TI_ST_CTRL, (SK_U8)GMT_ST_START);
+        }
+#endif /* YUKON */
+
+        /* enable the Tx Arbiters */
+        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+                SK_OUT8(IoC, MR_ADDR(i, TXA_CTRL), TXA_ENA_ARB);
+        }
+
+        /* enable the RAM Interface Arbiter */
+        SkGeInitRamIface(pAC, IoC);
+
+}       /* SkGeInit2 */
+
+/******************************************************************************
+ *
+ *      SkGeInit() - Initialize the GE Adapter with the specified level.
+ *
+ * Description:
+ *      Level   0:      Initialize the Module structures.
+ *      Level   1:      Generic Hardware Initialization. The IOP/MemBase pointer has
+ *                              to be set before calling this level.
+ *
+ *                      o Do a software reset.
+ *                      o Clear all reset bits.
+ *                      o Verify that the detected hardware is present.
+ *                        Return an error if not.
+ *                      o Get the hardware configuration
+ *                              + Set GIMacsFound with the number of MACs.
+ *                              + Store the RAM size in GIRamSize.
+ *                              + Save the PCI Revision ID in GIPciHwRev.
+ *                      o return an error
+ *                              if Number of MACs > SK_MAX_MACS
+ *
+ *                      After returning from Level 0 the adapter
+ *                      may be accessed with IO operations.
+ *
+ *      Level   2:      start the Blink Source Counter
+ *
+ * Returns:
+ *      0:      success
+ *      1:      Number of MACs exceeds SK_MAX_MACS      (after level 1)
+ *      2:      Adapter not present or not accessible
+ *      3:      Illegal initialization level
+ *      4:      Initialization Level 1 Call missing
+ *      5:      Unexpected PHY type detected
+ *      6:      HW self test failed
+ */
+int     SkGeInit(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Level)          /* initialization level */
+{
+        int             RetVal;         /* return value */
+        SK_U32  DWord;
+
+        RetVal = 0;
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
+                ("SkGeInit(Level %d)\n", Level));
+
+        switch (Level) {
+        case SK_INIT_DATA:
+                /* Initialization Level 0 */
+                SkGeInit0(pAC, IoC);
+                pAC->GIni.GILevel = SK_INIT_DATA;
+                break;
+        
+        case SK_INIT_IO:
+                /* Initialization Level 1 */
+                RetVal = SkGeInit1(pAC, IoC);
+                if (RetVal != 0) {
+                        break;
+                }
+
+                /* check if the adapter seems to be accessible */
+                SK_OUT32(IoC, B2_IRQM_INI, SK_TEST_VAL);
+                SK_IN32(IoC, B2_IRQM_INI, &DWord);
+                SK_OUT32(IoC, B2_IRQM_INI, 0L);
+                
+                if (DWord != SK_TEST_VAL) {
+                        RetVal = 2;
+                        break;
+                }
+
+                /* check if the number of GIMacsFound matches SK_MAX_MACS */
+                if (pAC->GIni.GIMacsFound > SK_MAX_MACS) {
+                        RetVal = 1;
+                        break;
+                }
+
+                /* Level 1 successfully passed */
+                pAC->GIni.GILevel = SK_INIT_IO;
+                break;
+        
+        case SK_INIT_RUN:
+                /* Initialization Level 2 */
+                if (pAC->GIni.GILevel != SK_INIT_IO) {
+#ifndef SK_DIAG
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E002, SKERR_HWI_E002MSG);
+#endif /* !SK_DIAG */
+                        RetVal = 4;
+                        break;
+                }
+                SkGeInit2(pAC, IoC);
+
+                /* Level 2 successfully passed */
+                pAC->GIni.GILevel = SK_INIT_RUN;
+                break;
+        
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E003, SKERR_HWI_E003MSG);
+                RetVal = 3;
+                break;
+        }
+
+        return(RetVal);
+}       /* SkGeInit */
+
+
+/******************************************************************************
+ *
+ *      SkGeDeInit() - Deinitialize the adapter
+ *
+ * Description:
+ *      All ports of the adapter will be stopped if not already done.
+ *      Do a software reset and switch off all LEDs.
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGeDeInit(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC)            /* IO context */
+{
+        int     i;
+        SK_U16  Word;
+
+#if (!defined(SK_SLIM) && !defined(VCPU))
+        /* ensure I2C is ready */
+        SkI2cWaitIrq(pAC, IoC);
+#endif  
+
+        /* stop all current transfer activity */
+        for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+                if (pAC->GIni.GP[i].PState != SK_PRT_STOP &&
+                        pAC->GIni.GP[i].PState != SK_PRT_RESET) {
+
+                        SkGeStopPort(pAC, IoC, i, SK_STOP_ALL, SK_HARD_RST);
+                }
+        }
+
+        /* Reset all bits in the PCI STATUS register */
+        /*
+         * Note: PCI Cfg cycles cannot be used, because they are not
+         *       available on some platforms after 'boot time'.
+         */
+        SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
+        
+        SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+        SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
+        SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+
+        /* do the reset, all LEDs are switched off now */
+        SK_OUT8(IoC, B0_CTST, CS_RST_SET);
+        
+        pAC->GIni.GILevel = SK_INIT_DATA;
+}       /* SkGeDeInit */
+
+
+/******************************************************************************
+ *
+ *      SkGeInitPort()  Initialize the specified port.
+ *
+ * Description:
+ *      PRxQSize, PXSQSize, and PXAQSize has to be
+ *      configured for the specified port before calling this function.
+ *  The descriptor rings has to be initialized too.
+ *
+ *      o (Re)configure queues of the specified port.
+ *      o configure the MAC of the specified port.
+ *      o put ASIC and MAC(s) in operational mode.
+ *      o initialize Rx/Tx and Sync LED
+ *      o initialize RAM Buffers and MAC FIFOs
+ *
+ *      The port is ready to connect when returning.
+ *
+ * Note:
+ *      The MAC's Rx and Tx state machine is still disabled when returning.
+ *
+ * Returns:
+ *      0:      success
+ *      1:      Queue size initialization error. The configured values
+ *              for PRxQSize, PXSQSize, or PXAQSize are invalid for one
+ *              or more queues. The specified port was NOT initialized.
+ *              An error log entry was generated.
+ *      2:      The port has to be stopped before it can be initialized again.
+ */
+int SkGeInitPort(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port to configure */
+{
+        SK_GEPORT *pPrt;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (SkGeCheckQSize(pAC, Port) != 0) {
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E004, SKERR_HWI_E004MSG);
+                return(1);
+        }
+        
+        if (pPrt->PState == SK_PRT_INIT || pPrt->PState == SK_PRT_RUN) {
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E005, SKERR_HWI_E005MSG);
+                return(2);
+        }
+
+        /* configuration ok, initialize the Port now */
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                /* initialize Rx, Tx and Link LED */
+                /*
+                 * If 1000BT Phy needs LED initialization than swap
+                 * LED and XMAC initialization order
+                 */
+                SkGeXmitLED(pAC, IoC, MR_ADDR(Port, TX_LED_INI), SK_LED_ENA);
+                SkGeXmitLED(pAC, IoC, MR_ADDR(Port, RX_LED_INI), SK_LED_ENA);
+                /* The Link LED is initialized by RLMT or Diagnostics itself */
+                
+                SkXmInitMac(pAC, IoC, Port);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+
+                SkGmInitMac(pAC, IoC, Port);
+        }
+#endif /* YUKON */
+        
+        /* do NOT initialize the Link Sync Counter */
+
+        SkGeInitMacFifo(pAC, IoC, Port);
+        
+        SkGeInitRamBufs(pAC, IoC, Port);
+        
+        if (pPrt->PXSQSize != 0) {
+                /* enable Force Sync bit if synchronous queue available */
+                SK_OUT8(IoC, MR_ADDR(Port, TXA_CTRL), TXA_ENA_FSYNC);
+        }
+        
+        SkGeInitBmu(pAC, IoC, Port);
+
+        /* mark port as initialized */
+        pPrt->PState = SK_PRT_INIT;
+
+        return(0);
+}       /* SkGeInitPort */
diff --git a/drivers/net/sk98lin/skgemib.c b/drivers/net/sk98lin/skgemib.c
new file mode 100644
index 0000000000..0a6f67a7a3
--- /dev/null
+++ b/drivers/net/sk98lin/skgemib.c
@@ -0,0 +1,1075 @@
+/*****************************************************************************
+ *
+ * Name:        skgemib.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.11 $
+ * Date:        $Date: 2003/09/15 13:38:12 $
+ * Purpose:     Private Network Management Interface Management Database
+ *
+ ****************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ * PRIVATE OID handler function prototypes
+ */
+PNMI_STATIC int Addr(SK_AC *pAC, SK_IOC IoC, int action,
+        SK_U32 Id, char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int CsumStat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int General(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int Mac8023Stat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int MacPrivateConf(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int MacPrivateStat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int Monitor(SK_AC *pAC, SK_IOC IoC, int action,
+        SK_U32 Id, char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int OidStruct(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int Perform(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int* pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int Rlmt(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int RlmtStat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int SensorStat(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int Vpd(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC int Vct(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+
+#ifdef SK_POWER_MGMT
+PNMI_STATIC int PowerManagement(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+#endif /* SK_POWER_MGMT */
+
+#ifdef SK_DIAG_SUPPORT
+PNMI_STATIC int DiagActions(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance,
+        unsigned int TableIndex, SK_U32 NetIndex);
+#endif /* SK_DIAG_SUPPORT */
+
+
+/* defines *******************************************************************/
+#define ID_TABLE_SIZE (sizeof(IdTable)/sizeof(IdTable[0]))
+
+
+/* global variables **********************************************************/
+
+/*
+ * Table to correlate OID with handler function and index to
+ * hardware register stored in StatAddress if applicable.
+ */
+PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTable[] = {
+        {OID_GEN_XMIT_OK,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX},
+        {OID_GEN_RCV_OK,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX},
+        {OID_GEN_XMIT_ERROR,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, General, 0},
+        {OID_GEN_RCV_ERROR,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, General, 0},
+        {OID_GEN_RCV_NO_BUFFER,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, General, 0},
+        {OID_GEN_DIRECTED_FRAMES_XMIT,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_UNICAST},
+        {OID_GEN_MULTICAST_FRAMES_XMIT,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_MULTICAST},
+        {OID_GEN_BROADCAST_FRAMES_XMIT,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_BROADCAST},
+        {OID_GEN_DIRECTED_FRAMES_RCV,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_UNICAST},
+        {OID_GEN_MULTICAST_FRAMES_RCV,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_MULTICAST},
+        {OID_GEN_BROADCAST_FRAMES_RCV,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_BROADCAST},
+        {OID_GEN_RCV_CRC_ERROR,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_FCS},
+        {OID_GEN_TRANSMIT_QUEUE_LENGTH,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, General, 0},
+        {OID_802_3_PERMANENT_ADDRESS,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, 0},
+        {OID_802_3_CURRENT_ADDRESS,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, 0},
+        {OID_802_3_RCV_ERROR_ALIGNMENT,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_FRAMING},
+        {OID_802_3_XMIT_ONE_COLLISION,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_SINGLE_COL},
+        {OID_802_3_XMIT_MORE_COLLISIONS,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_MULTI_COL},
+        {OID_802_3_XMIT_DEFERRED,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_DEFFERAL},
+        {OID_802_3_XMIT_MAX_COLLISIONS,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_EXCESS_COL},
+        {OID_802_3_RCV_OVERRUN,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HRX_OVERFLOW},
+        {OID_802_3_XMIT_UNDERRUN,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_UNDERRUN},
+        {OID_802_3_XMIT_TIMES_CRS_LOST,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_CARRIER},
+        {OID_802_3_XMIT_LATE_COLLISIONS,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Mac8023Stat, SK_PNMI_HTX_LATE_COL},
+#ifdef SK_POWER_MGMT
+        {OID_PNP_CAPABILITIES,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, PowerManagement, 0},
+        {OID_PNP_SET_POWER,
+                0,
+                0,
+                0,
+                SK_PNMI_WO, PowerManagement, 0},
+        {OID_PNP_QUERY_POWER,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, PowerManagement, 0},
+        {OID_PNP_ADD_WAKE_UP_PATTERN,
+                0,
+                0,
+                0,
+                SK_PNMI_WO, PowerManagement, 0},
+        {OID_PNP_REMOVE_WAKE_UP_PATTERN,
+                0,
+                0,
+                0,
+                SK_PNMI_WO, PowerManagement, 0},
+        {OID_PNP_ENABLE_WAKE_UP,
+                0,
+                0,
+                0,
+                SK_PNMI_RW, PowerManagement, 0},
+#endif /* SK_POWER_MGMT */
+#ifdef SK_DIAG_SUPPORT
+        {OID_SKGE_DIAG_MODE,
+                0,
+                0,
+                0,
+                SK_PNMI_RW, DiagActions, 0},
+#endif /* SK_DIAG_SUPPORT */
+        {OID_SKGE_MDB_VERSION,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(MgmtDBVersion),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_SUPPORTED_LIST,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_ALL_DATA,
+                0,
+                0,
+                0,
+                SK_PNMI_RW, OidStruct, 0},
+        {OID_SKGE_VPD_FREE_BYTES,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(VpdFreeBytes),
+                SK_PNMI_RO, Vpd, 0},
+        {OID_SKGE_VPD_ENTRIES_LIST,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(VpdEntriesList),
+                SK_PNMI_RO, Vpd, 0},
+        {OID_SKGE_VPD_ENTRIES_NUMBER,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(VpdEntriesNumber),
+                SK_PNMI_RO, Vpd, 0},
+        {OID_SKGE_VPD_KEY,
+                SK_PNMI_VPD_ENTRIES,
+                sizeof(SK_PNMI_VPD),
+                SK_PNMI_OFF(Vpd) + SK_PNMI_VPD_OFF(VpdKey),
+                SK_PNMI_RO, Vpd, 0},
+        {OID_SKGE_VPD_VALUE,
+                SK_PNMI_VPD_ENTRIES,
+                sizeof(SK_PNMI_VPD),
+                SK_PNMI_OFF(Vpd) + SK_PNMI_VPD_OFF(VpdValue),
+                SK_PNMI_RO, Vpd, 0},
+        {OID_SKGE_VPD_ACCESS,
+                SK_PNMI_VPD_ENTRIES,
+                sizeof(SK_PNMI_VPD),
+                SK_PNMI_OFF(Vpd) + SK_PNMI_VPD_OFF(VpdAccess),
+                SK_PNMI_RO, Vpd, 0},
+        {OID_SKGE_VPD_ACTION,
+                SK_PNMI_VPD_ENTRIES,
+                sizeof(SK_PNMI_VPD),
+                SK_PNMI_OFF(Vpd) + SK_PNMI_VPD_OFF(VpdAction),
+                SK_PNMI_RW, Vpd, 0},
+        {OID_SKGE_PORT_NUMBER,          
+                1,
+                0,
+                SK_PNMI_MAI_OFF(PortNumber),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_DEVICE_TYPE,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(DeviceType),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_DRIVER_DESCR,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(DriverDescr),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_DRIVER_VERSION,
+                1,
+                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,
+                SK_PNMI_MAI_OFF(HwDescr),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_HW_VERSION,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(HwVersion),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_CHIPSET,
+                1,
+                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,
+                SK_PNMI_MAI_OFF(Action),
+                SK_PNMI_RW, Perform, 0},
+        {OID_SKGE_RESULT,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TestResult),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_BUS_TYPE,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(BusType),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_BUS_SPEED,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(BusSpeed),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_BUS_WIDTH,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(BusWidth),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_TX_SW_QUEUE_LEN,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TxSwQueueLen),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_TX_SW_QUEUE_MAX,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TxSwQueueMax),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_TX_RETRY,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TxRetryCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_RX_INTR_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RxIntrCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_TX_INTR_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TxIntrCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_RX_NO_BUF_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RxNoBufCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_TX_NO_BUF_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TxNoBufCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_TX_USED_DESCR_NO,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TxUsedDescrNo),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_RX_DELIVERED_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RxDeliveredCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_RX_OCTETS_DELIV_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RxOctetsDeliveredCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_RX_HW_ERROR_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RxHwErrorsCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_TX_HW_ERROR_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TxHwErrorsCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_IN_ERRORS_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(InErrorsCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_OUT_ERROR_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(OutErrorsCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_ERR_RECOVERY_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(ErrRecoveryCts),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_SYSUPTIME,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(SysUpTime),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_SENSOR_NUMBER,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(SensorNumber),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_SENSOR_INDEX,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorIndex),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_DESCR,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorDescr),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_TYPE,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorType),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_VALUE,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorValue),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_WAR_THRES_LOW,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorWarningThresholdLow),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_WAR_THRES_UPP,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorWarningThresholdHigh),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_ERR_THRES_LOW,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorErrorThresholdLow),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_ERR_THRES_UPP,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorErrorThresholdHigh),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_STATUS,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorStatus),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_WAR_CTS,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorWarningCts),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_ERR_CTS,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorErrorCts),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_WAR_TIME,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorWarningTimestamp),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_SENSOR_ERR_TIME,
+                SK_PNMI_SENSOR_ENTRIES,
+                sizeof(SK_PNMI_SENSOR),
+                SK_PNMI_OFF(Sensor) + SK_PNMI_SEN_OFF(SensorErrorTimestamp),
+                SK_PNMI_RO, SensorStat, 0},
+        {OID_SKGE_CHKSM_NUMBER,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(ChecksumNumber),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_CHKSM_RX_OK_CTS,
+                SKCS_NUM_PROTOCOLS,
+                sizeof(SK_PNMI_CHECKSUM),
+                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumRxOkCts),
+                SK_PNMI_RO, CsumStat, 0},
+        {OID_SKGE_CHKSM_RX_UNABLE_CTS,
+                SKCS_NUM_PROTOCOLS,
+                sizeof(SK_PNMI_CHECKSUM),
+                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumRxUnableCts),
+                SK_PNMI_RO, CsumStat, 0},
+        {OID_SKGE_CHKSM_RX_ERR_CTS,
+                SKCS_NUM_PROTOCOLS,
+                sizeof(SK_PNMI_CHECKSUM),
+                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumRxErrCts),
+                SK_PNMI_RO, CsumStat, 0},
+        {OID_SKGE_CHKSM_TX_OK_CTS,
+                SKCS_NUM_PROTOCOLS,
+                sizeof(SK_PNMI_CHECKSUM),
+                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumTxOkCts),
+                SK_PNMI_RO, CsumStat, 0},
+        {OID_SKGE_CHKSM_TX_UNABLE_CTS,
+                SKCS_NUM_PROTOCOLS,
+                sizeof(SK_PNMI_CHECKSUM),
+                SK_PNMI_OFF(Checksum) + SK_PNMI_CHK_OFF(ChecksumTxUnableCts),
+                SK_PNMI_RO, CsumStat, 0},
+        {OID_SKGE_STAT_TX,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX},
+        {OID_SKGE_STAT_TX_OCTETS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxOctetsOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_OCTET},
+        {OID_SKGE_STAT_TX_BROADCAST,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxBroadcastOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_BROADCAST},
+        {OID_SKGE_STAT_TX_MULTICAST,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxMulticastOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_MULTICAST},
+        {OID_SKGE_STAT_TX_UNICAST,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxUnicastOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_UNICAST},
+        {OID_SKGE_STAT_TX_LONGFRAMES,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxLongFramesCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_LONGFRAMES},
+        {OID_SKGE_STAT_TX_BURST,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxBurstCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_BURST},
+        {OID_SKGE_STAT_TX_PFLOWC,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxPauseMacCtrlCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_PMACC},
+        {OID_SKGE_STAT_TX_FLOWC,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxMacCtrlCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_MACC},
+        {OID_SKGE_STAT_TX_SINGLE_COL,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxSingleCollisionCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_SINGLE_COL},
+        {OID_SKGE_STAT_TX_MULTI_COL,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxMultipleCollisionCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_MULTI_COL},
+        {OID_SKGE_STAT_TX_EXCESS_COL,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxExcessiveCollisionCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_EXCESS_COL},
+        {OID_SKGE_STAT_TX_LATE_COL,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxLateCollisionCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_LATE_COL},
+        {OID_SKGE_STAT_TX_DEFFERAL,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxDeferralCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_DEFFERAL},
+        {OID_SKGE_STAT_TX_EXCESS_DEF,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxExcessiveDeferralCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_EXCESS_DEF},
+        {OID_SKGE_STAT_TX_UNDERRUN,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxFifoUnderrunCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_UNDERRUN},
+        {OID_SKGE_STAT_TX_CARRIER,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxCarrierCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_CARRIER},
+/*      {OID_SKGE_STAT_TX_UTIL,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxUtilization),
+                SK_PNMI_RO, MacPrivateStat, (SK_U16)(-1)}, */
+        {OID_SKGE_STAT_TX_64,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx64Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_64},
+        {OID_SKGE_STAT_TX_127,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx127Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_127},
+        {OID_SKGE_STAT_TX_255,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx255Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_255},
+        {OID_SKGE_STAT_TX_511,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx511Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_511},
+        {OID_SKGE_STAT_TX_1023,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTx1023Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_1023},
+        {OID_SKGE_STAT_TX_MAX,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxMaxCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_MAX},
+        {OID_SKGE_STAT_TX_SYNC,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxSyncCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_SYNC},
+        {OID_SKGE_STAT_TX_SYNC_OCTETS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatTxSyncOctetsCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HTX_SYNC_OCTET},
+        {OID_SKGE_STAT_RX,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX},
+        {OID_SKGE_STAT_RX_OCTETS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxOctetsOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_OCTET},
+        {OID_SKGE_STAT_RX_BROADCAST,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxBroadcastOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_BROADCAST},
+        {OID_SKGE_STAT_RX_MULTICAST,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMulticastOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MULTICAST},
+        {OID_SKGE_STAT_RX_UNICAST,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxUnicastOkCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_UNICAST},
+        {OID_SKGE_STAT_RX_LONGFRAMES,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxLongFramesCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_LONGFRAMES},
+        {OID_SKGE_STAT_RX_PFLOWC,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxPauseMacCtrlCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_PMACC},
+        {OID_SKGE_STAT_RX_FLOWC,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMacCtrlCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MACC},
+        {OID_SKGE_STAT_RX_PFLOWC_ERR,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxPauseMacCtrlErrorCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_PMACC_ERR},
+        {OID_SKGE_STAT_RX_FLOWC_UNKWN,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMacCtrlUnknownCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MACC_UNKWN},
+        {OID_SKGE_STAT_RX_BURST,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxBurstCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_BURST},
+        {OID_SKGE_STAT_RX_MISSED,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMissedCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MISSED},
+        {OID_SKGE_STAT_RX_FRAMING,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxFramingCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_FRAMING},
+        {OID_SKGE_STAT_RX_OVERFLOW,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxFifoOverflowCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_OVERFLOW},
+        {OID_SKGE_STAT_RX_JABBER,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxJabberCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_JABBER},
+        {OID_SKGE_STAT_RX_CARRIER,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxCarrierCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_CARRIER},
+        {OID_SKGE_STAT_RX_IR_LENGTH,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxIRLengthCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_IRLENGTH},
+        {OID_SKGE_STAT_RX_SYMBOL,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxSymbolCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_SYMBOL},
+        {OID_SKGE_STAT_RX_SHORTS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxShortsCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_SHORTS},
+        {OID_SKGE_STAT_RX_RUNT,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxRuntCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_RUNT},
+        {OID_SKGE_STAT_RX_CEXT,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxCextCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_CEXT},
+        {OID_SKGE_STAT_RX_TOO_LONG,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxTooLongCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_TOO_LONG},
+        {OID_SKGE_STAT_RX_FCS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxFcsCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_FCS},
+/*      {OID_SKGE_STAT_RX_UTIL,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxUtilization),
+                SK_PNMI_RO, MacPrivateStat, (SK_U16)(-1)}, */
+        {OID_SKGE_STAT_RX_64,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx64Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_64},
+        {OID_SKGE_STAT_RX_127,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx127Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_127},
+        {OID_SKGE_STAT_RX_255,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx255Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_255},
+        {OID_SKGE_STAT_RX_511,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx511Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_511},
+        {OID_SKGE_STAT_RX_1023,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRx1023Cts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_1023},
+        {OID_SKGE_STAT_RX_MAX,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_STAT),
+                SK_PNMI_OFF(Stat) + SK_PNMI_STA_OFF(StatRxMaxCts),
+                SK_PNMI_RO, MacPrivateStat, SK_PNMI_HRX_MAX},
+        {OID_SKGE_PHYS_CUR_ADDR,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfMacCurrentAddr),
+                SK_PNMI_RW, Addr, 0},
+        {OID_SKGE_PHYS_FAC_ADDR,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfMacFactoryAddr),
+                SK_PNMI_RO, Addr, 0},
+        {OID_SKGE_PMD,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPMD),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_CONNECTOR,
+                SK_PNMI_MAC_ENTRIES,
+                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},
+        {OID_SKGE_LINK_CAP,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfLinkCapability),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_LINK_MODE,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfLinkMode),
+                SK_PNMI_RW, MacPrivateConf, 0},
+        {OID_SKGE_LINK_MODE_STATUS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfLinkModeStatus),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_LINK_STATUS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfLinkStatus),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_FLOWCTRL_CAP,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfFlowCtrlCapability),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_FLOWCTRL_MODE,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfFlowCtrlMode),
+                SK_PNMI_RW, MacPrivateConf, 0},
+        {OID_SKGE_FLOWCTRL_STATUS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfFlowCtrlStatus),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_PHY_OPERATION_CAP,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyOperationCapability),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_PHY_OPERATION_MODE,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyOperationMode),
+                SK_PNMI_RW, MacPrivateConf, 0},
+        {OID_SKGE_PHY_OPERATION_STATUS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyOperationStatus),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_SPEED_CAP,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfSpeedCapability),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_SPEED_MODE,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfSpeedMode),
+                SK_PNMI_RW, MacPrivateConf, 0},
+        {OID_SKGE_SPEED_STATUS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_CONF),
+                SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfSpeedStatus),
+                SK_PNMI_RO, MacPrivateConf, 0},
+        {OID_SKGE_TRAP,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(Trap),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_TRAP_NUMBER,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(TrapNumber),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_RLMT_MODE,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtMode),
+                SK_PNMI_RW, Rlmt, 0},
+        {OID_SKGE_RLMT_PORT_NUMBER,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtPortNumber),
+                SK_PNMI_RO, Rlmt, 0},
+        {OID_SKGE_RLMT_PORT_ACTIVE,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtPortActive),
+                SK_PNMI_RO, Rlmt, 0},
+        {OID_SKGE_RLMT_PORT_PREFERRED,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtPortPreferred),
+                SK_PNMI_RW, Rlmt, 0},
+        {OID_SKGE_RLMT_CHANGE_CTS,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtChangeCts),
+                SK_PNMI_RO, Rlmt, 0},
+        {OID_SKGE_RLMT_CHANGE_TIME,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtChangeTime),
+                SK_PNMI_RO, Rlmt, 0},
+        {OID_SKGE_RLMT_CHANGE_ESTIM,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtChangeEstimate),
+                SK_PNMI_RO, Rlmt, 0},
+        {OID_SKGE_RLMT_CHANGE_THRES,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtChangeThreshold),
+                SK_PNMI_RW, Rlmt, 0},
+        {OID_SKGE_RLMT_PORT_INDEX,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_RLMT),
+                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtIndex),
+                SK_PNMI_RO, RlmtStat, 0},
+        {OID_SKGE_RLMT_STATUS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_RLMT),
+                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtStatus),
+                SK_PNMI_RO, RlmtStat, 0},
+        {OID_SKGE_RLMT_TX_HELLO_CTS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_RLMT),
+                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtTxHelloCts),
+                SK_PNMI_RO, RlmtStat, 0},
+        {OID_SKGE_RLMT_RX_HELLO_CTS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_RLMT),
+                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtRxHelloCts),
+                SK_PNMI_RO, RlmtStat, 0},
+        {OID_SKGE_RLMT_TX_SP_REQ_CTS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_RLMT),
+                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtTxSpHelloReqCts),
+                SK_PNMI_RO, RlmtStat, 0},
+        {OID_SKGE_RLMT_RX_SP_CTS,
+                SK_PNMI_MAC_ENTRIES,
+                sizeof(SK_PNMI_RLMT),
+                SK_PNMI_OFF(Rlmt) + SK_PNMI_RLM_OFF(RlmtRxSpHelloCts),
+                SK_PNMI_RO, RlmtStat, 0},
+        {OID_SKGE_RLMT_MONITOR_NUMBER,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(RlmtMonitorNumber),
+                SK_PNMI_RO, General, 0},
+        {OID_SKGE_RLMT_MONITOR_INDEX,
+                SK_PNMI_MONITOR_ENTRIES,
+                sizeof(SK_PNMI_RLMT_MONITOR),
+                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorIndex),
+                SK_PNMI_RO, Monitor, 0},
+        {OID_SKGE_RLMT_MONITOR_ADDR,
+                SK_PNMI_MONITOR_ENTRIES,
+                sizeof(SK_PNMI_RLMT_MONITOR),
+                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorAddr),
+                SK_PNMI_RO, Monitor, 0},
+        {OID_SKGE_RLMT_MONITOR_ERRS,
+                SK_PNMI_MONITOR_ENTRIES,
+                sizeof(SK_PNMI_RLMT_MONITOR),
+                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorErrorCts),
+                SK_PNMI_RO, Monitor, 0},
+        {OID_SKGE_RLMT_MONITOR_TIMESTAMP,
+                SK_PNMI_MONITOR_ENTRIES,
+                sizeof(SK_PNMI_RLMT_MONITOR),
+                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorTimestamp),
+                SK_PNMI_RO, Monitor, 0},
+        {OID_SKGE_RLMT_MONITOR_ADMIN,
+                SK_PNMI_MONITOR_ENTRIES,
+                sizeof(SK_PNMI_RLMT_MONITOR),
+                SK_PNMI_OFF(RlmtMonitor) + SK_PNMI_MON_OFF(RlmtMonitorAdmin),
+                SK_PNMI_RW, Monitor, 0},
+        {OID_SKGE_MTU,
+                1,
+                0,
+                SK_PNMI_MAI_OFF(MtuSize),
+                SK_PNMI_RW, MacPrivateConf, 0},
+        {OID_SKGE_VCT_GET,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Vct, 0},
+        {OID_SKGE_VCT_SET,
+                0,
+                0,
+                0,
+                SK_PNMI_WO, Vct, 0},
+        {OID_SKGE_VCT_STATUS,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, Vct, 0},
+        {OID_SKGE_BOARDLEVEL,
+                0,
+                0,
+                0,
+                SK_PNMI_RO, General, 0},
+};
+
diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c
new file mode 100644
index 0000000000..b36dd9ac6b
--- /dev/null
+++ b/drivers/net/sk98lin/skgepnmi.c
@@ -0,0 +1,8210 @@
+/*****************************************************************************
+ *
+ * Name:        skgepnmi.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.111 $
+ * Date:        $Date: 2003/09/15 13:35:35 $
+ * Purpose:     Private Network Management Interface
+ *
+ ****************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+
+#ifndef _lint
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skgepnmi.c,v 1.111 2003/09/15 13:35:35 tschilli Exp $ (C) Marvell.";
+#endif /* !_lint */
+
+#include "h/skdrv1st.h"
+#include "h/sktypes.h"
+#include "h/xmac_ii.h"
+#include "h/skdebug.h"
+#include "h/skqueue.h"
+#include "h/skgepnmi.h"
+#include "h/skgesirq.h"
+#include "h/skcsum.h"
+#include "h/skvpd.h"
+#include "h/skgehw.h"
+#include "h/skgeinit.h"
+#include "h/skdrv2nd.h"
+#include "h/skgepnm2.h"
+#ifdef SK_POWER_MGMT
+#include "h/skgepmgt.h"
+#endif
+/* defines *******************************************************************/
+
+#ifndef DEBUG
+#define PNMI_STATIC     static
+#else   /* DEBUG */
+#define PNMI_STATIC
+#endif /* DEBUG */
+
+/*
+ * Public Function prototypes
+ */
+int SkPnmiInit(SK_AC *pAC, SK_IOC IoC, int level);
+int SkPnmiSetVar(SK_AC *pAC, SK_IOC IoC, SK_U32 Id, void *pBuf,
+        unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
+int SkPnmiGetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
+        unsigned int *pLen, SK_U32 NetIndex);
+int SkPnmiPreSetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
+        unsigned int *pLen, SK_U32 NetIndex);
+int SkPnmiSetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
+        unsigned int *pLen, SK_U32 NetIndex);
+int SkPnmiEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Param);
+int SkPnmiGenIoctl(SK_AC *pAC, SK_IOC IoC, void * pBuf,
+        unsigned int * pLen, SK_U32 NetIndex);
+
+
+/*
+ * Private Function prototypes
+ */
+
+PNMI_STATIC SK_U8 CalculateLinkModeStatus(SK_AC *pAC, SK_IOC IoC, unsigned int
+        PhysPortIndex);
+PNMI_STATIC SK_U8 CalculateLinkStatus(SK_AC *pAC, SK_IOC IoC, unsigned int
+        PhysPortIndex);
+PNMI_STATIC void CopyMac(char *pDst, SK_MAC_ADDR *pMac);
+PNMI_STATIC void CopyTrapQueue(SK_AC *pAC, char *pDstBuf);
+PNMI_STATIC SK_U64 GetPhysStatVal(SK_AC *pAC, SK_IOC IoC,
+        unsigned int PhysPortIndex, unsigned int StatIndex);
+PNMI_STATIC SK_U64 GetStatVal(SK_AC *pAC, SK_IOC IoC, unsigned int LogPortIndex,
+        unsigned int StatIndex, SK_U32 NetIndex);
+PNMI_STATIC char* GetTrapEntry(SK_AC *pAC, SK_U32 TrapId, unsigned int Size);
+PNMI_STATIC void GetTrapQueueLen(SK_AC *pAC, unsigned int *pLen,
+        unsigned int *pEntries);
+PNMI_STATIC int GetVpdKeyArr(SK_AC *pAC, SK_IOC IoC, char *pKeyArr,
+        unsigned int KeyArrLen, unsigned int *pKeyNo);
+PNMI_STATIC int LookupId(SK_U32 Id);
+PNMI_STATIC int MacUpdate(SK_AC *pAC, SK_IOC IoC, unsigned int FirstMac,
+        unsigned int LastMac);
+PNMI_STATIC int PnmiStruct(SK_AC *pAC, SK_IOC IoC, int Action, char *pBuf,
+        unsigned int *pLen, SK_U32 NetIndex);
+PNMI_STATIC int PnmiVar(SK_AC *pAC, SK_IOC IoC, int Action, SK_U32 Id,
+        char *pBuf, unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
+PNMI_STATIC void QueueRlmtNewMacTrap(SK_AC *pAC, unsigned int ActiveMac);
+PNMI_STATIC void QueueRlmtPortTrap(SK_AC *pAC, SK_U32 TrapId,
+        unsigned int PortIndex);
+PNMI_STATIC void QueueSensorTrap(SK_AC *pAC, SK_U32 TrapId,
+        unsigned int SensorIndex);
+PNMI_STATIC void QueueSimpleTrap(SK_AC *pAC, SK_U32 TrapId);
+PNMI_STATIC void ResetCounter(SK_AC *pAC, SK_IOC IoC, SK_U32 NetIndex);
+PNMI_STATIC int RlmtUpdate(SK_AC *pAC, SK_IOC IoC, SK_U32 NetIndex);
+PNMI_STATIC int SirqUpdate(SK_AC *pAC, SK_IOC IoC);
+PNMI_STATIC void VirtualConf(SK_AC *pAC, SK_IOC IoC, SK_U32 Id, char *pBuf);
+PNMI_STATIC int Vct(SK_AC *pAC, SK_IOC IoC, int Action, SK_U32 Id, char *pBuf,
+        unsigned int *pLen, SK_U32 Instance, unsigned int TableIndex, SK_U32 NetIndex);
+PNMI_STATIC void CheckVctStatus(SK_AC *, SK_IOC, char *, SK_U32, SK_U32);
+
+/*
+ * Table to correlate OID with handler function and index to
+ * hardware register stored in StatAddress if applicable.
+ */
+#include "skgemib.c"
+
+/* global variables **********************************************************/
+
+/*
+ * Overflow status register bit table and corresponding counter
+ * dependent on MAC type - the number relates to the size of overflow
+ * mask returned by the pFnMacOverflow function
+ */
+PNMI_STATIC const SK_U16 StatOvrflwBit[][SK_PNMI_MAC_TYPES] = {
+/* Bit0  */     { SK_PNMI_HTX,                          SK_PNMI_HTX_UNICAST},
+/* Bit1  */     { SK_PNMI_HTX_OCTETHIGH,        SK_PNMI_HTX_BROADCAST},
+/* Bit2  */     { SK_PNMI_HTX_OCTETLOW,         SK_PNMI_HTX_PMACC},
+/* Bit3  */     { SK_PNMI_HTX_BROADCAST,        SK_PNMI_HTX_MULTICAST},
+/* Bit4  */     { SK_PNMI_HTX_MULTICAST,        SK_PNMI_HTX_OCTETLOW},
+/* Bit5  */     { SK_PNMI_HTX_UNICAST,          SK_PNMI_HTX_OCTETHIGH},
+/* Bit6  */     { SK_PNMI_HTX_LONGFRAMES,       SK_PNMI_HTX_64},
+/* Bit7  */     { SK_PNMI_HTX_BURST,            SK_PNMI_HTX_127},
+/* Bit8  */     { SK_PNMI_HTX_PMACC,            SK_PNMI_HTX_255},
+/* Bit9  */     { SK_PNMI_HTX_MACC,             SK_PNMI_HTX_511},
+/* Bit10 */     { SK_PNMI_HTX_SINGLE_COL,       SK_PNMI_HTX_1023},
+/* Bit11 */     { SK_PNMI_HTX_MULTI_COL,        SK_PNMI_HTX_MAX},
+/* Bit12 */     { SK_PNMI_HTX_EXCESS_COL,       SK_PNMI_HTX_LONGFRAMES},
+/* Bit13 */     { SK_PNMI_HTX_LATE_COL,         SK_PNMI_HTX_RESERVED},
+/* Bit14 */     { SK_PNMI_HTX_DEFFERAL,         SK_PNMI_HTX_COL},
+/* Bit15 */     { SK_PNMI_HTX_EXCESS_DEF,       SK_PNMI_HTX_LATE_COL},
+/* Bit16 */     { SK_PNMI_HTX_UNDERRUN,         SK_PNMI_HTX_EXCESS_COL},
+/* Bit17 */     { SK_PNMI_HTX_CARRIER,          SK_PNMI_HTX_MULTI_COL},
+/* Bit18 */     { SK_PNMI_HTX_UTILUNDER,        SK_PNMI_HTX_SINGLE_COL},
+/* Bit19 */     { SK_PNMI_HTX_UTILOVER,         SK_PNMI_HTX_UNDERRUN},
+/* Bit20 */     { SK_PNMI_HTX_64,                       SK_PNMI_HTX_RESERVED},
+/* Bit21 */     { SK_PNMI_HTX_127,                      SK_PNMI_HTX_RESERVED},
+/* Bit22 */     { SK_PNMI_HTX_255,                      SK_PNMI_HTX_RESERVED},
+/* Bit23 */     { SK_PNMI_HTX_511,                      SK_PNMI_HTX_RESERVED},
+/* Bit24 */     { SK_PNMI_HTX_1023,             SK_PNMI_HTX_RESERVED},
+/* Bit25 */     { SK_PNMI_HTX_MAX,                      SK_PNMI_HTX_RESERVED},
+/* Bit26 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
+/* Bit27 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
+/* Bit28 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
+/* Bit29 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
+/* Bit30 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
+/* Bit31 */     { SK_PNMI_HTX_RESERVED,         SK_PNMI_HTX_RESERVED},
+/* Bit32 */     { SK_PNMI_HRX,                          SK_PNMI_HRX_UNICAST},
+/* Bit33 */     { SK_PNMI_HRX_OCTETHIGH,        SK_PNMI_HRX_BROADCAST},
+/* Bit34 */     { SK_PNMI_HRX_OCTETLOW,         SK_PNMI_HRX_PMACC},
+/* Bit35 */     { SK_PNMI_HRX_BROADCAST,        SK_PNMI_HRX_MULTICAST},
+/* Bit36 */     { SK_PNMI_HRX_MULTICAST,        SK_PNMI_HRX_FCS},
+/* Bit37 */     { SK_PNMI_HRX_UNICAST,          SK_PNMI_HRX_RESERVED},
+/* Bit38 */     { SK_PNMI_HRX_PMACC,            SK_PNMI_HRX_OCTETLOW},
+/* Bit39 */     { SK_PNMI_HRX_MACC,             SK_PNMI_HRX_OCTETHIGH},
+/* Bit40 */     { SK_PNMI_HRX_PMACC_ERR,        SK_PNMI_HRX_BADOCTETLOW},
+/* Bit41 */     { SK_PNMI_HRX_MACC_UNKWN,       SK_PNMI_HRX_BADOCTETHIGH},
+/* Bit42 */     { SK_PNMI_HRX_BURST,            SK_PNMI_HRX_UNDERSIZE},
+/* Bit43 */     { SK_PNMI_HRX_MISSED,           SK_PNMI_HRX_RUNT},
+/* Bit44 */     { SK_PNMI_HRX_FRAMING,          SK_PNMI_HRX_64},
+/* Bit45 */     { SK_PNMI_HRX_OVERFLOW,         SK_PNMI_HRX_127},
+/* Bit46 */     { SK_PNMI_HRX_JABBER,           SK_PNMI_HRX_255},
+/* Bit47 */     { SK_PNMI_HRX_CARRIER,          SK_PNMI_HRX_511},
+/* Bit48 */     { SK_PNMI_HRX_IRLENGTH,         SK_PNMI_HRX_1023},
+/* Bit49 */     { SK_PNMI_HRX_SYMBOL,           SK_PNMI_HRX_MAX},
+/* Bit50 */     { SK_PNMI_HRX_SHORTS,           SK_PNMI_HRX_LONGFRAMES},
+/* Bit51 */     { SK_PNMI_HRX_RUNT,             SK_PNMI_HRX_TOO_LONG},
+/* Bit52 */     { SK_PNMI_HRX_TOO_LONG,         SK_PNMI_HRX_JABBER},
+/* Bit53 */     { SK_PNMI_HRX_FCS,                      SK_PNMI_HRX_RESERVED},
+/* Bit54 */     { SK_PNMI_HRX_RESERVED,         SK_PNMI_HRX_OVERFLOW},
+/* Bit55 */     { SK_PNMI_HRX_CEXT,             SK_PNMI_HRX_RESERVED},
+/* Bit56 */     { SK_PNMI_HRX_UTILUNDER,        SK_PNMI_HRX_RESERVED},
+/* Bit57 */     { SK_PNMI_HRX_UTILOVER,         SK_PNMI_HRX_RESERVED},
+/* Bit58 */     { SK_PNMI_HRX_64,                       SK_PNMI_HRX_RESERVED},
+/* Bit59 */     { SK_PNMI_HRX_127,                      SK_PNMI_HRX_RESERVED},
+/* Bit60 */     { SK_PNMI_HRX_255,                      SK_PNMI_HRX_RESERVED},
+/* Bit61 */     { SK_PNMI_HRX_511,                      SK_PNMI_HRX_RESERVED},
+/* Bit62 */     { SK_PNMI_HRX_1023,             SK_PNMI_HRX_RESERVED},
+/* Bit63 */     { SK_PNMI_HRX_MAX,                      SK_PNMI_HRX_RESERVED}
+};
+
+/*
+ * Table for hardware register saving on resets and port switches
+ */
+PNMI_STATIC const SK_PNMI_STATADDR StatAddr[SK_PNMI_MAX_IDX][SK_PNMI_MAC_TYPES] = {
+        /* SK_PNMI_HTX */
+        {{XM_TXF_OK, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_OCTETHIGH */
+        {{XM_TXO_OK_HI, SK_TRUE}, {GM_TXO_OK_HI, SK_TRUE}},
+        /* SK_PNMI_HTX_OCTETLOW */
+        {{XM_TXO_OK_LO, SK_FALSE}, {GM_TXO_OK_LO, SK_FALSE}},
+        /* SK_PNMI_HTX_BROADCAST */
+        {{XM_TXF_BC_OK, SK_TRUE}, {GM_TXF_BC_OK, SK_TRUE}},
+        /* SK_PNMI_HTX_MULTICAST */
+        {{XM_TXF_MC_OK, SK_TRUE}, {GM_TXF_MC_OK, SK_TRUE}},
+        /* SK_PNMI_HTX_UNICAST */
+        {{XM_TXF_UC_OK, SK_TRUE}, {GM_TXF_UC_OK, SK_TRUE}},
+        /* SK_PNMI_HTX_BURST */
+        {{XM_TXE_BURST, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_PMACC */
+        {{XM_TXF_MPAUSE, SK_TRUE}, {GM_TXF_MPAUSE, SK_TRUE}},
+        /* SK_PNMI_HTX_MACC */
+        {{XM_TXF_MCTRL, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_COL */
+        {{0, SK_FALSE}, {GM_TXF_COL, SK_TRUE}},
+        /* SK_PNMI_HTX_SINGLE_COL */
+        {{XM_TXF_SNG_COL, SK_TRUE}, {GM_TXF_SNG_COL, SK_TRUE}},
+        /* SK_PNMI_HTX_MULTI_COL */
+        {{XM_TXF_MUL_COL, SK_TRUE}, {GM_TXF_MUL_COL, SK_TRUE}},
+        /* SK_PNMI_HTX_EXCESS_COL */
+        {{XM_TXF_ABO_COL, SK_TRUE}, {GM_TXF_ABO_COL, SK_TRUE}},
+        /* SK_PNMI_HTX_LATE_COL */
+        {{XM_TXF_LAT_COL, SK_TRUE}, {GM_TXF_LAT_COL, SK_TRUE}},
+        /* SK_PNMI_HTX_DEFFERAL */
+        {{XM_TXF_DEF, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_EXCESS_DEF */
+        {{XM_TXF_EX_DEF, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_UNDERRUN */
+        {{XM_TXE_FIFO_UR, SK_TRUE}, {GM_TXE_FIFO_UR, SK_TRUE}},
+        /* SK_PNMI_HTX_CARRIER */
+        {{XM_TXE_CS_ERR, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_UTILUNDER */
+        {{0, SK_FALSE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_UTILOVER */
+        {{0, SK_FALSE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_64 */
+        {{XM_TXF_64B, SK_TRUE}, {GM_TXF_64B, SK_TRUE}},
+        /* SK_PNMI_HTX_127 */
+        {{XM_TXF_127B, SK_TRUE}, {GM_TXF_127B, SK_TRUE}},
+        /* SK_PNMI_HTX_255 */
+        {{XM_TXF_255B, SK_TRUE}, {GM_TXF_255B, SK_TRUE}},
+        /* SK_PNMI_HTX_511 */
+        {{XM_TXF_511B, SK_TRUE}, {GM_TXF_511B, SK_TRUE}},
+        /* SK_PNMI_HTX_1023 */
+        {{XM_TXF_1023B, SK_TRUE}, {GM_TXF_1023B, SK_TRUE}},
+        /* SK_PNMI_HTX_MAX */
+        {{XM_TXF_MAX_SZ, SK_TRUE}, {GM_TXF_1518B, SK_TRUE}},
+        /* SK_PNMI_HTX_LONGFRAMES  */
+        {{XM_TXF_LONG, SK_TRUE}, {GM_TXF_MAX_SZ, SK_TRUE}},
+        /* SK_PNMI_HTX_SYNC */
+        {{0, SK_FALSE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_SYNC_OCTET */
+        {{0, SK_FALSE}, {0, SK_FALSE}},
+        /* SK_PNMI_HTX_RESERVED */
+        {{0, SK_FALSE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX */
+        {{XM_RXF_OK, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_OCTETHIGH */
+        {{XM_RXO_OK_HI, SK_TRUE}, {GM_RXO_OK_HI, SK_TRUE}},
+        /* SK_PNMI_HRX_OCTETLOW */
+        {{XM_RXO_OK_LO, SK_FALSE}, {GM_RXO_OK_LO, SK_FALSE}},
+        /* SK_PNMI_HRX_BADOCTETHIGH */
+        {{0, SK_FALSE}, {GM_RXO_ERR_HI, SK_TRUE}},
+        /* SK_PNMI_HRX_BADOCTETLOW */
+        {{0, SK_FALSE}, {GM_RXO_ERR_LO, SK_TRUE}},
+        /* SK_PNMI_HRX_BROADCAST */
+        {{XM_RXF_BC_OK, SK_TRUE}, {GM_RXF_BC_OK, SK_TRUE}},
+        /* SK_PNMI_HRX_MULTICAST */
+        {{XM_RXF_MC_OK, SK_TRUE}, {GM_RXF_MC_OK, SK_TRUE}},
+        /* SK_PNMI_HRX_UNICAST */
+        {{XM_RXF_UC_OK, SK_TRUE}, {GM_RXF_UC_OK, SK_TRUE}},
+        /* SK_PNMI_HRX_PMACC */
+        {{XM_RXF_MPAUSE, SK_TRUE}, {GM_RXF_MPAUSE, SK_TRUE}},
+        /* SK_PNMI_HRX_MACC */
+        {{XM_RXF_MCTRL, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_PMACC_ERR */
+        {{XM_RXF_INV_MP, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_MACC_UNKWN */
+        {{XM_RXF_INV_MOC, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_BURST */
+        {{XM_RXE_BURST, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_MISSED */
+        {{XM_RXE_FMISS, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_FRAMING */
+        {{XM_RXF_FRA_ERR, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_UNDERSIZE */
+        {{0, SK_FALSE}, {GM_RXF_SHT, SK_TRUE}},
+        /* SK_PNMI_HRX_OVERFLOW */
+        {{XM_RXE_FIFO_OV, SK_TRUE}, {GM_RXE_FIFO_OV, SK_TRUE}},
+        /* SK_PNMI_HRX_JABBER */
+        {{XM_RXF_JAB_PKT, SK_TRUE}, {GM_RXF_JAB_PKT, SK_TRUE}},
+        /* SK_PNMI_HRX_CARRIER */
+        {{XM_RXE_CAR_ERR, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_IRLENGTH */
+        {{XM_RXF_LEN_ERR, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_SYMBOL */
+        {{XM_RXE_SYM_ERR, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_SHORTS */
+        {{XM_RXE_SHT_ERR, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_RUNT */
+        {{XM_RXE_RUNT, SK_TRUE}, {GM_RXE_FRAG, SK_TRUE}},
+        /* SK_PNMI_HRX_TOO_LONG */
+        {{XM_RXF_LNG_ERR, SK_TRUE}, {GM_RXF_LNG_ERR, SK_TRUE}},
+        /* SK_PNMI_HRX_FCS */
+        {{XM_RXF_FCS_ERR, SK_TRUE}, {GM_RXF_FCS_ERR, SK_TRUE}},
+        /* SK_PNMI_HRX_CEXT */
+        {{XM_RXF_CEX_ERR, SK_TRUE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_UTILUNDER */
+        {{0, SK_FALSE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_UTILOVER */
+        {{0, SK_FALSE}, {0, SK_FALSE}},
+        /* SK_PNMI_HRX_64 */
+        {{XM_RXF_64B, SK_TRUE}, {GM_RXF_64B, SK_TRUE}},
+        /* SK_PNMI_HRX_127 */
+        {{XM_RXF_127B, SK_TRUE}, {GM_RXF_127B, SK_TRUE}},
+        /* SK_PNMI_HRX_255 */
+        {{XM_RXF_255B, SK_TRUE}, {GM_RXF_255B, SK_TRUE}},
+        /* SK_PNMI_HRX_511 */
+        {{XM_RXF_511B, SK_TRUE}, {GM_RXF_511B, SK_TRUE}},
+        /* SK_PNMI_HRX_1023 */
+        {{XM_RXF_1023B, SK_TRUE}, {GM_RXF_1023B, SK_TRUE}},
+        /* SK_PNMI_HRX_MAX */
+        {{XM_RXF_MAX_SZ, SK_TRUE}, {GM_RXF_1518B, SK_TRUE}},
+        /* SK_PNMI_HRX_LONGFRAMES */
+        {{0, SK_FALSE}, {GM_RXF_MAX_SZ, SK_TRUE}},
+        /* SK_PNMI_HRX_RESERVED */
+        {{0, SK_FALSE}, {0, SK_FALSE}}
+};
+
+
+/*****************************************************************************
+ *
+ * Public functions
+ *
+ */
+
+/*****************************************************************************
+ *
+ * SkPnmiInit - Init function of PNMI
+ *
+ * Description:
+ *      SK_INIT_DATA: Initialises the data structures
+ *      SK_INIT_IO:   Resets the XMAC statistics, determines the device and
+ *                    connector type.
+ *      SK_INIT_RUN:  Starts a timer event for port switch per hour
+ *                    calculation.
+ *
+ * Returns:
+ *      Always 0
+ */
+int SkPnmiInit(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Level)              /* Initialization level */
+{
+        unsigned int    PortMax;        /* Number of ports */
+        unsigned int    PortIndex;      /* Current port index in loop */
+        SK_U16          Val16;          /* Multiple purpose 16 bit variable */
+        SK_U8           Val8;           /* Mulitple purpose 8 bit variable */
+        SK_EVPARA       EventParam;     /* Event struct for timer event */
+        SK_PNMI_VCT     *pVctBackupData;
+
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                ("PNMI: SkPnmiInit: Called, level=%d\n", Level));
+
+        switch (Level) {
+
+        case SK_INIT_DATA:
+                SK_MEMSET((char *)&pAC->Pnmi, 0, sizeof(pAC->Pnmi));
+                pAC->Pnmi.TrapBufFree = SK_PNMI_TRAP_QUEUE_LEN;
+                pAC->Pnmi.StartUpTime = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
+                pAC->Pnmi.RlmtChangeThreshold = SK_PNMI_DEF_RLMT_CHG_THRES;
+                for (PortIndex = 0; PortIndex < SK_MAX_MACS; PortIndex ++) {
+
+                        pAC->Pnmi.Port[PortIndex].ActiveFlag = SK_FALSE;
+                        pAC->Pnmi.DualNetActiveFlag = SK_FALSE;
+                }
+
+#ifdef SK_PNMI_CHECK
+                if (SK_PNMI_MAX_IDX != SK_PNMI_CNT_NO) {
+                        
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR049, SK_PNMI_ERR049MSG);
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_INIT | SK_DBGCAT_FATAL,
+                                           ("CounterOffset struct size (%d) differs from"
+                                                "SK_PNMI_MAX_IDX (%d)\n",
+                                                SK_PNMI_CNT_NO, SK_PNMI_MAX_IDX));
+                }
+
+                if (SK_PNMI_MAX_IDX !=
+                        (sizeof(StatAddr) / (sizeof(SK_PNMI_STATADDR) * SK_PNMI_MAC_TYPES))) {
+                        
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR050, SK_PNMI_ERR050MSG);
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_INIT | SK_DBGCAT_FATAL,
+                                           ("StatAddr table size (%d) differs from "
+                                                "SK_PNMI_MAX_IDX (%d)\n",
+                                                (sizeof(StatAddr) /
+                                                 (sizeof(SK_PNMI_STATADDR) * SK_PNMI_MAC_TYPES)),
+                                                 SK_PNMI_MAX_IDX));
+                }
+#endif /* SK_PNMI_CHECK */
+                break;
+
+        case SK_INIT_IO:
+                /*
+                 * Reset MAC counters
+                 */
+                PortMax = pAC->GIni.GIMacsFound;
+
+                for (PortIndex = 0; PortIndex < PortMax; PortIndex ++) {
+
+                        pAC->GIni.GIFunc.pFnMacResetCounter(pAC, IoC, PortIndex);
+                }
+                
+                /* Initialize DSP variables for Vct() to 0xff => Never written! */              
+                for (PortIndex = 0; PortIndex < PortMax; PortIndex ++) {
+                        pAC->GIni.GP[PortIndex].PCableLen = 0xff;
+                        pVctBackupData = &pAC->Pnmi.VctBackup[PortIndex];
+                        pVctBackupData->PCableLen = 0xff;
+                }
+                
+                /*
+                 * Get pci bus speed
+                 */
+                SK_IN16(IoC, B0_CTST, &Val16);
+                if ((Val16 & CS_BUS_CLOCK) == 0) {
+
+                        pAC->Pnmi.PciBusSpeed = 33;
+                }
+                else {
+                        pAC->Pnmi.PciBusSpeed = 66;
+                }
+
+                /*
+                 * Get pci bus width
+                 */
+                SK_IN16(IoC, B0_CTST, &Val16);
+                if ((Val16 & CS_BUS_SLOT_SZ) == 0) {
+
+                        pAC->Pnmi.PciBusWidth = 32;
+                }
+                else {
+                        pAC->Pnmi.PciBusWidth = 64;
+                }
+
+                /*
+                 * Get chipset
+                 */
+                switch (pAC->GIni.GIChipId) {
+                case CHIP_ID_GENESIS:
+                        pAC->Pnmi.Chipset = SK_PNMI_CHIPSET_XMAC;
+                        break;
+
+                case CHIP_ID_YUKON:
+                        pAC->Pnmi.Chipset = SK_PNMI_CHIPSET_YUKON;
+                        break;
+
+                default:
+                        break;
+                }
+
+                /*
+                 * Get PMD and DeviceType
+                 */
+                SK_IN8(IoC, B2_PMD_TYP, &Val8);
+                switch (Val8) {
+                case 'S':
+                        pAC->Pnmi.PMD = 3;
+                        if (pAC->GIni.GIMacsFound > 1) {
+
+                                pAC->Pnmi.DeviceType = 0x00020002;
+                        }
+                        else {
+                                pAC->Pnmi.DeviceType = 0x00020001;
+                        }
+                        break;
+
+                case 'L':
+                        pAC->Pnmi.PMD = 2;
+                        if (pAC->GIni.GIMacsFound > 1) {
+
+                                pAC->Pnmi.DeviceType = 0x00020004;
+                        }
+                        else {
+                                pAC->Pnmi.DeviceType = 0x00020003;
+                        }
+                        break;
+
+                case 'C':
+                        pAC->Pnmi.PMD = 4;
+                        if (pAC->GIni.GIMacsFound > 1) {
+
+                                pAC->Pnmi.DeviceType = 0x00020006;
+                        }
+                        else {
+                                pAC->Pnmi.DeviceType = 0x00020005;
+                        }
+                        break;
+
+                case 'T':
+                        pAC->Pnmi.PMD = 5;
+                        if (pAC->GIni.GIMacsFound > 1) {
+
+                                pAC->Pnmi.DeviceType = 0x00020008;
+                        }
+                        else {
+                                pAC->Pnmi.DeviceType = 0x00020007;
+                        }
+                        break;
+
+                default :
+                        pAC->Pnmi.PMD = 1;
+                        pAC->Pnmi.DeviceType = 0;
+                        break;
+                }
+
+                /*
+                 * Get connector
+                 */
+                SK_IN8(IoC, B2_CONN_TYP, &Val8);
+                switch (Val8) {
+                case 'C':
+                        pAC->Pnmi.Connector = 2;
+                        break;
+
+                case 'D':
+                        pAC->Pnmi.Connector = 3;
+                        break;
+
+                case 'F':
+                        pAC->Pnmi.Connector = 4;
+                        break;
+
+                case 'J':
+                        pAC->Pnmi.Connector = 5;
+                        break;
+
+                case 'V':
+                        pAC->Pnmi.Connector = 6;
+                        break;
+
+                default:
+                        pAC->Pnmi.Connector = 1;
+                        break;
+                }
+                break;
+
+        case SK_INIT_RUN:
+                /*
+                 * Start timer for RLMT change counter
+                 */
+                SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+                SkTimerStart(pAC, IoC, &pAC->Pnmi.RlmtChangeEstimate.EstTimer,
+                        28125000, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
+                        EventParam);
+                break;
+
+        default:
+                break; /* Nothing todo */
+        }
+
+        return (0);
+}
+
+/*****************************************************************************
+ *
+ * SkPnmiGetVar - Retrieves the value of a single OID
+ *
+ * Description:
+ *      Calls a general sub-function for all this stuff. If the instance
+ *      -1 is passed, the values of all instances are returned in an
+ *      array of values.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to take
+ *                               the data.
+ *      SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+static int SkPnmiGetVar(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+SK_U32 Id,              /* Object ID that is to be processed */
+void *pBuf,             /* Buffer to which the management data will be copied */
+unsigned int *pLen,     /* On call: buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                ("PNMI: SkPnmiGetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
+                        Id, *pLen, Instance, NetIndex));
+
+        return (PnmiVar(pAC, IoC, SK_PNMI_GET, Id, (char *)pBuf, pLen,
+                Instance, NetIndex));
+}
+
+/*****************************************************************************
+ *
+ * SkPnmiPreSetVar - Presets the value of a single OID
+ *
+ * Description:
+ *      Calls a general sub-function for all this stuff. The preset does
+ *      the same as a set, but returns just before finally setting the
+ *      new value. This is useful to check if a set might be successfull.
+ *      If the instance -1 is passed, an array of values is supposed and
+ *      all instances of the OID will be set.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+static int SkPnmiPreSetVar(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+SK_U32 Id,              /* Object ID that is to be processed */
+void *pBuf,             /* Buffer to which the management data will be copied */
+unsigned int *pLen,     /* Total length of management data */
+SK_U32 Instance,        /* Instance (1..n) that is to be set or -1 */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                ("PNMI: SkPnmiPreSetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
+                        Id, *pLen, Instance, NetIndex));
+
+
+        return (PnmiVar(pAC, IoC, SK_PNMI_PRESET, Id, (char *)pBuf, pLen,
+                Instance, NetIndex));
+}
+
+/*****************************************************************************
+ *
+ * SkPnmiSetVar - Sets the value of a single OID
+ *
+ * Description:
+ *      Calls a general sub-function for all this stuff. The preset does
+ *      the same as a set, but returns just before finally setting the
+ *      new value. This is useful to check if a set might be successfull.
+ *      If the instance -1 is passed, an array of values is supposed and
+ *      all instances of the OID will be set.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+int SkPnmiSetVar(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+SK_U32 Id,              /* Object ID that is to be processed */
+void *pBuf,             /* Buffer to which the management data will be copied */
+unsigned int *pLen,     /* Total length of management data */
+SK_U32 Instance,        /* Instance (1..n) that is to be set or -1 */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                ("PNMI: SkPnmiSetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
+                        Id, *pLen, Instance, NetIndex));
+
+        return (PnmiVar(pAC, IoC, SK_PNMI_SET, Id, (char *)pBuf, pLen,
+                Instance, NetIndex));
+}
+
+/*****************************************************************************
+ *
+ * SkPnmiGetStruct - Retrieves the management database in SK_PNMI_STRUCT_DATA
+ *
+ * Description:
+ *      Runs through the IdTable, queries the single OIDs and stores the
+ *      returned data into the management database structure
+ *      SK_PNMI_STRUCT_DATA. The offset of the OID in the structure
+ *      is stored in the IdTable. The return value of the function will also
+ *      be stored in SK_PNMI_STRUCT_DATA if the passed buffer has the
+ *      minimum size of SK_PNMI_MIN_STRUCT_SIZE.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to take
+ *                               the data.
+ *      SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
+ */
+int SkPnmiGetStruct(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+void *pBuf,             /* Buffer to which the management data will be copied. */
+unsigned int *pLen,     /* Length of buffer */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        int             Ret;
+        unsigned int    TableIndex;
+        unsigned int    DstOffset;
+        unsigned int    InstanceNo;
+        unsigned int    InstanceCnt;
+        SK_U32          Instance;
+        unsigned int    TmpLen;
+        char            KeyArr[SK_PNMI_VPD_ENTRIES][SK_PNMI_VPD_KEY_SIZE];
+
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                ("PNMI: SkPnmiGetStruct: Called, BufLen=%d, NetIndex=%d\n",
+                        *pLen, NetIndex));
+
+        if (*pLen < SK_PNMI_STRUCT_SIZE) {
+
+                if (*pLen >= SK_PNMI_MIN_STRUCT_SIZE) {
+
+                        SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_TOO_SHORT,
+                                (SK_U32)(-1));
+                }
+
+                *pLen = SK_PNMI_STRUCT_SIZE;
+                return (SK_PNMI_ERR_TOO_SHORT);
+        }
+
+    /*
+     * Check NetIndex
+     */
+        if (NetIndex >= pAC->Rlmt.NumNets) {
+                return (SK_PNMI_ERR_UNKNOWN_NET);
+        }
+
+        /* Update statistic */
+        SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On call");
+
+        if ((Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1)) !=
+                SK_PNMI_ERR_OK) {
+
+                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
+                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                return (Ret);
+        }
+
+        if ((Ret = RlmtUpdate(pAC, IoC, NetIndex)) != SK_PNMI_ERR_OK) {
+
+                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
+                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                return (Ret);
+        }
+
+        if ((Ret = SirqUpdate(pAC, IoC)) != SK_PNMI_ERR_OK) {
+
+                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
+                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                return (Ret);
+        }
+
+        /*
+         * Increment semaphores to indicate that an update was
+         * already done
+         */
+        pAC->Pnmi.MacUpdatedFlag ++;
+        pAC->Pnmi.RlmtUpdatedFlag ++;
+        pAC->Pnmi.SirqUpdatedFlag ++;
+
+        /* Get vpd keys for instance calculation */
+        Ret = GetVpdKeyArr(pAC, IoC, &KeyArr[0][0], sizeof(KeyArr), &TmpLen);
+        if (Ret != SK_PNMI_ERR_OK) {
+
+                pAC->Pnmi.MacUpdatedFlag --;
+                pAC->Pnmi.RlmtUpdatedFlag --;
+                pAC->Pnmi.SirqUpdatedFlag --;
+
+                SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On return");
+                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
+                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                return (SK_PNMI_ERR_GENERAL);
+        }
+
+        /* Retrieve values */
+        SK_MEMSET((char *)pBuf, 0, SK_PNMI_STRUCT_SIZE);
+        for (TableIndex = 0; TableIndex < ID_TABLE_SIZE; TableIndex ++) {
+
+                InstanceNo = IdTable[TableIndex].InstanceNo;
+                for (InstanceCnt = 1; InstanceCnt <= InstanceNo;
+                        InstanceCnt ++) {
+
+                        DstOffset = IdTable[TableIndex].Offset +
+                                (InstanceCnt - 1) *
+                                IdTable[TableIndex].StructSize;
+
+                        /*
+                         * For the VPD the instance is not an index number
+                         * but the key itself. Determin with the instance
+                         * counter the VPD key to be used.
+                         */
+                        if (IdTable[TableIndex].Id == OID_SKGE_VPD_KEY ||
+                                IdTable[TableIndex].Id == OID_SKGE_VPD_VALUE ||
+                                IdTable[TableIndex].Id == OID_SKGE_VPD_ACCESS ||
+                                IdTable[TableIndex].Id == OID_SKGE_VPD_ACTION) {
+
+                                SK_STRNCPY((char *)&Instance, KeyArr[InstanceCnt - 1], 4);
+                        }
+                        else {
+                                Instance = (SK_U32)InstanceCnt;
+                        }
+
+                        TmpLen = *pLen - DstOffset;
+                        Ret = IdTable[TableIndex].Func(pAC, IoC, SK_PNMI_GET,
+                                IdTable[TableIndex].Id, (char *)pBuf +
+                                DstOffset, &TmpLen, Instance, TableIndex, NetIndex);
+
+                        /*
+                         * An unknown instance error means that we reached
+                         * the last instance of that variable. Proceed with
+                         * the next OID in the table and ignore the return
+                         * code.
+                         */
+                        if (Ret == SK_PNMI_ERR_UNKNOWN_INST) {
+
+                break;
+                        }
+
+                        if (Ret != SK_PNMI_ERR_OK) {
+
+                                pAC->Pnmi.MacUpdatedFlag --;
+                                pAC->Pnmi.RlmtUpdatedFlag --;
+                                pAC->Pnmi.SirqUpdatedFlag --;
+
+                                SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On return");
+                                SK_PNMI_SET_STAT(pBuf, Ret, DstOffset);
+                                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                                return (Ret);
+                        }
+                }
+        }
+
+        pAC->Pnmi.MacUpdatedFlag --;
+        pAC->Pnmi.RlmtUpdatedFlag --;
+        pAC->Pnmi.SirqUpdatedFlag --;
+
+        *pLen = SK_PNMI_STRUCT_SIZE;
+        SK_PNMI_CHECKFLAGS("SkPnmiGetStruct: On return");
+        SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_OK, (SK_U32)(-1));
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * SkPnmiPreSetStruct - Presets the management database in SK_PNMI_STRUCT_DATA
+ *
+ * Description:
+ *      Calls a general sub-function for all this set stuff. The preset does
+ *      the same as a set, but returns just before finally setting the
+ *      new value. This is useful to check if a set might be successfull.
+ *      The sub-function runs through the IdTable, checks which OIDs are able
+ *      to set, and calls the handler function of the OID to perform the
+ *      preset. The return value of the function will also be stored in
+ *      SK_PNMI_STRUCT_DATA if the passed buffer has the minimum size of
+ *      SK_PNMI_MIN_STRUCT_SIZE.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ */
+int SkPnmiPreSetStruct(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+void *pBuf,             /* Buffer which contains the data to be set */
+unsigned int *pLen,     /* Length of buffer */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                ("PNMI: SkPnmiPreSetStruct: Called, BufLen=%d, NetIndex=%d\n",
+                        *pLen, NetIndex));
+
+        return (PnmiStruct(pAC, IoC, SK_PNMI_PRESET, (char *)pBuf,
+                                        pLen, NetIndex));
+}
+
+/*****************************************************************************
+ *
+ * SkPnmiSetStruct - Sets the management database in SK_PNMI_STRUCT_DATA
+ *
+ * Description:
+ *      Calls a general sub-function for all this set stuff. The return value
+ *      of the function will also be stored in SK_PNMI_STRUCT_DATA if the
+ *      passed buffer has the minimum size of SK_PNMI_MIN_STRUCT_SIZE.
+ *      The sub-function runs through the IdTable, checks which OIDs are able
+ *      to set, and calls the handler function of the OID to perform the
+ *      set. The return value of the function will also be stored in
+ *      SK_PNMI_STRUCT_DATA if the passed buffer has the minimum size of
+ *      SK_PNMI_MIN_STRUCT_SIZE.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ */
+int SkPnmiSetStruct(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+void *pBuf,             /* Buffer which contains the data to be set */
+unsigned int *pLen,     /* Length of buffer */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                ("PNMI: SkPnmiSetStruct: Called, BufLen=%d, NetIndex=%d\n",
+                        *pLen, NetIndex));
+
+        return (PnmiStruct(pAC, IoC, SK_PNMI_SET, (char *)pBuf,
+                                        pLen, NetIndex));
+}
+
+/*****************************************************************************
+ *
+ * SkPnmiEvent - Event handler
+ *
+ * Description:
+ *      Handles the following events:
+ *      SK_PNMI_EVT_SIRQ_OVERFLOW     When a hardware counter overflows an
+ *                                    interrupt will be generated which is
+ *                                    first handled by SIRQ which generates a
+ *                                    this event. The event increments the
+ *                                    upper 32 bit of the 64 bit counter.
+ *      SK_PNMI_EVT_SEN_XXX           The event is generated by the I2C module
+ *                                    when a sensor reports a warning or
+ *                                    error. The event will store a trap
+ *                                    message in the trap buffer.
+ *      SK_PNMI_EVT_CHG_EST_TIMER     The timer event was initiated by this
+ *                                    module and is used to calculate the
+ *                                    port switches per hour.
+ *      SK_PNMI_EVT_CLEAR_COUNTER     The event clears all counters and
+ *                                    timestamps.
+ *      SK_PNMI_EVT_XMAC_RESET        The event is generated by the driver
+ *                                    before a hard reset of the XMAC is
+ *                                    performed. All counters will be saved
+ *                                    and added to the hardware counter
+ *                                    values after reset to grant continuous
+ *                                    counter values.
+ *      SK_PNMI_EVT_RLMT_PORT_UP      Generated by RLMT to notify that a port
+ *                                    went logically up. A trap message will
+ *                                    be stored to the trap buffer.
+ *      SK_PNMI_EVT_RLMT_PORT_DOWN    Generated by RLMT to notify that a port
+ *                                    went logically down. A trap message will
+ *                                    be stored to the trap buffer.
+ *      SK_PNMI_EVT_RLMT_SEGMENTATION Generated by RLMT to notify that two
+ *                                    spanning tree root bridges were
+ *                                    detected. A trap message will be stored
+ *                                    to the trap buffer.
+ *      SK_PNMI_EVT_RLMT_ACTIVE_DOWN  Notifies PNMI that an active port went
+ *                                    down. PNMI will not further add the
+ *                                    statistic values to the virtual port.
+ *      SK_PNMI_EVT_RLMT_ACTIVE_UP    Notifies PNMI that a port went up and
+ *                                    is now an active port. PNMI will now
+ *                                    add the statistic data of this port to
+ *                                    the virtual port.
+ *      SK_PNMI_EVT_RLMT_SET_NETS     Notifies PNMI about the net mode. The first parameter
+ *                                    contains the number of nets. 1 means single net, 2 means
+ *                                    dual net. The second parameter is -1
+ *
+ * Returns:
+ *      Always 0
+ */
+int SkPnmiEvent(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+SK_U32 Event,           /* Event-Id */
+SK_EVPARA Param)        /* Event dependent parameter */
+{
+        unsigned int    PhysPortIndex;
+    unsigned int        MaxNetNumber;
+        int                     CounterIndex;
+        int                     Ret;
+        SK_U16          MacStatus;
+        SK_U64          OverflowStatus;
+        SK_U64          Mask;
+        int                     MacType;
+        SK_U64          Value;
+        SK_U32          Val32;
+        SK_U16          Register;
+        SK_EVPARA       EventParam;
+        SK_U64          NewestValue;
+        SK_U64          OldestValue;
+        SK_U64          Delta;
+        SK_PNMI_ESTIMATE *pEst;
+        SK_U32          NetIndex;
+        SK_GEPORT       *pPrt;
+        SK_PNMI_VCT     *pVctBackupData;
+        SK_U32          RetCode;
+        int             i;
+        SK_U32          CableLength;
+
+
+#ifdef DEBUG
+        if (Event != SK_PNMI_EVT_XMAC_RESET) {
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                        ("PNMI: SkPnmiEvent: Called, Event=0x%x, Param=0x%x\n",
+                        (unsigned int)Event, (unsigned int)Param.Para64));
+        }
+#endif /* DEBUG */
+        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On call");
+
+        MacType = pAC->GIni.GIMacType;
+        
+        switch (Event) {
+
+        case SK_PNMI_EVT_SIRQ_OVERFLOW:
+                PhysPortIndex = (int)Param.Para32[0];
+                MacStatus = (SK_U16)Param.Para32[1];
+#ifdef DEBUG
+                if (PhysPortIndex >= SK_MAX_MACS) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SIRQ_OVERFLOW parameter"
+                                 " wrong, PhysPortIndex=0x%x\n",
+                                PhysPortIndex));
+                        return (0);
+                }
+#endif /* DEBUG */
+                OverflowStatus = 0;
+
+                /*
+                 * Check which source caused an overflow interrupt.
+                 */
+                if ((pAC->GIni.GIFunc.pFnMacOverflow(pAC, IoC, PhysPortIndex,
+                                MacStatus, &OverflowStatus) != 0) ||
+                        (OverflowStatus == 0)) {
+
+                        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
+                        return (0);
+                }
+
+                /*
+                 * Check the overflow status register and increment
+                 * the upper dword of corresponding counter.
+                 */
+                for (CounterIndex = 0; CounterIndex < sizeof(Mask) * 8;
+                        CounterIndex ++) {
+
+                        Mask = (SK_U64)1 << CounterIndex;
+                        if ((OverflowStatus & Mask) == 0) {
+
+                                continue;
+                        }
+
+                        switch (StatOvrflwBit[CounterIndex][MacType]) {
+
+                        case SK_PNMI_HTX_UTILUNDER:
+                        case SK_PNMI_HTX_UTILOVER:
+                                if (MacType == SK_MAC_XMAC) {
+                                        XM_IN16(IoC, PhysPortIndex, XM_TX_CMD, &Register);
+                                        Register |= XM_TX_SAM_LINE;
+                                        XM_OUT16(IoC, PhysPortIndex, XM_TX_CMD, Register);
+                                }
+                                break;
+
+                        case SK_PNMI_HRX_UTILUNDER:
+                        case SK_PNMI_HRX_UTILOVER:
+                                if (MacType == SK_MAC_XMAC) {
+                                        XM_IN16(IoC, PhysPortIndex, XM_RX_CMD, &Register);
+                                        Register |= XM_RX_SAM_LINE;
+                                        XM_OUT16(IoC, PhysPortIndex, XM_RX_CMD, Register);
+                                }
+                                break;
+
+                        case SK_PNMI_HTX_OCTETHIGH:
+                        case SK_PNMI_HTX_OCTETLOW:
+                        case SK_PNMI_HTX_RESERVED:
+                        case SK_PNMI_HRX_OCTETHIGH:
+                        case SK_PNMI_HRX_OCTETLOW:
+                        case SK_PNMI_HRX_IRLENGTH:
+                        case SK_PNMI_HRX_RESERVED:
+                        
+                        /*
+                         * the following counters aren't be handled (id > 63)
+                         */
+                        case SK_PNMI_HTX_SYNC:
+                        case SK_PNMI_HTX_SYNC_OCTET:
+                                break;
+
+                        case SK_PNMI_HRX_LONGFRAMES:
+                                if (MacType == SK_MAC_GMAC) {
+                                        pAC->Pnmi.Port[PhysPortIndex].
+                                                CounterHigh[CounterIndex] ++;
+                                }
+                                break;
+
+                        default:
+                                pAC->Pnmi.Port[PhysPortIndex].
+                                        CounterHigh[CounterIndex] ++;
+                        }
+                }
+                break;
+
+        case SK_PNMI_EVT_SEN_WAR_LOW:
+#ifdef DEBUG
+                if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_WAR_LOW parameter wrong, SensorIndex=%d\n",
+                                (unsigned int)Param.Para64));
+                        return (0);
+                }
+#endif /* DEBUG */
+
+                /*
+                 * Store a trap message in the trap buffer and generate
+                 * an event for user space applications with the
+                 * SK_DRIVER_SENDEVENT macro.
+                 */
+                QueueSensorTrap(pAC, OID_SKGE_TRAP_SEN_WAR_LOW,
+                        (unsigned int)Param.Para64);
+                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+                break;
+
+        case SK_PNMI_EVT_SEN_WAR_UPP:
+#ifdef DEBUG
+                if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_WAR_UPP parameter wrong, SensorIndex=%d\n",
+                                (unsigned int)Param.Para64));
+                        return (0);
+                }
+#endif /* DEBUG */
+
+                /*
+                 * Store a trap message in the trap buffer and generate
+                 * an event for user space applications with the
+                 * SK_DRIVER_SENDEVENT macro.
+                 */
+                QueueSensorTrap(pAC, OID_SKGE_TRAP_SEN_WAR_UPP,
+                        (unsigned int)Param.Para64);
+                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+                break;
+
+        case SK_PNMI_EVT_SEN_ERR_LOW:
+#ifdef DEBUG
+                if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_ERR_LOW parameter wrong, SensorIndex=%d\n",
+                                (unsigned int)Param.Para64));
+                        return (0);
+                }
+#endif /* DEBUG */
+
+                /*
+                 * Store a trap message in the trap buffer and generate
+                 * an event for user space applications with the
+                 * SK_DRIVER_SENDEVENT macro.
+                 */
+                QueueSensorTrap(pAC, OID_SKGE_TRAP_SEN_ERR_LOW,
+                        (unsigned int)Param.Para64);
+                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+                break;
+        
+        case SK_PNMI_EVT_SEN_ERR_UPP:
+#ifdef DEBUG
+                if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_ERR_UPP parameter wrong, SensorIndex=%d\n",
+                                (unsigned int)Param.Para64));
+                        return (0);
+                }
+#endif /* DEBUG */
+
+                /*
+                 * Store a trap message in the trap buffer and generate
+                 * an event for user space applications with the
+                 * SK_DRIVER_SENDEVENT macro.
+                 */
+                QueueSensorTrap(pAC, OID_SKGE_TRAP_SEN_ERR_UPP,
+                        (unsigned int)Param.Para64);
+                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+                break;
+
+        case SK_PNMI_EVT_CHG_EST_TIMER:
+                /*
+                 * Calculate port switch average on a per hour basis
+                 *   Time interval for check       : 28125 ms
+                 *   Number of values for average  : 8
+                 *
+                 * Be careful in changing these values, on change check
+                 *   - typedef of SK_PNMI_ESTIMATE (Size of EstValue
+                 *     array one less than value number)
+                 *   - Timer initialization SkTimerStart() in SkPnmiInit
+                 *   - Delta value below must be multiplicated with
+                 *     power of 2
+                 *
+                 */
+                pEst = &pAC->Pnmi.RlmtChangeEstimate;
+                CounterIndex = pEst->EstValueIndex + 1;
+                if (CounterIndex == 7) {
+
+                        CounterIndex = 0;
+                }
+                pEst->EstValueIndex = CounterIndex;
+
+                NewestValue = pAC->Pnmi.RlmtChangeCts;
+                OldestValue = pEst->EstValue[CounterIndex];
+                pEst->EstValue[CounterIndex] = NewestValue;
+
+                /*
+                 * Calculate average. Delta stores the number of
+                 * port switches per 28125 * 8 = 225000 ms
+                 */
+                if (NewestValue >= OldestValue) {
+
+                        Delta = NewestValue - OldestValue;
+                }
+                else {
+                        /* Overflow situation */
+                        Delta = (SK_U64)(0 - OldestValue) + NewestValue;
+                }
+
+                /*
+                 * Extrapolate delta to port switches per hour.
+                 *     Estimate = Delta * (3600000 / 225000)
+                 *              = Delta * 16
+                 *              = Delta << 4
+                 */
+                pAC->Pnmi.RlmtChangeEstimate.Estimate = Delta << 4;
+
+                /*
+                 * Check if threshold is exceeded. If the threshold is
+                 * permanently exceeded every 28125 ms an event will be
+                 * generated to remind the user of this condition.
+                 */
+                if ((pAC->Pnmi.RlmtChangeThreshold != 0) &&
+                        (pAC->Pnmi.RlmtChangeEstimate.Estimate >=
+                        pAC->Pnmi.RlmtChangeThreshold)) {
+
+                        QueueSimpleTrap(pAC, OID_SKGE_TRAP_RLMT_CHANGE_THRES);
+                        (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+                }
+
+                SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+                SkTimerStart(pAC, IoC, &pAC->Pnmi.RlmtChangeEstimate.EstTimer,
+                        28125000, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
+                        EventParam);
+                break;
+
+        case SK_PNMI_EVT_CLEAR_COUNTER:
+                /*
+                 *  Param.Para32[0] contains the NetIndex (0 ..1).
+                 *  Param.Para32[1] is reserved, contains -1.
+                 */
+                NetIndex = (SK_U32)Param.Para32[0];
+
+#ifdef DEBUG
+                if (NetIndex >= pAC->Rlmt.NumNets) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_CLEAR_COUNTER parameter wrong, NetIndex=%d\n",
+                                NetIndex));
+
+                        return (0);
+                }
+#endif /* DEBUG */
+
+                /*
+                 * Set all counters and timestamps to zero.
+                 * The according NetIndex is required as a
+                 * parameter of the event.
+                 */
+                ResetCounter(pAC, IoC, NetIndex);
+                break;
+
+        case SK_PNMI_EVT_XMAC_RESET:
+                /*
+                 * To grant continuous counter values store the current
+                 * XMAC statistic values to the entries 1..n of the
+                 * CounterOffset array. XMAC Errata #2
+                 */
+#ifdef DEBUG
+                if ((unsigned int)Param.Para64 >= SK_MAX_MACS) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_XMAC_RESET parameter wrong, PhysPortIndex=%d\n",
+                                (unsigned int)Param.Para64));
+                        return (0);
+                }
+#endif
+                PhysPortIndex = (unsigned int)Param.Para64;
+
+                /*
+                 * Update XMAC statistic to get fresh values
+                 */
+                Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
+                if (Ret != SK_PNMI_ERR_OK) {
+
+                        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
+                        return (0);
+                }
+                /*
+                 * Increment semaphore to indicate that an update was
+                 * already done
+                 */
+                pAC->Pnmi.MacUpdatedFlag ++;
+
+                for (CounterIndex = 0; CounterIndex < SK_PNMI_MAX_IDX;
+                        CounterIndex ++) {
+
+                        if (!StatAddr[CounterIndex][MacType].GetOffset) {
+
+                                continue;
+                        }
+
+                        pAC->Pnmi.Port[PhysPortIndex].CounterOffset[CounterIndex] =
+                                GetPhysStatVal(pAC, IoC, PhysPortIndex, CounterIndex);
+                        
+                        pAC->Pnmi.Port[PhysPortIndex].CounterHigh[CounterIndex] = 0;
+                }
+
+                pAC->Pnmi.MacUpdatedFlag --;
+                break;
+
+        case SK_PNMI_EVT_RLMT_PORT_UP:
+                PhysPortIndex = (unsigned int)Param.Para32[0];
+#ifdef DEBUG
+                if (PhysPortIndex >= SK_MAX_MACS) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_PORT_UP parameter"
+                 " wrong, PhysPortIndex=%d\n", PhysPortIndex));
+
+                        return (0);
+                }
+#endif /* DEBUG */
+
+                /*
+                 * Store a trap message in the trap buffer and generate an event for
+                 * user space applications with the SK_DRIVER_SENDEVENT macro.
+                 */
+                QueueRlmtPortTrap(pAC, OID_SKGE_TRAP_RLMT_PORT_UP, PhysPortIndex);
+                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+
+                /* Bugfix for XMAC errata (#10620)*/
+                if (MacType == SK_MAC_XMAC) {
+                        /* Add incremental difference to offset (#10620)*/
+                        (void)pAC->GIni.GIFunc.pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                XM_RXE_SHT_ERR, &Val32);
+                        
+                        Value = (((SK_U64)pAC->Pnmi.Port[PhysPortIndex].
+                                 CounterHigh[SK_PNMI_HRX_SHORTS] << 32) | (SK_U64)Val32);
+                        pAC->Pnmi.Port[PhysPortIndex].CounterOffset[SK_PNMI_HRX_SHORTS] +=
+                                Value - pAC->Pnmi.Port[PhysPortIndex].RxShortZeroMark;
+                }
+                
+                /* Tell VctStatus() that a link was up meanwhile. */
+                pAC->Pnmi.VctStatus[PhysPortIndex] |= SK_PNMI_VCT_LINK;         
+                break;
+
+    case SK_PNMI_EVT_RLMT_PORT_DOWN:
+                PhysPortIndex = (unsigned int)Param.Para32[0];
+
+#ifdef DEBUG
+                if (PhysPortIndex >= SK_MAX_MACS) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_PORT_DOWN parameter"
+                 " wrong, PhysPortIndex=%d\n", PhysPortIndex));
+
+                        return (0);
+                }
+#endif /* DEBUG */
+
+                /*
+                 * Store a trap message in the trap buffer and generate an event for
+                 * user space applications with the SK_DRIVER_SENDEVENT macro.
+                 */
+                QueueRlmtPortTrap(pAC, OID_SKGE_TRAP_RLMT_PORT_DOWN, PhysPortIndex);
+                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+
+                /* Bugfix #10620 - get zero level for incremental difference */
+                if (MacType == SK_MAC_XMAC) {
+
+                        (void)pAC->GIni.GIFunc.pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                XM_RXE_SHT_ERR, &Val32);
+                        
+                        pAC->Pnmi.Port[PhysPortIndex].RxShortZeroMark =
+                                (((SK_U64)pAC->Pnmi.Port[PhysPortIndex].
+                                 CounterHigh[SK_PNMI_HRX_SHORTS] << 32) | (SK_U64)Val32);
+                }
+                break;
+
+        case SK_PNMI_EVT_RLMT_ACTIVE_DOWN:
+                PhysPortIndex = (unsigned int)Param.Para32[0];
+                NetIndex = (SK_U32)Param.Para32[1];
+
+#ifdef DEBUG
+                if (PhysPortIndex >= SK_MAX_MACS) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_DOWN parameter too high, PhysPort=%d\n",
+                                PhysPortIndex));
+                }
+
+                if (NetIndex >= pAC->Rlmt.NumNets) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_DOWN parameter too high, NetIndex=%d\n",
+                                NetIndex));
+                }
+#endif /* DEBUG */
+
+                /*
+                 * For now, ignore event if NetIndex != 0.
+                 */
+                if (Param.Para32[1] != 0) {
+
+                        return (0);
+                }
+
+                /*
+                 * Nothing to do if port is already inactive
+                 */
+                if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+
+                        return (0);
+                }
+
+                /*
+                 * Update statistic counters to calculate new offset for the virtual
+                 * port and increment semaphore to indicate that an update was already
+                 * done.
+                 */
+                if (MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1) !=
+                        SK_PNMI_ERR_OK) {
+
+                        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
+                        return (0);
+                }
+                pAC->Pnmi.MacUpdatedFlag ++;
+
+                /*
+                 * Calculate new counter offset for virtual port to grant continous
+                 * counting on port switches. The virtual port consists of all currently
+                 * active ports. The port down event indicates that a port is removed
+                 * from the virtual port. Therefore add the counter value of the removed
+                 * port to the CounterOffset for the virtual port to grant the same
+                 * counter value.
+                 */
+                for (CounterIndex = 0; CounterIndex < SK_PNMI_MAX_IDX;
+                        CounterIndex ++) {
+
+                        if (!StatAddr[CounterIndex][MacType].GetOffset) {
+
+                                continue;
+                        }
+
+                        Value = GetPhysStatVal(pAC, IoC, PhysPortIndex, CounterIndex);
+
+                        pAC->Pnmi.VirtualCounterOffset[CounterIndex] += Value;
+                }
+
+                /*
+                 * Set port to inactive
+                 */
+                pAC->Pnmi.Port[PhysPortIndex].ActiveFlag = SK_FALSE;
+
+                pAC->Pnmi.MacUpdatedFlag --;
+                break;
+
+        case SK_PNMI_EVT_RLMT_ACTIVE_UP:
+                PhysPortIndex = (unsigned int)Param.Para32[0];
+                NetIndex = (SK_U32)Param.Para32[1];
+
+#ifdef DEBUG
+                if (PhysPortIndex >= SK_MAX_MACS) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_UP parameter too high, PhysPort=%d\n",
+                                PhysPortIndex));
+                }
+
+                if (NetIndex >= pAC->Rlmt.NumNets) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
+                                ("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_UP parameter too high, NetIndex=%d\n",
+                                NetIndex));
+                }
+#endif /* DEBUG */
+
+                /*
+                 * For now, ignore event if NetIndex != 0.
+                 */
+                if (Param.Para32[1] != 0) {
+
+                        return (0);
+                }
+
+                /*
+                 * Nothing to do if port is already active
+                 */
+                if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+
+                        return (0);
+                }
+
+                /*
+                 * Statistic maintenance
+                 */
+                pAC->Pnmi.RlmtChangeCts ++;
+                pAC->Pnmi.RlmtChangeTime = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
+
+                /*
+                 * Store a trap message in the trap buffer and generate an event for
+                 * user space applications with the SK_DRIVER_SENDEVENT macro.
+                 */
+                QueueRlmtNewMacTrap(pAC, PhysPortIndex);
+                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+
+                /*
+                 * Update statistic counters to calculate new offset for the virtual
+                 * port and increment semaphore to indicate that an update was
+                 * already done.
+                 */
+                if (MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1) !=
+                        SK_PNMI_ERR_OK) {
+
+                        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
+                        return (0);
+                }
+                pAC->Pnmi.MacUpdatedFlag ++;
+
+                /*
+                 * Calculate new counter offset for virtual port to grant continous
+                 * counting on port switches. A new port is added to the virtual port.
+                 * Therefore substract the counter value of the new port from the
+                 * CounterOffset for the virtual port to grant the same value.
+                 */
+                for (CounterIndex = 0; CounterIndex < SK_PNMI_MAX_IDX;
+                        CounterIndex ++) {
+
+                        if (!StatAddr[CounterIndex][MacType].GetOffset) {
+
+                                continue;
+                        }
+
+                        Value = GetPhysStatVal(pAC, IoC, PhysPortIndex, CounterIndex);
+
+                        pAC->Pnmi.VirtualCounterOffset[CounterIndex] -= Value;
+                }
+
+                /* Set port to active */
+                pAC->Pnmi.Port[PhysPortIndex].ActiveFlag = SK_TRUE;
+
+                pAC->Pnmi.MacUpdatedFlag --;
+                break;
+
+        case SK_PNMI_EVT_RLMT_SEGMENTATION:
+                /*
+                 * Para.Para32[0] contains the NetIndex.
+                 */
+
+                /*
+                 * Store a trap message in the trap buffer and generate an event for
+                 * user space applications with the SK_DRIVER_SENDEVENT macro.
+                 */
+                QueueSimpleTrap(pAC, OID_SKGE_TRAP_RLMT_SEGMENTATION);
+                (void)SK_DRIVER_SENDEVENT(pAC, IoC);
+                break;
+
+    case SK_PNMI_EVT_RLMT_SET_NETS:
+                /*
+                 *  Param.Para32[0] contains the number of Nets.
+                 *  Param.Para32[1] is reserved, contains -1.
+                 */
+            /*
+         * Check number of nets
+                 */
+                MaxNetNumber = pAC->GIni.GIMacsFound;
+                if (((unsigned int)Param.Para32[0] < 1)
+                        || ((unsigned int)Param.Para32[0] > MaxNetNumber)) {
+                        return (SK_PNMI_ERR_UNKNOWN_NET);
+                }
+
+        if ((unsigned int)Param.Para32[0] == 1) { /* single net mode */
+                pAC->Pnmi.DualNetActiveFlag = SK_FALSE;
+        }
+        else { /* dual net mode */
+                pAC->Pnmi.DualNetActiveFlag = SK_TRUE;
+        }
+        break;
+
+    case SK_PNMI_EVT_VCT_RESET:
+                PhysPortIndex = Param.Para32[0];
+                pPrt = &pAC->GIni.GP[PhysPortIndex];
+                pVctBackupData = &pAC->Pnmi.VctBackup[PhysPortIndex];
+                
+                if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING) {
+                        RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_FALSE);
+                        if (RetCode == 2) {
+                                /*
+                                 * VCT test is still running.
+                                 * Start VCT timer counter again.
+                                 */
+                                SK_MEMSET((char *) &Param, 0, sizeof(Param));
+                                Param.Para32[0] = PhysPortIndex;
+                                Param.Para32[1] = -1;
+                                SkTimerStart(pAC, IoC,
+                                        &pAC->Pnmi.VctTimeout[PhysPortIndex].VctTimer,
+                                4000000, SKGE_PNMI, SK_PNMI_EVT_VCT_RESET, Param);
+                                break;
+                        }
+                        pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_PENDING;
+                        pAC->Pnmi.VctStatus[PhysPortIndex] |=
+                                (SK_PNMI_VCT_NEW_VCT_DATA | SK_PNMI_VCT_TEST_DONE);
+                        
+                        /* Copy results for later use to PNMI struct. */
+                        for (i = 0; i < 4; i++)  {
+                                if (pPrt->PMdiPairSts[i] == SK_PNMI_VCT_NORMAL_CABLE) {
+                                        if ((pPrt->PMdiPairLen[i] > 35) &&
+                                                (pPrt->PMdiPairLen[i] < 0xff)) {
+                                                pPrt->PMdiPairSts[i] = SK_PNMI_VCT_IMPEDANCE_MISMATCH;
+                                        }
+                                }
+                                if ((pPrt->PMdiPairLen[i] > 35) &&
+                                        (pPrt->PMdiPairLen[i] != 0xff)) {
+                                        CableLength = 1000 *
+                                                (((175 * pPrt->PMdiPairLen[i]) / 210) - 28);
+                                }
+                                else {
+                                        CableLength = 0;
+                                }
+                                pVctBackupData->PMdiPairLen[i] = CableLength;
+                                pVctBackupData->PMdiPairSts[i] = pPrt->PMdiPairSts[i];
+                        }
+                        
+                        Param.Para32[0] = PhysPortIndex;
+                        Param.Para32[1] = -1;
+                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Param);
+                        SkEventDispatcher(pAC, IoC);
+                }
+                
+                break;
+
+        default:
+                break;
+        }
+
+        SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
+        return (0);
+}
+
+
+/******************************************************************************
+ *
+ * Private functions
+ *
+ */
+
+/*****************************************************************************
+ *
+ * PnmiVar - Gets, presets, and sets single OIDs
+ *
+ * Description:
+ *      Looks up the requested OID, calls the corresponding handler
+ *      function, and passes the parameters with the get, preset, or
+ *      set command. The function is called by SkGePnmiGetVar,
+ *      SkGePnmiPreSetVar, or SkGePnmiSetVar.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_XXX. For details have a look at the description of the
+ *      calling functions.
+ *      SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
+ */
+PNMI_STATIC int PnmiVar(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* Total length of pBuf management data  */
+SK_U32 Instance,        /* Instance (1..n) that is to be set or -1 */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        unsigned int    TableIndex;
+        int             Ret;
+
+
+        if ((TableIndex = LookupId(Id)) == (unsigned int)(-1)) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_UNKNOWN_OID);
+        }
+        
+    /* Check NetIndex */
+        if (NetIndex >= pAC->Rlmt.NumNets) {
+                return (SK_PNMI_ERR_UNKNOWN_NET);
+        }
+
+        SK_PNMI_CHECKFLAGS("PnmiVar: On call");
+
+        Ret = IdTable[TableIndex].Func(pAC, IoC, Action, Id, pBuf, pLen,
+                Instance, TableIndex, NetIndex);
+
+        SK_PNMI_CHECKFLAGS("PnmiVar: On return");
+
+        return (Ret);
+}
+
+/*****************************************************************************
+ *
+ * PnmiStruct - Presets and Sets data in structure SK_PNMI_STRUCT_DATA
+ *
+ * Description:
+ *      The return value of the function will also be stored in
+ *      SK_PNMI_STRUCT_DATA if the passed buffer has the minimum size of
+ *      SK_PNMI_MIN_STRUCT_SIZE. The sub-function runs through the IdTable,
+ *      checks which OIDs are able to set, and calls the handler function of
+ *      the OID to perform the set. The return value of the function will
+ *      also be stored in SK_PNMI_STRUCT_DATA if the passed buffer has the
+ *      minimum size of SK_PNMI_MIN_STRUCT_SIZE. The function is called
+ *      by SkGePnmiPreSetStruct and SkGePnmiSetStruct.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_XXX. The codes are described in the calling functions.
+ *      SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
+ */
+PNMI_STATIC int PnmiStruct(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int  Action,    /* PRESET/SET action to be performed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* Length of pBuf management data buffer */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        int             Ret;
+        unsigned int    TableIndex;
+        unsigned int    DstOffset;
+        unsigned int    Len;
+        unsigned int    InstanceNo;
+        unsigned int    InstanceCnt;
+        SK_U32          Instance;
+        SK_U32          Id;
+
+
+        /* Check if the passed buffer has the right size */
+        if (*pLen < SK_PNMI_STRUCT_SIZE) {
+
+                /* Check if we can return the error within the buffer */
+                if (*pLen >= SK_PNMI_MIN_STRUCT_SIZE) {
+
+                        SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_TOO_SHORT,
+                                (SK_U32)(-1));
+                }
+
+                *pLen = SK_PNMI_STRUCT_SIZE;
+                return (SK_PNMI_ERR_TOO_SHORT);
+        }
+        
+    /* Check NetIndex */
+        if (NetIndex >= pAC->Rlmt.NumNets) {
+                return (SK_PNMI_ERR_UNKNOWN_NET);
+        }
+        
+        SK_PNMI_CHECKFLAGS("PnmiStruct: On call");
+
+        /*
+         * Update the values of RLMT and SIRQ and increment semaphores to
+         * indicate that an update was already done.
+         */
+        if ((Ret = RlmtUpdate(pAC, IoC, NetIndex)) != SK_PNMI_ERR_OK) {
+
+                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
+                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                return (Ret);
+        }
+
+        if ((Ret = SirqUpdate(pAC, IoC)) != SK_PNMI_ERR_OK) {
+
+                SK_PNMI_SET_STAT(pBuf, Ret, (SK_U32)(-1));
+                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                return (Ret);
+        }
+
+        pAC->Pnmi.RlmtUpdatedFlag ++;
+        pAC->Pnmi.SirqUpdatedFlag ++;
+
+        /* Preset/Set values */
+        for (TableIndex = 0; TableIndex < ID_TABLE_SIZE; TableIndex ++) {
+
+                if ((IdTable[TableIndex].Access != SK_PNMI_RW) &&
+                        (IdTable[TableIndex].Access != SK_PNMI_WO)) {
+
+                        continue;
+                }
+
+                InstanceNo = IdTable[TableIndex].InstanceNo;
+                Id = IdTable[TableIndex].Id;
+
+                for (InstanceCnt = 1; InstanceCnt <= InstanceNo;
+                        InstanceCnt ++) {
+
+                        DstOffset = IdTable[TableIndex].Offset +
+                                (InstanceCnt - 1) *
+                                IdTable[TableIndex].StructSize;
+
+                        /*
+                         * Because VPD multiple instance variables are
+                         * not setable we do not need to evaluate VPD
+                         * instances. Have a look to VPD instance
+                         * calculation in SkPnmiGetStruct().
+                         */
+                        Instance = (SK_U32)InstanceCnt;
+
+                        /*
+                         * Evaluate needed buffer length
+                         */
+                        Len = 0;
+                        Ret = IdTable[TableIndex].Func(pAC, IoC,
+                                SK_PNMI_GET, IdTable[TableIndex].Id,
+                                NULL, &Len, Instance, TableIndex, NetIndex);
+
+                        if (Ret == SK_PNMI_ERR_UNKNOWN_INST) {
+
+                                break;
+                        }
+                        if (Ret != SK_PNMI_ERR_TOO_SHORT) {
+
+                                pAC->Pnmi.RlmtUpdatedFlag --;
+                                pAC->Pnmi.SirqUpdatedFlag --;
+
+                                SK_PNMI_CHECKFLAGS("PnmiStruct: On return");
+                                SK_PNMI_SET_STAT(pBuf,
+                                        SK_PNMI_ERR_GENERAL, DstOffset);
+                                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                        if (Id == OID_SKGE_VPD_ACTION) {
+
+                                switch (*(pBuf + DstOffset)) {
+
+                                case SK_PNMI_VPD_CREATE:
+                                        Len = 3 + *(pBuf + DstOffset + 3);
+                                        break;
+
+                                case SK_PNMI_VPD_DELETE:
+                                        Len = 3;
+                                        break;
+
+                                default:
+                                        Len = 1;
+                                        break;
+                                }
+                        }
+
+                        /* Call the OID handler function */
+                        Ret = IdTable[TableIndex].Func(pAC, IoC, Action,
+                                IdTable[TableIndex].Id, pBuf + DstOffset,
+                                &Len, Instance, TableIndex, NetIndex);
+
+                        if (Ret != SK_PNMI_ERR_OK) {
+
+                                pAC->Pnmi.RlmtUpdatedFlag --;
+                                pAC->Pnmi.SirqUpdatedFlag --;
+
+                                SK_PNMI_CHECKFLAGS("PnmiStruct: On return");
+                                SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_BAD_VALUE,
+                                        DstOffset);
+                                *pLen = SK_PNMI_MIN_STRUCT_SIZE;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+                }
+        }
+
+        pAC->Pnmi.RlmtUpdatedFlag --;
+        pAC->Pnmi.SirqUpdatedFlag --;
+
+        SK_PNMI_CHECKFLAGS("PnmiStruct: On return");
+        SK_PNMI_SET_STAT(pBuf, SK_PNMI_ERR_OK, (SK_U32)(-1));
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * LookupId - Lookup an OID in the IdTable
+ *
+ * Description:
+ *      Scans the IdTable to find the table entry of an OID.
+ *
+ * Returns:
+ *      The table index or -1 if not found.
+ */
+PNMI_STATIC int LookupId(
+SK_U32 Id)              /* Object identifier to be searched */
+{
+        int i;
+
+        for (i = 0; i < ID_TABLE_SIZE; i++) {
+
+                if (IdTable[i].Id == Id) {
+
+                        return i;
+                }
+        }
+
+        return (-1);
+}
+
+/*****************************************************************************
+ *
+ * OidStruct - Handler of OID_SKGE_ALL_DATA
+ *
+ * Description:
+ *      This OID performs a Get/Preset/SetStruct call and returns all data
+ *      in a SK_PNMI_STRUCT_DATA structure.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int OidStruct(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        if (Id != OID_SKGE_ALL_DATA) {
+
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR003,
+                        SK_PNMI_ERR003MSG);
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_GENERAL);
+        }
+
+        /*
+         * Check instance. We only handle single instance variables
+         */
+        if (Instance != (SK_U32)(-1) && Instance != 1) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_UNKNOWN_INST);
+        }
+
+        switch (Action) {
+
+        case SK_PNMI_GET:
+                return (SkPnmiGetStruct(pAC, IoC, pBuf, pLen, NetIndex));
+
+        case SK_PNMI_PRESET:
+                return (SkPnmiPreSetStruct(pAC, IoC, pBuf, pLen, NetIndex));
+
+        case SK_PNMI_SET:
+                return (SkPnmiSetStruct(pAC, IoC, pBuf, pLen, NetIndex));
+        }
+
+        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR004, SK_PNMI_ERR004MSG);
+
+        *pLen = 0;
+        return (SK_PNMI_ERR_GENERAL);
+}
+
+/*****************************************************************************
+ *
+ * Perform - OID handler of OID_SKGE_ACTION
+ *
+ * Description:
+ *      None.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int Perform(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        int     Ret;
+        SK_U32  ActionOp;
+
+
+        /*
+         * Check instance. We only handle single instance variables
+         */
+        if (Instance != (SK_U32)(-1) && Instance != 1) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_UNKNOWN_INST);
+        }
+
+        if (*pLen < sizeof(SK_U32)) {
+
+                *pLen = sizeof(SK_U32);
+                return (SK_PNMI_ERR_TOO_SHORT);
+        }
+
+        /* Check if a get should be performed */
+        if (Action == SK_PNMI_GET) {
+
+                /* A get is easy. We always return the same value */
+                ActionOp = (SK_U32)SK_PNMI_ACT_IDLE;
+                SK_PNMI_STORE_U32(pBuf, ActionOp);
+                *pLen = sizeof(SK_U32);
+
+                return (SK_PNMI_ERR_OK);
+        }
+
+        /* Continue with PRESET/SET action */
+        if (*pLen > sizeof(SK_U32)) {
+
+                return (SK_PNMI_ERR_BAD_VALUE);
+        }
+
+        /* Check if the command is a known one */
+        SK_PNMI_READ_U32(pBuf, ActionOp);
+        if (*pLen > sizeof(SK_U32) ||
+                (ActionOp != SK_PNMI_ACT_IDLE &&
+                ActionOp != SK_PNMI_ACT_RESET &&
+                ActionOp != SK_PNMI_ACT_SELFTEST &&
+                ActionOp != SK_PNMI_ACT_RESETCNT)) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_BAD_VALUE);
+        }
+
+        /* A preset ends here */
+        if (Action == SK_PNMI_PRESET) {
+
+                return (SK_PNMI_ERR_OK);
+        }
+
+        switch (ActionOp) {
+
+        case SK_PNMI_ACT_IDLE:
+                /* Nothing to do */
+                break;
+
+        case SK_PNMI_ACT_RESET:
+                /*
+                 * Perform a driver reset or something that comes near
+                 * to this.
+                 */
+                Ret = SK_DRIVER_RESET(pAC, IoC);
+                if (Ret != 0) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR005,
+                                SK_PNMI_ERR005MSG);
+
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+                break;
+
+        case SK_PNMI_ACT_SELFTEST:
+                /*
+                 * Perform a driver selftest or something similar to this.
+                 * Currently this feature is not used and will probably
+                 * implemented in another way.
+                 */
+                Ret = SK_DRIVER_SELFTEST(pAC, IoC);
+                pAC->Pnmi.TestResult = Ret;
+                break;
+
+        case SK_PNMI_ACT_RESETCNT:
+                /* Set all counters and timestamps to zero */
+                ResetCounter(pAC, IoC, NetIndex);
+                break;
+
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR006,
+                        SK_PNMI_ERR006MSG);
+
+                return (SK_PNMI_ERR_GENERAL);
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * Mac8023Stat - OID handler of OID_GEN_XXX and OID_802_3_XXX
+ *
+ * Description:
+ *      Retrieves the statistic values of the virtual port (logical
+ *      index 0). Only special OIDs of NDIS are handled which consist
+ *      of a 32 bit instead of a 64 bit value. The OIDs are public
+ *      because perhaps some other platform can use them too.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int Mac8023Stat(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex,        /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        int     Ret;
+        SK_U64  StatVal;
+        SK_U32  StatVal32;
+        SK_BOOL Is64BitReq = SK_FALSE;
+
+        /*
+         * Only the active Mac is returned
+         */
+        if (Instance != (SK_U32)(-1) && Instance != 1) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_UNKNOWN_INST);
+        }
+
+        /*
+         * Check action type
+         */
+        if (Action != SK_PNMI_GET) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_READ_ONLY);
+        }
+
+        /* Check length */
+        switch (Id) {
+
+        case OID_802_3_PERMANENT_ADDRESS:
+        case OID_802_3_CURRENT_ADDRESS:
+                if (*pLen < sizeof(SK_MAC_ADDR)) {
+
+                        *pLen = sizeof(SK_MAC_ADDR);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        default:
+#ifndef SK_NDIS_64BIT_CTR
+                if (*pLen < sizeof(SK_U32)) {
+                        *pLen = sizeof(SK_U32);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+
+#else /* SK_NDIS_64BIT_CTR */
+
+                /* for compatibility, at least 32bit are required for OID */
+                if (*pLen < sizeof(SK_U32)) {
+                        /*
+                        * but indicate handling for 64bit values,
+                        * if insufficient space is provided
+                        */
+                        *pLen = sizeof(SK_U64);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+
+                Is64BitReq = (*pLen < sizeof(SK_U64)) ? SK_FALSE : SK_TRUE;
+#endif /* SK_NDIS_64BIT_CTR */
+                break;
+        }
+
+        /*
+         * Update all statistics, because we retrieve virtual MAC, which
+         * consists of multiple physical statistics and increment semaphore
+         * to indicate that an update was already done.
+         */
+        Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
+        if ( Ret != SK_PNMI_ERR_OK) {
+
+                *pLen = 0;
+                return (Ret);
+        }
+        pAC->Pnmi.MacUpdatedFlag ++;
+
+        /*
+         * Get value (MAC Index 0 identifies the virtual MAC)
+         */
+        switch (Id) {
+
+        case OID_802_3_PERMANENT_ADDRESS:
+                CopyMac(pBuf, &pAC->Addr.Net[NetIndex].PermanentMacAddress);
+                *pLen = sizeof(SK_MAC_ADDR);
+                break;
+
+        case OID_802_3_CURRENT_ADDRESS:
+                CopyMac(pBuf, &pAC->Addr.Net[NetIndex].CurrentMacAddress);
+                *pLen = sizeof(SK_MAC_ADDR);
+                break;
+
+        default:
+                StatVal = GetStatVal(pAC, IoC, 0, IdTable[TableIndex].Param, NetIndex);
+
+                /* by default 32bit values are evaluated */
+                if (!Is64BitReq) {
+                        StatVal32 = (SK_U32)StatVal;
+                        SK_PNMI_STORE_U32(pBuf, StatVal32);
+                        *pLen = sizeof(SK_U32);
+                }
+                else {
+                        SK_PNMI_STORE_U64(pBuf, StatVal);
+                        *pLen = sizeof(SK_U64);
+                }
+                break;
+        }
+
+        pAC->Pnmi.MacUpdatedFlag --;
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * MacPrivateStat - OID handler function of OID_SKGE_STAT_XXX
+ *
+ * Description:
+ *      Retrieves the MAC statistic data.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int MacPrivateStat(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        unsigned int    LogPortMax;
+        unsigned int    LogPortIndex;
+        unsigned int    PhysPortMax;
+        unsigned int    Limit;
+        unsigned int    Offset;
+        int                             MacType;
+        int                             Ret;
+        SK_U64                  StatVal;
+        
+        
+
+        /* Calculate instance if wished. MAC index 0 is the virtual MAC */
+        PhysPortMax = pAC->GIni.GIMacsFound;
+        LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
+        
+        MacType = pAC->GIni.GIMacType;
+
+        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
+                LogPortMax--;
+        }
+
+        if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
+                /* Check instance range */
+                if ((Instance < 1) || (Instance > LogPortMax)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+                LogPortIndex = SK_PNMI_PORT_INST2LOG(Instance);
+                Limit = LogPortIndex + 1;
+        }
+
+        else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
+
+                LogPortIndex = 0;
+                Limit = LogPortMax;
+        }
+
+        /* Check action */
+        if (Action != SK_PNMI_GET) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_READ_ONLY);
+        }
+
+        /* Check length */
+        if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U64)) {
+
+                *pLen = (Limit - LogPortIndex) * sizeof(SK_U64);
+                return (SK_PNMI_ERR_TOO_SHORT);
+        }
+
+        /*
+         * Update MAC statistic and increment semaphore to indicate that
+         * an update was already done.
+         */
+        Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
+        if (Ret != SK_PNMI_ERR_OK) {
+
+                *pLen = 0;
+                return (Ret);
+        }
+        pAC->Pnmi.MacUpdatedFlag ++;
+
+        /* Get value */
+        Offset = 0;
+        for (; LogPortIndex < Limit; LogPortIndex ++) {
+
+                switch (Id) {
+
+/* XXX not yet implemented due to XMAC problems
+                case OID_SKGE_STAT_TX_UTIL:
+                        return (SK_PNMI_ERR_GENERAL);
+*/
+/* XXX not yet implemented due to XMAC problems
+                case OID_SKGE_STAT_RX_UTIL:
+                        return (SK_PNMI_ERR_GENERAL);
+*/
+                case OID_SKGE_STAT_RX:
+                        if (MacType == SK_MAC_GMAC) {
+                                StatVal =
+                                        GetStatVal(pAC, IoC, LogPortIndex,
+                                                           SK_PNMI_HRX_BROADCAST, NetIndex) +
+                                        GetStatVal(pAC, IoC, LogPortIndex,
+                                                           SK_PNMI_HRX_MULTICAST, NetIndex) +
+                                        GetStatVal(pAC, IoC, LogPortIndex,
+                                                           SK_PNMI_HRX_UNICAST, NetIndex) +
+                                        GetStatVal(pAC, IoC, LogPortIndex,
+                                                           SK_PNMI_HRX_UNDERSIZE, NetIndex);
+                        }
+                        else {
+                                StatVal = GetStatVal(pAC, IoC, LogPortIndex,
+                                        IdTable[TableIndex].Param, NetIndex);
+                        }
+                        break;
+
+                case OID_SKGE_STAT_TX:
+                        if (MacType == SK_MAC_GMAC) {
+                                StatVal =
+                                        GetStatVal(pAC, IoC, LogPortIndex,
+                                                           SK_PNMI_HTX_BROADCAST, NetIndex) +
+                                        GetStatVal(pAC, IoC, LogPortIndex,
+                                                           SK_PNMI_HTX_MULTICAST, NetIndex) +
+                                        GetStatVal(pAC, IoC, LogPortIndex,
+                                                           SK_PNMI_HTX_UNICAST, NetIndex);
+                        }
+                        else {
+                                StatVal = GetStatVal(pAC, IoC, LogPortIndex,
+                                        IdTable[TableIndex].Param, NetIndex);
+                        }
+                        break;
+
+                default:
+                        StatVal = GetStatVal(pAC, IoC, LogPortIndex,
+                                IdTable[TableIndex].Param, NetIndex);
+                }
+                SK_PNMI_STORE_U64(pBuf + Offset, StatVal);
+
+                Offset += sizeof(SK_U64);
+        }
+        *pLen = Offset;
+
+        pAC->Pnmi.MacUpdatedFlag --;
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * Addr - OID handler function of OID_SKGE_PHYS_CUR_ADDR and _FAC_ADDR
+ *
+ * Description:
+ *      Get/Presets/Sets the current and factory MAC address. The MAC
+ *      address of the virtual port, which is reported to the OS, may
+ *      not be changed, but the physical ones. A set to the virtual port
+ *      will be ignored. No error should be reported because otherwise
+ *      a multiple instance set (-1) would always fail.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int Addr(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        int             Ret;
+        unsigned int    LogPortMax;
+        unsigned int    PhysPortMax;
+        unsigned int    LogPortIndex;
+        unsigned int    PhysPortIndex;
+        unsigned int    Limit;
+        unsigned int    Offset = 0;
+
+        /*
+         * Calculate instance if wished. MAC index 0 is the virtual
+         * MAC.
+         */
+        PhysPortMax = pAC->GIni.GIMacsFound;
+        LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
+
+        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
+                LogPortMax--;
+        }
+
+        if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
+                /* Check instance range */
+                if ((Instance < 1) || (Instance > LogPortMax)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+                LogPortIndex = SK_PNMI_PORT_INST2LOG(Instance);
+                Limit = LogPortIndex + 1;
+        }
+        else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
+
+                LogPortIndex = 0;
+                Limit = LogPortMax;
+        }
+
+        /*
+         * Perform Action
+         */
+        if (Action == SK_PNMI_GET) {
+
+                /* Check length */
+                if (*pLen < (Limit - LogPortIndex) * 6) {
+
+                        *pLen = (Limit - LogPortIndex) * 6;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+
+                /*
+                 * Get value
+                 */
+                for (; LogPortIndex < Limit; LogPortIndex ++) {
+
+                        switch (Id) {
+
+                        case OID_SKGE_PHYS_CUR_ADDR:
+                                if (LogPortIndex == 0) {
+                                        CopyMac(pBuf + Offset, &pAC->Addr.Net[NetIndex].CurrentMacAddress);
+                                }
+                                else {
+                                        PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
+
+                                        CopyMac(pBuf + Offset,
+                                                &pAC->Addr.Port[PhysPortIndex].CurrentMacAddress);
+                                }
+                                Offset += 6;
+                                break;
+
+                        case OID_SKGE_PHYS_FAC_ADDR:
+                                if (LogPortIndex == 0) {
+                                        CopyMac(pBuf + Offset,
+                                                &pAC->Addr.Net[NetIndex].PermanentMacAddress);
+                                }
+                                else {
+                                        PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                pAC, LogPortIndex);
+
+                                        CopyMac(pBuf + Offset,
+                                                &pAC->Addr.Port[PhysPortIndex].PermanentMacAddress);
+                                }
+                                Offset += 6;
+                                break;
+
+                        default:
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR008,
+                                        SK_PNMI_ERR008MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                }
+
+                *pLen = Offset;
+        }
+        else {
+                /*
+                 * The logical MAC address may not be changed only
+                 * the physical ones
+                 */
+                if (Id == OID_SKGE_PHYS_FAC_ADDR) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_READ_ONLY);
+                }
+
+                /*
+                 * Only the current address may be changed
+                 */
+                if (Id != OID_SKGE_PHYS_CUR_ADDR) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR009,
+                                SK_PNMI_ERR009MSG);
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                /* Check length */
+                if (*pLen < (Limit - LogPortIndex) * 6) {
+
+                        *pLen = (Limit - LogPortIndex) * 6;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                if (*pLen > (Limit - LogPortIndex) * 6) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_BAD_VALUE);
+                }
+
+                /*
+                 * Check Action
+                 */
+                if (Action == SK_PNMI_PRESET) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_OK);
+                }
+
+                /*
+                 * Set OID_SKGE_MAC_CUR_ADDR
+                 */
+                for (; LogPortIndex < Limit; LogPortIndex ++, Offset += 6) {
+
+                        /*
+                         * A set to virtual port and set of broadcast
+                         * address will be ignored
+                         */
+                        if (LogPortIndex == 0 || SK_MEMCMP(pBuf + Offset,
+                                "\xff\xff\xff\xff\xff\xff", 6) == 0) {
+
+                                continue;
+                        }
+
+                        PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC,
+                                LogPortIndex);
+
+                        Ret = SkAddrOverride(pAC, IoC, PhysPortIndex,
+                                (SK_MAC_ADDR *)(pBuf + Offset),
+                                (LogPortIndex == 0 ? SK_ADDR_VIRTUAL_ADDRESS :
+                                SK_ADDR_PHYSICAL_ADDRESS));
+                        if (Ret != SK_ADDR_OVERRIDE_SUCCESS) {
+
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                }
+                *pLen = Offset;
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * CsumStat - OID handler function of OID_SKGE_CHKSM_XXX
+ *
+ * Description:
+ *      Retrieves the statistic values of the CSUM module. The CSUM data
+ *      structure must be available in the SK_AC even if the CSUM module
+ *      is not included, because PNMI reads the statistic data from the
+ *      CSUM part of SK_AC directly.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int CsumStat(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        unsigned int    Index;
+        unsigned int    Limit;
+        unsigned int    Offset = 0;
+        SK_U64          StatVal;
+
+
+        /*
+         * Calculate instance if wished
+         */
+        if (Instance != (SK_U32)(-1)) {
+
+                if ((Instance < 1) || (Instance > SKCS_NUM_PROTOCOLS)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+                Index = (unsigned int)Instance - 1;
+                Limit = Index + 1;
+        }
+        else {
+                Index = 0;
+                Limit = SKCS_NUM_PROTOCOLS;
+        }
+
+        /*
+         * Check action
+         */
+        if (Action != SK_PNMI_GET) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_READ_ONLY);
+        }
+
+        /* Check length */
+        if (*pLen < (Limit - Index) * sizeof(SK_U64)) {
+
+                *pLen = (Limit - Index) * sizeof(SK_U64);
+                return (SK_PNMI_ERR_TOO_SHORT);
+        }
+
+        /*
+         * Get value
+         */
+        for (; Index < Limit; Index ++) {
+
+                switch (Id) {
+
+                case OID_SKGE_CHKSM_RX_OK_CTS:
+                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].RxOkCts;
+                        break;
+
+                case OID_SKGE_CHKSM_RX_UNABLE_CTS:
+                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].RxUnableCts;
+                        break;
+
+                case OID_SKGE_CHKSM_RX_ERR_CTS:
+                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].RxErrCts;
+                        break;
+
+                case OID_SKGE_CHKSM_TX_OK_CTS:
+                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].TxOkCts;
+                        break;
+
+                case OID_SKGE_CHKSM_TX_UNABLE_CTS:
+                        StatVal = pAC->Csum.ProtoStats[NetIndex][Index].TxUnableCts;
+                        break;
+
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR010,
+                                SK_PNMI_ERR010MSG);
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                SK_PNMI_STORE_U64(pBuf + Offset, StatVal);
+                Offset += sizeof(SK_U64);
+        }
+
+        /*
+         * Store used buffer space
+         */
+        *pLen = Offset;
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * SensorStat - OID handler function of OID_SKGE_SENSOR_XXX
+ *
+ * Description:
+ *      Retrieves the statistic values of the I2C module, which handles
+ *      the temperature and voltage sensors.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int SensorStat(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        unsigned int    i;
+        unsigned int    Index;
+        unsigned int    Limit;
+        unsigned int    Offset;
+        unsigned int    Len;
+        SK_U32          Val32;
+        SK_U64          Val64;
+
+
+        /*
+         * Calculate instance if wished
+         */
+        if ((Instance != (SK_U32)(-1))) {
+
+                if ((Instance < 1) || (Instance > (SK_U32)pAC->I2c.MaxSens)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+
+                Index = (unsigned int)Instance -1;
+                Limit = (unsigned int)Instance;
+        }
+        else {
+                Index = 0;
+                Limit = (unsigned int) pAC->I2c.MaxSens;
+        }
+
+        /*
+         * Check action
+         */
+        if (Action != SK_PNMI_GET) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_READ_ONLY);
+        }
+
+        /* Check length */
+        switch (Id) {
+
+        case OID_SKGE_SENSOR_VALUE:
+        case OID_SKGE_SENSOR_WAR_THRES_LOW:
+        case OID_SKGE_SENSOR_WAR_THRES_UPP:
+        case OID_SKGE_SENSOR_ERR_THRES_LOW:
+        case OID_SKGE_SENSOR_ERR_THRES_UPP:
+                if (*pLen < (Limit - Index) * sizeof(SK_U32)) {
+
+                        *pLen = (Limit - Index) * sizeof(SK_U32);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        case OID_SKGE_SENSOR_DESCR:
+                for (Offset = 0, i = Index; i < Limit; i ++) {
+
+                        Len = (unsigned int)
+                                SK_STRLEN(pAC->I2c.SenTable[i].SenDesc) + 1;
+                        if (Len >= SK_PNMI_STRINGLEN2) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR011,
+                                        SK_PNMI_ERR011MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                        Offset += Len;
+                }
+                if (*pLen < Offset) {
+
+                        *pLen = Offset;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        case OID_SKGE_SENSOR_INDEX:
+        case OID_SKGE_SENSOR_TYPE:
+        case OID_SKGE_SENSOR_STATUS:
+                if (*pLen < Limit - Index) {
+
+                        *pLen = Limit - Index;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        case OID_SKGE_SENSOR_WAR_CTS:
+        case OID_SKGE_SENSOR_WAR_TIME:
+        case OID_SKGE_SENSOR_ERR_CTS:
+        case OID_SKGE_SENSOR_ERR_TIME:
+                if (*pLen < (Limit - Index) * sizeof(SK_U64)) {
+
+                        *pLen = (Limit - Index) * sizeof(SK_U64);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR012,
+                        SK_PNMI_ERR012MSG);
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_GENERAL);
+
+        }
+
+        /*
+         * Get value
+         */
+        for (Offset = 0; Index < Limit; Index ++) {
+
+                switch (Id) {
+
+                case OID_SKGE_SENSOR_INDEX:
+                        *(pBuf + Offset) = (char)Index;
+                        Offset += sizeof(char);
+                        break;
+
+                case OID_SKGE_SENSOR_DESCR:
+                        Len = SK_STRLEN(pAC->I2c.SenTable[Index].SenDesc);
+                        SK_MEMCPY(pBuf + Offset + 1,
+                                pAC->I2c.SenTable[Index].SenDesc, Len);
+                        *(pBuf + Offset) = (char)Len;
+                        Offset += Len + 1;
+                        break;
+
+                case OID_SKGE_SENSOR_TYPE:
+                        *(pBuf + Offset) =
+                                (char)pAC->I2c.SenTable[Index].SenType;
+                        Offset += sizeof(char);
+                        break;
+
+                case OID_SKGE_SENSOR_VALUE:
+                        Val32 = (SK_U32)pAC->I2c.SenTable[Index].SenValue;
+                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+                        Offset += sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_SENSOR_WAR_THRES_LOW:
+                        Val32 = (SK_U32)pAC->I2c.SenTable[Index].
+                                SenThreWarnLow;
+                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+                        Offset += sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_SENSOR_WAR_THRES_UPP:
+                        Val32 = (SK_U32)pAC->I2c.SenTable[Index].
+                                SenThreWarnHigh;
+                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+                        Offset += sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_SENSOR_ERR_THRES_LOW:
+                        Val32 = (SK_U32)pAC->I2c.SenTable[Index].
+                                SenThreErrLow;
+                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+                        Offset += sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_SENSOR_ERR_THRES_UPP:
+                        Val32 = pAC->I2c.SenTable[Index].SenThreErrHigh;
+                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+                        Offset += sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_SENSOR_STATUS:
+                        *(pBuf + Offset) =
+                                (char)pAC->I2c.SenTable[Index].SenErrFlag;
+                        Offset += sizeof(char);
+                        break;
+
+                case OID_SKGE_SENSOR_WAR_CTS:
+                        Val64 = pAC->I2c.SenTable[Index].SenWarnCts;
+                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
+                        Offset += sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_SENSOR_ERR_CTS:
+                        Val64 = pAC->I2c.SenTable[Index].SenErrCts;
+                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
+                        Offset += sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_SENSOR_WAR_TIME:
+                        Val64 = SK_PNMI_HUNDREDS_SEC(pAC->I2c.SenTable[Index].
+                                SenBegWarnTS);
+                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
+                        Offset += sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_SENSOR_ERR_TIME:
+                        Val64 = SK_PNMI_HUNDREDS_SEC(pAC->I2c.SenTable[Index].
+                                SenBegErrTS);
+                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
+                        Offset += sizeof(SK_U64);
+                        break;
+
+                default:
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
+                                ("SensorStat: Unknown OID should be handled before"));
+
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+        }
+
+        /*
+         * Store used buffer space
+         */
+        *pLen = Offset;
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * Vpd - OID handler function of OID_SKGE_VPD_XXX
+ *
+ * Description:
+ *      Get/preset/set of VPD data. As instance the name of a VPD key
+ *      can be passed. The Instance parameter is a SK_U32 and can be
+ *      used as a string buffer for the VPD key, because their maximum
+ *      length is 4 byte.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int Vpd(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        SK_VPD_STATUS   *pVpdStatus;
+        unsigned int    BufLen;
+        char            Buf[256];
+        char            KeyArr[SK_PNMI_VPD_ENTRIES][SK_PNMI_VPD_KEY_SIZE];
+        char            KeyStr[SK_PNMI_VPD_KEY_SIZE];
+        unsigned int    KeyNo;
+        unsigned int    Offset;
+        unsigned int    Index;
+        unsigned int    FirstIndex;
+        unsigned int    LastIndex;
+        unsigned int    Len;
+        int             Ret;
+        SK_U32          Val32;
+
+        /*
+         * Get array of all currently stored VPD keys
+         */
+        Ret = GetVpdKeyArr(pAC, IoC, &KeyArr[0][0], sizeof(KeyArr), &KeyNo);
+        if (Ret != SK_PNMI_ERR_OK) {
+                *pLen = 0;
+                return (Ret);
+        }
+
+        /*
+         * If instance is not -1, try to find the requested VPD key for
+         * the multiple instance variables. The other OIDs as for example
+         * OID VPD_ACTION are single instance variables and must be
+         * handled separatly.
+         */
+        FirstIndex = 0;
+        LastIndex = KeyNo;
+
+        if ((Instance != (SK_U32)(-1))) {
+
+                if (Id == OID_SKGE_VPD_KEY || Id == OID_SKGE_VPD_VALUE ||
+                        Id == OID_SKGE_VPD_ACCESS) {
+
+                        SK_STRNCPY(KeyStr, (char *)&Instance, 4);
+                        KeyStr[4] = 0;
+
+                        for (Index = 0; Index < KeyNo; Index ++) {
+
+                                if (SK_STRCMP(KeyStr, KeyArr[Index]) == 0) {
+                                        FirstIndex = Index;
+                                        LastIndex = Index+1;
+                                        break;
+                                }
+                        }
+                        if (Index == KeyNo) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_UNKNOWN_INST);
+                        }
+                }
+                else if (Instance != 1) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+        }
+
+        /*
+         * Get value, if a query should be performed
+         */
+        if (Action == SK_PNMI_GET) {
+
+                switch (Id) {
+
+                case OID_SKGE_VPD_FREE_BYTES:
+                        /* Check length of buffer */
+                        if (*pLen < sizeof(SK_U32)) {
+
+                                *pLen = sizeof(SK_U32);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        /* Get number of free bytes */
+                        pVpdStatus = VpdStat(pAC, IoC);
+                        if (pVpdStatus == NULL) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR017,
+                                        SK_PNMI_ERR017MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                        if ((pVpdStatus->vpd_status & VPD_VALID) == 0) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR018,
+                                        SK_PNMI_ERR018MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                        
+                        Val32 = (SK_U32)pVpdStatus->vpd_free_rw;
+                        SK_PNMI_STORE_U32(pBuf, Val32);
+                        *pLen = sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_VPD_ENTRIES_LIST:
+                        /* Check length */
+                        for (Len = 0, Index = 0; Index < KeyNo; Index ++) {
+
+                                Len += SK_STRLEN(KeyArr[Index]) + 1;
+                        }
+                        if (*pLen < Len) {
+
+                                *pLen = Len;
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+
+                        /* Get value */
+                        *(pBuf) = (char)Len - 1;
+                        for (Offset = 1, Index = 0; Index < KeyNo; Index ++) {
+
+                                Len = SK_STRLEN(KeyArr[Index]);
+                                SK_MEMCPY(pBuf + Offset, KeyArr[Index], Len);
+
+                                Offset += Len;
+
+                                if (Index < KeyNo - 1) {
+
+                                        *(pBuf + Offset) = ' ';
+                                        Offset ++;
+                                }
+                        }
+                        *pLen = Offset;
+                        break;
+
+                case OID_SKGE_VPD_ENTRIES_NUMBER:
+                        /* Check length */
+                        if (*pLen < sizeof(SK_U32)) {
+
+                                *pLen = sizeof(SK_U32);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+
+                        Val32 = (SK_U32)KeyNo;
+                        SK_PNMI_STORE_U32(pBuf, Val32);
+                        *pLen = sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_VPD_KEY:
+                        /* Check buffer length, if it is large enough */
+                        for (Len = 0, Index = FirstIndex;
+                                Index < LastIndex; Index ++) {
+
+                                Len += SK_STRLEN(KeyArr[Index]) + 1;
+                        }
+                        if (*pLen < Len) {
+
+                                *pLen = Len;
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+
+                        /*
+                         * Get the key to an intermediate buffer, because
+                         * we have to prepend a length byte.
+                         */
+                        for (Offset = 0, Index = FirstIndex;
+                                Index < LastIndex; Index ++) {
+
+                                Len = SK_STRLEN(KeyArr[Index]);
+
+                                *(pBuf + Offset) = (char)Len;
+                                SK_MEMCPY(pBuf + Offset + 1, KeyArr[Index],
+                                        Len);
+                                Offset += Len + 1;
+                        }
+                        *pLen = Offset;
+                        break;
+
+                case OID_SKGE_VPD_VALUE:
+                        /* Check the buffer length if it is large enough */
+                        for (Offset = 0, Index = FirstIndex;
+                                Index < LastIndex; Index ++) {
+
+                                BufLen = 256;
+                                if (VpdRead(pAC, IoC, KeyArr[Index], Buf,
+                                        (int *)&BufLen) > 0 ||
+                                        BufLen >= SK_PNMI_VPD_DATALEN) {
+
+                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                SK_PNMI_ERR021,
+                                                SK_PNMI_ERR021MSG);
+
+                                        return (SK_PNMI_ERR_GENERAL);
+                                }
+                                Offset += BufLen + 1;
+                        }
+                        if (*pLen < Offset) {
+
+                                *pLen = Offset;
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+
+                        /*
+                         * Get the value to an intermediate buffer, because
+                         * we have to prepend a length byte.
+                         */
+                        for (Offset = 0, Index = FirstIndex;
+                                Index < LastIndex; Index ++) {
+
+                                BufLen = 256;
+                                if (VpdRead(pAC, IoC, KeyArr[Index], Buf,
+                                        (int *)&BufLen) > 0 ||
+                                        BufLen >= SK_PNMI_VPD_DATALEN) {
+
+                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                SK_PNMI_ERR022,
+                                                SK_PNMI_ERR022MSG);
+
+                                        *pLen = 0;
+                                        return (SK_PNMI_ERR_GENERAL);
+                                }
+
+                                *(pBuf + Offset) = (char)BufLen;
+                                SK_MEMCPY(pBuf + Offset + 1, Buf, BufLen);
+                                Offset += BufLen + 1;
+                        }
+                        *pLen = Offset;
+                        break;
+
+                case OID_SKGE_VPD_ACCESS:
+                        if (*pLen < LastIndex - FirstIndex) {
+
+                                *pLen = LastIndex - FirstIndex;
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+
+                        for (Offset = 0, Index = FirstIndex;
+                                Index < LastIndex; Index ++) {
+
+                                if (VpdMayWrite(KeyArr[Index])) {
+
+                                        *(pBuf + Offset) = SK_PNMI_VPD_RW;
+                                }
+                                else {
+                                        *(pBuf + Offset) = SK_PNMI_VPD_RO;
+                                }
+                                Offset ++;
+                        }
+                        *pLen = Offset;
+                        break;
+
+                case OID_SKGE_VPD_ACTION:
+                        Offset = LastIndex - FirstIndex;
+                        if (*pLen < Offset) {
+
+                                *pLen = Offset;
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        SK_MEMSET(pBuf, 0, Offset);
+                        *pLen = Offset;
+                        break;
+
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR023,
+                                SK_PNMI_ERR023MSG);
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+        }
+        else {
+                /* The only OID which can be set is VPD_ACTION */
+                if (Id != OID_SKGE_VPD_ACTION) {
+
+                        if (Id == OID_SKGE_VPD_FREE_BYTES ||
+                                Id == OID_SKGE_VPD_ENTRIES_LIST ||
+                                Id == OID_SKGE_VPD_ENTRIES_NUMBER ||
+                                Id == OID_SKGE_VPD_KEY ||
+                                Id == OID_SKGE_VPD_VALUE ||
+                                Id == OID_SKGE_VPD_ACCESS) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_READ_ONLY);
+                        }
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR024,
+                                SK_PNMI_ERR024MSG);
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                /*
+                 * From this point we handle VPD_ACTION. Check the buffer
+                 * length. It should at least have the size of one byte.
+                 */
+                if (*pLen < 1) {
+
+                        *pLen = 1;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+
+                /*
+                 * The first byte contains the VPD action type we should
+                 * perform.
+                 */
+                switch (*pBuf) {
+
+                case SK_PNMI_VPD_IGNORE:
+                        /* Nothing to do */
+                        break;
+
+                case SK_PNMI_VPD_CREATE:
+                        /*
+                         * We have to create a new VPD entry or we modify
+                         * an existing one. Check first the buffer length.
+                         */
+                        if (*pLen < 4) {
+
+                                *pLen = 4;
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        KeyStr[0] = pBuf[1];
+                        KeyStr[1] = pBuf[2];
+                        KeyStr[2] = 0;
+
+                        /*
+                         * Is the entry writable or does it belong to the
+                         * read-only area?
+                         */
+                        if (!VpdMayWrite(KeyStr)) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+
+                        Offset = (int)pBuf[3] & 0xFF;
+
+                        SK_MEMCPY(Buf, pBuf + 4, Offset);
+                        Buf[Offset] = 0;
+
+                        /* A preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+
+                                return (SK_PNMI_ERR_OK);
+                        }
+
+                        /* Write the new entry or modify an existing one */
+                        Ret = VpdWrite(pAC, IoC, KeyStr, Buf);
+                        if (Ret == SK_PNMI_VPD_NOWRITE ) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+                        else if (Ret != SK_PNMI_VPD_OK) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR025,
+                                        SK_PNMI_ERR025MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+
+                        /*
+                         * Perform an update of the VPD data. This is
+                         * not mandantory, but just to be sure.
+                         */
+                        Ret = VpdUpdate(pAC, IoC);
+                        if (Ret != SK_PNMI_VPD_OK) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR026,
+                                        SK_PNMI_ERR026MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                        break;
+
+                case SK_PNMI_VPD_DELETE:
+                        /* Check if the buffer size is plausible */
+                        if (*pLen < 3) {
+
+                                *pLen = 3;
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        if (*pLen > 3) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+                        KeyStr[0] = pBuf[1];
+                        KeyStr[1] = pBuf[2];
+                        KeyStr[2] = 0;
+
+                        /* Find the passed key in the array */
+                        for (Index = 0; Index < KeyNo; Index ++) {
+
+                                if (SK_STRCMP(KeyStr, KeyArr[Index]) == 0) {
+
+                                        break;
+                                }
+                        }
+                        /*
+                         * If we cannot find the key it is wrong, so we
+                         * return an appropriate error value.
+                         */
+                        if (Index == KeyNo) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+
+                        if (Action == SK_PNMI_PRESET) {
+
+                                return (SK_PNMI_ERR_OK);
+                        }
+
+                        /* Ok, you wanted it and you will get it */
+                        Ret = VpdDelete(pAC, IoC, KeyStr);
+                        if (Ret != SK_PNMI_VPD_OK) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR027,
+                                        SK_PNMI_ERR027MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+
+                        /*
+                         * Perform an update of the VPD data. This is
+                         * not mandantory, but just to be sure.
+                         */
+                        Ret = VpdUpdate(pAC, IoC);
+                        if (Ret != SK_PNMI_VPD_OK) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR028,
+                                        SK_PNMI_ERR028MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                        break;
+
+                default:
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_BAD_VALUE);
+                }
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * General - OID handler function of various single instance OIDs
+ *
+ * Description:
+ *      The code is simple. No description necessary.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int General(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        int             Ret;
+        unsigned int    Index;
+        unsigned int    Len;
+        unsigned int    Offset;
+        unsigned int    Val;
+        SK_U8           Val8;
+        SK_U16          Val16;
+        SK_U32          Val32;
+        SK_U64          Val64;
+        SK_U64          Val64RxHwErrs = 0;
+        SK_U64          Val64TxHwErrs = 0;
+        SK_BOOL         Is64BitReq = SK_FALSE;
+        char            Buf[256];
+        int                     MacType;
+
+        /*
+         * Check instance. We only handle single instance variables.
+         */
+        if (Instance != (SK_U32)(-1) && Instance != 1) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_UNKNOWN_INST);
+        }
+
+        /*
+         * Check action. We only allow get requests.
+         */
+        if (Action != SK_PNMI_GET) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_READ_ONLY);
+        }
+        
+        MacType = pAC->GIni.GIMacType;
+        
+        /*
+         * Check length for the various supported OIDs
+         */
+        switch (Id) {
+
+        case OID_GEN_XMIT_ERROR:
+        case OID_GEN_RCV_ERROR:
+        case OID_GEN_RCV_NO_BUFFER:
+#ifndef SK_NDIS_64BIT_CTR
+                if (*pLen < sizeof(SK_U32)) {
+                        *pLen = sizeof(SK_U32);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+
+#else /* SK_NDIS_64BIT_CTR */
+
+                /*
+                 * for compatibility, at least 32bit are required for oid
+                 */
+                if (*pLen < sizeof(SK_U32)) {
+                        /*
+                        * but indicate handling for 64bit values,
+                        * if insufficient space is provided
+                        */
+                        *pLen = sizeof(SK_U64);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+
+                Is64BitReq = (*pLen < sizeof(SK_U64)) ? SK_FALSE : SK_TRUE;
+#endif /* SK_NDIS_64BIT_CTR */
+                break;
+
+        case OID_SKGE_PORT_NUMBER:
+        case OID_SKGE_DEVICE_TYPE:
+        case OID_SKGE_RESULT:
+        case OID_SKGE_RLMT_MONITOR_NUMBER:
+        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);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        case OID_SKGE_CHIPSET:
+                if (*pLen < sizeof(SK_U16)) {
+
+                        *pLen = sizeof(SK_U16);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        case OID_SKGE_BUS_TYPE:
+        case OID_SKGE_BUS_SPEED:
+        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);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        case OID_SKGE_TX_SW_QUEUE_LEN:
+        case OID_SKGE_TX_SW_QUEUE_MAX:
+        case OID_SKGE_TX_RETRY:
+        case OID_SKGE_RX_INTR_CTS:
+        case OID_SKGE_TX_INTR_CTS:
+        case OID_SKGE_RX_NO_BUF_CTS:
+        case OID_SKGE_TX_NO_BUF_CTS:
+        case OID_SKGE_TX_USED_DESCR_NO:
+        case OID_SKGE_RX_DELIVERED_CTS:
+        case OID_SKGE_RX_OCTETS_DELIV_CTS:
+        case OID_SKGE_RX_HW_ERROR_CTS:
+        case OID_SKGE_TX_HW_ERROR_CTS:
+        case OID_SKGE_IN_ERRORS_CTS:
+        case OID_SKGE_OUT_ERROR_CTS:
+        case OID_SKGE_ERR_RECOVERY_CTS:
+        case OID_SKGE_SYSUPTIME:
+                if (*pLen < sizeof(SK_U64)) {
+
+                        *pLen = sizeof(SK_U64);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        default:
+                /* Checked later */
+                break;
+        }
+
+        /* Update statistic */
+        if (Id == OID_SKGE_RX_HW_ERROR_CTS ||
+                Id == OID_SKGE_TX_HW_ERROR_CTS ||
+                Id == OID_SKGE_IN_ERRORS_CTS ||
+                Id == OID_SKGE_OUT_ERROR_CTS ||
+                Id == OID_GEN_XMIT_ERROR ||
+                Id == OID_GEN_RCV_ERROR) {
+
+                /* Force the XMAC to update its statistic counters and
+                 * Increment semaphore to indicate that an update was
+                 * already done.
+                 */
+                Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
+                if (Ret != SK_PNMI_ERR_OK) {
+
+                        *pLen = 0;
+                        return (Ret);
+                }
+                pAC->Pnmi.MacUpdatedFlag ++;
+
+                /*
+                 * Some OIDs consist of multiple hardware counters. Those
+                 * values which are contained in all of them will be added
+                 * now.
+                 */
+                switch (Id) {
+
+                case OID_SKGE_RX_HW_ERROR_CTS:
+                case OID_SKGE_IN_ERRORS_CTS:
+                case OID_GEN_RCV_ERROR:
+                        Val64RxHwErrs =
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_MISSED, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_FRAMING, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_OVERFLOW, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_JABBER, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_CARRIER, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_IRLENGTH, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_SYMBOL, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_SHORTS, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_RUNT, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_TOO_LONG, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_FCS, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_CEXT, NetIndex);
+                break;
+
+                case OID_SKGE_TX_HW_ERROR_CTS:
+                case OID_SKGE_OUT_ERROR_CTS:
+                case OID_GEN_XMIT_ERROR:
+                        Val64TxHwErrs =
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_EXCESS_COL, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_LATE_COL, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_UNDERRUN, NetIndex) +
+                                GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_CARRIER, NetIndex);
+                        break;
+                }
+        }
+
+        /*
+         * Retrieve value
+         */
+        switch (Id) {
+
+        case OID_SKGE_SUPPORTED_LIST:
+                Len = ID_TABLE_SIZE * sizeof(SK_U32);
+                if (*pLen < Len) {
+
+                        *pLen = Len;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                for (Offset = 0, Index = 0; Offset < Len;
+                        Offset += sizeof(SK_U32), Index ++) {
+
+                        Val32 = (SK_U32)IdTable[Index].Id;
+                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+                }
+                *pLen = Len;
+                break;
+
+        case OID_SKGE_BOARDLEVEL:
+                Val32 = (SK_U32)pAC->GIni.GILevel;
+                SK_PNMI_STORE_U32(pBuf, Val32);
+                *pLen = sizeof(SK_U32);
+                break;
+
+        case OID_SKGE_PORT_NUMBER:
+                Val32 = (SK_U32)pAC->GIni.GIMacsFound;
+                SK_PNMI_STORE_U32(pBuf, Val32);
+                *pLen = sizeof(SK_U32);
+                break;
+
+        case OID_SKGE_DEVICE_TYPE:
+                Val32 = (SK_U32)pAC->Pnmi.DeviceType;
+                SK_PNMI_STORE_U32(pBuf, Val32);
+                *pLen = sizeof(SK_U32);
+                break;
+
+        case OID_SKGE_DRIVER_DESCR:
+                if (pAC->Pnmi.pDriverDescription == NULL) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR007,
+                                SK_PNMI_ERR007MSG);
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                Len = SK_STRLEN(pAC->Pnmi.pDriverDescription) + 1;
+                if (Len > SK_PNMI_STRINGLEN1) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR029,
+                                SK_PNMI_ERR029MSG);
+
+                        *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.pDriverDescription, Len - 1);
+                *pLen = Len;
+                break;
+
+        case OID_SKGE_DRIVER_VERSION:
+                if (pAC->Pnmi.pDriverVersion == NULL) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
+                                SK_PNMI_ERR030MSG);
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                Len = SK_STRLEN(pAC->Pnmi.pDriverVersion) + 1;
+                if (Len > SK_PNMI_STRINGLEN1) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
+                                SK_PNMI_ERR031MSG);
+
+                        *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.pDriverVersion, Len - 1);
+                *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
+                 * query may move to the initialisation routine. But
+                 * the VPD data is cached and therefore a call here
+                 * will not make much difference.
+                 */
+                Len = 256;
+                if (VpdRead(pAC, IoC, VPD_NAME, Buf, (int *)&Len) > 0) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR032,
+                                SK_PNMI_ERR032MSG);
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+                Len ++;
+                if (Len > SK_PNMI_STRINGLEN1) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR033,
+                                SK_PNMI_ERR033MSG);
+
+                        *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, Buf, Len - 1);
+                *pLen = Len;
+                break;
+
+        case OID_SKGE_HW_VERSION:
+                /* Oh, I love to do some string manipulation */
+                if (*pLen < 5) {
+
+                        *pLen = 5;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                Val8 = (SK_U8)pAC->GIni.GIPciHwRev;
+                pBuf[0] = 4;
+                pBuf[1] = 'v';
+                pBuf[2] = (char)(0x30 | ((Val8 >> 4) & 0x0F));
+                pBuf[3] = '.';
+                pBuf[4] = (char)(0x30 | (Val8 & 0x0F));
+                *pLen = 5;
+                break;
+
+        case OID_SKGE_CHIPSET:
+                Val16 = pAC->Pnmi.Chipset;
+                SK_PNMI_STORE_U16(pBuf, Val16);
+                *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;
+                *pLen = sizeof(char);
+                break;
+
+        case OID_SKGE_BUS_SPEED:
+                *pBuf = pAC->Pnmi.PciBusSpeed;
+                *pLen = sizeof(char);
+                break;
+
+        case OID_SKGE_BUS_WIDTH:
+                *pBuf = pAC->Pnmi.PciBusWidth;
+                *pLen = sizeof(char);
+                break;
+
+        case OID_SKGE_RESULT:
+                Val32 = pAC->Pnmi.TestResult;
+                SK_PNMI_STORE_U32(pBuf, Val32);
+                *pLen = sizeof(SK_U32);
+                break;
+
+        case OID_SKGE_SENSOR_NUMBER:
+                *pBuf = (char)pAC->I2c.MaxSens;
+                *pLen = sizeof(char);
+                break;
+
+        case OID_SKGE_CHKSM_NUMBER:
+                *pBuf = SKCS_NUM_PROTOCOLS;
+                *pLen = sizeof(char);
+                break;
+
+        case OID_SKGE_TRAP_NUMBER:
+                GetTrapQueueLen(pAC, &Len, &Val);
+                Val32 = (SK_U32)Val;
+                SK_PNMI_STORE_U32(pBuf, Val32);
+                *pLen = sizeof(SK_U32);
+                break;
+
+        case OID_SKGE_TRAP:
+                GetTrapQueueLen(pAC, &Len, &Val);
+                if (*pLen < Len) {
+
+                        *pLen = Len;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                CopyTrapQueue(pAC, pBuf);
+                *pLen = Len;
+                break;
+
+        case OID_SKGE_RLMT_MONITOR_NUMBER:
+/* XXX Not yet implemented by RLMT therefore we return zero elements */
+                Val32 = 0;
+                SK_PNMI_STORE_U32(pBuf, Val32);
+                *pLen = sizeof(SK_U32);
+                break;
+
+        case OID_SKGE_TX_SW_QUEUE_LEN:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxSwQueueLen;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].TxSwQueueLen +
+                                        pAC->Pnmi.BufPort[1].TxSwQueueLen;
+                        }                       
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].TxSwQueueLen;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].TxSwQueueLen +
+                                        pAC->Pnmi.Port[1].TxSwQueueLen;
+                        }                       
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+
+        case OID_SKGE_TX_SW_QUEUE_MAX:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxSwQueueMax;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].TxSwQueueMax +
+                                        pAC->Pnmi.BufPort[1].TxSwQueueMax;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].TxSwQueueMax;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].TxSwQueueMax +
+                                        pAC->Pnmi.Port[1].TxSwQueueMax;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_TX_RETRY:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxRetryCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].TxRetryCts +
+                                        pAC->Pnmi.BufPort[1].TxRetryCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].TxRetryCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].TxRetryCts +
+                                        pAC->Pnmi.Port[1].TxRetryCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_RX_INTR_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].RxIntrCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].RxIntrCts +
+                                        pAC->Pnmi.BufPort[1].RxIntrCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].RxIntrCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].RxIntrCts +
+                                        pAC->Pnmi.Port[1].RxIntrCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_TX_INTR_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxIntrCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].TxIntrCts +
+                                        pAC->Pnmi.BufPort[1].TxIntrCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].TxIntrCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].TxIntrCts +
+                                        pAC->Pnmi.Port[1].TxIntrCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_RX_NO_BUF_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].RxNoBufCts +
+                                        pAC->Pnmi.BufPort[1].RxNoBufCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].RxNoBufCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].RxNoBufCts +
+                                        pAC->Pnmi.Port[1].RxNoBufCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_TX_NO_BUF_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].TxNoBufCts +
+                                        pAC->Pnmi.BufPort[1].TxNoBufCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].TxNoBufCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].TxNoBufCts +
+                                        pAC->Pnmi.Port[1].TxNoBufCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_TX_USED_DESCR_NO:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].TxUsedDescrNo;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].TxUsedDescrNo +
+                                        pAC->Pnmi.BufPort[1].TxUsedDescrNo;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].TxUsedDescrNo;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].TxUsedDescrNo +
+                                        pAC->Pnmi.Port[1].TxUsedDescrNo;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_RX_DELIVERED_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].RxDeliveredCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].RxDeliveredCts +
+                                        pAC->Pnmi.BufPort[1].RxDeliveredCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].RxDeliveredCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].RxDeliveredCts +
+                                        pAC->Pnmi.Port[1].RxDeliveredCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_RX_OCTETS_DELIV_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].RxOctetsDeliveredCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].RxOctetsDeliveredCts +
+                                        pAC->Pnmi.BufPort[1].RxOctetsDeliveredCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].RxOctetsDeliveredCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].RxOctetsDeliveredCts +
+                                        pAC->Pnmi.Port[1].RxOctetsDeliveredCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_RX_HW_ERROR_CTS:
+                SK_PNMI_STORE_U64(pBuf, Val64RxHwErrs);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_TX_HW_ERROR_CTS:
+                SK_PNMI_STORE_U64(pBuf, Val64TxHwErrs);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_IN_ERRORS_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = Val64RxHwErrs + pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = Val64RxHwErrs +
+                                        pAC->Pnmi.BufPort[0].RxNoBufCts +
+                                        pAC->Pnmi.BufPort[1].RxNoBufCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = Val64RxHwErrs + pAC->Pnmi.Port[NetIndex].RxNoBufCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = Val64RxHwErrs +
+                                        pAC->Pnmi.Port[0].RxNoBufCts +
+                                        pAC->Pnmi.Port[1].RxNoBufCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_OUT_ERROR_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = Val64TxHwErrs + pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = Val64TxHwErrs +
+                                        pAC->Pnmi.BufPort[0].TxNoBufCts +
+                                        pAC->Pnmi.BufPort[1].TxNoBufCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = Val64TxHwErrs + pAC->Pnmi.Port[NetIndex].TxNoBufCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = Val64TxHwErrs +
+                                        pAC->Pnmi.Port[0].TxNoBufCts +
+                                        pAC->Pnmi.Port[1].TxNoBufCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_ERR_RECOVERY_CTS:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.BufPort[NetIndex].ErrRecoveryCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.BufPort[0].ErrRecoveryCts +
+                                        pAC->Pnmi.BufPort[1].ErrRecoveryCts;
+                        }
+                }
+                else {
+                        /* Dual net mode */
+                        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                                Val64 = pAC->Pnmi.Port[NetIndex].ErrRecoveryCts;
+                        }
+                        /* Single net mode */
+                        else {
+                                Val64 = pAC->Pnmi.Port[0].ErrRecoveryCts +
+                                        pAC->Pnmi.Port[1].ErrRecoveryCts;
+                        }
+                }
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_SYSUPTIME:
+                Val64 = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
+                Val64 -= pAC->Pnmi.StartUpTime;
+                SK_PNMI_STORE_U64(pBuf, Val64);
+                *pLen = sizeof(SK_U64);
+                break;
+
+        case OID_SKGE_MDB_VERSION:
+                Val32 = SK_PNMI_MDB_VERSION;
+                SK_PNMI_STORE_U32(pBuf, Val32);
+                *pLen = sizeof(SK_U32);
+                break;
+
+        case OID_GEN_RCV_ERROR:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        Val64 = Val64RxHwErrs + pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
+                }
+                else {
+                        Val64 = Val64RxHwErrs + pAC->Pnmi.Port[NetIndex].RxNoBufCts;
+                }
+
+                /*
+                 * by default 32bit values are evaluated
+                 */
+                if (!Is64BitReq) {
+                        Val32 = (SK_U32)Val64;
+                        SK_PNMI_STORE_U32(pBuf, Val32);
+                        *pLen = sizeof(SK_U32);
+                }
+                else {
+                        SK_PNMI_STORE_U64(pBuf, Val64);
+                        *pLen = sizeof(SK_U64);
+                }
+                break;
+
+        case OID_GEN_XMIT_ERROR:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        Val64 = Val64TxHwErrs + pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
+                }
+                else {
+                        Val64 = Val64TxHwErrs + pAC->Pnmi.Port[NetIndex].TxNoBufCts;
+                }
+
+                /*
+                 * by default 32bit values are evaluated
+                 */
+                if (!Is64BitReq) {
+                        Val32 = (SK_U32)Val64;
+                        SK_PNMI_STORE_U32(pBuf, Val32);
+                        *pLen = sizeof(SK_U32);
+                }
+                else {
+                        SK_PNMI_STORE_U64(pBuf, Val64);
+                        *pLen = sizeof(SK_U64);
+                }
+                break;
+
+        case OID_GEN_RCV_NO_BUFFER:
+                /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+                if (MacType == SK_MAC_XMAC) {
+                        Val64 = pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
+                }
+                else {
+                        Val64 = pAC->Pnmi.Port[NetIndex].RxNoBufCts;
+                }
+
+                /*
+                 * by default 32bit values are evaluated
+                 */
+                if (!Is64BitReq) {
+                        Val32 = (SK_U32)Val64;
+                        SK_PNMI_STORE_U32(pBuf, Val32);
+                        *pLen = sizeof(SK_U32);
+                }
+                else {
+                        SK_PNMI_STORE_U64(pBuf, Val64);
+                        *pLen = sizeof(SK_U64);
+                }
+                break;
+
+        case OID_GEN_TRANSMIT_QUEUE_LENGTH:
+                Val32 = (SK_U32)pAC->Pnmi.Port[NetIndex].TxSwQueueLen;
+                SK_PNMI_STORE_U32(pBuf, Val32);
+                *pLen = sizeof(SK_U32);
+                break;
+
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR034,
+                        SK_PNMI_ERR034MSG);
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_GENERAL);
+        }
+
+        if (Id == OID_SKGE_RX_HW_ERROR_CTS ||
+                Id == OID_SKGE_TX_HW_ERROR_CTS ||
+                Id == OID_SKGE_IN_ERRORS_CTS ||
+                Id == OID_SKGE_OUT_ERROR_CTS ||
+                Id == OID_GEN_XMIT_ERROR ||
+                Id == OID_GEN_RCV_ERROR) {
+
+                pAC->Pnmi.MacUpdatedFlag --;
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * Rlmt - OID handler function of OID_SKGE_RLMT_XXX single instance.
+ *
+ * Description:
+ *      Get/Presets/Sets the RLMT OIDs.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int Rlmt(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        int             Ret;
+        unsigned int    PhysPortIndex;
+        unsigned int    PhysPortMax;
+        SK_EVPARA       EventParam;
+        SK_U32          Val32;
+        SK_U64          Val64;
+
+
+        /*
+         * Check instance. Only single instance OIDs are allowed here.
+         */
+        if (Instance != (SK_U32)(-1) && Instance != 1) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_UNKNOWN_INST);
+        }
+
+        /*
+         * Perform the requested action.
+         */
+        if (Action == SK_PNMI_GET) {
+
+                /*
+                 * Check if the buffer length is large enough.
+                 */
+
+                switch (Id) {
+
+                case OID_SKGE_RLMT_MODE:
+                case OID_SKGE_RLMT_PORT_ACTIVE:
+                case OID_SKGE_RLMT_PORT_PREFERRED:
+                        if (*pLen < sizeof(SK_U8)) {
+
+                                *pLen = sizeof(SK_U8);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        break;
+
+                case OID_SKGE_RLMT_PORT_NUMBER:
+                        if (*pLen < sizeof(SK_U32)) {
+
+                                *pLen = sizeof(SK_U32);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        break;
+
+                case OID_SKGE_RLMT_CHANGE_CTS:
+                case OID_SKGE_RLMT_CHANGE_TIME:
+                case OID_SKGE_RLMT_CHANGE_ESTIM:
+                case OID_SKGE_RLMT_CHANGE_THRES:
+                        if (*pLen < sizeof(SK_U64)) {
+
+                                *pLen = sizeof(SK_U64);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        break;
+
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR035,
+                                SK_PNMI_ERR035MSG);
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                /*
+                 * Update RLMT statistic and increment semaphores to indicate
+                 * that an update was already done. Maybe RLMT will hold its
+                 * statistic always up to date some time. Then we can
+                 * remove this type of call.
+                 */
+                if ((Ret = RlmtUpdate(pAC, IoC, NetIndex)) != SK_PNMI_ERR_OK) {
+
+                        *pLen = 0;
+                        return (Ret);
+                }
+                pAC->Pnmi.RlmtUpdatedFlag ++;
+
+                /*
+                 * Retrieve Value
+                */
+                switch (Id) {
+
+                case OID_SKGE_RLMT_MODE:
+                        *pBuf = (char)pAC->Rlmt.Net[0].RlmtMode;
+                        *pLen = sizeof(char);
+                        break;
+
+                case OID_SKGE_RLMT_PORT_NUMBER:
+                        Val32 = (SK_U32)pAC->GIni.GIMacsFound;
+                        SK_PNMI_STORE_U32(pBuf, Val32);
+                        *pLen = sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_RLMT_PORT_ACTIVE:
+                        *pBuf = 0;
+                        /*
+                         * If multiple ports may become active this OID
+                         * doesn't make sense any more. A new variable in
+                         * the port structure should be created. However,
+                         * for this variable the first active port is
+                         * returned.
+                         */
+                        PhysPortMax = pAC->GIni.GIMacsFound;
+
+                        for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
+                                PhysPortIndex ++) {
+
+                                if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+
+                                        *pBuf = (char)SK_PNMI_PORT_PHYS2LOG(PhysPortIndex);
+                                        break;
+                                }
+                        }
+                        *pLen = sizeof(char);
+                        break;
+
+                case OID_SKGE_RLMT_PORT_PREFERRED:
+                        *pBuf = (char)SK_PNMI_PORT_PHYS2LOG(pAC->Rlmt.Net[NetIndex].Preference);
+                        *pLen = sizeof(char);
+                        break;
+
+                case OID_SKGE_RLMT_CHANGE_CTS:
+                        Val64 = pAC->Pnmi.RlmtChangeCts;
+                        SK_PNMI_STORE_U64(pBuf, Val64);
+                        *pLen = sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_RLMT_CHANGE_TIME:
+                        Val64 = pAC->Pnmi.RlmtChangeTime;
+                        SK_PNMI_STORE_U64(pBuf, Val64);
+                        *pLen = sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_RLMT_CHANGE_ESTIM:
+                        Val64 = pAC->Pnmi.RlmtChangeEstimate.Estimate;
+                        SK_PNMI_STORE_U64(pBuf, Val64);
+                        *pLen = sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_RLMT_CHANGE_THRES:
+                        Val64 = pAC->Pnmi.RlmtChangeThreshold;
+                        SK_PNMI_STORE_U64(pBuf, Val64);
+                        *pLen = sizeof(SK_U64);
+                        break;
+
+                default:
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
+                                ("Rlmt: Unknown OID should be handled before"));
+
+                        pAC->Pnmi.RlmtUpdatedFlag --;
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                pAC->Pnmi.RlmtUpdatedFlag --;
+        }
+        else {
+                /* Perform a preset or set */
+                switch (Id) {
+
+                case OID_SKGE_RLMT_MODE:
+                        /* Check if the buffer length is plausible */
+                        if (*pLen < sizeof(char)) {
+
+                                *pLen = sizeof(char);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        /* Check if the value range is correct */
+                        if (*pLen != sizeof(char) ||
+                                (*pBuf & SK_PNMI_RLMT_MODE_CHK_LINK) == 0 ||
+                                *(SK_U8 *)pBuf > 15) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+                        /* The preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_OK);
+                        }
+                        /* Send an event to RLMT to change the mode */
+                        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+                        EventParam.Para32[0] |= (SK_U32)(*pBuf);
+                        EventParam.Para32[1] = 0;
+                        if (SkRlmtEvent(pAC, IoC, SK_RLMT_MODE_CHANGE,
+                                EventParam) > 0) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR037,
+                                        SK_PNMI_ERR037MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                        break;
+
+                case OID_SKGE_RLMT_PORT_PREFERRED:
+                        /* Check if the buffer length is plausible */
+                        if (*pLen < sizeof(char)) {
+
+                                *pLen = sizeof(char);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        /* Check if the value range is correct */
+                        if (*pLen != sizeof(char) || *(SK_U8 *)pBuf >
+                                (SK_U8)pAC->GIni.GIMacsFound) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+                        /* The preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_OK);
+                        }
+
+                        /*
+                         * Send an event to RLMT change the preferred port.
+                         * A param of -1 means automatic mode. RLMT will
+                         * make the decision which is the preferred port.
+                         */
+                        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+                        EventParam.Para32[0] = (SK_U32)(*pBuf) - 1;
+                        EventParam.Para32[1] = NetIndex;
+                        if (SkRlmtEvent(pAC, IoC, SK_RLMT_PREFPORT_CHANGE,
+                                EventParam) > 0) {
+
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR038,
+                                        SK_PNMI_ERR038MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                        break;
+
+                case OID_SKGE_RLMT_CHANGE_THRES:
+                        /* Check if the buffer length is plausible */
+                        if (*pLen < sizeof(SK_U64)) {
+
+                                *pLen = sizeof(SK_U64);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        /*
+                         * There are not many restrictions to the
+                         * value range.
+                         */
+                        if (*pLen != sizeof(SK_U64)) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+                        /* A preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_OK);
+                        }
+                        /*
+                         * Store the new threshold, which will be taken
+                         * on the next timer event.
+                         */
+                        SK_PNMI_READ_U64(pBuf, Val64);
+                        pAC->Pnmi.RlmtChangeThreshold = Val64;
+                        break;
+
+                default:
+                        /* The other OIDs are not be able for set */
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_READ_ONLY);
+                }
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * RlmtStat - OID handler function of OID_SKGE_RLMT_XXX multiple instance.
+ *
+ * Description:
+ *      Performs get requests on multiple instance variables.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int RlmtStat(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        unsigned int    PhysPortMax;
+        unsigned int    PhysPortIndex;
+        unsigned int    Limit;
+        unsigned int    Offset;
+        int             Ret;
+        SK_U32          Val32;
+        SK_U64          Val64;
+
+        /*
+         * Calculate the port indexes from the instance.
+         */
+        PhysPortMax = pAC->GIni.GIMacsFound;
+
+        if ((Instance != (SK_U32)(-1))) {
+                /* Check instance range */
+                if ((Instance < 1) || (Instance > PhysPortMax)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+
+                /* Single net mode */
+                PhysPortIndex = Instance - 1;
+
+                /* Dual net mode */
+                if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                        PhysPortIndex = NetIndex;
+                }
+
+                /* Both net modes */
+                Limit = PhysPortIndex + 1;
+        }
+        else {
+                /* Single net mode */
+                PhysPortIndex = 0;
+                Limit = PhysPortMax;
+
+                /* Dual net mode */
+                if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                        PhysPortIndex = NetIndex;
+                        Limit = PhysPortIndex + 1;
+                }
+        }
+
+        /*
+         * Currently only get requests are allowed.
+         */
+        if (Action != SK_PNMI_GET) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_READ_ONLY);
+        }
+
+        /*
+         * Check if the buffer length is large enough.
+         */
+        switch (Id) {
+
+        case OID_SKGE_RLMT_PORT_INDEX:
+        case OID_SKGE_RLMT_STATUS:
+                if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U32)) {
+
+                        *pLen = (Limit - PhysPortIndex) * sizeof(SK_U32);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        case OID_SKGE_RLMT_TX_HELLO_CTS:
+        case OID_SKGE_RLMT_RX_HELLO_CTS:
+        case OID_SKGE_RLMT_TX_SP_REQ_CTS:
+        case OID_SKGE_RLMT_RX_SP_CTS:
+                if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U64)) {
+
+                        *pLen = (Limit - PhysPortIndex) * sizeof(SK_U64);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR039,
+                        SK_PNMI_ERR039MSG);
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_GENERAL);
+
+        }
+
+        /*
+         * Update statistic and increment semaphores to indicate that
+         * an update was already done.
+         */
+        if ((Ret = RlmtUpdate(pAC, IoC, NetIndex)) != SK_PNMI_ERR_OK) {
+
+                *pLen = 0;
+                return (Ret);
+        }
+        pAC->Pnmi.RlmtUpdatedFlag ++;
+
+        /*
+         * Get value
+         */
+        Offset = 0;
+        for (; PhysPortIndex < Limit; PhysPortIndex ++) {
+
+                switch (Id) {
+
+                case OID_SKGE_RLMT_PORT_INDEX:
+                        Val32 = PhysPortIndex;
+                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+                        Offset += sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_RLMT_STATUS:
+                        if (pAC->Rlmt.Port[PhysPortIndex].PortState ==
+                                SK_RLMT_PS_INIT ||
+                                pAC->Rlmt.Port[PhysPortIndex].PortState ==
+                                SK_RLMT_PS_DOWN) {
+
+                                Val32 = SK_PNMI_RLMT_STATUS_ERROR;
+                        }
+                        else if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+
+                                Val32 = SK_PNMI_RLMT_STATUS_ACTIVE;
+                        }
+                        else {
+                                Val32 = SK_PNMI_RLMT_STATUS_STANDBY;
+                        }
+                        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+                        Offset += sizeof(SK_U32);
+                        break;
+
+                case OID_SKGE_RLMT_TX_HELLO_CTS:
+                        Val64 = pAC->Rlmt.Port[PhysPortIndex].TxHelloCts;
+                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
+                        Offset += sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_RLMT_RX_HELLO_CTS:
+                        Val64 = pAC->Rlmt.Port[PhysPortIndex].RxHelloCts;
+                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
+                        Offset += sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_RLMT_TX_SP_REQ_CTS:
+                        Val64 = pAC->Rlmt.Port[PhysPortIndex].TxSpHelloReqCts;
+                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
+                        Offset += sizeof(SK_U64);
+                        break;
+
+                case OID_SKGE_RLMT_RX_SP_CTS:
+                        Val64 = pAC->Rlmt.Port[PhysPortIndex].RxSpHelloCts;
+                        SK_PNMI_STORE_U64(pBuf + Offset, Val64);
+                        Offset += sizeof(SK_U64);
+                        break;
+
+                default:
+                        SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
+                                ("RlmtStat: Unknown OID should be errored before"));
+
+                        pAC->Pnmi.RlmtUpdatedFlag --;
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+        }
+        *pLen = Offset;
+
+        pAC->Pnmi.RlmtUpdatedFlag --;
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * MacPrivateConf - OID handler function of OIDs concerning the configuration
+ *
+ * Description:
+ *      Get/Presets/Sets the OIDs concerning the configuration.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int MacPrivateConf(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        unsigned int    PhysPortMax;
+        unsigned int    PhysPortIndex;
+        unsigned int    LogPortMax;
+        unsigned int    LogPortIndex;
+        unsigned int    Limit;
+        unsigned int    Offset;
+        char            Val8;
+        char            *pBufPtr;
+        int                     Ret;
+        SK_EVPARA       EventParam;
+        SK_U32          Val32;
+
+        /*
+         * Calculate instance if wished. MAC index 0 is the virtual MAC.
+         */
+        PhysPortMax = pAC->GIni.GIMacsFound;
+        LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
+
+        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
+                LogPortMax--;
+        }
+
+        if ((Instance != (SK_U32)(-1))) { /* Only one specific instance is queried */
+                /* Check instance range */
+                if ((Instance < 1) || (Instance > LogPortMax)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+                LogPortIndex = SK_PNMI_PORT_INST2LOG(Instance);
+                Limit = LogPortIndex + 1;
+        }
+
+        else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
+
+                LogPortIndex = 0;
+                Limit = LogPortMax;
+        }
+
+        /*
+         * Perform action
+         */
+        if (Action == SK_PNMI_GET) {
+
+                /* Check length */
+                switch (Id) {
+
+                case OID_SKGE_PMD:
+                case OID_SKGE_CONNECTOR:
+                case OID_SKGE_LINK_CAP:
+                case OID_SKGE_LINK_MODE:
+                case OID_SKGE_LINK_MODE_STATUS:
+                case OID_SKGE_LINK_STATUS:
+                case OID_SKGE_FLOWCTRL_CAP:
+                case OID_SKGE_FLOWCTRL_MODE:
+                case OID_SKGE_FLOWCTRL_STATUS:
+                case OID_SKGE_PHY_OPERATION_CAP:
+                case OID_SKGE_PHY_OPERATION_MODE:
+                case OID_SKGE_PHY_OPERATION_STATUS:
+                case OID_SKGE_SPEED_CAP:
+                case OID_SKGE_SPEED_MODE:
+                case OID_SKGE_SPEED_STATUS:
+                        if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U8)) {
+
+                                *pLen = (Limit - LogPortIndex) * sizeof(SK_U8);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        break;
+
+        case OID_SKGE_MTU:
+        case OID_SKGE_PHY_TYPE:
+                        if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U32)) {
+
+                                *pLen = (Limit - LogPortIndex) * sizeof(SK_U32);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        break;
+
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR041,
+                                SK_PNMI_ERR041MSG);
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                /*
+                 * Update statistic and increment semaphore to indicate
+                 * that an update was already done.
+                 */
+                if ((Ret = SirqUpdate(pAC, IoC)) != SK_PNMI_ERR_OK) {
+
+                        *pLen = 0;
+                        return (Ret);
+                }
+                pAC->Pnmi.SirqUpdatedFlag ++;
+
+                /*
+                 * Get value
+                 */
+                Offset = 0;
+                for (; LogPortIndex < Limit; LogPortIndex ++) {
+
+                        pBufPtr = pBuf + Offset;
+                        
+                        switch (Id) {
+
+                        case OID_SKGE_PMD:
+                                *pBufPtr = pAC->Pnmi.PMD;
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_CONNECTOR:
+                                *pBufPtr = pAC->Pnmi.Connector;
+                                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;
+
+                        case OID_SKGE_LINK_CAP:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical ports */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkCap;
+                                        }
+                                }
+                                else { /* DualNetMode */
+                                        
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkCap;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_LINK_MODE:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical ports */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkModeConf;
+                                        }
+                                }
+                                else { /* DualNetMode */
+                                
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkModeConf;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_LINK_MODE_STATUS:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical port */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+
+                                                *pBufPtr =
+                                                        CalculateLinkModeStatus(pAC, IoC, PhysPortIndex);
+                                        }
+                                }
+                                else { /* DualNetMode */
+                                        
+                                        *pBufPtr = CalculateLinkModeStatus(pAC, IoC, NetIndex);
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_LINK_STATUS:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical ports */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = CalculateLinkStatus(pAC, IoC, PhysPortIndex);
+                                        }
+                                }
+                                else { /* DualNetMode */
+
+                                        *pBufPtr = CalculateLinkStatus(pAC, IoC, NetIndex);
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_FLOWCTRL_CAP:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical ports */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlCap;
+                                        }
+                                }
+                                else { /* DualNetMode */
+                                
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlCap;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_FLOWCTRL_MODE:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical port */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlMode;
+                                        }
+                                }
+                                else { /* DualNetMode */
+
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlMode;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_FLOWCTRL_STATUS:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical port */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlStatus;
+                                        }
+                                }
+                                else { /* DualNetMode */
+
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlStatus;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_PHY_OPERATION_CAP:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical ports */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSCap;
+                                        }
+                                }
+                                else { /* DualNetMode */
+                                
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PMSCap;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_PHY_OPERATION_MODE:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical port */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSMode;
+                                        }
+                                }
+                                else { /* DualNetMode */
+                                
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PMSMode;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_PHY_OPERATION_STATUS:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical port */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSStatus;
+                                        }
+                                }
+                                else {
+                                
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PMSStatus;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_SPEED_CAP:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical ports */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeedCap;
+                                        }
+                                }
+                                else { /* DualNetMode */
+                                
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeedCap;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_SPEED_MODE:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical port */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeed;
+                                        }
+                                }
+                                else { /* DualNetMode */
+
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeed;
+                                }
+                                Offset += sizeof(char);
+                                break;
+
+                        case OID_SKGE_SPEED_STATUS:
+                                if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+                                        if (LogPortIndex == 0) {
+                                                /* Get value for virtual port */
+                                                VirtualConf(pAC, IoC, Id, pBufPtr);
+                                        }
+                                        else {
+                                                /* Get value for physical port */
+                                                PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
+                                                        pAC, LogPortIndex);
+        
+                                                *pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed;
+                                        }
+                                }
+                                else { /* DualNetMode */
+
+                                        *pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeedUsed;
+                                }
+                                Offset += sizeof(char);
+                                break;
+                        
+                        case OID_SKGE_MTU:
+                                Val32 = SK_DRIVER_GET_MTU(pAC, IoC, NetIndex);
+                                SK_PNMI_STORE_U32(pBufPtr, Val32);
+                                Offset += sizeof(SK_U32);
+                                break;
+
+                        default:
+                                SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
+                                        ("MacPrivateConf: Unknown OID should be handled before"));
+
+                                pAC->Pnmi.SirqUpdatedFlag --;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                }
+                *pLen = Offset;
+                pAC->Pnmi.SirqUpdatedFlag --;
+
+                return (SK_PNMI_ERR_OK);
+        }
+
+        /*
+         * From here SET or PRESET action. Check if the passed
+         * buffer length is plausible.
+         */
+        switch (Id) {
+
+        case OID_SKGE_LINK_MODE:
+        case OID_SKGE_FLOWCTRL_MODE:
+        case OID_SKGE_PHY_OPERATION_MODE:
+        case OID_SKGE_SPEED_MODE:
+                if (*pLen < Limit - LogPortIndex) {
+
+                        *pLen = Limit - LogPortIndex;
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                if (*pLen != Limit - LogPortIndex) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_BAD_VALUE);
+                }
+                break;
+
+        case OID_SKGE_MTU:
+                if (*pLen < sizeof(SK_U32)) {
+
+                        *pLen = sizeof(SK_U32);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                if (*pLen != sizeof(SK_U32)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_BAD_VALUE);
+                }
+                break;
+
+    default:
+                *pLen = 0;
+                return (SK_PNMI_ERR_READ_ONLY);
+        }
+
+        /*
+         * Perform preset or set
+         */
+        Offset = 0;
+        for (; LogPortIndex < Limit; LogPortIndex ++) {
+
+                switch (Id) {
+
+                case OID_SKGE_LINK_MODE:
+                        /* Check the value range */
+                        Val8 = *(pBuf + Offset);
+                        if (Val8 == 0) {
+
+                                Offset += sizeof(char);
+                                break;
+                        }
+                        if (Val8 < SK_LMODE_HALF ||
+                                (LogPortIndex != 0 && Val8 > SK_LMODE_AUTOSENSE) ||
+                                (LogPortIndex == 0 && Val8 > SK_LMODE_INDETERMINATED)) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+
+                        /* The preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+
+                                return (SK_PNMI_ERR_OK);
+                        }
+
+                        if (LogPortIndex == 0) {
+
+                                /*
+                                 * The virtual port consists of all currently
+                                 * active ports. Find them and send an event
+                                 * with the new link mode to SIRQ.
+                                 */
+                                for (PhysPortIndex = 0;
+                                        PhysPortIndex < PhysPortMax;
+                                        PhysPortIndex ++) {
+
+                                        if (!pAC->Pnmi.Port[PhysPortIndex].
+                                                ActiveFlag) {
+
+                                                continue;
+                                        }
+
+                                        EventParam.Para32[0] = PhysPortIndex;
+                                        EventParam.Para32[1] = (SK_U32)Val8;
+                                        if (SkGeSirqEvent(pAC, IoC,
+                                                SK_HWEV_SET_LMODE,
+                                                EventParam) > 0) {
+
+                                                SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                        SK_PNMI_ERR043,
+                                                        SK_PNMI_ERR043MSG);
+
+                                                *pLen = 0;
+                                                return (SK_PNMI_ERR_GENERAL);
+                                        }
+                                }
+                        }
+                        else {
+                                /*
+                                 * Send an event with the new link mode to
+                                 * the SIRQ module.
+                                 */
+                                EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
+                                        pAC, LogPortIndex);
+                                EventParam.Para32[1] = (SK_U32)Val8;
+                                if (SkGeSirqEvent(pAC, IoC, SK_HWEV_SET_LMODE,
+                                        EventParam) > 0) {
+
+                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                SK_PNMI_ERR043,
+                                                SK_PNMI_ERR043MSG);
+
+                                        *pLen = 0;
+                                        return (SK_PNMI_ERR_GENERAL);
+                                }
+                        }
+                        Offset += sizeof(char);
+                        break;
+
+                case OID_SKGE_FLOWCTRL_MODE:
+                        /* Check the value range */
+                        Val8 = *(pBuf + Offset);
+                        if (Val8 == 0) {
+
+                                Offset += sizeof(char);
+                                break;
+                        }
+                        if (Val8 < SK_FLOW_MODE_NONE ||
+                                (LogPortIndex != 0 && Val8 > SK_FLOW_MODE_SYM_OR_REM) ||
+                                (LogPortIndex == 0 && Val8 > SK_FLOW_MODE_INDETERMINATED)) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+
+                        /* The preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+
+                                return (SK_PNMI_ERR_OK);
+                        }
+
+                        if (LogPortIndex == 0) {
+
+                                /*
+                                 * The virtual port consists of all currently
+                                 * active ports. Find them and send an event
+                                 * with the new flow control mode to SIRQ.
+                                 */
+                                for (PhysPortIndex = 0;
+                                        PhysPortIndex < PhysPortMax;
+                                        PhysPortIndex ++) {
+
+                                        if (!pAC->Pnmi.Port[PhysPortIndex].
+                                                ActiveFlag) {
+
+                                                continue;
+                                        }
+
+                                        EventParam.Para32[0] = PhysPortIndex;
+                                        EventParam.Para32[1] = (SK_U32)Val8;
+                                        if (SkGeSirqEvent(pAC, IoC,
+                                                SK_HWEV_SET_FLOWMODE,
+                                                EventParam) > 0) {
+
+                                                SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                        SK_PNMI_ERR044,
+                                                        SK_PNMI_ERR044MSG);
+
+                                                *pLen = 0;
+                                                return (SK_PNMI_ERR_GENERAL);
+                                        }
+                                }
+                        }
+                        else {
+                                /*
+                                 * Send an event with the new flow control
+                                 * mode to the SIRQ module.
+                                 */
+                                EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
+                                        pAC, LogPortIndex);
+                                EventParam.Para32[1] = (SK_U32)Val8;
+                                if (SkGeSirqEvent(pAC, IoC,
+                                        SK_HWEV_SET_FLOWMODE, EventParam)
+                                        > 0) {
+
+                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                SK_PNMI_ERR044,
+                                                SK_PNMI_ERR044MSG);
+
+                                        *pLen = 0;
+                                        return (SK_PNMI_ERR_GENERAL);
+                                }
+                        }
+                        Offset += sizeof(char);
+                        break;
+
+                case OID_SKGE_PHY_OPERATION_MODE :
+                        /* Check the value range */
+                        Val8 = *(pBuf + Offset);
+                        if (Val8 == 0) {
+                                /* mode of this port remains unchanged */
+                                Offset += sizeof(char);
+                                break;
+                        }
+                        if (Val8 < SK_MS_MODE_AUTO ||
+                                (LogPortIndex != 0 && Val8 > SK_MS_MODE_SLAVE) ||
+                                (LogPortIndex == 0 && Val8 > SK_MS_MODE_INDETERMINATED)) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+
+                        /* The preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+
+                                return (SK_PNMI_ERR_OK);
+                        }
+
+                        if (LogPortIndex == 0) {
+
+                                /*
+                                 * The virtual port consists of all currently
+                                 * active ports. Find them and send an event
+                                 * with new master/slave (role) mode to SIRQ.
+                                 */
+                                for (PhysPortIndex = 0;
+                                        PhysPortIndex < PhysPortMax;
+                                        PhysPortIndex ++) {
+
+                                        if (!pAC->Pnmi.Port[PhysPortIndex].
+                                                ActiveFlag) {
+
+                                                continue;
+                                        }
+
+                                        EventParam.Para32[0] = PhysPortIndex;
+                                        EventParam.Para32[1] = (SK_U32)Val8;
+                                        if (SkGeSirqEvent(pAC, IoC,
+                                                SK_HWEV_SET_ROLE,
+                                                EventParam) > 0) {
+
+                                                SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                        SK_PNMI_ERR042,
+                                                        SK_PNMI_ERR042MSG);
+
+                                                *pLen = 0;
+                                                return (SK_PNMI_ERR_GENERAL);
+                                        }
+                                }
+                        }
+                        else {
+                                /*
+                                 * Send an event with the new master/slave
+                                 * (role) mode to the SIRQ module.
+                                 */
+                                EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
+                                        pAC, LogPortIndex);
+                                EventParam.Para32[1] = (SK_U32)Val8;
+                                if (SkGeSirqEvent(pAC, IoC,
+                                        SK_HWEV_SET_ROLE, EventParam) > 0) {
+
+                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                SK_PNMI_ERR042,
+                                                SK_PNMI_ERR042MSG);
+
+                                        *pLen = 0;
+                                        return (SK_PNMI_ERR_GENERAL);
+                                }
+                        }
+
+                        Offset += sizeof(char);
+                        break;
+
+                case OID_SKGE_SPEED_MODE:
+                        /* Check the value range */
+                        Val8 = *(pBuf + Offset);
+                        if (Val8 == 0) {
+
+                                Offset += sizeof(char);
+                                break;
+                        }
+                        if (Val8 < (SK_LSPEED_AUTO) ||
+                                (LogPortIndex != 0 && Val8 > (SK_LSPEED_1000MBPS)) ||
+                                (LogPortIndex == 0 && Val8 > (SK_LSPEED_INDETERMINATED))) {
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+
+                        /* The preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+
+                                return (SK_PNMI_ERR_OK);
+                        }
+
+                        if (LogPortIndex == 0) {
+
+                                /*
+                                 * The virtual port consists of all currently
+                                 * active ports. Find them and send an event
+                                 * with the new flow control mode to SIRQ.
+                                 */
+                                for (PhysPortIndex = 0;
+                                        PhysPortIndex < PhysPortMax;
+                                        PhysPortIndex ++) {
+
+                                        if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+
+                                                continue;
+                                        }
+
+                                        EventParam.Para32[0] = PhysPortIndex;
+                                        EventParam.Para32[1] = (SK_U32)Val8;
+                                        if (SkGeSirqEvent(pAC, IoC,
+                                                SK_HWEV_SET_SPEED,
+                                                EventParam) > 0) {
+
+                                                SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                        SK_PNMI_ERR045,
+                                                        SK_PNMI_ERR045MSG);
+
+                                                *pLen = 0;
+                                                return (SK_PNMI_ERR_GENERAL);
+                                        }
+                                }
+                        }
+                        else {
+                                /*
+                                 * Send an event with the new flow control
+                                 * mode to the SIRQ module.
+                                 */
+                                EventParam.Para32[0] = SK_PNMI_PORT_LOG2PHYS(
+                                        pAC, LogPortIndex);
+                                EventParam.Para32[1] = (SK_U32)Val8;
+                                if (SkGeSirqEvent(pAC, IoC,
+                                        SK_HWEV_SET_SPEED,
+                                        EventParam) > 0) {
+
+                                        SK_ERR_LOG(pAC, SK_ERRCL_SW,
+                                                SK_PNMI_ERR045,
+                                                SK_PNMI_ERR045MSG);
+
+                                        *pLen = 0;
+                                        return (SK_PNMI_ERR_GENERAL);
+                                }
+                        }
+                        Offset += sizeof(char);
+                        break;
+
+                case OID_SKGE_MTU :
+                        /* Check the value range */
+                        Val32 = *(SK_U32*)(pBuf + Offset);
+                        if (Val32 == 0) {
+                                /* mtu of this port remains unchanged */
+                                Offset += sizeof(SK_U32);
+                                break;
+                        }
+                        if (SK_DRIVER_PRESET_MTU(pAC, IoC, NetIndex, Val32) != 0) {
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_BAD_VALUE);
+                        }
+
+                        /* The preset ends here */
+                        if (Action == SK_PNMI_PRESET) {
+                                return (SK_PNMI_ERR_OK);
+                        }
+
+                        if (SK_DRIVER_SET_MTU(pAC, IoC, NetIndex, Val32) != 0) {
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+
+                        Offset += sizeof(SK_U32);
+                        break;
+                
+                default:
+            SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
+                ("MacPrivateConf: Unknown OID should be handled before set"));
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * Monitor - OID handler function for RLMT_MONITOR_XXX
+ *
+ * Description:
+ *      Because RLMT currently does not support the monitoring of
+ *      remote adapter cards, we return always an empty table.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_BAD_VALUE    The passed value is not in the valid
+ *                               value range.
+ *      SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+PNMI_STATIC int Monitor(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        unsigned int    Index;
+        unsigned int    Limit;
+        unsigned int    Offset;
+        unsigned int    Entries;
+
+        
+        /*
+         * Calculate instance if wished.
+         */
+        /* XXX Not yet implemented. Return always an empty table. */
+        Entries = 0;
+
+        if ((Instance != (SK_U32)(-1))) {
+
+                if ((Instance < 1) || (Instance > Entries)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+
+                Index = (unsigned int)Instance - 1;
+                Limit = (unsigned int)Instance;
+        }
+        else {
+                Index = 0;
+                Limit = Entries;
+        }
+
+        /*
+         * Get/Set value
+        */
+        if (Action == SK_PNMI_GET) {
+
+                for (Offset=0; Index < Limit; Index ++) {
+
+                        switch (Id) {
+
+                        case OID_SKGE_RLMT_MONITOR_INDEX:
+                        case OID_SKGE_RLMT_MONITOR_ADDR:
+                        case OID_SKGE_RLMT_MONITOR_ERRS:
+                        case OID_SKGE_RLMT_MONITOR_TIMESTAMP:
+                        case OID_SKGE_RLMT_MONITOR_ADMIN:
+                                break;
+
+                        default:
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR046,
+                                        SK_PNMI_ERR046MSG);
+
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                }
+                *pLen = Offset;
+        }
+        else {
+                /* Only MONITOR_ADMIN can be set */
+                if (Id != OID_SKGE_RLMT_MONITOR_ADMIN) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_READ_ONLY);
+                }
+
+                /* Check if the length is plausible */
+                if (*pLen < (Limit - Index)) {
+
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                /* Okay, we have a wide value range */
+                if (*pLen != (Limit - Index)) {
+
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_BAD_VALUE);
+                }
+/*
+                for (Offset=0; Index < Limit; Index ++) {
+                }
+*/
+/*
+ * XXX Not yet implemented. Return always BAD_VALUE, because the table
+ * is empty.
+ */
+                *pLen = 0;
+                return (SK_PNMI_ERR_BAD_VALUE);
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * VirtualConf - Calculates the values of configuration OIDs for virtual port
+ *
+ * Description:
+ *      We handle here the get of the configuration group OIDs, which are
+ *      a little bit complicated. The virtual port consists of all currently
+ *      active physical ports. If multiple ports are active and configured
+ *      differently we get in some trouble to return a single value. So we
+ *      get the value of the first active port and compare it with that of
+ *      the other active ports. If they are not the same, we return a value
+ *      that indicates that the state is indeterminated.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void VirtualConf(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf)             /* Buffer used for the management data transfer */
+{
+        unsigned int    PhysPortMax;
+        unsigned int    PhysPortIndex;
+        SK_U8           Val8;
+        SK_U32          Val32;
+        SK_BOOL         PortActiveFlag;
+        SK_GEPORT       *pPrt;
+
+        *pBuf = 0;
+        PortActiveFlag = SK_FALSE;
+        PhysPortMax = pAC->GIni.GIMacsFound;
+        
+        for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
+                PhysPortIndex ++) {
+
+                pPrt = &pAC->GIni.GP[PhysPortIndex];
+
+                /* Check if the physical port is active */
+                if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+
+                        continue;
+                }
+
+                PortActiveFlag = SK_TRUE;
+
+                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:
+
+                        /*
+                         * Different capabilities should not happen, but
+                         * in the case of the cases OR them all together.
+                         * From a curious point of view the virtual port
+                         * is capable of all found capabilities.
+                         */
+                        *pBuf |= pPrt->PLinkCap;
+                        break;
+
+                case OID_SKGE_LINK_MODE:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PLinkModeConf;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different link
+                         * mode than the first one we return a value that
+                         * indicates that the link mode is indeterminated.
+                         */
+                        if (*pBuf != pPrt->PLinkModeConf) {
+
+                                *pBuf = SK_LMODE_INDETERMINATED;
+                        }
+                        break;
+
+                case OID_SKGE_LINK_MODE_STATUS:
+                        /* Get the link mode of the physical port */
+                        Val8 = CalculateLinkModeStatus(pAC, IoC, PhysPortIndex);
+
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = Val8;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different link
+                         * mode status than the first one we return a value
+                         * that indicates that the link mode status is
+                         * indeterminated.
+                         */
+                        if (*pBuf != Val8) {
+
+                                *pBuf = SK_LMODE_STAT_INDETERMINATED;
+                        }
+                        break;
+
+                case OID_SKGE_LINK_STATUS:
+                        /* Get the link status of the physical port */
+                        Val8 = CalculateLinkStatus(pAC, IoC, PhysPortIndex);
+
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = Val8;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different link
+                         * status than the first one, we return a value
+                         * that indicates that the link status is
+                         * indeterminated.
+                         */
+                        if (*pBuf != Val8) {
+
+                                *pBuf = SK_PNMI_RLMT_LSTAT_INDETERMINATED;
+                        }
+                        break;
+
+                case OID_SKGE_FLOWCTRL_CAP:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PFlowCtrlCap;
+                                continue;
+                        }
+
+                        /*
+                         * From a curious point of view the virtual port
+                         * is capable of all found capabilities.
+                         */
+                        *pBuf |= pPrt->PFlowCtrlCap;
+                        break;
+
+                case OID_SKGE_FLOWCTRL_MODE:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PFlowCtrlMode;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different flow
+                         * control mode than the first one, we return a value
+                         * that indicates that the mode is indeterminated.
+                         */
+                        if (*pBuf != pPrt->PFlowCtrlMode) {
+
+                                *pBuf = SK_FLOW_MODE_INDETERMINATED;
+                        }
+                        break;
+
+                case OID_SKGE_FLOWCTRL_STATUS:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PFlowCtrlStatus;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different flow
+                         * control status than the first one, we return a
+                         * value that indicates that the status is
+                         * indeterminated.
+                         */
+                        if (*pBuf != pPrt->PFlowCtrlStatus) {
+
+                                *pBuf = SK_FLOW_STAT_INDETERMINATED;
+                        }
+                        break;
+                
+                case OID_SKGE_PHY_OPERATION_CAP:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PMSCap;
+                                continue;
+                        }
+
+                        /*
+                         * From a curious point of view the virtual port
+                         * is capable of all found capabilities.
+                         */
+                        *pBuf |= pPrt->PMSCap;
+                        break;
+
+                case OID_SKGE_PHY_OPERATION_MODE:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PMSMode;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different master/
+                         * slave mode than the first one, we return a value
+                         * that indicates that the mode is indeterminated.
+                         */
+                        if (*pBuf != pPrt->PMSMode) {
+
+                                *pBuf = SK_MS_MODE_INDETERMINATED;
+                        }
+                        break;
+
+                case OID_SKGE_PHY_OPERATION_STATUS:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PMSStatus;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different master/
+                         * slave status than the first one, we return a
+                         * value that indicates that the status is
+                         * indeterminated.
+                         */
+                        if (*pBuf != pPrt->PMSStatus) {
+
+                                *pBuf = SK_MS_STAT_INDETERMINATED;
+                        }
+                        break;
+                
+                case OID_SKGE_SPEED_MODE:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PLinkSpeed;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different flow
+                         * control mode than the first one, we return a value
+                         * that indicates that the mode is indeterminated.
+                         */
+                        if (*pBuf != pPrt->PLinkSpeed) {
+
+                                *pBuf = SK_LSPEED_INDETERMINATED;
+                        }
+                        break;
+                
+                case OID_SKGE_SPEED_STATUS:
+                        /* Check if it is the first active port */
+                        if (*pBuf == 0) {
+
+                                *pBuf = pPrt->PLinkSpeedUsed;
+                                continue;
+                        }
+
+                        /*
+                         * If we find an active port with a different flow
+                         * control status than the first one, we return a
+                         * value that indicates that the status is
+                         * indeterminated.
+                         */
+                        if (*pBuf != pPrt->PLinkSpeedUsed) {
+
+                                *pBuf = SK_LSPEED_STAT_INDETERMINATED;
+                        }
+                        break;
+                }
+        }
+
+        /*
+         * If no port is active return an indeterminated answer
+         */
+        if (!PortActiveFlag) {
+
+                switch (Id) {
+
+                case OID_SKGE_LINK_CAP:
+                        *pBuf = SK_LMODE_CAP_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_LINK_MODE:
+                        *pBuf = SK_LMODE_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_LINK_MODE_STATUS:
+                        *pBuf = SK_LMODE_STAT_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_LINK_STATUS:
+                        *pBuf = SK_PNMI_RLMT_LSTAT_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_FLOWCTRL_CAP:
+                case OID_SKGE_FLOWCTRL_MODE:
+                        *pBuf = SK_FLOW_MODE_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_FLOWCTRL_STATUS:
+                        *pBuf = SK_FLOW_STAT_INDETERMINATED;
+                        break;
+                        
+                case OID_SKGE_PHY_OPERATION_CAP:
+                        *pBuf = SK_MS_CAP_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_PHY_OPERATION_MODE:
+                        *pBuf = SK_MS_MODE_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_PHY_OPERATION_STATUS:
+                        *pBuf = SK_MS_STAT_INDETERMINATED;
+                        break;
+                case OID_SKGE_SPEED_CAP:
+                        *pBuf = SK_LSPEED_CAP_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_SPEED_MODE:
+                        *pBuf = SK_LSPEED_INDETERMINATED;
+                        break;
+
+                case OID_SKGE_SPEED_STATUS:
+                        *pBuf = SK_LSPEED_STAT_INDETERMINATED;
+                        break;
+                }
+        }
+}
+
+/*****************************************************************************
+ *
+ * CalculateLinkStatus - Determins the link status of a physical port
+ *
+ * Description:
+ *      Determins the link status the following way:
+ *        LSTAT_PHY_DOWN:  Link is down
+ *        LSTAT_AUTONEG:   Auto-negotiation failed
+ *        LSTAT_LOG_DOWN:  Link is up but RLMT did not yet put the port
+ *                         logically up.
+ *        LSTAT_LOG_UP:    RLMT marked the port as up
+ *
+ * Returns:
+ *      Link status of physical port
+ */
+PNMI_STATIC SK_U8 CalculateLinkStatus(
+SK_AC *pAC,                     /* Pointer to adapter context */
+SK_IOC IoC,                     /* IO context handle */
+unsigned int PhysPortIndex)     /* Physical port index */
+{
+        SK_U8   Result;
+
+        if (!pAC->GIni.GP[PhysPortIndex].PHWLinkUp) {
+
+                Result = SK_PNMI_RLMT_LSTAT_PHY_DOWN;
+        }
+        else if (pAC->GIni.GP[PhysPortIndex].PAutoNegFail > 0) {
+
+                Result = SK_PNMI_RLMT_LSTAT_AUTONEG;
+                                }
+        else if (!pAC->Rlmt.Port[PhysPortIndex].PortDown) {
+
+                Result = SK_PNMI_RLMT_LSTAT_LOG_UP;
+        }
+        else {
+                Result = SK_PNMI_RLMT_LSTAT_LOG_DOWN;
+        }
+
+        return (Result);
+}
+
+/*****************************************************************************
+ *
+ * CalculateLinkModeStatus - Determins the link mode status of a phys. port
+ *
+ * Description:
+ *      The COMMON module only tells us if the mode is half or full duplex.
+ *      But in the decade of auto sensing it is useful for the user to
+ *      know if the mode was negotiated or forced. Therefore we have a
+ *      look to the mode, which was last used by the negotiation process.
+ *
+ * Returns:
+ *      The link mode status
+ */
+PNMI_STATIC SK_U8 CalculateLinkModeStatus(
+SK_AC *pAC,                     /* Pointer to adapter context */
+SK_IOC IoC,                     /* IO context handle */
+unsigned int PhysPortIndex)     /* Physical port index */
+{
+        SK_U8   Result;
+
+        /* Get the current mode, which can be full or half duplex */
+        Result = pAC->GIni.GP[PhysPortIndex].PLinkModeStatus;
+
+        /* Check if no valid mode could be found (link is down) */
+        if (Result < SK_LMODE_STAT_HALF) {
+
+                Result = SK_LMODE_STAT_UNKNOWN;
+        }
+        else if (pAC->GIni.GP[PhysPortIndex].PLinkMode >= SK_LMODE_AUTOHALF) {
+
+                /*
+                 * Auto-negotiation was used to bring up the link. Change
+                 * the already found duplex status that it indicates
+                 * auto-negotiation was involved.
+                 */
+                if (Result == SK_LMODE_STAT_HALF) {
+
+                        Result = SK_LMODE_STAT_AUTOHALF;
+                }
+                else if (Result == SK_LMODE_STAT_FULL) {
+
+                        Result = SK_LMODE_STAT_AUTOFULL;
+                }
+        }
+
+        return (Result);
+}
+
+/*****************************************************************************
+ *
+ * GetVpdKeyArr - Obtain an array of VPD keys
+ *
+ * Description:
+ *      Read the VPD keys and build an array of VPD keys, which are
+ *      easy to access.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK       Task successfully performed.
+ *      SK_PNMI_ERR_GENERAL  Something went wrong.
+ */
+PNMI_STATIC int GetVpdKeyArr(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+char *pKeyArr,          /* Ptr KeyArray */
+unsigned int KeyArrLen, /* Length of array in bytes */
+unsigned int *pKeyNo)   /* Number of keys */
+{
+        unsigned int            BufKeysLen = SK_PNMI_VPD_BUFSIZE;
+        char                    BufKeys[SK_PNMI_VPD_BUFSIZE];
+        unsigned int            StartOffset;
+        unsigned int            Offset;
+        int                     Index;
+        int                     Ret;
+
+
+        SK_MEMSET(pKeyArr, 0, KeyArrLen);
+
+        /*
+         * Get VPD key list
+         */
+        Ret = VpdKeys(pAC, IoC, (char *)&BufKeys, (int *)&BufKeysLen,
+                (int *)pKeyNo);
+        if (Ret > 0) {
+
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR014,
+                        SK_PNMI_ERR014MSG);
+
+                return (SK_PNMI_ERR_GENERAL);
+        }
+        /* If no keys are available return now */
+        if (*pKeyNo == 0 || BufKeysLen == 0) {
+
+                return (SK_PNMI_ERR_OK);
+        }
+        /*
+         * If the key list is too long for us trunc it and give a
+         * errorlog notification. This case should not happen because
+         * the maximum number of keys is limited due to RAM limitations
+         */
+        if (*pKeyNo > SK_PNMI_VPD_ENTRIES) {
+
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR015,
+                        SK_PNMI_ERR015MSG);
+
+                *pKeyNo = SK_PNMI_VPD_ENTRIES;
+        }
+
+        /*
+         * Now build an array of fixed string length size and copy
+         * the keys together.
+         */
+        for (Index = 0, StartOffset = 0, Offset = 0; Offset < BufKeysLen;
+                Offset ++) {
+
+                if (BufKeys[Offset] != 0) {
+
+                        continue;
+                }
+
+                if (Offset - StartOffset > SK_PNMI_VPD_KEY_SIZE) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR016,
+                                SK_PNMI_ERR016MSG);
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+
+                SK_STRNCPY(pKeyArr + Index * SK_PNMI_VPD_KEY_SIZE,
+                        &BufKeys[StartOffset], SK_PNMI_VPD_KEY_SIZE);
+
+                Index ++;
+                StartOffset = Offset + 1;
+        }
+
+        /* Last key not zero terminated? Get it anyway */
+        if (StartOffset < Offset) {
+
+                SK_STRNCPY(pKeyArr + Index * SK_PNMI_VPD_KEY_SIZE,
+                        &BufKeys[StartOffset], SK_PNMI_VPD_KEY_SIZE);
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * SirqUpdate - Let the SIRQ update its internal values
+ *
+ * Description:
+ *      Just to be sure that the SIRQ module holds its internal data
+ *      structures up to date, we send an update event before we make
+ *      any access.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK       Task successfully performed.
+ *      SK_PNMI_ERR_GENERAL  Something went wrong.
+ */
+PNMI_STATIC int SirqUpdate(
+SK_AC *pAC,     /* Pointer to adapter context */
+SK_IOC IoC)     /* IO context handle */
+{
+        SK_EVPARA       EventParam;
+
+
+        /* Was the module already updated during the current PNMI call? */
+        if (pAC->Pnmi.SirqUpdatedFlag > 0) {
+
+                return (SK_PNMI_ERR_OK);
+        }
+
+        /* Send an synchronuous update event to the module */
+        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+        if (SkGeSirqEvent(pAC, IoC, SK_HWEV_UPDATE_STAT, EventParam) > 0) {
+
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR047,
+                        SK_PNMI_ERR047MSG);
+
+                return (SK_PNMI_ERR_GENERAL);
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * RlmtUpdate - Let the RLMT update its internal values
+ *
+ * Description:
+ *      Just to be sure that the RLMT module holds its internal data
+ *      structures up to date, we send an update event before we make
+ *      any access.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK       Task successfully performed.
+ *      SK_PNMI_ERR_GENERAL  Something went wrong.
+ */
+PNMI_STATIC int RlmtUpdate(
+SK_AC *pAC,     /* Pointer to adapter context */
+SK_IOC IoC,     /* IO context handle */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode allways zero */
+{
+        SK_EVPARA       EventParam;
+
+
+        /* Was the module already updated during the current PNMI call? */
+        if (pAC->Pnmi.RlmtUpdatedFlag > 0) {
+
+                return (SK_PNMI_ERR_OK);
+        }
+
+        /* Send an synchronuous update event to the module */
+        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+        EventParam.Para32[0] = NetIndex;
+        EventParam.Para32[1] = (SK_U32)-1;
+        if (SkRlmtEvent(pAC, IoC, SK_RLMT_STATS_UPDATE, EventParam) > 0) {
+
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR048,
+                        SK_PNMI_ERR048MSG);
+
+                return (SK_PNMI_ERR_GENERAL);
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * MacUpdate - Force the XMAC to output the current statistic
+ *
+ * Description:
+ *      The XMAC holds its statistic internally. To obtain the current
+ *      values we must send a command so that the statistic data will
+ *      be written to a predefined memory area on the adapter.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK       Task successfully performed.
+ *      SK_PNMI_ERR_GENERAL  Something went wrong.
+ */
+PNMI_STATIC int MacUpdate(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+unsigned int FirstMac,  /* Index of the first Mac to be updated */
+unsigned int LastMac)   /* Index of the last Mac to be updated */
+{
+        unsigned int    MacIndex;
+
+        /*
+         * Were the statistics already updated during the
+         * current PNMI call?
+         */
+        if (pAC->Pnmi.MacUpdatedFlag > 0) {
+
+                return (SK_PNMI_ERR_OK);
+        }
+
+        /* Send an update command to all MACs specified */
+        for (MacIndex = FirstMac; MacIndex <= LastMac; MacIndex ++) {
+
+                /*
+                 * 2002-09-13 pweber:   Freeze the current SW counters.
+                 *                      (That should be done as close as
+                 *                      possible to the update of the
+                 *                      HW counters)
+                 */
+                if (pAC->GIni.GIMacType == SK_MAC_XMAC) {
+                        pAC->Pnmi.BufPort[MacIndex] = pAC->Pnmi.Port[MacIndex];
+                }
+                        
+                /* 2002-09-13 pweber:  Update the HW counter  */
+                if (pAC->GIni.GIFunc.pFnMacUpdateStats(pAC, IoC, MacIndex) != 0) {
+
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+        }
+
+        return (SK_PNMI_ERR_OK);
+}
+
+/*****************************************************************************
+ *
+ * GetStatVal - Retrieve an XMAC statistic counter
+ *
+ * Description:
+ *      Retrieves the statistic counter of a virtual or physical port. The
+ *      virtual port is identified by the index 0. It consists of all
+ *      currently active ports. To obtain the counter value for this port
+ *      we must add the statistic counter of all active ports. To grant
+ *      continuous counter values for the virtual port even when port
+ *      switches occur we must additionally add a delta value, which was
+ *      calculated during a SK_PNMI_EVT_RLMT_ACTIVE_UP event.
+ *
+ * Returns:
+ *      Requested statistic value
+ */
+PNMI_STATIC SK_U64 GetStatVal(
+SK_AC *pAC,                                     /* Pointer to adapter context */
+SK_IOC IoC,                                     /* IO context handle */
+unsigned int LogPortIndex,      /* Index of the logical Port to be processed */
+unsigned int StatIndex,         /* Index to statistic value */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode allways zero */
+{
+        unsigned int    PhysPortIndex;
+        unsigned int    PhysPortMax;
+        SK_U64                  Val = 0;
+
+
+        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {   /* Dual net mode */
+
+                PhysPortIndex = NetIndex;
+                
+                Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
+        }
+        else {  /* Single Net mode */
+
+                if (LogPortIndex == 0) {
+
+                        PhysPortMax = pAC->GIni.GIMacsFound;
+
+                        /* Add counter of all active ports */
+                        for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
+                                PhysPortIndex ++) {
+
+                                if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
+
+                                        Val += GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
+                                }
+                        }
+
+                        /* Correct value because of port switches */
+                        Val += pAC->Pnmi.VirtualCounterOffset[StatIndex];
+                }
+                else {
+                        /* Get counter value of physical port */
+                        PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
+                        
+                        Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
+                }
+        }
+        return (Val);
+}
+
+/*****************************************************************************
+ *
+ * GetPhysStatVal - Get counter value for physical port
+ *
+ * Description:
+ *      Builds a 64bit counter value. Except for the octet counters
+ *      the lower 32bit are counted in hardware and the upper 32bit
+ *      in software by monitoring counter overflow interrupts in the
+ *      event handler. To grant continous counter values during XMAC
+ *      resets (caused by a workaround) we must add a delta value.
+ *      The delta was calculated in the event handler when a
+ *      SK_PNMI_EVT_XMAC_RESET was received.
+ *
+ * Returns:
+ *      Counter value
+ */
+PNMI_STATIC SK_U64 GetPhysStatVal(
+SK_AC *pAC,                                     /* Pointer to adapter context */
+SK_IOC IoC,                                     /* IO context handle */
+unsigned int PhysPortIndex,     /* Index of the logical Port to be processed */
+unsigned int StatIndex)         /* Index to statistic value */
+{
+        SK_U64  Val = 0;
+        SK_U32  LowVal = 0;
+        SK_U32  HighVal = 0;
+        SK_U16  Word;
+        int             MacType;
+        unsigned int HelpIndex;
+        SK_GEPORT       *pPrt;
+        
+        SK_PNMI_PORT    *pPnmiPrt;
+        SK_GEMACFUNC    *pFnMac;
+        
+        pPrt = &pAC->GIni.GP[PhysPortIndex];
+        
+        MacType = pAC->GIni.GIMacType;
+        
+        /* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+        if (MacType == SK_MAC_XMAC) {
+                pPnmiPrt = &pAC->Pnmi.BufPort[PhysPortIndex];
+        }
+        else {
+                pPnmiPrt = &pAC->Pnmi.Port[PhysPortIndex];
+        }
+        
+        pFnMac   = &pAC->GIni.GIFunc;
+
+        switch (StatIndex) {
+        case SK_PNMI_HTX:
+                if (MacType == SK_MAC_GMAC) {
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                        StatAddr[SK_PNMI_HTX_BROADCAST][MacType].Reg,
+                                                        &LowVal);
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                        StatAddr[SK_PNMI_HTX_MULTICAST][MacType].Reg,
+                                                        &HighVal);
+                        LowVal += HighVal;
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                        StatAddr[SK_PNMI_HTX_UNICAST][MacType].Reg,
+                                                        &HighVal);
+                        LowVal += HighVal;
+                }
+                else {
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                                  StatAddr[StatIndex][MacType].Reg,
+                                                                                  &LowVal);
+                }
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+        
+        case SK_PNMI_HRX:
+                if (MacType == SK_MAC_GMAC) {
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                        StatAddr[SK_PNMI_HRX_BROADCAST][MacType].Reg,
+                                                        &LowVal);
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                        StatAddr[SK_PNMI_HRX_MULTICAST][MacType].Reg,
+                                                        &HighVal);
+                        LowVal += HighVal;
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                        StatAddr[SK_PNMI_HRX_UNICAST][MacType].Reg,
+                                                        &HighVal);
+                        LowVal += HighVal;
+                }
+                else {
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                                  StatAddr[StatIndex][MacType].Reg,
+                                                                                  &LowVal);
+                }
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+
+        case SK_PNMI_HTX_OCTET:
+        case SK_PNMI_HRX_OCTET:
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex][MacType].Reg,
+                                                                          &HighVal);
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex + 1][MacType].Reg,
+                                                                          &LowVal);
+                break;
+
+        case SK_PNMI_HTX_BURST:
+        case SK_PNMI_HTX_EXCESS_DEF:
+        case SK_PNMI_HTX_CARRIER:
+                /* Not supported by GMAC */
+                if (MacType == SK_MAC_GMAC) {
+                        return (Val);
+                }
+
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex][MacType].Reg,
+                                                                          &LowVal);
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+
+        case SK_PNMI_HTX_MACC:
+                /* GMAC only supports PAUSE MAC control frames */
+                if (MacType == SK_MAC_GMAC) {
+                        HelpIndex = SK_PNMI_HTX_PMACC;
+                }
+                else {
+                        HelpIndex = StatIndex;
+                }
+                
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                StatAddr[HelpIndex][MacType].Reg,
+                                                                &LowVal);
+
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+
+        case SK_PNMI_HTX_COL:
+        case SK_PNMI_HRX_UNDERSIZE:
+                /* Not supported by XMAC */
+                if (MacType == SK_MAC_XMAC) {
+                        return (Val);
+                }
+
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex][MacType].Reg,
+                                                                          &LowVal);
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+
+        case SK_PNMI_HTX_DEFFERAL:
+                /* Not supported by GMAC */
+                if (MacType == SK_MAC_GMAC) {
+                        return (Val);
+                }
+                
+                /*
+                 * XMAC counts frames with deferred transmission
+                 * even in full-duplex mode.
+                 *
+                 * In full-duplex mode the counter remains constant!
+                 */
+                if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL) ||
+                        (pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL)) {
+
+                        LowVal = 0;
+                        HighVal = 0;
+                }
+                else {
+                        /* Otherwise get contents of hardware register */
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                                  StatAddr[StatIndex][MacType].Reg,
+                                                                                  &LowVal);
+                        HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                }
+                break;
+
+        case SK_PNMI_HRX_BADOCTET:
+                /* Not supported by XMAC */
+                if (MacType == SK_MAC_XMAC) {
+                        return (Val);
+                }
+
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex][MacType].Reg,
+                                                                          &HighVal);
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex + 1][MacType].Reg,
+                                      &LowVal);
+                break;
+
+        case SK_PNMI_HTX_OCTETLOW:
+        case SK_PNMI_HRX_OCTETLOW:
+        case SK_PNMI_HRX_BADOCTETLOW:
+                return (Val);
+
+        case SK_PNMI_HRX_LONGFRAMES:
+                /* For XMAC the SW counter is managed by PNMI */
+                if (MacType == SK_MAC_XMAC) {
+                        return (pPnmiPrt->StatRxLongFrameCts);
+                }
+                
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex][MacType].Reg,
+                                                                          &LowVal);
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+                
+        case SK_PNMI_HRX_TOO_LONG:
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                StatAddr[StatIndex][MacType].Reg,
+                                                                &LowVal);
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                
+                Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
+
+                if (MacType == SK_MAC_GMAC) {
+                        /* For GMAC the SW counter is additionally managed by PNMI */
+                        Val += pPnmiPrt->StatRxFrameTooLongCts;
+                }
+                else {
+                        /*
+                         * Frames longer than IEEE 802.3 frame max size are counted
+                         * by XMAC in frame_too_long counter even reception of long
+                         * frames was enabled and the frame was correct.
+                         * So correct the value by subtracting RxLongFrame counter.
+                         */
+                        Val -= pPnmiPrt->StatRxLongFrameCts;
+                }
+
+                LowVal = (SK_U32)Val;
+                HighVal = (SK_U32)(Val >> 32);
+                break;
+                
+        case SK_PNMI_HRX_SHORTS:
+                /* Not supported by GMAC */
+                if (MacType == SK_MAC_GMAC) {
+                        /* GM_RXE_FRAG?? */
+                        return (Val);
+                }
+                
+                /*
+                 * XMAC counts short frame errors even if link down (#10620)
+                 *
+                 * If link-down the counter remains constant
+                 */
+                if (pPrt->PLinkModeStatus != SK_LMODE_STAT_UNKNOWN) {
+
+                        /* Otherwise get incremental difference */
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                                  StatAddr[StatIndex][MacType].Reg,
+                                                                                  &LowVal);
+                        HighVal = pPnmiPrt->CounterHigh[StatIndex];
+
+                        Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
+                        Val -= pPnmiPrt->RxShortZeroMark;
+
+                        LowVal = (SK_U32)Val;
+                        HighVal = (SK_U32)(Val >> 32);
+                }
+                break;
+
+        case SK_PNMI_HRX_MACC:
+        case SK_PNMI_HRX_MACC_UNKWN:
+        case SK_PNMI_HRX_BURST:
+        case SK_PNMI_HRX_MISSED:
+        case SK_PNMI_HRX_FRAMING:
+        case SK_PNMI_HRX_CARRIER:
+        case SK_PNMI_HRX_IRLENGTH:
+        case SK_PNMI_HRX_SYMBOL:
+        case SK_PNMI_HRX_CEXT:
+                /* Not supported by GMAC */
+                if (MacType == SK_MAC_GMAC) {
+                        return (Val);
+                }
+
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex][MacType].Reg,
+                                                                          &LowVal);
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+
+        case SK_PNMI_HRX_PMACC_ERR:
+                /* For GMAC the SW counter is managed by PNMI */
+                if (MacType == SK_MAC_GMAC) {
+                        return (pPnmiPrt->StatRxPMaccErr);
+                }
+                
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex][MacType].Reg,
+                                                                          &LowVal);
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+
+        /* SW counter managed by PNMI */
+        case SK_PNMI_HTX_SYNC:
+                LowVal = (SK_U32)pPnmiPrt->StatSyncCts;
+                HighVal = (SK_U32)(pPnmiPrt->StatSyncCts >> 32);
+                break;
+
+        /* SW counter managed by PNMI */
+        case SK_PNMI_HTX_SYNC_OCTET:
+                LowVal = (SK_U32)pPnmiPrt->StatSyncOctetsCts;
+                HighVal = (SK_U32)(pPnmiPrt->StatSyncOctetsCts >> 32);
+                break;
+
+        case SK_PNMI_HRX_FCS:
+                /*
+                 * Broadcom filters FCS errors and counts it in
+                 * Receive Error Counter register
+                 */
+                if (pPrt->PhyType == SK_PHY_BCOM) {
+                        /* do not read while not initialized (PHY_READ hangs!)*/
+                        if (pPrt->PState != SK_PRT_RESET) {
+                                SkXmPhyRead(pAC, IoC, PhysPortIndex, PHY_BCOM_RE_CTR, &Word);
+                                
+                                LowVal = Word;
+                        }
+                        HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                }
+                else {
+                        (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                                  StatAddr[StatIndex][MacType].Reg,
+                                                                                  &LowVal);
+                        HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                }
+                break;
+
+        default:
+                (void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+                                                                          StatAddr[StatIndex][MacType].Reg,
+                                                                          &LowVal);
+                HighVal = pPnmiPrt->CounterHigh[StatIndex];
+                break;
+        }
+
+        Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
+
+        /* Correct value because of possible XMAC reset. XMAC Errata #2 */
+        Val += pPnmiPrt->CounterOffset[StatIndex];
+
+        return (Val);
+}
+
+/*****************************************************************************
+ *
+ * ResetCounter - Set all counters and timestamps to zero
+ *
+ * Description:
+ *      Notifies other common modules which store statistic data to
+ *      reset their counters and finally reset our own counters.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void ResetCounter(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+SK_U32 NetIndex)
+{
+        unsigned int    PhysPortIndex;
+        SK_EVPARA       EventParam;
+
+
+        SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
+
+        /* Notify sensor module */
+        SkEventQueue(pAC, SKGE_I2C, SK_I2CEV_CLEAR, EventParam);
+
+        /* Notify RLMT module */
+        EventParam.Para32[0] = NetIndex;
+        EventParam.Para32[1] = (SK_U32)-1;
+        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STATS_CLEAR, EventParam);
+        EventParam.Para32[1] = 0;
+
+        /* Notify SIRQ module */
+        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_CLEAR_STAT, EventParam);
+
+        /* Notify CSUM module */
+#ifdef SK_USE_CSUM
+        EventParam.Para32[0] = NetIndex;
+        EventParam.Para32[1] = (SK_U32)-1;
+        SkEventQueue(pAC, SKGE_CSUM, SK_CSUM_EVENT_CLEAR_PROTO_STATS,
+                EventParam);
+#endif /* SK_USE_CSUM */
+        
+        /* Clear XMAC statistic */
+        for (PhysPortIndex = 0; PhysPortIndex <
+                (unsigned int)pAC->GIni.GIMacsFound; PhysPortIndex ++) {
+
+                (void)pAC->GIni.GIFunc.pFnMacResetCounter(pAC, IoC, PhysPortIndex);
+
+                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].CounterHigh,
+                        0, sizeof(pAC->Pnmi.Port[PhysPortIndex].CounterHigh));
+                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
+                        CounterOffset, 0, sizeof(pAC->Pnmi.Port[
+                        PhysPortIndex].CounterOffset));
+                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].StatSyncCts,
+                        0, sizeof(pAC->Pnmi.Port[PhysPortIndex].StatSyncCts));
+                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
+                        StatSyncOctetsCts, 0, sizeof(pAC->Pnmi.Port[
+                        PhysPortIndex].StatSyncOctetsCts));
+                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
+                        StatRxLongFrameCts, 0, sizeof(pAC->Pnmi.Port[
+                        PhysPortIndex].StatRxLongFrameCts));
+                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
+                                  StatRxFrameTooLongCts, 0, sizeof(pAC->Pnmi.Port[
+                        PhysPortIndex].StatRxFrameTooLongCts));
+                SK_MEMSET((char *)&pAC->Pnmi.Port[PhysPortIndex].
+                                  StatRxPMaccErr, 0, sizeof(pAC->Pnmi.Port[
+                        PhysPortIndex].StatRxPMaccErr));
+        }
+
+        /*
+         * Clear local statistics
+         */
+        SK_MEMSET((char *)&pAC->Pnmi.VirtualCounterOffset, 0,
+                  sizeof(pAC->Pnmi.VirtualCounterOffset));
+        pAC->Pnmi.RlmtChangeCts = 0;
+        pAC->Pnmi.RlmtChangeTime = 0;
+        SK_MEMSET((char *)&pAC->Pnmi.RlmtChangeEstimate.EstValue[0], 0,
+                sizeof(pAC->Pnmi.RlmtChangeEstimate.EstValue));
+        pAC->Pnmi.RlmtChangeEstimate.EstValueIndex = 0;
+        pAC->Pnmi.RlmtChangeEstimate.Estimate = 0;
+        pAC->Pnmi.Port[NetIndex].TxSwQueueMax = 0;
+        pAC->Pnmi.Port[NetIndex].TxRetryCts = 0;
+        pAC->Pnmi.Port[NetIndex].RxIntrCts = 0;
+        pAC->Pnmi.Port[NetIndex].TxIntrCts = 0;
+        pAC->Pnmi.Port[NetIndex].RxNoBufCts = 0;
+        pAC->Pnmi.Port[NetIndex].TxNoBufCts = 0;
+        pAC->Pnmi.Port[NetIndex].TxUsedDescrNo = 0;
+        pAC->Pnmi.Port[NetIndex].RxDeliveredCts = 0;
+        pAC->Pnmi.Port[NetIndex].RxOctetsDeliveredCts = 0;
+        pAC->Pnmi.Port[NetIndex].ErrRecoveryCts = 0;
+}
+
+/*****************************************************************************
+ *
+ * GetTrapEntry - Get an entry in the trap buffer
+ *
+ * Description:
+ *      The trap buffer stores various events. A user application somehow
+ *      gets notified that an event occured and retrieves the trap buffer
+ *      contens (or simply polls the buffer). The buffer is organized as
+ *      a ring which stores the newest traps at the beginning. The oldest
+ *      traps are overwritten by the newest ones. Each trap entry has a
+ *      unique number, so that applications may detect new trap entries.
+ *
+ * Returns:
+ *      A pointer to the trap entry
+ */
+PNMI_STATIC char* GetTrapEntry(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_U32 TrapId,          /* SNMP ID of the trap */
+unsigned int Size)      /* Space needed for trap entry */
+{
+        unsigned int            BufPad = pAC->Pnmi.TrapBufPad;
+        unsigned int            BufFree = pAC->Pnmi.TrapBufFree;
+        unsigned int            Beg = pAC->Pnmi.TrapQueueBeg;
+        unsigned int            End = pAC->Pnmi.TrapQueueEnd;
+        char                    *pBuf = &pAC->Pnmi.TrapBuf[0];
+        int                     Wrap;
+        unsigned int            NeededSpace;
+        unsigned int            EntrySize;
+        SK_U32                  Val32;
+        SK_U64                  Val64;
+
+
+        /* Last byte of entry will get a copy of the entry length */
+        Size ++;
+
+        /*
+         * Calculate needed buffer space */
+        if (Beg >= Size) {
+
+                NeededSpace = Size;
+                Wrap = SK_FALSE;
+        }
+        else {
+                NeededSpace = Beg + Size;
+                Wrap = SK_TRUE;
+        }
+
+        /*
+         * Check if enough buffer space is provided. Otherwise
+         * free some entries. Leave one byte space between begin
+         * and end of buffer to make it possible to detect whether
+         * the buffer is full or empty
+         */
+        while (BufFree < NeededSpace + 1) {
+
+                if (End == 0) {
+
+                        End = SK_PNMI_TRAP_QUEUE_LEN;
+                }
+
+                EntrySize = (unsigned int)*((unsigned char *)pBuf + End - 1);
+                BufFree += EntrySize;
+                End -= EntrySize;
+#ifdef DEBUG
+                SK_MEMSET(pBuf + End, (char)(-1), EntrySize);
+#endif /* DEBUG */
+                if (End == BufPad) {
+#ifdef DEBUG
+                        SK_MEMSET(pBuf, (char)(-1), End);
+#endif /* DEBUG */
+                        BufFree += End;
+                        End = 0;
+                        BufPad = 0;
+                }
+        }
+
+        /*
+         * Insert new entry as first entry. Newest entries are
+         * stored at the beginning of the queue.
+         */
+        if (Wrap) {
+
+                BufPad = Beg;
+                Beg = SK_PNMI_TRAP_QUEUE_LEN - Size;
+        }
+        else {
+                Beg = Beg - Size;
+        }
+        BufFree -= NeededSpace;
+
+        /* Save the current offsets */
+        pAC->Pnmi.TrapQueueBeg = Beg;
+        pAC->Pnmi.TrapQueueEnd = End;
+        pAC->Pnmi.TrapBufPad = BufPad;
+        pAC->Pnmi.TrapBufFree = BufFree;
+
+        /* Initialize the trap entry */
+        *(pBuf + Beg + Size - 1) = (char)Size;
+        *(pBuf + Beg) = (char)Size;
+        Val32 = (pAC->Pnmi.TrapUnique) ++;
+        SK_PNMI_STORE_U32(pBuf + Beg + 1, Val32);
+        SK_PNMI_STORE_U32(pBuf + Beg + 1 + sizeof(SK_U32), TrapId);
+        Val64 = SK_PNMI_HUNDREDS_SEC(SkOsGetTime(pAC));
+        SK_PNMI_STORE_U64(pBuf + Beg + 1 + 2 * sizeof(SK_U32), Val64);
+
+        return (pBuf + Beg);
+}
+
+/*****************************************************************************
+ *
+ * CopyTrapQueue - Copies the trap buffer for the TRAP OID
+ *
+ * Description:
+ *      On a query of the TRAP OID the trap buffer contents will be
+ *      copied continuously to the request buffer, which must be large
+ *      enough. No length check is performed.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void CopyTrapQueue(
+SK_AC *pAC,             /* Pointer to adapter context */
+char *pDstBuf)          /* Buffer to which the queued traps will be copied */
+{
+        unsigned int    BufPad = pAC->Pnmi.TrapBufPad;
+        unsigned int    Trap = pAC->Pnmi.TrapQueueBeg;
+        unsigned int    End = pAC->Pnmi.TrapQueueEnd;
+        char            *pBuf = &pAC->Pnmi.TrapBuf[0];
+        unsigned int    Len;
+        unsigned int    DstOff = 0;
+
+
+        while (Trap != End) {
+
+                Len = (unsigned int)*(pBuf + Trap);
+
+                /*
+                 * Last byte containing a copy of the length will
+                 * not be copied.
+                 */
+                *(pDstBuf + DstOff) = (char)(Len - 1);
+                SK_MEMCPY(pDstBuf + DstOff + 1, pBuf + Trap + 1, Len - 2);
+                DstOff += Len - 1;
+
+                Trap += Len;
+                if (Trap == SK_PNMI_TRAP_QUEUE_LEN) {
+
+                        Trap = BufPad;
+                }
+        }
+}
+
+/*****************************************************************************
+ *
+ * GetTrapQueueLen - Get the length of the trap buffer
+ *
+ * Description:
+ *      Evaluates the number of currently stored traps and the needed
+ *      buffer size to retrieve them.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void GetTrapQueueLen(
+SK_AC *pAC,             /* Pointer to adapter context */
+unsigned int *pLen,     /* Length in Bytes of all queued traps */
+unsigned int *pEntries) /* Returns number of trapes stored in queue */
+{
+        unsigned int    BufPad = pAC->Pnmi.TrapBufPad;
+        unsigned int    Trap = pAC->Pnmi.TrapQueueBeg;
+        unsigned int    End = pAC->Pnmi.TrapQueueEnd;
+        char            *pBuf = &pAC->Pnmi.TrapBuf[0];
+        unsigned int    Len;
+        unsigned int    Entries = 0;
+        unsigned int    TotalLen = 0;
+
+
+        while (Trap != End) {
+
+                Len = (unsigned int)*(pBuf + Trap);
+                TotalLen += Len - 1;
+                Entries ++;
+
+                Trap += Len;
+                if (Trap == SK_PNMI_TRAP_QUEUE_LEN) {
+
+                        Trap = BufPad;
+                }
+        }
+
+        *pEntries = Entries;
+        *pLen = TotalLen;
+}
+
+/*****************************************************************************
+ *
+ * QueueSimpleTrap - Store a simple trap to the trap buffer
+ *
+ * Description:
+ *      A simple trap is a trap with now additional data. It consists
+ *      simply of a trap code.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void QueueSimpleTrap(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_U32 TrapId)          /* Type of sensor trap */
+{
+        GetTrapEntry(pAC, TrapId, SK_PNMI_TRAP_SIMPLE_LEN);
+}
+
+/*****************************************************************************
+ *
+ * QueueSensorTrap - Stores a sensor trap in the trap buffer
+ *
+ * Description:
+ *      Gets an entry in the trap buffer and fills it with sensor related
+ *      data.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void QueueSensorTrap(
+SK_AC *pAC,                     /* Pointer to adapter context */
+SK_U32 TrapId,                  /* Type of sensor trap */
+unsigned int SensorIndex)       /* Index of sensor which caused the trap */
+{
+        char            *pBuf;
+        unsigned int    Offset;
+        unsigned int    DescrLen;
+        SK_U32          Val32;
+
+
+        /* Get trap buffer entry */
+        DescrLen = SK_STRLEN(pAC->I2c.SenTable[SensorIndex].SenDesc);
+        pBuf = GetTrapEntry(pAC, TrapId,
+                SK_PNMI_TRAP_SENSOR_LEN_BASE + DescrLen);
+        Offset = SK_PNMI_TRAP_SIMPLE_LEN;
+
+        /* Store additionally sensor trap related data */
+        Val32 = OID_SKGE_SENSOR_INDEX;
+        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+        *(pBuf + Offset + 4) = 4;
+        Val32 = (SK_U32)SensorIndex;
+        SK_PNMI_STORE_U32(pBuf + Offset + 5, Val32);
+        Offset += 9;
+        
+        Val32 = (SK_U32)OID_SKGE_SENSOR_DESCR;
+        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+        *(pBuf + Offset + 4) = (char)DescrLen;
+        SK_MEMCPY(pBuf + Offset + 5, pAC->I2c.SenTable[SensorIndex].SenDesc,
+                DescrLen);
+        Offset += DescrLen + 5;
+
+        Val32 = OID_SKGE_SENSOR_TYPE;
+        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+        *(pBuf + Offset + 4) = 1;
+        *(pBuf + Offset + 5) = (char)pAC->I2c.SenTable[SensorIndex].SenType;
+        Offset += 6;
+
+        Val32 = OID_SKGE_SENSOR_VALUE;
+        SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+        *(pBuf + Offset + 4) = 4;
+        Val32 = (SK_U32)pAC->I2c.SenTable[SensorIndex].SenValue;
+        SK_PNMI_STORE_U32(pBuf + Offset + 5, Val32);
+}
+
+/*****************************************************************************
+ *
+ * QueueRlmtNewMacTrap - Store a port switch trap in the trap buffer
+ *
+ * Description:
+ *      Nothing further to explain.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void QueueRlmtNewMacTrap(
+SK_AC *pAC,             /* Pointer to adapter context */
+unsigned int ActiveMac) /* Index (0..n) of the currently active port */
+{
+        char    *pBuf;
+        SK_U32  Val32;
+
+
+        pBuf = GetTrapEntry(pAC, OID_SKGE_TRAP_RLMT_CHANGE_PORT,
+                SK_PNMI_TRAP_RLMT_CHANGE_LEN);
+
+        Val32 = OID_SKGE_RLMT_PORT_ACTIVE;
+        SK_PNMI_STORE_U32(pBuf + SK_PNMI_TRAP_SIMPLE_LEN, Val32);
+        *(pBuf + SK_PNMI_TRAP_SIMPLE_LEN + 4) = 1;
+        *(pBuf + SK_PNMI_TRAP_SIMPLE_LEN + 5) = (char)ActiveMac;
+}
+
+/*****************************************************************************
+ *
+ * QueueRlmtPortTrap - Store port related RLMT trap to trap buffer
+ *
+ * Description:
+ *      Nothing further to explain.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void QueueRlmtPortTrap(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_U32 TrapId,          /* Type of RLMT port trap */
+unsigned int PortIndex) /* Index of the port, which changed its state */
+{
+        char    *pBuf;
+        SK_U32  Val32;
+
+
+        pBuf = GetTrapEntry(pAC, TrapId, SK_PNMI_TRAP_RLMT_PORT_LEN);
+
+        Val32 = OID_SKGE_RLMT_PORT_INDEX;
+        SK_PNMI_STORE_U32(pBuf + SK_PNMI_TRAP_SIMPLE_LEN, Val32);
+        *(pBuf + SK_PNMI_TRAP_SIMPLE_LEN + 4) = 1;
+        *(pBuf + SK_PNMI_TRAP_SIMPLE_LEN + 5) = (char)PortIndex;
+}
+
+/*****************************************************************************
+ *
+ * CopyMac - Copies a MAC address
+ *
+ * Description:
+ *      Nothing further to explain.
+ *
+ * Returns:
+ *      Nothing
+ */
+PNMI_STATIC void CopyMac(
+char *pDst,             /* Pointer to destination buffer */
+SK_MAC_ADDR *pMac)      /* Pointer of Source */
+{
+        int     i;
+
+
+        for (i = 0; i < sizeof(SK_MAC_ADDR); i ++) {
+
+                *(pDst + i) = pMac->a[i];
+        }
+}
+
+#ifdef SK_POWER_MGMT
+/*****************************************************************************
+ *
+ * PowerManagement - OID handler function of PowerManagement OIDs
+ *
+ * Description:
+ *      The code is simple. No description necessary.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                               exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+
+PNMI_STATIC int PowerManagement(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* Get/PreSet/Set action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer to which to mgmt data will be retrieved */
+unsigned int *pLen,     /* On call: buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode allways zero */
+{
+        
+        SK_U32  RetCode = SK_PNMI_ERR_GENERAL;
+
+        /*
+         * Check instance. We only handle single instance variables
+         */
+        if (Instance != (SK_U32)(-1) && Instance != 1) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_UNKNOWN_INST);
+        }
+        
+    
+    /* Check length */
+    switch (Id) {
+
+    case OID_PNP_CAPABILITIES:
+        if (*pLen < sizeof(SK_PNP_CAPABILITIES)) {
+
+            *pLen = sizeof(SK_PNP_CAPABILITIES);
+            return (SK_PNMI_ERR_TOO_SHORT);
+        }
+        break;
+
+        case OID_PNP_SET_POWER:
+    case OID_PNP_QUERY_POWER:
+        if (*pLen < sizeof(SK_DEVICE_POWER_STATE))
+        {
+                *pLen = sizeof(SK_DEVICE_POWER_STATE);
+                return (SK_PNMI_ERR_TOO_SHORT);
+        }
+        break;
+
+    case OID_PNP_ADD_WAKE_UP_PATTERN:
+    case OID_PNP_REMOVE_WAKE_UP_PATTERN:
+                if (*pLen < sizeof(SK_PM_PACKET_PATTERN)) {
+
+                        *pLen = sizeof(SK_PM_PACKET_PATTERN);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+    case OID_PNP_ENABLE_WAKE_UP:
+        if (*pLen < sizeof(SK_U32)) {
+
+            *pLen = sizeof(SK_U32);
+            return (SK_PNMI_ERR_TOO_SHORT);
+        }
+        break;
+    }
+        
+    /*
+         * Perform action
+         */
+        if (Action == SK_PNMI_GET) {
+
+                /*
+                 * Get value
+                 */
+                switch (Id) {
+
+                case OID_PNP_CAPABILITIES:
+                        RetCode = SkPowerQueryPnPCapabilities(pAC, IoC, pBuf, pLen);
+                        break;
+
+                case OID_PNP_QUERY_POWER:
+                        /* The Windows DDK describes: An OID_PNP_QUERY_POWER requests
+                         the miniport to indicate whether it can transition its NIC
+                         to the low-power state.
+                         A miniport driver must always return NDIS_STATUS_SUCCESS
+                         to a query of OID_PNP_QUERY_POWER. */
+                        *pLen = sizeof(SK_DEVICE_POWER_STATE);
+            RetCode = SK_PNMI_ERR_OK;
+                        break;
+
+                        /* NDIS handles these OIDs as write-only.
+                         * So in case of get action the buffer with written length = 0
+                         * is returned
+                         */
+                case OID_PNP_SET_POWER:
+                case OID_PNP_ADD_WAKE_UP_PATTERN:
+                case OID_PNP_REMOVE_WAKE_UP_PATTERN:
+                        *pLen = 0;      
+            RetCode = SK_PNMI_ERR_NOT_SUPPORTED;
+                        break;
+
+                case OID_PNP_ENABLE_WAKE_UP:
+                        RetCode = SkPowerGetEnableWakeUp(pAC, IoC, pBuf, pLen);
+                        break;
+
+                default:
+                        RetCode = SK_PNMI_ERR_GENERAL;
+                        break;
+                }
+
+                return (RetCode);
+        }
+        
+
+        /*
+         * Perform preset or set
+         */
+        
+        /* POWER module does not support PRESET action */
+        if (Action == SK_PNMI_PRESET) {
+                return (SK_PNMI_ERR_OK);
+        }
+
+        switch (Id) {
+        case OID_PNP_SET_POWER:
+                RetCode = SkPowerSetPower(pAC, IoC, pBuf, pLen);        
+                break;
+
+        case OID_PNP_ADD_WAKE_UP_PATTERN:
+                RetCode = SkPowerAddWakeUpPattern(pAC, IoC, pBuf, pLen);        
+                break;
+                
+        case OID_PNP_REMOVE_WAKE_UP_PATTERN:
+                RetCode = SkPowerRemoveWakeUpPattern(pAC, IoC, pBuf, pLen);     
+                break;
+                
+        case OID_PNP_ENABLE_WAKE_UP:
+                RetCode = SkPowerSetEnableWakeUp(pAC, IoC, pBuf, pLen);
+                break;
+                
+        default:
+                RetCode = SK_PNMI_ERR_READ_ONLY;
+        }
+        
+        return (RetCode);
+}
+#endif /* SK_POWER_MGMT */
+
+#ifdef SK_DIAG_SUPPORT
+/*****************************************************************************
+ *
+ * DiagActions - OID handler function of Diagnostic driver 
+ *
+ * Description:
+ *      The code is simple. No description necessary.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+
+PNMI_STATIC int DiagActions(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+
+        SK_U32  DiagStatus;
+        SK_U32  RetCode = SK_PNMI_ERR_GENERAL;
+
+        /*
+         * Check instance. We only handle single instance variables.
+         */
+        if (Instance != (SK_U32)(-1) && Instance != 1) {
+
+                *pLen = 0;
+                return (SK_PNMI_ERR_UNKNOWN_INST);
+        }
+
+        /*
+         * Check length.
+         */
+        switch (Id) {
+
+        case OID_SKGE_DIAG_MODE:
+                if (*pLen < sizeof(SK_U32)) {
+
+                        *pLen = sizeof(SK_U32);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR040, SK_PNMI_ERR040MSG);
+                *pLen = 0;
+                return (SK_PNMI_ERR_GENERAL);
+        }
+
+        /* Perform action. */
+
+        /* GET value. */
+        if (Action == SK_PNMI_GET) {
+
+                switch (Id) {
+
+                case OID_SKGE_DIAG_MODE:
+                        DiagStatus = pAC->Pnmi.DiagAttached;
+                        SK_PNMI_STORE_U32(pBuf, DiagStatus);
+                        *pLen = sizeof(SK_U32); 
+                        RetCode = SK_PNMI_ERR_OK;
+                        break;
+
+                default:
+                        *pLen = 0;      
+                        RetCode = SK_PNMI_ERR_GENERAL;
+                        break;
+                }
+                return (RetCode); 
+        }
+
+        /* From here SET or PRESET value. */
+        
+        /* PRESET value is not supported. */
+        if (Action == SK_PNMI_PRESET) {
+                return (SK_PNMI_ERR_OK); 
+        }
+
+        /* SET value. */
+        switch (Id) {
+                case OID_SKGE_DIAG_MODE:
+
+                        /* 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 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); 
+                                                }
+                                                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;
+
+                                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:
+                                        RetCode = SK_PNMI_ERR_BAD_VALUE;
+                                        break;
+                        }
+                        break;
+
+                default:
+                        RetCode = SK_PNMI_ERR_GENERAL;
+        }
+
+        if (RetCode == SK_PNMI_ERR_OK) {
+                *pLen = sizeof(SK_U32);
+        }
+        else {
+
+                *pLen = 0;
+        }
+        return (RetCode);
+}
+#endif /* SK_DIAG_SUPPORT */
+
+/*****************************************************************************
+ *
+ * Vct - OID handler function of  OIDs
+ *
+ * Description:
+ *      The code is simple. No description necessary.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was performed successfully.
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *                               the correct data (e.g. a 32bit value is
+ *                               needed, but a 16 bit value was passed).
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter).
+ *      SK_PNMI_ERR_READ_ONLY    Only the Get action is allowed.
+ *
+ */
+
+PNMI_STATIC int Vct(
+SK_AC *pAC,             /* Pointer to adapter context */
+SK_IOC IoC,             /* IO context handle */
+int Action,             /* GET/PRESET/SET action */
+SK_U32 Id,              /* Object ID that is to be processed */
+char *pBuf,             /* Buffer used for the management data transfer */
+unsigned int *pLen,     /* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,        /* Instance (-1,2..n) that is to be queried */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)        /* NetIndex (0..n), in single net mode always zero */
+{
+        SK_GEPORT       *pPrt;
+        SK_PNMI_VCT     *pVctBackupData;
+        SK_U32          LogPortMax;
+        SK_U32          PhysPortMax;
+        SK_U32          PhysPortIndex;
+        SK_U32          Limit;
+        SK_U32          Offset;
+        SK_BOOL         Link;
+        SK_U32          RetCode = SK_PNMI_ERR_GENERAL;
+        int             i;
+        SK_EVPARA       Para;
+        SK_U32          CableLength;
+        
+        /*
+         * Calculate the port indexes from the instance.
+         */
+        PhysPortMax = pAC->GIni.GIMacsFound;
+        LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
+        
+        /* Dual net mode? */
+        if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                LogPortMax--;
+        }
+        
+        if ((Instance != (SK_U32) (-1))) {
+                /* Check instance range. */
+                if ((Instance < 2) || (Instance > LogPortMax)) {
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_UNKNOWN_INST);
+                }
+                
+                if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
+                        PhysPortIndex = NetIndex;
+                }
+                else {
+                        PhysPortIndex = Instance - 2;
+                }
+                Limit = PhysPortIndex + 1;
+        }
+        else {
+                /*
+                 * Instance == (SK_U32) (-1), get all Instances of that OID.
+                 *
+                 * Not implemented yet. May be used in future releases.
+                 */
+                PhysPortIndex = 0;
+                Limit = PhysPortMax;
+        }
+        
+        pPrt = &pAC->GIni.GP[PhysPortIndex];
+        if (pPrt->PHWLinkUp) {
+                Link = SK_TRUE;
+        }
+        else {
+                Link = SK_FALSE;
+        }
+        
+        /* Check MAC type */
+        if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
+                *pLen = 0;
+                return (SK_PNMI_ERR_GENERAL);
+        }
+        
+        /* Initialize backup data pointer. */
+        pVctBackupData = &pAC->Pnmi.VctBackup[PhysPortIndex];
+        
+        /* Check action type */
+        if (Action == SK_PNMI_GET) {
+                /* Check length */
+                switch (Id) {
+                
+                case OID_SKGE_VCT_GET:
+                        if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_PNMI_VCT)) {
+                                *pLen = (Limit - PhysPortIndex) * sizeof(SK_PNMI_VCT);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        break;
+                
+                case OID_SKGE_VCT_STATUS:
+                        if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U8)) {
+                                *pLen = (Limit - PhysPortIndex) * sizeof(SK_U8);
+                                return (SK_PNMI_ERR_TOO_SHORT);
+                        }
+                        break;
+                
+                default:
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }       
+                
+                /* Get value */
+                Offset = 0;
+                for (; PhysPortIndex < Limit; PhysPortIndex++) {
+                        switch (Id) {
+                        
+                        case OID_SKGE_VCT_GET:
+                                if ((Link == SK_FALSE) &&
+                                        (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING)) {
+                                        RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_FALSE);
+                                        if (RetCode == 0) {
+                                                pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_PENDING;
+                                                pAC->Pnmi.VctStatus[PhysPortIndex] |=
+                                                        (SK_PNMI_VCT_NEW_VCT_DATA | SK_PNMI_VCT_TEST_DONE);
+                                                
+                                                /* Copy results for later use to PNMI struct. */
+                                                for (i = 0; i < 4; i++)  {
+                                                        if (pPrt->PMdiPairSts[i] == SK_PNMI_VCT_NORMAL_CABLE) {
+                                                                if ((pPrt->PMdiPairLen[i] > 35) && (pPrt->PMdiPairLen[i] < 0xff)) {
+                                                                        pPrt->PMdiPairSts[i] = SK_PNMI_VCT_IMPEDANCE_MISMATCH;
+                                                                }
+                                                        }
+                                                        if ((pPrt->PMdiPairLen[i] > 35) && (pPrt->PMdiPairLen[i] != 0xff)) {
+                                                                CableLength = 1000 * (((175 * pPrt->PMdiPairLen[i]) / 210) - 28);
+                                                        }
+                                                        else {
+                                                                CableLength = 0;
+                                                        }
+                                                        pVctBackupData->PMdiPairLen[i] = CableLength;
+                                                        pVctBackupData->PMdiPairSts[i] = pPrt->PMdiPairSts[i];
+                                                }
+
+                                                Para.Para32[0] = PhysPortIndex;
+                                                Para.Para32[1] = -1;
+                                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Para);
+                                                SkEventDispatcher(pAC, IoC);
+                                        }
+                                        else {
+                                                ; /* VCT test is running. */
+                                        }
+                                }
+                                
+                                /* Get all results. */
+                                CheckVctStatus(pAC, IoC, pBuf, Offset, PhysPortIndex);
+                                Offset += sizeof(SK_U8);
+                                *(pBuf + Offset) = pPrt->PCableLen;
+                                Offset += sizeof(SK_U8);
+                                for (i = 0; i < 4; i++)  {
+                                        SK_PNMI_STORE_U32((pBuf + Offset), pVctBackupData->PMdiPairLen[i]);
+                                        Offset += sizeof(SK_U32);
+                                }
+                                for (i = 0; i < 4; i++)  {
+                                        *(pBuf + Offset) = pVctBackupData->PMdiPairSts[i];
+                                        Offset += sizeof(SK_U8);
+                                }
+                                
+                                RetCode = SK_PNMI_ERR_OK;
+                                break;
+                
+                        case OID_SKGE_VCT_STATUS:
+                                CheckVctStatus(pAC, IoC, pBuf, Offset, PhysPortIndex);
+                                Offset += sizeof(SK_U8);
+                                RetCode = SK_PNMI_ERR_OK;
+                                break;
+                        
+                        default:
+                                *pLen = 0;
+                                return (SK_PNMI_ERR_GENERAL);
+                        }
+                } /* for */
+                *pLen = Offset;
+                return (RetCode);
+        
+        } /* if SK_PNMI_GET */
+        
+        /*
+         * From here SET or PRESET action. Check if the passed
+         * buffer length is plausible.
+         */
+        
+        /* Check length */
+        switch (Id) {
+        case OID_SKGE_VCT_SET:
+                if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U32)) {
+                        *pLen = (Limit - PhysPortIndex) * sizeof(SK_U32);
+                        return (SK_PNMI_ERR_TOO_SHORT);
+                }
+                break;
+        
+        default:
+                *pLen = 0;
+                return (SK_PNMI_ERR_GENERAL);
+        }
+        
+        /*
+         * Perform preset or set.
+         */
+        
+        /* VCT does not support PRESET action. */
+        if (Action == SK_PNMI_PRESET) {
+                return (SK_PNMI_ERR_OK);
+        }
+        
+        Offset = 0;
+        for (; PhysPortIndex < Limit; PhysPortIndex++) {
+                switch (Id) {
+                case OID_SKGE_VCT_SET: /* Start VCT test. */
+                        if (Link == SK_FALSE) {
+                                SkGeStopPort(pAC, IoC, PhysPortIndex, SK_STOP_ALL, SK_SOFT_RST);
+                                
+                                RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_TRUE);
+                                if (RetCode == 0) { /* RetCode: 0 => Start! */
+                                        pAC->Pnmi.VctStatus[PhysPortIndex] |= SK_PNMI_VCT_PENDING;
+                                        pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_NEW_VCT_DATA;
+                                        pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_LINK;
+                                        
+                                        /*
+                                         * Start VCT timer counter.
+                                         */
+                                        SK_MEMSET((char *) &Para, 0, sizeof(Para));
+                                        Para.Para32[0] = PhysPortIndex;
+                                        Para.Para32[1] = -1;
+                                        SkTimerStart(pAC, IoC, &pAC->Pnmi.VctTimeout[PhysPortIndex].VctTimer,
+                                                4000000, SKGE_PNMI, SK_PNMI_EVT_VCT_RESET, Para);
+                                        SK_PNMI_STORE_U32((pBuf + Offset), RetCode);
+                                        RetCode = SK_PNMI_ERR_OK;
+                                }
+                                else { /* RetCode: 2 => Running! */
+                                        SK_PNMI_STORE_U32((pBuf + Offset), RetCode);
+                                        RetCode = SK_PNMI_ERR_OK;
+                                }
+                        }
+                        else { /* RetCode: 4 => Link! */
+                                RetCode = 4;
+                                SK_PNMI_STORE_U32((pBuf + Offset), RetCode);
+                                RetCode = SK_PNMI_ERR_OK;
+                        }
+                        Offset += sizeof(SK_U32);
+                        break;
+        
+                default:
+                        *pLen = 0;
+                        return (SK_PNMI_ERR_GENERAL);
+                }
+        } /* for */
+        *pLen = Offset;
+        return (RetCode);
+
+} /* Vct */
+
+
+PNMI_STATIC void CheckVctStatus(
+SK_AC           *pAC,
+SK_IOC          IoC,
+char            *pBuf,
+SK_U32          Offset,
+SK_U32          PhysPortIndex)
+{
+        SK_GEPORT       *pPrt;
+        SK_PNMI_VCT     *pVctData;
+        SK_U32          RetCode;
+        
+        pPrt = &pAC->GIni.GP[PhysPortIndex];
+        
+        pVctData = (SK_PNMI_VCT *) (pBuf + Offset);
+        pVctData->VctStatus = SK_PNMI_VCT_NONE;
+        
+        if (!pPrt->PHWLinkUp) {
+                
+                /* Was a VCT test ever made before? */
+                if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_TEST_DONE) {
+                        if ((pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_LINK)) {
+                                pVctData->VctStatus |= SK_PNMI_VCT_OLD_VCT_DATA;
+                        }
+                        else {
+                                pVctData->VctStatus |= SK_PNMI_VCT_NEW_VCT_DATA;
+                        }
+                }
+                
+                /* Check VCT test status. */
+                RetCode = SkGmCableDiagStatus(pAC,IoC, PhysPortIndex, SK_FALSE);
+                if (RetCode == 2) { /* VCT test is running. */
+                        pVctData->VctStatus |= SK_PNMI_VCT_RUNNING;
+                }
+                else { /* VCT data was copied to pAC here. Check PENDING state. */
+                        if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING) {
+                                pVctData->VctStatus |= SK_PNMI_VCT_NEW_VCT_DATA;
+                        }
+                }
+                
+                if (pPrt->PCableLen != 0xff) { /* Old DSP value. */
+                        pVctData->VctStatus |= SK_PNMI_VCT_OLD_DSP_DATA;
+                }
+        }
+        else {
+                
+                /* Was a VCT test ever made before? */
+                if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_TEST_DONE) {
+                        pVctData->VctStatus &= ~SK_PNMI_VCT_NEW_VCT_DATA;
+                        pVctData->VctStatus |= SK_PNMI_VCT_OLD_VCT_DATA;
+                }
+                
+                /* DSP only valid in 100/1000 modes. */
+                if (pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed !=
+                        SK_LSPEED_STAT_10MBPS) {        
+                        pVctData->VctStatus |= SK_PNMI_VCT_NEW_DSP_DATA;
+                }
+        }
+} /* CheckVctStatus */
+
+
+/*****************************************************************************
+ *
+ *      SkPnmiGenIoctl - Handles new generic PNMI IOCTL, calls the needed
+ *                       PNMI function depending on the subcommand and
+ *                       returns all data belonging to the complete database
+ *                       or OID request.
+ *
+ * Description:
+ *      Looks up the requested subcommand, calls the corresponding handler
+ *      function and passes all required parameters to it.
+ *      The function is called by the driver. It is needed to handle the new
+ *  generic PNMI IOCTL. This IOCTL is given to the driver and contains both
+ *  the OID and a subcommand to decide what kind of request has to be done.
+ *
+ * Returns:
+ *      SK_PNMI_ERR_OK           The request was successfully performed
+ *      SK_PNMI_ERR_GENERAL      A general severe internal error occured
+ *      SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to take
+ *                               the data.
+ *      SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown
+ *      SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *                               adapter.
+ */
+int SkPnmiGenIoctl(
+SK_AC           *pAC,           /* Pointer to adapter context struct */
+SK_IOC          IoC,            /* I/O context */
+void            *pBuf,          /* Buffer used for the management data transfer */
+unsigned int *pLen,             /* Length of buffer */
+SK_U32          NetIndex)       /* NetIndex (0..n), in single net mode always zero */
+{
+SK_I32  Mode;                   /* Store value of subcommand. */
+SK_U32  Oid;                    /* Store value of OID. */
+int             ReturnCode;             /* Store return value to show status of PNMI action. */
+int     HeaderLength;   /* Length of desired action plus OID. */
+
+        ReturnCode = SK_PNMI_ERR_GENERAL;
+        
+        SK_MEMCPY(&Mode, pBuf, sizeof(SK_I32));
+        SK_MEMCPY(&Oid, (char *) pBuf + sizeof(SK_I32), sizeof(SK_U32));
+        HeaderLength = sizeof(SK_I32) + sizeof(SK_U32);
+        *pLen = *pLen - HeaderLength;
+        SK_MEMCPY((char *) pBuf + sizeof(SK_I32), (char *) pBuf + HeaderLength, *pLen);
+        
+        switch(Mode) {
+        case SK_GET_SINGLE_VAR:
+                ReturnCode = SkPnmiGetVar(pAC, IoC, Oid, 
+                                (char *) pBuf + sizeof(SK_I32), pLen,
+                                ((SK_U32) (-1)), NetIndex);
+                SK_PNMI_STORE_U32(pBuf, ReturnCode);
+                *pLen = *pLen + sizeof(SK_I32);
+                break;
+        case SK_PRESET_SINGLE_VAR:
+                ReturnCode = SkPnmiPreSetVar(pAC, IoC, Oid, 
+                                (char *) pBuf + sizeof(SK_I32), pLen,
+                                ((SK_U32) (-1)), NetIndex);
+                SK_PNMI_STORE_U32(pBuf, ReturnCode);
+                *pLen = *pLen + sizeof(SK_I32);
+                break;
+        case SK_SET_SINGLE_VAR:
+                ReturnCode = SkPnmiSetVar(pAC, IoC, Oid, 
+                                (char *) pBuf + sizeof(SK_I32), pLen,
+                                ((SK_U32) (-1)), NetIndex);
+                SK_PNMI_STORE_U32(pBuf, ReturnCode);
+                *pLen = *pLen + sizeof(SK_I32);
+                break;
+        case SK_GET_FULL_MIB:
+                ReturnCode = SkPnmiGetStruct(pAC, IoC, pBuf, pLen, NetIndex);
+                break;
+        case SK_PRESET_FULL_MIB:
+                ReturnCode = SkPnmiPreSetStruct(pAC, IoC, pBuf, pLen, NetIndex);
+                break;
+        case SK_SET_FULL_MIB:
+                ReturnCode = SkPnmiSetStruct(pAC, IoC, pBuf, pLen, NetIndex);
+                break;
+        default:
+                break;
+        }
+        
+        return (ReturnCode);
+
+} /* SkGeIocGen */
diff --git a/drivers/net/sk98lin/skgesirq.c b/drivers/net/sk98lin/skgesirq.c
new file mode 100644
index 0000000000..3e7aa49afd
--- /dev/null
+++ b/drivers/net/sk98lin/skgesirq.c
@@ -0,0 +1,2229 @@
+/******************************************************************************
+ *
+ * Name:        skgesirq.c
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.92 $
+ * Date:        $Date: 2003/09/16 14:37:07 $
+ * Purpose:     Special IRQ module
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ *      Special Interrupt handler
+ *
+ *      The following abstract should show how this module is included
+ *      in the driver path:
+ *
+ *      In the ISR of the driver the bits for frame transmission complete and
+ *      for receive complete are checked and handled by the driver itself.
+ *      The bits of the slow path mask are checked after that and then the
+ *      entry into the so-called "slow path" is prepared. It is an implementors
+ *      decision whether this is executed directly or just scheduled by
+ *      disabling the mask. In the interrupt service routine some events may be
+ *      generated, so it would be a good idea to call the EventDispatcher
+ *      right after this ISR.
+ *
+ *      The Interrupt source register of the adapter is NOT read by this module.
+ *  SO if the drivers implementor needs a while loop around the
+ *      slow data paths interrupt bits, he needs to call the SkGeSirqIsr() for
+ *      each loop entered.
+ *
+ *      However, the MAC Interrupt status registers are read in a while loop.
+ *
+ */
+
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skgesirq.c,v 1.92 2003/09/16 14:37:07 rschmidt Exp $ (C) Marvell.";
+#endif
+
+#include "h/skdrv1st.h"         /* Driver Specific Definitions */
+#ifndef SK_SLIM
+#include "h/skgepnmi.h"         /* PNMI Definitions */
+#include "h/skrlmt.h"           /* RLMT Definitions */
+#endif
+#include "h/skdrv2nd.h"         /* Adapter Control and Driver specific Def. */
+
+/* local function prototypes */
+#ifdef GENESIS
+static int      SkGePortCheckUpXmac(SK_AC*, SK_IOC, int, SK_BOOL);
+static int      SkGePortCheckUpBcom(SK_AC*, SK_IOC, int, SK_BOOL);
+static void     SkPhyIsrBcom(SK_AC*, SK_IOC, int, SK_U16);
+#endif /* GENESIS */
+#ifdef YUKON
+static int      SkGePortCheckUpGmac(SK_AC*, SK_IOC, int, SK_BOOL);
+static void     SkPhyIsrGmac(SK_AC*, SK_IOC, int, SK_U16);
+#endif /* YUKON */
+#ifdef OTHER_PHY
+static int      SkGePortCheckUpLone(SK_AC*, SK_IOC, int, SK_BOOL);
+static int      SkGePortCheckUpNat(SK_AC*, SK_IOC, int, SK_BOOL);
+static void     SkPhyIsrLone(SK_AC*, SK_IOC, int, SK_U16);
+#endif /* OTHER_PHY */
+
+#ifdef GENESIS
+/*
+ * array of Rx counter from XMAC which are checked
+ * in AutoSense mode to check whether a link is not able to auto-negotiate.
+ */
+static const SK_U16 SkGeRxRegs[]= {
+        XM_RXF_64B,
+        XM_RXF_127B,
+        XM_RXF_255B,
+        XM_RXF_511B,
+        XM_RXF_1023B,
+        XM_RXF_MAX_SZ
+} ;
+#endif /* GENESIS */
+
+#ifdef __C2MAN__
+/*
+ *      Special IRQ function
+ *
+ *      General Description:
+ *
+ */
+intro()
+{}
+#endif
+
+/******************************************************************************
+ *
+ *      SkHWInitDefSense() - Default Autosensing mode initialization
+ *
+ * Description: sets the PLinkMode for HWInit
+ *
+ * Returns: N/A
+ */
+static void SkHWInitDefSense(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        pPrt->PAutoNegTimeOut = 0;
+
+        if (pPrt->PLinkModeConf != SK_LMODE_AUTOSENSE) {
+                pPrt->PLinkMode = pPrt->PLinkModeConf;
+                return;
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                ("AutoSensing: First mode %d on Port %d\n",
+                (int)SK_LMODE_AUTOFULL, Port));
+
+        pPrt->PLinkMode = (SK_U8)SK_LMODE_AUTOFULL;
+
+        return;
+}       /* SkHWInitDefSense */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkHWSenseGetNext() - Get Next Autosensing Mode
+ *
+ * Description: gets the appropriate next mode
+ *
+ * Note:
+ *
+ */
+static SK_U8 SkHWSenseGetNext(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        pPrt->PAutoNegTimeOut = 0;
+
+    if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
+                /* Leave all as configured */
+                return(pPrt->PLinkModeConf);
+        }
+
+    if (pPrt->PLinkMode == (SK_U8)SK_LMODE_AUTOFULL) {
+                /* Return next mode AUTOBOTH */
+        return ((SK_U8)SK_LMODE_AUTOBOTH);
+        }
+
+        /* Return default autofull */
+    return ((SK_U8)SK_LMODE_AUTOFULL);
+}       /* SkHWSenseGetNext */
+
+
+/******************************************************************************
+ *
+ *      SkHWSenseSetNext() - Autosensing Set next mode
+ *
+ * Description: sets the appropriate next mode
+ *
+ * Returns: N/A
+ */
+static void SkHWSenseSetNext(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_U8   NewMode)        /* New Mode to be written in sense mode */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        pPrt->PAutoNegTimeOut = 0;
+
+    if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
+                return;
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                ("AutoSensing: next mode %d on Port %d\n",
+                (int)NewMode, Port));
+
+        pPrt->PLinkMode = NewMode;
+
+        return;
+}       /* SkHWSenseSetNext */
+#endif /* GENESIS */
+
+
+/******************************************************************************
+ *
+ *      SkHWLinkDown() - Link Down handling
+ *
+ * Description: handles the hardware link down signal
+ *
+ * Returns: N/A
+ */
+void SkHWLinkDown(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* Disable all MAC interrupts */
+        SkMacIrqDisable(pAC, IoC, Port);
+
+        /* Disable Receiver and Transmitter */
+        SkMacRxTxDisable(pAC, IoC, Port);
+        
+        /* Init default sense mode */
+        SkHWInitDefSense(pAC, IoC, Port);
+
+        if (pPrt->PHWLinkUp == SK_FALSE) {
+                return;
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                ("Link down Port %d\n", Port));
+
+        /* Set Link to DOWN */
+        pPrt->PHWLinkUp = SK_FALSE;
+
+        /* Reset Port stati */
+    pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+    pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
+        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);
+
+        /* GP0: used for workaround of Rev. C Errata 2 */
+
+        /* Do NOT signal to RLMT */
+
+        /* Do NOT start the timer here */
+}       /* SkHWLinkDown */
+
+
+/******************************************************************************
+ *
+ *      SkHWLinkUp() - Link Up handling
+ *
+ * Description: handles the hardware link up signal
+ *
+ * Returns: N/A
+ */
+static void SkHWLinkUp(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PHWLinkUp) {
+                /* We do NOT need to proceed on active link */
+                return;
+        }
+
+        pPrt->PHWLinkUp = SK_TRUE;
+        pPrt->PAutoNegFail = SK_FALSE;
+    pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+
+    if (pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOHALF &&
+        pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOFULL &&
+        pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOBOTH) {
+                /* Link is up and no Auto-negotiation should be done */
+
+                /* Link speed should be the configured one */
+                switch (pPrt->PLinkSpeed) {
+                case SK_LSPEED_AUTO:
+                        /* default is 1000 Mbps */
+                case SK_LSPEED_1000MBPS:
+                        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+                        break;
+                case SK_LSPEED_100MBPS:
+                        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_100MBPS;
+                        break;
+                case SK_LSPEED_10MBPS:
+                        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_10MBPS;
+                        break;
+                }
+
+                /* Set Link Mode Status */
+                if (pPrt->PLinkMode == SK_LMODE_FULL) {
+                        pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_FULL;
+                }
+                else {
+            pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_HALF;
+                }
+
+                /* No flow control without auto-negotiation */
+        pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
+
+                /* enable Rx/Tx */
+        (void)SkMacRxTxEnable(pAC, IoC, Port);
+        }
+}       /* SkHWLinkUp */
+
+
+/******************************************************************************
+ *
+ *      SkMacParity() - MAC parity workaround
+ *
+ * Description: handles MAC parity errors correctly
+ *
+ * Returns: N/A
+ */
+static void SkMacParity(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index of the port failed */
+{
+        SK_EVPARA       Para;
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        SK_U32          TxMax;          /* Tx Max Size Counter */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* Clear IRQ Tx Parity Error */
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+
+                SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_PERR);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /* HW-Bug #8: cleared by GMF_CLI_TX_FC instead of GMF_CLI_TX_PE */
+                SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T),
+                        (SK_U8)((pAC->GIni.GIChipId == CHIP_ID_YUKON &&
+                        pAC->GIni.GIChipRev == 0) ? GMF_CLI_TX_FC : GMF_CLI_TX_PE));
+        }
+#endif /* YUKON */
+        
+        if (pPrt->PCheckPar) {
+
+                if (Port == MAC_1) {
+                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E016, SKERR_SIRQ_E016MSG);
+                }
+                else {
+                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E017, SKERR_SIRQ_E017MSG);
+                }
+                Para.Para64 = Port;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                
+                Para.Para32[0] = Port;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+
+                return;
+        }
+
+        /* Check whether frames with a size of 1k were sent */
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                /* Snap statistic counters */
+                (void)SkXmUpdateStats(pAC, IoC, Port);
+                
+                (void)SkXmMacStatistic(pAC, IoC, Port, XM_TXF_MAX_SZ, &TxMax);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+
+                (void)SkGmMacStatistic(pAC, IoC, Port, GM_TXF_1518B, &TxMax);
+        }
+#endif /* YUKON */
+        
+        if (TxMax > 0) {
+                /* From now on check the parity */
+                pPrt->PCheckPar = SK_TRUE;
+        }
+}       /* SkMacParity */
+
+
+/******************************************************************************
+ *
+ *      SkGeHwErr() - Hardware Error service routine
+ *
+ * Description: handles all HW Error interrupts
+ *
+ * Returns: N/A
+ */
+static void SkGeHwErr(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+SK_U32  HwStatus)       /* Interrupt status word */
+{
+        SK_EVPARA       Para;
+        SK_U16          Word;
+
+        if ((HwStatus & (IS_IRQ_MST_ERR | IS_IRQ_STAT)) != 0) {
+                /* PCI Errors occured */
+                if ((HwStatus & IS_IRQ_STAT) != 0) {
+                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E013, SKERR_SIRQ_E013MSG);
+                }
+                else {
+                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E012, SKERR_SIRQ_E012MSG);
+                }
+
+                /* Reset all bits in the PCI STATUS register */
+                SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
+                
+                SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+        SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
+                SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+
+                Para.Para64 = 0;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
+        }
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+
+                if ((HwStatus & IS_NO_STAT_M1) != 0) {
+                        /* Ignore it */
+                        /* This situation is also indicated in the descriptor */
+                        SK_OUT16(IoC, MR_ADDR(MAC_1, RX_MFF_CTRL1), MFF_CLR_INSTAT);
+                }
+
+                if ((HwStatus & IS_NO_STAT_M2) != 0) {
+                        /* Ignore it */
+                        /* This situation is also indicated in the descriptor */
+                        SK_OUT16(IoC, MR_ADDR(MAC_2, RX_MFF_CTRL1), MFF_CLR_INSTAT);
+                }
+
+                if ((HwStatus & IS_NO_TIST_M1) != 0) {
+                        /* Ignore it */
+                        /* This situation is also indicated in the descriptor */
+                        SK_OUT16(IoC, MR_ADDR(MAC_1, RX_MFF_CTRL1), MFF_CLR_INTIST);
+                }
+
+                if ((HwStatus & IS_NO_TIST_M2) != 0) {
+                        /* Ignore it */
+                        /* This situation is also indicated in the descriptor */
+                        SK_OUT16(IoC, MR_ADDR(MAC_2, RX_MFF_CTRL1), MFF_CLR_INTIST);
+                }
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /* This is necessary only for Rx timing measurements */
+                if ((HwStatus & IS_IRQ_TIST_OV) != 0) {
+                        /* increment Time Stamp Timer counter (high) */
+                        pAC->GIni.GITimeStampCnt++;
+
+                        /* Clear Time Stamp Timer IRQ */
+                        SK_OUT8(IoC, GMAC_TI_ST_CTRL, (SK_U8)GMT_ST_CLR_IRQ);
+                }
+
+                if ((HwStatus & IS_IRQ_SENSOR) != 0) {
+                        /* no sensors on 32-bit Yukon */
+                        if (pAC->GIni.GIYukon32Bit) {
+                                /* disable HW Error IRQ */
+                                pAC->GIni.GIValIrqMask &= ~IS_HW_ERR;
+                        }
+                }
+        }
+#endif /* YUKON */
+
+        if ((HwStatus & IS_RAM_RD_PAR) != 0) {
+                SK_OUT16(IoC, B3_RI_CTRL, RI_CLR_RD_PERR);
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E014, SKERR_SIRQ_E014MSG);
+                Para.Para64 = 0;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
+        }
+
+        if ((HwStatus & IS_RAM_WR_PAR) != 0) {
+                SK_OUT16(IoC, B3_RI_CTRL, RI_CLR_WR_PERR);
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E015, SKERR_SIRQ_E015MSG);
+                Para.Para64 = 0;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
+        }
+
+        if ((HwStatus & IS_M1_PAR_ERR) != 0) {
+                SkMacParity(pAC, IoC, MAC_1);
+        }
+
+        if ((HwStatus & IS_M2_PAR_ERR) != 0) {
+                SkMacParity(pAC, IoC, MAC_2);
+        }
+
+        if ((HwStatus & IS_R1_PAR_ERR) != 0) {
+                /* Clear IRQ */
+                SK_OUT32(IoC, B0_R1_CSR, CSR_IRQ_CL_P);
+
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E018, SKERR_SIRQ_E018MSG);
+                Para.Para64 = MAC_1;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                
+                Para.Para32[0] = MAC_1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+
+        if ((HwStatus & IS_R2_PAR_ERR) != 0) {
+                /* Clear IRQ */
+                SK_OUT32(IoC, B0_R2_CSR, CSR_IRQ_CL_P);
+
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E019, SKERR_SIRQ_E019MSG);
+                Para.Para64 = MAC_2;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                
+                Para.Para32[0] = MAC_2;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+}       /* SkGeHwErr */
+
+
+/******************************************************************************
+ *
+ *      SkGeSirqIsr() - Special Interrupt Service Routine
+ *
+ * Description: handles all non data transfer specific interrupts (slow path)
+ *
+ * Returns: N/A
+ */
+void SkGeSirqIsr(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+SK_U32  Istatus)        /* Interrupt status word */
+{
+        SK_EVPARA       Para;
+        SK_U32          RegVal32;       /* Read register value */
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        SK_U16          PhyInt;
+        int                     i;
+
+        if (((Istatus & IS_HW_ERR) & pAC->GIni.GIValIrqMask) != 0) {
+                /* read the HW Error Interrupt source */
+                SK_IN32(IoC, B0_HWE_ISRC, &RegVal32);
+                
+                SkGeHwErr(pAC, IoC, RegVal32);
+        }
+
+        /*
+         * Packet Timeout interrupts
+         */
+        /* Check whether MACs are correctly initialized */
+        if (((Istatus & (IS_PA_TO_RX1 | IS_PA_TO_TX1)) != 0) &&
+                pAC->GIni.GP[MAC_1].PState == SK_PRT_RESET) {
+                /* MAC 1 was not initialized but Packet timeout occured */
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E004,
+                        SKERR_SIRQ_E004MSG);
+        }
+
+        if (((Istatus & (IS_PA_TO_RX2 | IS_PA_TO_TX2)) != 0) &&
+            pAC->GIni.GP[MAC_2].PState == SK_PRT_RESET) {
+                /* MAC 2 was not initialized but Packet timeout occured */
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E005,
+                        SKERR_SIRQ_E005MSG);
+        }
+
+        if ((Istatus & IS_PA_TO_RX1) != 0) {
+                /* Means network is filling us up */
+                SK_ERR_LOG(pAC, SK_ERRCL_HW | SK_ERRCL_INIT, SKERR_SIRQ_E002,
+                        SKERR_SIRQ_E002MSG);
+                SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_RX1);
+        }
+
+        if ((Istatus & IS_PA_TO_RX2) != 0) {
+                /* Means network is filling us up */
+                SK_ERR_LOG(pAC, SK_ERRCL_HW | SK_ERRCL_INIT, SKERR_SIRQ_E003,
+                        SKERR_SIRQ_E003MSG);
+                SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_RX2);
+        }
+
+        if ((Istatus & IS_PA_TO_TX1) != 0) {
+                
+                pPrt = &pAC->GIni.GP[0];
+
+                /* May be a normal situation in a server with a slow network */
+                SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_TX1);
+
+#ifdef GENESIS
+                if (pAC->GIni.GIGenesis) {
+                        /*
+                         * workaround: if in half duplex mode, check for Tx hangup.
+                         * Read number of TX'ed bytes, wait for 10 ms, then compare
+                         * the number with current value. If nothing changed, we assume
+                         * that Tx is hanging and do a FIFO flush (see event routine).
+                         */
+                        if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
+                                pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) &&
+                                !pPrt->HalfDupTimerActive) {
+                                /*
+                                 * many more pack. arb. timeouts may come in between,
+                                 * we ignore those
+                                 */
+                                pPrt->HalfDupTimerActive = SK_TRUE;
+                                /* Snap statistic counters */
+                                (void)SkXmUpdateStats(pAC, IoC, 0);
+
+                                (void)SkXmMacStatistic(pAC, IoC, 0, XM_TXO_OK_HI, &RegVal32);
+
+                                pPrt->LastOctets = (SK_U64)RegVal32 << 32;
+                                
+                                (void)SkXmMacStatistic(pAC, IoC, 0, XM_TXO_OK_LO, &RegVal32);
+
+                                pPrt->LastOctets += RegVal32;
+                                
+                                Para.Para32[0] = 0;
+                                SkTimerStart(pAC, IoC, &pPrt->HalfDupChkTimer, SK_HALFDUP_CHK_TIME,
+                                        SKGE_HWAC, SK_HWEV_HALFDUP_CHK, Para);
+                        }
+                }
+#endif /* GENESIS */
+        }
+
+        if ((Istatus & IS_PA_TO_TX2) != 0) {
+                
+                pPrt = &pAC->GIni.GP[1];
+
+                /* May be a normal situation in a server with a slow network */
+                SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_TX2);
+
+#ifdef GENESIS
+                if (pAC->GIni.GIGenesis) {
+                        /* workaround: see above */
+                        if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
+                                 pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) &&
+                                !pPrt->HalfDupTimerActive) {
+                                pPrt->HalfDupTimerActive = SK_TRUE;
+                                /* Snap statistic counters */
+                                (void)SkXmUpdateStats(pAC, IoC, 1);
+
+                                (void)SkXmMacStatistic(pAC, IoC, 1, XM_TXO_OK_HI, &RegVal32);
+
+                                pPrt->LastOctets = (SK_U64)RegVal32 << 32;
+                                
+                                (void)SkXmMacStatistic(pAC, IoC, 1, XM_TXO_OK_LO, &RegVal32);
+
+                                pPrt->LastOctets += RegVal32;
+                                
+                                Para.Para32[0] = 1;
+                                SkTimerStart(pAC, IoC, &pPrt->HalfDupChkTimer, SK_HALFDUP_CHK_TIME,
+                                        SKGE_HWAC, SK_HWEV_HALFDUP_CHK, Para);
+                        }
+                }
+#endif /* GENESIS */
+        }
+
+        /* Check interrupts of the particular queues */
+        if ((Istatus & IS_R1_C) != 0) {
+                /* Clear IRQ */
+                SK_OUT32(IoC, B0_R1_CSR, CSR_IRQ_CL_C);
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E006,
+                        SKERR_SIRQ_E006MSG);
+                Para.Para64 = MAC_1;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                Para.Para32[0] = MAC_1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+
+        if ((Istatus & IS_R2_C) != 0) {
+                /* Clear IRQ */
+                SK_OUT32(IoC, B0_R2_CSR, CSR_IRQ_CL_C);
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E007,
+                        SKERR_SIRQ_E007MSG);
+                Para.Para64 = MAC_2;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                Para.Para32[0] = MAC_2;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+
+        if ((Istatus & IS_XS1_C) != 0) {
+                /* Clear IRQ */
+                SK_OUT32(IoC, B0_XS1_CSR, CSR_IRQ_CL_C);
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E008,
+                        SKERR_SIRQ_E008MSG);
+                Para.Para64 = MAC_1;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                Para.Para32[0] = MAC_1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+
+        if ((Istatus & IS_XA1_C) != 0) {
+                /* Clear IRQ */
+                SK_OUT32(IoC, B0_XA1_CSR, CSR_IRQ_CL_C);
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E009,
+                        SKERR_SIRQ_E009MSG);
+                Para.Para64 = MAC_1;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                Para.Para32[0] = MAC_1;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+
+        if ((Istatus & IS_XS2_C) != 0) {
+                /* Clear IRQ */
+                SK_OUT32(IoC, B0_XS2_CSR, CSR_IRQ_CL_C);
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E010,
+                        SKERR_SIRQ_E010MSG);
+                Para.Para64 = MAC_2;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                Para.Para32[0] = MAC_2;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+
+        if ((Istatus & IS_XA2_C) != 0) {
+                /* Clear IRQ */
+                SK_OUT32(IoC, B0_XA2_CSR, CSR_IRQ_CL_C);
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_SIRQ_E011,
+                        SKERR_SIRQ_E011MSG);
+                Para.Para64 = MAC_2;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+                Para.Para32[0] = MAC_2;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+
+        /* External reg interrupt */
+        if ((Istatus & IS_EXT_REG) != 0) {
+                /* Test IRQs from PHY */
+                for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
+                        
+                        pPrt = &pAC->GIni.GP[i];
+                        
+                        if (pPrt->PState == SK_PRT_RESET) {
+                                continue;
+                        }
+                        
+#ifdef GENESIS
+                        if (pAC->GIni.GIGenesis) {
+                                
+                                switch (pPrt->PhyType) {
+                                
+                                case SK_PHY_XMAC:
+                                        break;
+                                
+                                case SK_PHY_BCOM:
+                                        SkXmPhyRead(pAC, IoC, i, PHY_BCOM_INT_STAT, &PhyInt);
+        
+                                        if ((PhyInt & ~PHY_B_DEF_MSK) != 0) {
+                                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                                        ("Port %d Bcom Int: 0x%04X\n",
+                                                        i, PhyInt));
+                                                SkPhyIsrBcom(pAC, IoC, i, PhyInt);
+                                        }
+                                        break;
+#ifdef OTHER_PHY
+                                case SK_PHY_LONE:
+                                        SkXmPhyRead(pAC, IoC, i, PHY_LONE_INT_STAT, &PhyInt);
+                                        
+                                        if ((PhyInt & PHY_L_DEF_MSK) != 0) {
+                                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                                        ("Port %d Lone Int: %x\n",
+                                                        i, PhyInt));
+                                                SkPhyIsrLone(pAC, IoC, i, PhyInt);
+                                        }
+                                        break;
+#endif /* OTHER_PHY */
+                                }
+                        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+                        if (pAC->GIni.GIYukon) {
+                                /* Read PHY Interrupt Status */
+                                SkGmPhyRead(pAC, IoC, i, PHY_MARV_INT_STAT, &PhyInt);
+
+                                if ((PhyInt & PHY_M_DEF_MSK) != 0) {
+                                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                                ("Port %d Marv Int: 0x%04X\n",
+                                                i, PhyInt));
+                                        SkPhyIsrGmac(pAC, IoC, i, PhyInt);
+                                }
+                        }
+#endif /* YUKON */
+                }
+        }
+
+        /* I2C Ready interrupt */
+        if ((Istatus & IS_I2C_READY) != 0) {
+#ifdef SK_SLIM
+        SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+#else           
+                SkI2cIsr(pAC, IoC);
+#endif          
+        }
+
+        /* SW forced interrupt */
+        if ((Istatus & IS_IRQ_SW) != 0) {
+                /* clear the software IRQ */
+                SK_OUT8(IoC, B0_CTST, CS_CL_SW_IRQ);
+        }
+
+        if ((Istatus & IS_LNK_SYNC_M1) != 0) {
+                /*
+                 * We do NOT need the Link Sync interrupt, because it shows
+                 * us only a link going down.
+                 */
+                /* clear interrupt */
+                SK_OUT8(IoC, MR_ADDR(MAC_1, LNK_SYNC_CTRL), LED_CLR_IRQ);
+        }
+
+        /* Check MAC after link sync counter */
+        if ((Istatus & IS_MAC1) != 0) {
+                /* IRQ from MAC 1 */
+                SkMacIrq(pAC, IoC, MAC_1);
+        }
+
+        if ((Istatus & IS_LNK_SYNC_M2) != 0) {
+                /*
+                 * We do NOT need the Link Sync interrupt, because it shows
+                 * us only a link going down.
+                 */
+                /* clear interrupt */
+                SK_OUT8(IoC, MR_ADDR(MAC_2, LNK_SYNC_CTRL), LED_CLR_IRQ);
+        }
+
+        /* Check MAC after link sync counter */
+        if ((Istatus & IS_MAC2) != 0) {
+                /* IRQ from MAC 2 */
+                SkMacIrq(pAC, IoC, MAC_2);
+        }
+
+        /* Timer interrupt (served last) */
+        if ((Istatus & IS_TIMINT) != 0) {
+                /* check for HW Errors */
+                if (((Istatus & IS_HW_ERR) & ~pAC->GIni.GIValIrqMask) != 0) {
+                        /* read the HW Error Interrupt source */
+                        SK_IN32(IoC, B0_HWE_ISRC, &RegVal32);
+
+                        SkGeHwErr(pAC, IoC, RegVal32);
+                }
+
+                SkHwtIsr(pAC, IoC);
+        }
+
+}       /* SkGeSirqIsr */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ * SkGePortCheckShorts() - Implementing XMAC Workaround Errata # 2
+ *
+ * return:
+ *      0       o.k. nothing needed
+ *      1       Restart needed on this port
+ */
+static int SkGePortCheckShorts(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO Context */
+int             Port)           /* Which port should be checked */
+{
+        SK_U32          Shorts;                 /* Short Event Counter */
+        SK_U32          CheckShorts;    /* Check value for Short Event Counter */
+        SK_U64          RxCts;                  /* Rx Counter (packets on network) */
+        SK_U32          RxTmp;                  /* Rx temp. Counter */
+        SK_U32          FcsErrCts;              /* FCS Error Counter */
+        SK_GEPORT       *pPrt;                  /* GIni Port struct pointer */
+        int                     Rtv;                    /* Return value */
+        int                     i;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* Default: no action */
+        Rtv = SK_HW_PS_NONE;
+
+        (void)SkXmUpdateStats(pAC, IoC, Port);
+
+        /* Extra precaution: check for short Event counter */
+        (void)SkXmMacStatistic(pAC, IoC, Port, XM_RXE_SHT_ERR, &Shorts);
+
+        /*
+         * Read Rx counters (packets seen on the network and not necessarily
+         * really received.
+         */
+        RxCts = 0;
+
+        for (i = 0; i < sizeof(SkGeRxRegs)/sizeof(SkGeRxRegs[0]); i++) {
+                
+                (void)SkXmMacStatistic(pAC, IoC, Port, SkGeRxRegs[i], &RxTmp);
+                
+                RxCts += (SK_U64)RxTmp;
+        }
+
+        /* On default: check shorts against zero */
+        CheckShorts = 0;
+
+        /* Extra precaution on active links */
+        if (pPrt->PHWLinkUp) {
+                /* Reset Link Restart counter */
+                pPrt->PLinkResCt = 0;
+                pPrt->PAutoNegTOCt = 0;
+
+                /* If link is up check for 2 */
+                CheckShorts = 2;
+
+                (void)SkXmMacStatistic(pAC, IoC, Port, XM_RXF_FCS_ERR, &FcsErrCts);
+                
+                if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
+                    pPrt->PLipaAutoNeg == SK_LIPA_UNKNOWN &&
+                    (pPrt->PLinkMode == SK_LMODE_HALF ||
+                         pPrt->PLinkMode == SK_LMODE_FULL)) {
+                        /*
+                         * This is autosensing and we are in the fallback
+                         * manual full/half duplex mode.
+                         */
+                        if (RxCts == pPrt->PPrevRx) {
+                                /* Nothing received, restart link */
+                                pPrt->PPrevFcs = FcsErrCts;
+                                pPrt->PPrevShorts = Shorts;
+                                
+                                return(SK_HW_PS_RESTART);
+                        }
+                        else {
+                                pPrt->PLipaAutoNeg = SK_LIPA_MANUAL;
+                        }
+                }
+
+                if (((RxCts - pPrt->PPrevRx) > pPrt->PRxLim) ||
+                    (!(FcsErrCts - pPrt->PPrevFcs))) {
+                        /*
+                         * Note: The compare with zero above has to be done the way shown,
+                         * otherwise the Linux driver will have a problem.
+                         */
+                        /*
+                         * We received a bunch of frames or no CRC error occured on the
+                         * network -> ok.
+                         */
+                        pPrt->PPrevRx = RxCts;
+                        pPrt->PPrevFcs = FcsErrCts;
+                        pPrt->PPrevShorts = Shorts;
+
+                        return(SK_HW_PS_NONE);
+                }
+
+                pPrt->PPrevFcs = FcsErrCts;
+        }
+
+
+        if ((Shorts - pPrt->PPrevShorts) > CheckShorts) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                        ("Short Event Count Restart Port %d \n", Port));
+                Rtv = SK_HW_PS_RESTART;
+        }
+
+        pPrt->PPrevShorts = Shorts;
+        pPrt->PPrevRx = RxCts;
+
+        return(Rtv);
+}       /* SkGePortCheckShorts */
+#endif /* GENESIS */
+
+
+/******************************************************************************
+ *
+ * SkGePortCheckUp() - Check if the link is up
+ *
+ * return:
+ *      0       o.k. nothing needed
+ *      1       Restart needed on this port
+ *      2       Link came up
+ */
+static int SkGePortCheckUp(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO Context */
+int             Port)           /* Which port should be checked */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        SK_BOOL         AutoNeg;        /* Is Auto-negotiation used ? */
+        int                     Rtv;            /* Return value */
+
+        Rtv = SK_HW_PS_NONE;
+        
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+                AutoNeg = SK_FALSE;
+        }
+        else {
+                AutoNeg = SK_TRUE;
+        }
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+
+                switch (pPrt->PhyType) {
+                
+                case SK_PHY_XMAC:
+                        Rtv = SkGePortCheckUpXmac(pAC, IoC, Port, AutoNeg);
+                        break;
+                case SK_PHY_BCOM:
+                        Rtv = SkGePortCheckUpBcom(pAC, IoC, Port, AutoNeg);
+                        break;
+#ifdef OTHER_PHY
+                case SK_PHY_LONE:
+                        Rtv = SkGePortCheckUpLone(pAC, IoC, Port, AutoNeg);
+                        break;
+                case SK_PHY_NAT:
+                        Rtv = SkGePortCheckUpNat(pAC, IoC, Port, AutoNeg);
+                        break;
+#endif /* OTHER_PHY */
+                }
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                Rtv = SkGePortCheckUpGmac(pAC, IoC, Port, AutoNeg);
+        }
+#endif /* YUKON */
+
+        return(Rtv);    
+}       /* SkGePortCheckUp */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ * SkGePortCheckUpXmac() - Implementing of the Workaround Errata # 2
+ *
+ * return:
+ *      0       o.k. nothing needed
+ *      1       Restart needed on this port
+ *      2       Link came up
+ */
+static int SkGePortCheckUpXmac(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO Context */
+int             Port,           /* Which port should be checked */
+SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
+{
+        SK_U32          Shorts;         /* Short Event Counter */
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        int                     Done;
+        SK_U32          GpReg;          /* General Purpose register value */
+        SK_U16          Isrc;           /* Interrupt source register */
+        SK_U16          IsrcSum;        /* Interrupt source register sum */
+        SK_U16          LpAb;           /* Link Partner Ability */
+        SK_U16          ResAb;          /* Resolved Ability */
+        SK_U16          ExtStat;        /* Extended Status Register */
+        SK_U8           NextMode;       /* Next AutoSensing Mode */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PHWLinkUp) {
+                if (pPrt->PhyType != SK_PHY_XMAC) {
+                        return(SK_HW_PS_NONE);
+                }
+                else {
+                        return(SkGePortCheckShorts(pAC, IoC, Port));
+                }
+        }
+
+        IsrcSum = pPrt->PIsave;
+        pPrt->PIsave = 0;
+
+        /* Now wait for each port's link */
+        if (pPrt->PLinkBroken) {
+                /* Link was broken */
+                XM_IN32(IoC, Port, XM_GP_PORT, &GpReg);
+
+                if ((GpReg & XM_GP_INP_ASS) == 0) {
+                        /* The Link is in sync */
+                        XM_IN16(IoC, Port, XM_ISRC, &Isrc);
+                        IsrcSum |= Isrc;
+                        SkXmAutoNegLipaXmac(pAC, IoC, Port, IsrcSum);
+                        
+                        if ((Isrc & XM_IS_INP_ASS) == 0) {
+                                /* It has been in sync since last time */
+                                /* Restart the PORT */
+                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                        ("Link in sync Restart Port %d\n", Port));
+
+                                (void)SkXmUpdateStats(pAC, IoC, Port);
+
+                                /* We now need to reinitialize the PrevShorts counter */
+                                (void)SkXmMacStatistic(pAC, IoC, Port, XM_RXE_SHT_ERR, &Shorts);
+                                pPrt->PPrevShorts = Shorts;
+
+                                pPrt->PLinkBroken = SK_FALSE;
+
+                                /*
+                                 * Link Restart Workaround:
+                                 *  it may be possible that the other Link side
+                                 *  restarts its link as well an we detect
+                                 *  another LinkBroken. To prevent this
+                                 *  happening we check for a maximum number
+                                 *  of consecutive restart. If those happens,
+                                 *  we do NOT restart the active link and
+                                 *  check whether the link is now o.k.
+                                 */
+                                pPrt->PLinkResCt++;
+                                
+                                pPrt->PAutoNegTimeOut = 0;
+
+                                if (pPrt->PLinkResCt < SK_MAX_LRESTART) {
+                                        return(SK_HW_PS_RESTART);
+                                }
+
+                                pPrt->PLinkResCt = 0;
+                                
+                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                        ("Do NOT restart on Port %d %x %x\n", Port, Isrc, IsrcSum));
+                        }
+                        else {
+                                pPrt->PIsave = (SK_U16)(IsrcSum & XM_IS_AND);
+                                
+                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                        ("Save Sync/nosync Port %d %x %x\n", Port, Isrc, IsrcSum));
+
+                                /* Do nothing more if link is broken */
+                                return(SK_HW_PS_NONE);
+                        }
+                }
+                else {
+                        /* Do nothing more if link is broken */
+                        return(SK_HW_PS_NONE);
+                }
+
+        }
+        else {
+                /* Link was not broken, check if it is */
+                XM_IN16(IoC, Port, XM_ISRC, &Isrc);
+                IsrcSum |= Isrc;
+                if ((Isrc & XM_IS_INP_ASS) != 0) {
+                        XM_IN16(IoC, Port, XM_ISRC, &Isrc);
+                        IsrcSum |= Isrc;
+                        if ((Isrc & XM_IS_INP_ASS) != 0) {
+                                XM_IN16(IoC, Port, XM_ISRC, &Isrc);
+                                IsrcSum |= Isrc;
+                                if ((Isrc & XM_IS_INP_ASS) != 0) {
+                                        pPrt->PLinkBroken = SK_TRUE;
+                                        /* Re-Init Link partner Autoneg flag */
+                                        pPrt->PLipaAutoNeg = SK_LIPA_UNKNOWN;
+                                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                                ("Link broken Port %d\n", Port));
+
+                                        /* Cable removed-> reinit sense mode */
+                                        SkHWInitDefSense(pAC, IoC, Port);
+
+                                        return(SK_HW_PS_RESTART);
+                                }
+                        }
+                }
+                else {
+                        SkXmAutoNegLipaXmac(pAC, IoC, Port, Isrc);
+                        
+                        if (SkGePortCheckShorts(pAC, IoC, Port) == SK_HW_PS_RESTART) {
+                                return(SK_HW_PS_RESTART);
+                        }
+                }
+        }
+
+        /*
+         * here we usually can check whether the link is in sync and
+         * auto-negotiation is done.
+         */
+        XM_IN32(IoC, Port, XM_GP_PORT, &GpReg);
+        XM_IN16(IoC, Port, XM_ISRC, &Isrc);
+        IsrcSum |= Isrc;
+
+        SkXmAutoNegLipaXmac(pAC, IoC, Port, IsrcSum);
+        
+        if ((GpReg & XM_GP_INP_ASS) != 0 || (IsrcSum & XM_IS_INP_ASS) != 0) {
+                if ((GpReg & XM_GP_INP_ASS) == 0) {
+                        /* Save Auto-negotiation Done interrupt only if link is in sync */
+                        pPrt->PIsave = (SK_U16)(IsrcSum & XM_IS_AND);
+                }
+#ifdef DEBUG
+                if ((pPrt->PIsave & XM_IS_AND) != 0) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                ("AutoNeg done rescheduled Port %d\n", Port));
+                }
+#endif /* DEBUG */
+                return(SK_HW_PS_NONE);
+        }
+
+        if (AutoNeg) {
+                if ((IsrcSum & XM_IS_AND) != 0) {
+                        SkHWLinkUp(pAC, IoC, Port);
+                        Done = SkMacAutoNegDone(pAC, IoC, Port);
+                        if (Done != SK_AND_OK) {
+                                /* Get PHY parameters, for debugging only */
+                                SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_AUNE_LP, &LpAb);
+                                SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_RES_ABI, &ResAb);
+                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                        ("AutoNeg FAIL Port %d (LpAb %x, ResAb %x)\n",
+                                         Port, LpAb, ResAb));
+                                        
+                                /* Try next possible mode */
+                                NextMode = SkHWSenseGetNext(pAC, IoC, Port);
+                                SkHWLinkDown(pAC, IoC, Port);
+                                if (Done == SK_AND_DUP_CAP) {
+                                        /* GoTo next mode */
+                                        SkHWSenseSetNext(pAC, IoC, Port, NextMode);
+                                }
+
+                                return(SK_HW_PS_RESTART);
+                        }
+                        /*
+                         * Dummy Read extended status to prevent extra link down/ups
+                         * (clear Page Received bit if set)
+                         */
+                        SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_AUNE_EXP, &ExtStat);
+                        
+                        return(SK_HW_PS_LINK);
+                }
+                
+                /* AutoNeg not done, but HW link is up. Check for timeouts */
+                pPrt->PAutoNegTimeOut++;
+                if (pPrt->PAutoNegTimeOut >= SK_AND_MAX_TO) {
+                        /* Increase the Timeout counter */
+                        pPrt->PAutoNegTOCt++;
+
+                        /* Timeout occured */
+                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                ("AutoNeg timeout Port %d\n", Port));
+                        if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
+                                pPrt->PLipaAutoNeg != SK_LIPA_AUTO) {
+                                /* Set Link manually up */
+                                SkHWSenseSetNext(pAC, IoC, Port, SK_LMODE_FULL);
+                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                        ("Set manual full duplex Port %d\n", Port));
+                        }
+
+                        if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
+                                pPrt->PLipaAutoNeg == SK_LIPA_AUTO &&
+                                pPrt->PAutoNegTOCt >= SK_MAX_ANEG_TO) {
+                                /*
+                                 * This is rather complicated.
+                                 * we need to check here whether the LIPA_AUTO
+                                 * we saw before is false alert. We saw at one
+                                 * switch ( SR8800) that on boot time it sends
+                                 * just one auto-neg packet and does no further
+                                 * auto-negotiation.
+                                 * Solution: we restart the autosensing after
+                                 * a few timeouts.
+                                 */
+                                pPrt->PAutoNegTOCt = 0;
+                                pPrt->PLipaAutoNeg = SK_LIPA_UNKNOWN;
+                                SkHWInitDefSense(pAC, IoC, Port);
+                        }
+
+                        /* Do the restart */
+                        return(SK_HW_PS_RESTART);
+                }
+        }
+        else {
+                /* Link is up and we don't need more */
+#ifdef DEBUG
+                if (pPrt->PLipaAutoNeg == SK_LIPA_AUTO) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                ("ERROR: Lipa auto detected on port %d\n", Port));
+                }
+#endif /* DEBUG */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                        ("Link sync(GP), Port %d\n", Port));
+                SkHWLinkUp(pAC, IoC, Port);
+                
+                /*
+                 * Link sync (GP) and so assume a good connection. But if not received
+                 * a bunch of frames received in a time slot (maybe broken tx cable)
+                 * the port is restart.
+                 */
+                return(SK_HW_PS_LINK);
+        }
+
+        return(SK_HW_PS_NONE);
+}       /* SkGePortCheckUpXmac */
+
+
+/******************************************************************************
+ *
+ * SkGePortCheckUpBcom() - Check if the link is up on Bcom PHY
+ *
+ * return:
+ *      0       o.k. nothing needed
+ *      1       Restart needed on this port
+ *      2       Link came up
+ */
+static int SkGePortCheckUpBcom(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO Context */
+int             Port,           /* Which port should be checked */
+SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        int                     Done;
+        SK_U16          Isrc;           /* Interrupt source register */
+        SK_U16          PhyStat;        /* Phy Status Register */
+        SK_U16          ResAb;          /* Master/Slave resolution */
+        SK_U16          Ctrl;           /* Broadcom control flags */
+#ifdef DEBUG
+        SK_U16          LpAb;
+        SK_U16          ExtStat;
+#endif /* DEBUG */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* Check for No HCD Link events (#10523) */
+        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &Isrc);
+
+#ifdef xDEBUG
+        if ((Isrc & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) ==
+                (PHY_B_IS_SCR_S_ER | PHY_B_IS_RRS_CHANGE | PHY_B_IS_LRS_CHANGE)) {
+
+                SK_U32  Stat1, Stat2, Stat3;
+
+                Stat1 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_MASK, &Stat1);
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "CheckUp1 - Stat: %x, Mask: %x",
+                        (void *)Isrc,
+                        (void *)Stat1);
+
+                Stat1 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Stat1);
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &Stat2);
+                Stat1 = Stat1 << 16 | Stat2;
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, &Stat2);
+                Stat3 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &Stat3);
+                Stat2 = Stat2 << 16 | Stat3;
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "Ctrl/Stat: %x, AN Adv/LP: %x",
+                        (void *)Stat1,
+                        (void *)Stat2);
+
+                Stat1 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_EXP, &Stat1);
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_EXT_STAT, &Stat2);
+                Stat1 = Stat1 << 16 | Stat2;
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, &Stat2);
+                Stat3 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &Stat3);
+                Stat2 = Stat2 << 16 | Stat3;
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "AN Exp/IEEE Ext: %x, 1000T Ctrl/Stat: %x",
+                        (void *)Stat1,
+                        (void *)Stat2);
+
+                Stat1 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, &Stat1);
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_STAT, &Stat2);
+                Stat1 = Stat1 << 16 | Stat2;
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &Stat2);
+                Stat3 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &Stat3);
+                Stat2 = Stat2 << 16 | Stat3;
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "PHY Ext Ctrl/Stat: %x, Aux Ctrl/Stat: %x",
+                        (void *)Stat1,
+                        (void *)Stat2);
+        }
+#endif /* DEBUG */
+
+        if ((Isrc & (PHY_B_IS_NO_HDCL /* | PHY_B_IS_NO_HDC */)) != 0) {
+                /*
+                 * Workaround BCom Errata:
+                 *      enable and disable loopback mode if "NO HCD" occurs.
+                 */
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Ctrl);
+                SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_CTRL,
+                        (SK_U16)(Ctrl | PHY_CT_LOOP));
+                SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_CTRL,
+                        (SK_U16)(Ctrl & ~PHY_CT_LOOP));
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("No HCD Link event, Port %d\n", Port));
+#ifdef xDEBUG
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "No HCD link event, port %d.",
+                        (void *)Port,
+                        (void *)NULL);
+#endif /* DEBUG */
+        }
+
+        /* Not obsolete: link status bit is latched to 0 and autoclearing! */
+        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &PhyStat);
+
+        if (pPrt->PHWLinkUp) {
+                return(SK_HW_PS_NONE);
+        }
+
+#ifdef xDEBUG
+        {
+                SK_U32  Stat1, Stat2, Stat3;
+
+                Stat1 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_MASK, &Stat1);
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "CheckUp1a - Stat: %x, Mask: %x",
+                        (void *)Isrc,
+                        (void *)Stat1);
+
+                Stat1 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Stat1);
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &PhyStat);
+                Stat1 = Stat1 << 16 | PhyStat;
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, &Stat2);
+                Stat3 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &Stat3);
+                Stat2 = Stat2 << 16 | Stat3;
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "Ctrl/Stat: %x, AN Adv/LP: %x",
+                        (void *)Stat1,
+                        (void *)Stat2);
+
+                Stat1 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_EXP, &Stat1);
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_EXT_STAT, &Stat2);
+                Stat1 = Stat1 << 16 | Stat2;
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, &Stat2);
+                Stat3 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
+                Stat2 = Stat2 << 16 | ResAb;
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "AN Exp/IEEE Ext: %x, 1000T Ctrl/Stat: %x",
+                        (void *)Stat1,
+                        (void *)Stat2);
+
+                Stat1 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, &Stat1);
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_P_EXT_STAT, &Stat2);
+                Stat1 = Stat1 << 16 | Stat2;
+                Stat2 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &Stat2);
+                Stat3 = 0;
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &Stat3);
+                Stat2 = Stat2 << 16 | Stat3;
+                CMSMPrintString(
+                        pAC->pConfigTable,
+                        MSG_TYPE_RUNTIME_INFO,
+                        "PHY Ext Ctrl/Stat: %x, Aux Ctrl/Stat: %x",
+                        (void *)Stat1,
+                        (void *)Stat2);
+        }
+#endif /* DEBUG */
+
+        /*
+         * Here we usually can check whether the link is in sync and
+         * auto-negotiation is done.
+         */
+
+        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_STAT, &PhyStat);
+
+        SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("CheckUp Port %d, PhyStat: 0x%04X\n", Port, PhyStat));
+
+        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
+
+        if ((ResAb & PHY_B_1000S_MSF) != 0) {
+                /* Error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("Master/Slave Fault port %d\n", Port));
+                
+                pPrt->PAutoNegFail = SK_TRUE;
+                pPrt->PMSStatus = SK_MS_STAT_FAULT;
+                
+                return(SK_HW_PS_RESTART);
+        }
+
+        if ((PhyStat & PHY_ST_LSYNC) == 0) {
+                return(SK_HW_PS_NONE);
+        }
+        
+        pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
+                SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("Port %d, ResAb: 0x%04X\n", Port, ResAb));
+
+        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 */
+                                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &LpAb);
+                                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ExtStat);
+                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                        ("AutoNeg FAIL Port %d (LpAb %x, 1000TStat %x)\n",
+                                        Port, LpAb, ExtStat));
+#endif /* DEBUG */
+                                return(SK_HW_PS_RESTART);
+                        }
+                        else {
+#ifdef xDEBUG
+                                /* Dummy read ISR to prevent extra link downs/ups */
+                                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &ExtStat);
+
+                                if ((ExtStat & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) != 0) {
+                                        CMSMPrintString(
+                                                pAC->pConfigTable,
+                                                MSG_TYPE_RUNTIME_INFO,
+                                                "CheckUp2 - Stat: %x",
+                                                (void *)ExtStat,
+                                                (void *)NULL);
+                                }
+#endif /* DEBUG */
+                                return(SK_HW_PS_LINK);
+                        }
+                }
+        }
+        else {  /* !AutoNeg */
+                /* Link is up and we don't need more. */
+#ifdef DEBUG
+                if (pPrt->PLipaAutoNeg == SK_LIPA_AUTO) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                ("ERROR: Lipa auto detected on port %d\n", Port));
+                }
+#endif /* DEBUG */
+
+#ifdef xDEBUG
+                /* Dummy read ISR to prevent extra link downs/ups */
+                SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_INT_STAT, &ExtStat);
+
+                if ((ExtStat & ~(PHY_B_IS_HCT | PHY_B_IS_LCT)) != 0) {
+                        CMSMPrintString(
+                                pAC->pConfigTable,
+                                MSG_TYPE_RUNTIME_INFO,
+                                "CheckUp3 - Stat: %x",
+                                (void *)ExtStat,
+                                (void *)NULL);
+                }
+#endif /* DEBUG */
+                
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                        ("Link sync(GP), Port %d\n", Port));
+                SkHWLinkUp(pAC, IoC, Port);
+                
+                return(SK_HW_PS_LINK);
+        }
+
+        return(SK_HW_PS_NONE);
+}       /* SkGePortCheckUpBcom */
+#endif /* GENESIS */
+
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ * SkGePortCheckUpGmac() - Check if the link is up on Marvell PHY
+ *
+ * return:
+ *      0       o.k. nothing needed
+ *      1       Restart needed on this port
+ *      2       Link came up
+ */
+static int SkGePortCheckUpGmac(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO Context */
+int             Port,           /* Which port should be checked */
+SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        int                     Done;
+        SK_U16          PhyIsrc;        /* PHY Interrupt source */
+        SK_U16          PhyStat;        /* PPY Status */
+        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);
+
+        if ((PhyIsrc & PHY_M_IS_AN_COMPL) != 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("Auto-Negotiation Completed, PhyIsrc: 0x%04X\n", PhyIsrc));
+        }
+
+        if ((PhyIsrc & PHY_M_IS_LSP_CHANGE) != 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("Link Speed Changed, PhyIsrc: 0x%04X\n", PhyIsrc));
+        }
+
+        SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
+        
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
+
+        if ((ResAb & PHY_B_1000S_MSF) != 0) {
+                /* Error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("Master/Slave Fault port %d\n", Port));
+                
+                pPrt->PAutoNegFail = SK_TRUE;
+                pPrt->PMSStatus = SK_MS_STAT_FAULT;
+                
+                return(SK_HW_PS_RESTART);
+        }
+
+        /* Read PHY Specific Status */
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("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);
+        }
+        
+        if ((PhySpecStat & PHY_M_PS_DOWNS_STAT) != 0 ||
+                (PhyIsrc & PHY_M_IS_DOWNSH_DET) != 0) {
+                /* Downshift detected */
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E025, SKERR_SIRQ_E025MSG);
+                
+                Para.Para64 = Port;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_DOWNSHIFT_DET, Para);
+                
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("Downshift detected, PhyIsrc: 0x%04X\n", PhyIsrc));
+        }
+
+        pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
+                SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
+        
+        pPrt->PCableLen = (SK_U8)((PhySpecStat & PHY_M_PS_CABLE_MSK) >> 7);
+        
+        if (AutoNeg) {
+                /* Auto-Negotiation Over ? */
+                if ((PhyStat & PHY_ST_AN_OVER) != 0) {
+                        
+                        SkHWLinkUp(pAC, IoC, Port);
+                        
+                        Done = SkMacAutoNegDone(pAC, IoC, Port);
+                        
+                        if (Done != SK_AND_OK) {
+                                return(SK_HW_PS_RESTART);
+                        }
+                        
+                        return(SK_HW_PS_LINK);
+                }
+        }
+        else {  /* !AutoNeg */
+                /* Link is up and we don't need more */
+#ifdef DEBUG
+                if (pPrt->PLipaAutoNeg == SK_LIPA_AUTO) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                ("ERROR: Lipa auto detected on port %d\n", Port));
+                }
+#endif /* DEBUG */
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                        ("Link sync, Port %d\n", Port));
+                SkHWLinkUp(pAC, IoC, Port);
+                
+                return(SK_HW_PS_LINK);
+        }
+
+        return(SK_HW_PS_NONE);
+}       /* SkGePortCheckUpGmac */
+#endif /* YUKON */
+
+
+#ifdef OTHER_PHY
+/******************************************************************************
+ *
+ * SkGePortCheckUpLone() - Check if the link is up on Level One PHY
+ *
+ * return:
+ *      0       o.k. nothing needed
+ *      1       Restart needed on this port
+ *      2       Link came up
+ */
+static int SkGePortCheckUpLone(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO Context */
+int             Port,           /* Which port should be checked */
+SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        int                     Done;
+        SK_U16          Isrc;           /* Interrupt source register */
+        SK_U16          LpAb;           /* Link Partner Ability */
+        SK_U16          ExtStat;        /* Extended Status Register */
+        SK_U16          PhyStat;        /* Phy Status Register */
+        SK_U16          StatSum;
+        SK_U8           NextMode;       /* Next AutoSensing Mode */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PHWLinkUp) {
+                return(SK_HW_PS_NONE);
+        }
+
+        StatSum = pPrt->PIsave;
+        pPrt->PIsave = 0;
+
+        /*
+         * here we usually can check whether the link is in sync and
+         * auto-negotiation is done.
+         */
+        SkXmPhyRead(pAC, IoC, Port, PHY_LONE_STAT, &PhyStat);
+        StatSum |= PhyStat;
+
+        SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
+        
+        if ((PhyStat & PHY_ST_LSYNC) == 0) {
+                /* Save Auto-negotiation Done bit */
+                pPrt->PIsave = (SK_U16)(StatSum & PHY_ST_AN_OVER);
+#ifdef DEBUG
+                if ((pPrt->PIsave & PHY_ST_AN_OVER) != 0) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                ("AutoNeg done rescheduled Port %d\n", Port));
+                }
+#endif /* DEBUG */
+                return(SK_HW_PS_NONE);
+        }
+
+        if (AutoNeg) {
+                if ((StatSum & PHY_ST_AN_OVER) != 0) {
+                        SkHWLinkUp(pAC, IoC, Port);
+                        Done = SkMacAutoNegDone(pAC, IoC, Port);
+                        if (Done != SK_AND_OK) {
+                                /* Get PHY parameters, for debugging only */
+                                SkXmPhyRead(pAC, IoC, Port, PHY_LONE_AUNE_LP, &LpAb);
+                                SkXmPhyRead(pAC, IoC, Port, PHY_LONE_1000T_STAT, &ExtStat);
+                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                        ("AutoNeg FAIL Port %d (LpAb %x, 1000TStat %x)\n",
+                                         Port, LpAb, ExtStat));
+                                        
+                                /* Try next possible mode */
+                                NextMode = SkHWSenseGetNext(pAC, IoC, Port);
+                                SkHWLinkDown(pAC, IoC, Port);
+                                if (Done == SK_AND_DUP_CAP) {
+                                        /* GoTo next mode */
+                                        SkHWSenseSetNext(pAC, IoC, Port, NextMode);
+                                }
+
+                                return(SK_HW_PS_RESTART);
+
+                        }
+                        else {
+                                /*
+                                 * Dummy Read interrupt status to prevent
+                                 * extra link down/ups
+                                 */
+                                SkXmPhyRead(pAC, IoC, Port, PHY_LONE_INT_STAT, &ExtStat);
+                                return(SK_HW_PS_LINK);
+                        }
+                }
+                
+                /* AutoNeg not done, but HW link is up. Check for timeouts */
+                pPrt->PAutoNegTimeOut++;
+                if (pPrt->PAutoNegTimeOut >= SK_AND_MAX_TO) {
+                        /* Timeout occured */
+                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                ("AutoNeg timeout Port %d\n", Port));
+                        if (pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE &&
+                                pPrt->PLipaAutoNeg != SK_LIPA_AUTO) {
+                                /* Set Link manually up */
+                                SkHWSenseSetNext(pAC, IoC, Port, SK_LMODE_FULL);
+                                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                                        ("Set manual full duplex Port %d\n", Port));
+                        }
+
+                        /* Do the restart */
+                        return(SK_HW_PS_RESTART);
+                }
+        }
+        else {
+                /* Link is up and we don't need more */
+#ifdef DEBUG
+                if (pPrt->PLipaAutoNeg == SK_LIPA_AUTO) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                                ("ERROR: Lipa auto detected on port %d\n", Port));
+                }
+#endif /* DEBUG */
+
+                /*
+                 * Dummy Read interrupt status to prevent
+                 * extra link down/ups
+                 */
+                SkXmPhyRead(pAC, IoC, Port, PHY_LONE_INT_STAT, &ExtStat);
+                
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                        ("Link sync(GP), Port %d\n", Port));
+                SkHWLinkUp(pAC, IoC, Port);
+                
+                return(SK_HW_PS_LINK);
+        }
+
+        return(SK_HW_PS_NONE);
+}       /* SkGePortCheckUpLone */
+
+
+/******************************************************************************
+ *
+ * SkGePortCheckUpNat() - Check if the link is up on National PHY
+ *
+ * return:
+ *      0       o.k. nothing needed
+ *      1       Restart needed on this port
+ *      2       Link came up
+ */
+static int SkGePortCheckUpNat(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO Context */
+int             Port,           /* Which port should be checked */
+SK_BOOL AutoNeg)        /* Is Auto-negotiation used ? */
+{
+        /* todo: National */
+        return(SK_HW_PS_NONE);
+}       /* SkGePortCheckUpNat */
+#endif /* OTHER_PHY */
+
+
+/******************************************************************************
+ *
+ *      SkGeSirqEvent() - Event Service Routine
+ *
+ * Description:
+ *
+ * Notes:
+ */
+int     SkGeSirqEvent(
+SK_AC           *pAC,           /* Adapter Context */
+SK_IOC          IoC,            /* Io Context */
+SK_U32          Event,          /* Module specific Event */
+SK_EVPARA       Para)           /* Event specific Parameter */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        SK_U32          Port;
+        SK_U32          Val32;
+        int                     PortStat;
+        SK_U8           Val8;
+#ifdef GENESIS
+        SK_U64          Octets;
+#endif /* GENESIS */
+
+        Port = Para.Para32[0];
+        pPrt = &pAC->GIni.GP[Port];
+
+        switch (Event) {
+        case SK_HWEV_WATIM:
+                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:
+                        if (pPrt->PHWLinkUp) {
+                                /* Set Link to down */
+                                SkHWLinkDown(pAC, IoC, (int)Port);
+
+                                /*
+                                 * Signal directly to RLMT to ensure correct
+                                 * sequence of SWITCH and RESET event.
+                                 */
+                                SkRlmtEvent(pAC, IoC, SK_RLMT_LINK_DOWN, Para);
+                        }
+
+                        /* Restart needed */
+                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Para);
+                        break;
+
+                case SK_HW_PS_LINK:
+                        /* Signal to RLMT */
+                        SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_UP, Para);
+                        break;
+                }
+                
+                /* Start again the check Timer */
+                if (pPrt->PHWLinkUp) {
+                        Val32 = SK_WA_ACT_TIME;
+                }
+                else {
+                        Val32 = SK_WA_INA_TIME;
+                }
+
+                /* Todo: still needed for non-XMAC PHYs??? */
+                /* Start workaround Errata #2 timer */
+                SkTimerStart(pAC, IoC, &pPrt->PWaTimer, Val32,
+                        SKGE_HWAC, SK_HWEV_WATIM, Para);
+                break;
+
+        case SK_HWEV_PORT_START:
+                if (pPrt->PHWLinkUp) {
+                        /*
+                         * Signal directly to RLMT to ensure correct
+                         * sequence of SWITCH and RESET event.
+                         */
+                        SkRlmtEvent(pAC, IoC, SK_RLMT_LINK_DOWN, Para);
+                }
+
+                SkHWLinkDown(pAC, IoC, (int)Port);
+
+                /* Schedule Port RESET */
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Para);
+
+                /* Start workaround Errata #2 timer */
+                SkTimerStart(pAC, IoC, &pPrt->PWaTimer, SK_WA_INA_TIME,
+                        SKGE_HWAC, SK_HWEV_WATIM, Para);
+                break;
+
+        case SK_HWEV_PORT_STOP:
+                if (pPrt->PHWLinkUp) {
+                        /*
+                         * Signal directly to RLMT to ensure correct
+                         * sequence of SWITCH and RESET event.
+                         */
+                        SkRlmtEvent(pAC, IoC, SK_RLMT_LINK_DOWN, Para);
+                }
+
+                /* Stop Workaround Timer */
+                SkTimerStop(pAC, IoC, &pPrt->PWaTimer);
+
+                SkHWLinkDown(pAC, IoC, (int)Port);
+                break;
+
+        case SK_HWEV_UPDATE_STAT:
+                /* We do NOT need to update any statistics */
+                break;
+
+        case SK_HWEV_CLEAR_STAT:
+                /* We do NOT need to clear any statistics */
+                for (Port = 0; Port < (SK_U32)pAC->GIni.GIMacsFound; Port++) {
+                        pPrt->PPrevRx = 0;
+                        pPrt->PPrevFcs = 0;
+                        pPrt->PPrevShorts = 0;
+                }
+                break;
+
+        case SK_HWEV_SET_LMODE:
+                Val8 = (SK_U8)Para.Para32[1];
+                if (pPrt->PLinkModeConf != Val8) {
+                        /* Set New link mode */
+                        pPrt->PLinkModeConf = Val8;
+
+                        /* Restart Port */
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para);
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
+                }
+                break;
+
+        case SK_HWEV_SET_FLOWMODE:
+                Val8 = (SK_U8)Para.Para32[1];
+                if (pPrt->PFlowCtrlMode != Val8) {
+                        /* Set New Flow Control mode */
+                        pPrt->PFlowCtrlMode = Val8;
+
+                        /* Restart Port */
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para);
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
+                }
+                break;
+
+        case SK_HWEV_SET_ROLE:
+                /* not possible for fiber */
+                if (!pAC->GIni.GICopperType) {
+                        break;
+                }
+                Val8 = (SK_U8)Para.Para32[1];
+                if (pPrt->PMSMode != Val8) {
+                        /* Set New Role (Master/Slave) mode */
+                        pPrt->PMSMode = Val8;
+
+                        /* Restart Port */
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para);
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
+                }
+                break;
+
+        case SK_HWEV_SET_SPEED:
+                if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
+                        break;
+                }
+                Val8 = (SK_U8)Para.Para32[1];
+                if (pPrt->PLinkSpeed != Val8) {
+                        /* Set New Speed parameter */
+                        pPrt->PLinkSpeed = Val8;
+
+                        /* Restart Port */
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para);
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
+                }
+                break;
+
+#ifdef GENESIS
+        case SK_HWEV_HALFDUP_CHK:
+                if (pAC->GIni.GIGenesis) {
+                        /*
+                         * half duplex hangup workaround.
+                         * See packet arbiter timeout interrupt for description
+                         */
+                        pPrt->HalfDupTimerActive = SK_FALSE;
+                        if (pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
+                                pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) {
+                                /* Snap statistic counters */
+                                (void)SkXmUpdateStats(pAC, IoC, Port);
+
+                                (void)SkXmMacStatistic(pAC, IoC, Port, XM_TXO_OK_HI, &Val32);
+
+                                Octets = (SK_U64)Val32 << 32;
+                                
+                                (void)SkXmMacStatistic(pAC, IoC, Port, XM_TXO_OK_LO, &Val32);
+
+                                Octets += Val32;
+                                
+                                if (pPrt->LastOctets == Octets) {
+                                        /* Tx hanging, a FIFO flush restarts it */
+                                        SkMacFlushTxFifo(pAC, IoC, Port);
+                                }
+                        }
+                }
+                break;
+#endif /* GENESIS */
+        
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_SIRQ_E001, SKERR_SIRQ_E001MSG);
+                break;
+        }
+
+        return(0);
+}       /* SkGeSirqEvent */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkPhyIsrBcom() - PHY interrupt service routine
+ *
+ * Description: handles all interrupts from BCom PHY
+ *
+ * Returns: N/A
+ */
+static void SkPhyIsrBcom(
+SK_AC           *pAC,           /* Adapter Context */
+SK_IOC          IoC,            /* Io Context */
+int                     Port,           /* Port Num = PHY Num */
+SK_U16          IStatus)        /* Interrupt Status */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        SK_EVPARA       Para;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if ((IStatus & PHY_B_IS_PSE) != 0) {
+                /* Incorrectable pair swap error */
+                SK_ERR_LOG(pAC, SK_ERRCL_HW | SK_ERRCL_INIT, SKERR_SIRQ_E022,
+                        SKERR_SIRQ_E022MSG);
+        }
+        
+        if ((IStatus & (PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE)) != 0) {
+
+                SkHWLinkDown(pAC, IoC, Port);
+
+                Para.Para32[0] = (SK_U32)Port;
+                /* Signal to RLMT */
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+
+                /* Start workaround Errata #2 timer */
+                SkTimerStart(pAC, IoC, &pPrt->PWaTimer, SK_WA_INA_TIME,
+                        SKGE_HWAC, SK_HWEV_WATIM, Para);
+        }
+
+}       /* SkPhyIsrBcom */
+#endif /* GENESIS */
+
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ *      SkPhyIsrGmac() - PHY interrupt service routine
+ *
+ * Description: handles all interrupts from Marvell PHY
+ *
+ * Returns: N/A
+ */
+static void SkPhyIsrGmac(
+SK_AC           *pAC,           /* Adapter Context */
+SK_IOC          IoC,            /* Io Context */
+int                     Port,           /* Port Num = PHY Num */
+SK_U16          IStatus)        /* Interrupt Status */
+{
+        SK_GEPORT       *pPrt;          /* GIni Port struct pointer */
+        SK_EVPARA       Para;
+        SK_U16          Word;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if ((IStatus & (PHY_M_IS_AN_PR | PHY_M_IS_LST_CHANGE)) != 0) {
+
+                SkHWLinkDown(pAC, IoC, Port);
+
+                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_ADV, &Word);
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("AutoNeg.Adv: 0x%04X\n", Word));
+                
+                /* Set Auto-negotiation advertisement */
+                if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM) {
+                        /* restore Asymmetric Pause bit */
+                        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_AUNE_ADV,
+                                (SK_U16)(Word | PHY_M_AN_ASP));
+                }
+                
+                Para.Para32[0] = (SK_U32)Port;
+                /* Signal to RLMT */
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+        
+        if ((IStatus & PHY_M_IS_AN_ERROR) != 0) {
+                /* Auto-Negotiation Error */
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E023, SKERR_SIRQ_E023MSG);
+        }
+        
+        if ((IStatus & PHY_M_IS_FIFO_ERROR) != 0) {
+                /* FIFO Overflow/Underrun Error */
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E024, SKERR_SIRQ_E024MSG);
+        }
+        
+}       /* SkPhyIsrGmac */
+#endif /* YUKON */
+
+
+#ifdef OTHER_PHY
+/******************************************************************************
+ *
+ *      SkPhyIsrLone() - PHY interrupt service routine
+ *
+ * Description: handles all interrupts from LONE PHY
+ *
+ * Returns: N/A
+ */
+static void SkPhyIsrLone(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* Io Context */
+int             Port,           /* Port Num = PHY Num */
+SK_U16  IStatus)        /* Interrupt Status */
+{
+        SK_EVPARA       Para;
+
+        if (IStatus & (PHY_L_IS_DUP | PHY_L_IS_ISOL)) {
+                
+                SkHWLinkDown(pAC, IoC, Port);
+
+                Para.Para32[0] = (SK_U32)Port;
+                /* Signal to RLMT */
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+        }
+
+}       /* SkPhyIsrLone */
+#endif /* OTHER_PHY */
+
+/* End of File */
diff --git a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c
new file mode 100644
index 0000000000..79bf57cb53
--- /dev/null
+++ b/drivers/net/sk98lin/ski2c.c
@@ -0,0 +1,1296 @@
+/******************************************************************************
+ *
+ * Name:        ski2c.c
+ * 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-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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+ *      I2C Protocol
+ */
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $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"
+#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
+
+#ifdef __C2MAN__
+/*
+        I2C protocol implementation.
+
+        General Description:
+
+        The I2C protocol is used for the temperature sensors and for
+        the serial EEPROM which hold the configuration.
+
+        This file covers functions that allow to read write and do
+        some bulk requests a specified I2C address.
+
+        The Genesis has 2 I2C buses. One for the EEPROM which holds
+        the VPD Data and one for temperature and voltage sensor.
+        The following picture shows the I2C buses, I2C devices and
+        their control registers.
+
+        Note: The VPD functions are in skvpd.c
+.
+.       PCI Config I2C Bus for VPD Data:
+.
+.                     +------------+
+.                     | VPD EEPROM |
+.                     +------------+
+.                            |
+.                            | <-- I2C
+.                            |
+.                +-----------+-----------+
+.                |                       |
+.       +-----------------+     +-----------------+
+.       | PCI_VPD_ADR_REG |     | PCI_VPD_DAT_REG |
+.       +-----------------+     +-----------------+
+.
+.
+.       I2C Bus for LM80 sensor:
+.
+.                       +-----------------+
+.                       | Temperature and |
+.                       | Voltage Sensor  |
+.                       |       LM80      |
+.                       +-----------------+
+.                               |
+.                               |
+.                       I2C --> |
+.                               |
+.                            +----+
+.            +-------------->| OR |<--+
+.            |               +----+   |
+.     +------+------+                 |
+.     |             |                 |
+. +--------+    +--------+      +----------+
+. | B2_I2C |    | B2_I2C |      |  B2_I2C  |
+. | _CTRL  |    | _DATA  |      |   _SW    |
+. +--------+    +--------+      +----------+
+.
+        The I2C bus may be driven by the B2_I2C_SW or by the B2_I2C_CTRL
+        and B2_I2C_DATA registers.
+        For driver software it is recommended to use the I2C control and
+        data register, because I2C bus timing is done by the ASIC and
+        an interrupt may be received when the I2C request is completed.
+
+        Clock Rate Timing:                      MIN     MAX     generated by
+                VPD EEPROM:                     50 kHz  100 kHz         HW
+                LM80 over I2C Ctrl/Data reg.    50 kHz  100 kHz         HW
+                LM80 over B2_I2C_SW register    0       400 kHz         SW
+
+        Note:   The clock generated by the hardware is dependend on the
+                PCI clock. If the PCI bus clock is 33 MHz, the I2C/VPD
+                clock is 50 kHz.
+ */
+intro()
+{}
+#endif
+
+#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.
+ */
+#ifndef I2C_SLOW_TIMING
+#define T_CLK_LOW                       1300L   /* clock low time in ns */
+#define T_CLK_HIGH                       600L   /* clock high time in ns */
+#define T_DATA_IN_SETUP          100L   /* data in Set-up Time */
+#define T_START_HOLD             600L   /* start condition hold time */
+#define T_START_SETUP            600L   /* start condition Set-up time */
+#define T_STOP_SETUP             600L   /* stop condition Set-up time */
+#define T_BUS_IDLE                      1300L   /* time the bus must free after Tx */
+#define T_CLK_2_DATA_OUT         900L   /* max. clock low to data output valid */
+#else   /* I2C_SLOW_TIMING */
+/* I2C Standard Mode Timing */
+#define T_CLK_LOW                       4700L   /* clock low time in ns */
+#define T_CLK_HIGH                      4000L   /* clock high time in ns */
+#define T_DATA_IN_SETUP          250L   /* data in Set-up Time */
+#define T_START_HOLD            4000L   /* start condition hold time */
+#define T_START_SETUP           4700L   /* start condition Set-up time */
+#define T_STOP_SETUP            4000L   /* stop condition Set-up time */
+#define T_BUS_IDLE                      4700L   /* time the bus must free after Tx */
+#endif  /* !I2C_SLOW_TIMING */
+
+#define NS2BCLK(x)      (((x)*125)/10000)
+
+/*
+ * I2C Wire Operations
+ *
+ * About I2C_CLK_LOW():
+ *
+ * The Data Direction bit (I2C_DATA_DIR) has to be set to input when setting
+ * clock to low, to prevent the ASIC and the I2C data client from driving the
+ * serial data line simultaneously (ASIC: last bit of a byte = '1', I2C client
+ * send an 'ACK'). See also Concentrator Bugreport No. 10192.
+ */
+#define I2C_DATA_HIGH(IoC)      SK_I2C_SET_BIT(IoC, I2C_DATA)
+#define I2C_DATA_LOW(IoC)       SK_I2C_CLR_BIT(IoC, I2C_DATA)
+#define I2C_DATA_OUT(IoC)       SK_I2C_SET_BIT(IoC, I2C_DATA_DIR)
+#define I2C_DATA_IN(IoC)        SK_I2C_CLR_BIT(IoC, I2C_DATA_DIR | I2C_DATA)
+#define I2C_CLK_HIGH(IoC)       SK_I2C_SET_BIT(IoC, I2C_CLK)
+#define I2C_CLK_LOW(IoC)        SK_I2C_CLR_BIT(IoC, I2C_CLK | I2C_DATA_DIR)
+#define I2C_START_COND(IoC)     SK_I2C_CLR_BIT(IoC, I2C_CLK)
+
+#define NS2CLKT(x)      ((x*125L)/10000)
+
+/*--------------- I2C Interface Register Functions --------------- */
+
+/*
+ * sending one bit
+ */
+void SkI2cSndBit(
+SK_IOC  IoC,    /* I/O Context */
+SK_U8   Bit)    /* Bit to send */
+{
+        I2C_DATA_OUT(IoC);
+        if (Bit) {
+                I2C_DATA_HIGH(IoC);
+        }
+        else {
+                I2C_DATA_LOW(IoC);
+        }
+        SkDgWaitTime(IoC, NS2BCLK(T_DATA_IN_SETUP));
+        I2C_CLK_HIGH(IoC);
+        SkDgWaitTime(IoC, NS2BCLK(T_CLK_HIGH));
+        I2C_CLK_LOW(IoC);
+}       /* SkI2cSndBit*/
+
+
+/*
+ * Signal a start to the I2C Bus.
+ *
+ * A start is signaled when data goes to low in a high clock cycle.
+ *
+ * Ends with Clock Low.
+ *
+ * Status: not tested
+ */
+void SkI2cStart(
+SK_IOC  IoC)    /* I/O Context */
+{
+        /* Init data and Clock to output lines */
+        /* Set Data high */
+        I2C_DATA_OUT(IoC);
+        I2C_DATA_HIGH(IoC);
+        /* Set Clock high */
+        I2C_CLK_HIGH(IoC);
+
+        SkDgWaitTime(IoC, NS2BCLK(T_START_SETUP));
+
+        /* Set Data Low */
+        I2C_DATA_LOW(IoC);
+
+        SkDgWaitTime(IoC, NS2BCLK(T_START_HOLD));
+
+        /* Clock low without Data to Input */
+        I2C_START_COND(IoC);
+
+        SkDgWaitTime(IoC, NS2BCLK(T_CLK_LOW));
+}       /* SkI2cStart */
+
+
+void SkI2cStop(
+SK_IOC  IoC)    /* I/O Context */
+{
+        /* Init data and Clock to output lines */
+        /* Set Data low */
+        I2C_DATA_OUT(IoC);
+        I2C_DATA_LOW(IoC);
+
+        SkDgWaitTime(IoC, NS2BCLK(T_CLK_2_DATA_OUT));
+
+        /* Set Clock high */
+        I2C_CLK_HIGH(IoC);
+
+        SkDgWaitTime(IoC, NS2BCLK(T_STOP_SETUP));
+
+        /*
+         * Set Data High:       Do it by setting the Data Line to Input.
+         *                      Because of a pull up resistor the Data Line
+         *                      floods to high.
+         */
+        I2C_DATA_IN(IoC);
+
+        /*
+         *      When I2C activity is stopped
+         *       o      DATA should be set to input and
+         *       o      CLOCK should be set to high!
+         */
+        SkDgWaitTime(IoC, NS2BCLK(T_BUS_IDLE));
+}       /* SkI2cStop */
+
+
+/*
+ * Receive just one bit via the I2C bus.
+ *
+ * Note:        Clock must be set to LOW before calling this function.
+ *
+ * Returns The received bit.
+ */
+int SkI2cRcvBit(
+SK_IOC  IoC)    /* I/O Context */
+{
+        int     Bit;
+        SK_U8   I2cSwCtrl;
+
+        /* Init data as input line */
+        I2C_DATA_IN(IoC);
+
+        SkDgWaitTime(IoC, NS2BCLK(T_CLK_2_DATA_OUT));
+
+        I2C_CLK_HIGH(IoC);
+
+        SkDgWaitTime(IoC, NS2BCLK(T_CLK_HIGH));
+
+        SK_I2C_GET_SW(IoC, &I2cSwCtrl);
+        
+        Bit = (I2cSwCtrl & I2C_DATA) ? 1 : 0;
+
+        I2C_CLK_LOW(IoC);
+        SkDgWaitTime(IoC, NS2BCLK(T_CLK_LOW-T_CLK_2_DATA_OUT));
+
+        return(Bit);
+}       /* SkI2cRcvBit */
+
+
+/*
+ * Receive an ACK.
+ *
+ * returns      0 If acknowledged
+ *              1 in case of an error
+ */
+int SkI2cRcvAck(
+SK_IOC  IoC)    /* I/O Context */
+{
+        /*
+         * Received bit must be zero.
+         */
+        return(SkI2cRcvBit(IoC) != 0);
+}       /* SkI2cRcvAck */
+
+
+/*
+ * Send an NACK.
+ */
+void SkI2cSndNAck(
+SK_IOC  IoC)    /* I/O Context */
+{
+        /*
+         * Received bit must be zero.
+         */
+        SkI2cSndBit(IoC, 1);
+}       /* SkI2cSndNAck */
+
+
+/*
+ * Send an ACK.
+ */
+void SkI2cSndAck(
+SK_IOC IoC)     /* I/O Context */
+{
+        /*
+         * Received bit must be zero.
+         */
+        SkI2cSndBit(IoC, 0);
+}       /* SkI2cSndAck */
+
+
+/*
+ * Send one byte to the I2C device and wait for ACK.
+ *
+ * Return acknowleged status.
+ */
+int SkI2cSndByte(
+SK_IOC  IoC,    /* I/O Context */
+int             Byte)   /* byte to send */
+{
+        int     i;
+
+        for (i = 0; i < 8; i++) {
+                if (Byte & (1<<(7-i))) {
+                        SkI2cSndBit(IoC, 1);
+                }
+                else {
+                        SkI2cSndBit(IoC, 0);
+                }
+        }
+
+        return(SkI2cRcvAck(IoC));
+}       /* SkI2cSndByte */
+
+
+/*
+ * Receive one byte and ack it.
+ *
+ * Return byte.
+ */
+int SkI2cRcvByte(
+SK_IOC  IoC,    /* I/O Context */
+int             Last)   /* Last Byte Flag */
+{
+        int     i;
+        int     Byte = 0;
+
+        for (i = 0; i < 8; i++) {
+                Byte <<= 1;
+                Byte |= SkI2cRcvBit(IoC);
+        }
+
+        if (Last) {
+                SkI2cSndNAck(IoC);
+        }
+        else {
+                SkI2cSndAck(IoC);
+        }
+
+        return(Byte);
+}       /* SkI2cRcvByte */
+
+
+/*
+ * Start dialog and send device address
+ *
+ * Return 0 if acknowleged, 1 in case of an error
+ */
+int     SkI2cSndDev(
+SK_IOC  IoC,    /* I/O Context */
+int             Addr,   /* Device Address */
+int             Rw)             /* Read / Write Flag */
+{
+        SkI2cStart(IoC);
+        Rw = ~Rw;
+        Rw &= I2C_WRITE;
+        return(SkI2cSndByte(IoC, (Addr<<1) | Rw));
+}       /* SkI2cSndDev */
+
+#endif /* SK_DIAG */
+
+/*----------------- I2C CTRL Register Functions ----------*/
+
+/*
+ * waits for a completion of an I2C transfer
+ *
+ * returns      0:      success, transfer completes
+ *                      1:      error,   transfer does not complete, I2C transfer
+ *                                               killed, wait loop terminated.
+ */
+static int      SkI2cWait(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC,    /* I/O Context */
+int             Event)  /* complete event to wait for (I2C_READ or I2C_WRITE) */
+{
+        SK_U64  StartTime;
+        SK_U64  CurrentTime;
+        SK_U32  I2cCtrl;
+
+        StartTime = SkOsGetTime(pAC);
+        
+        do {
+                CurrentTime = SkOsGetTime(pAC);
+
+                if (CurrentTime - StartTime > SK_TICKS_PER_SEC / 8) {
+                        
+                        SK_I2C_STOP(IoC);
+#ifndef SK_DIAG
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E002, SKERR_I2C_E002MSG);
+#endif /* !SK_DIAG */
+                        return(1);
+                }
+                
+                SK_I2C_GET_CTL(IoC, &I2cCtrl);
+
+#ifdef xYUKON_DBG
+                printf("StartTime=%lu, CurrentTime=%lu\n",
+                        StartTime, CurrentTime);
+                if (kbhit()) {
+                        return(1);
+                }
+#endif /* YUKON_DBG */
+        
+        } while ((I2cCtrl & I2C_FLAG) == (SK_U32)Event << 31);
+
+        return(0);
+}       /* SkI2cWait */
+
+
+/*
+ * waits for a completion of an I2C transfer
+ *
+ * Returns
+ *      Nothing
+ */
+void SkI2cWaitIrq(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC)    /* I/O Context */
+{
+        SK_SENSOR       *pSen;
+        SK_U64          StartTime;
+        SK_U32          IrqSrc;
+
+        pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+
+        if (pSen->SenState == SK_SEN_IDLE) {
+                return;
+        }
+
+        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 */
+                        return;
+                }
+                
+                SK_IN32(IoC, B0_ISRC, &IrqSrc);
+
+        } while ((IrqSrc & IS_I2C_READY) == 0);
+
+        pSen->SenState = SK_SEN_IDLE;
+        return;
+}       /* SkI2cWaitIrq */
+
+/*
+ * writes a single byte or 4 bytes into the I2C device
+ *
+ * returns      0:      success
+ *                      1:      error
+ */
+static int SkI2cWrite(
+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, I2cDevSize, I2cReg, I2cBurst);
+        
+        return(SkI2cWait(pAC, IoC, I2C_WRITE));
+}       /* SkI2cWrite*/
+
+
+#ifdef  SK_DIAG
+/*
+ * reads a single byte or 4 bytes from the I2C device
+ *
+ * returns      the word read
+ */
+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, 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 */
+
+
+/*
+ * read a sensor's value
+ *
+ * This function reads a sensor's value from the I2C sensor chip. The sensor
+ * is defined by its index into the sensors database in the struct pAC points
+ * to.
+ * Returns
+ *              1 if the read is completed
+ *              0 if the read must be continued (I2C Bus still allocated)
+ */
+static int      SkI2cReadSensor(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_SENSOR       *pSen)  /* Sensor to be read */
+{
+    if (pSen->SenRead != NULL) {
+        return((*pSen->SenRead)(pAC, IoC, pSen));
+    }
+        else {
+        return(0); /* no success */
+        }
+}       /* SkI2cReadSensor */
+
+/*
+ * Do the Init state 0 initialization
+ */
+static int SkI2cInit0(
+SK_AC   *pAC)   /* Adapter Context */
+{
+        int     i;
+
+        /* Begin with first sensor */
+        pAC->I2c.CurrSens = 0;
+        
+        /* Begin with timeout control for state machine */
+        pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
+        
+        /* Set sensor number to zero */
+        pAC->I2c.MaxSens = 0;
+
+#ifndef SK_DIAG
+        /* Initialize Number of Dummy Reads */
+        pAC->I2c.DummyReads = SK_MAX_SENSORS;
+#endif
+
+        for (i = 0; i < SK_MAX_SENSORS; i++) {
+                pAC->I2c.SenTable[i].SenDesc = "unknown";
+                pAC->I2c.SenTable[i].SenType = SK_SEN_UNKNOWN;
+                pAC->I2c.SenTable[i].SenThreErrHigh = 0;
+                pAC->I2c.SenTable[i].SenThreErrLow = 0;
+                pAC->I2c.SenTable[i].SenThreWarnHigh = 0;
+                pAC->I2c.SenTable[i].SenThreWarnLow = 0;
+                pAC->I2c.SenTable[i].SenReg = LM80_FAN2_IN;
+                pAC->I2c.SenTable[i].SenInit = SK_SEN_DYN_INIT_NONE;
+                pAC->I2c.SenTable[i].SenValue = 0;
+                pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_NOT_PRESENT;
+                pAC->I2c.SenTable[i].SenErrCts = 0;
+                pAC->I2c.SenTable[i].SenBegErrTS = 0;
+                pAC->I2c.SenTable[i].SenState = SK_SEN_IDLE;
+                pAC->I2c.SenTable[i].SenRead = NULL;
+                pAC->I2c.SenTable[i].SenDev = 0;
+        }
+
+        /* Now we are "INIT data"ed */
+        pAC->I2c.InitLevel = SK_INIT_DATA;
+        return(0);
+}       /* SkI2cInit0*/
+
+
+/*
+ * Do the init state 1 initialization
+ *
+ * initialize the following register of the LM80:
+ * Configuration register:
+ * - START, noINT, activeLOW, noINT#Clear, noRESET, noCI, noGPO#, noINIT
+ *
+ * Interrupt Mask Register 1:
+ * - all interrupts are Disabled (0xff)
+ *
+ * Interrupt Mask Register 2:
+ * - all interrupts are Disabled (0xff) Interrupt modi doesn't matter.
+ *
+ * Fan Divisor/RST_OUT register:
+ * - Divisors set to 1 (bits 00), all others 0s.
+ *
+ * OS# Configuration/Temperature resolution Register:
+ * - all 0s
+ *
+ */
+static int SkI2cInit1(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC)    /* I/O Context */
+{
+    int i;
+    SK_U8 I2cSwCtrl;
+        SK_GEPORT *pPrt;        /* GIni Port struct pointer */
+
+        if (pAC->I2c.InitLevel != SK_INIT_DATA) {
+                /* ReInit not needed in I2C module */
+                return(0);
+        }
+
+    /* Set the Direction of I2C-Data Pin to IN */
+    SK_I2C_CLR_BIT(IoC, I2C_DATA_DIR | I2C_DATA);
+    /* Check for 32-Bit Yukon with Low at I2C-Data Pin */
+        SK_I2C_GET_SW(IoC, &I2cSwCtrl);
+
+        if ((I2cSwCtrl & I2C_DATA) == 0) {
+                /* this is a 32-Bit board */
+                pAC->GIni.GIYukon32Bit = SK_TRUE;
+        return(0);
+    }
+
+        /* Check for 64 Bit Yukon without sensors */
+        if (SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_CFG, 0) != 0) {
+        return(0);
+    }
+
+        (void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_1, 0);
+        
+        (void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_2, 0);
+        
+        (void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_FAN_CTRL, 0);
+        
+        (void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_TEMP_CTRL, 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
+         * set when performing Init Level 0
+         */
+    pAC->I2c.MaxSens = 5;
+        
+        pPrt = &pAC->GIni.GP[0];
+        
+        if (pAC->GIni.GIGenesis) {
+                if (pPrt->PhyType == SK_PHY_BCOM) {
+                        if (pAC->GIni.GIMacsFound == 1) {
+                                pAC->I2c.MaxSens += 1;
+                        }
+                        else {
+                                pAC->I2c.MaxSens += 3;
+                        }
+                }
+        }
+        else {
+                pAC->I2c.MaxSens += 3;
+        }
+        
+        for (i = 0; i < pAC->I2c.MaxSens; i++) {
+                switch (i) {
+                case 0:
+                        pAC->I2c.SenTable[i].SenDesc = "Temperature";
+                        pAC->I2c.SenTable[i].SenType = SK_SEN_TEMP;
+                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_TEMP_HIGH_ERR;
+                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_TEMP_HIGH_WARN;
+                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_TEMP_LOW_WARN;
+                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_TEMP_LOW_ERR;
+                        pAC->I2c.SenTable[i].SenReg = LM80_TEMP_IN;
+                        break;
+                case 1:
+                        pAC->I2c.SenTable[i].SenDesc = "Voltage PCI";
+                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PCI_5V_HIGH_ERR;
+                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PCI_5V_HIGH_WARN;
+                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PCI_5V_LOW_WARN;
+                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PCI_5V_LOW_ERR;
+                        pAC->I2c.SenTable[i].SenReg = LM80_VT0_IN;
+                        break;
+                case 2:
+                        pAC->I2c.SenTable[i].SenDesc = "Voltage PCI-IO";
+                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PCI_IO_5V_HIGH_ERR;
+                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PCI_IO_5V_HIGH_WARN;
+                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PCI_IO_3V3_LOW_WARN;
+                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PCI_IO_3V3_LOW_ERR;
+                        pAC->I2c.SenTable[i].SenReg = LM80_VT1_IN;
+                        pAC->I2c.SenTable[i].SenInit = SK_SEN_DYN_INIT_PCI_IO;
+                        break;
+                case 3:
+                        pAC->I2c.SenTable[i].SenDesc = "Voltage ASIC";
+                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_VDD_HIGH_ERR;
+                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_VDD_HIGH_WARN;
+                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VDD_LOW_WARN;
+                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VDD_LOW_ERR;
+                        pAC->I2c.SenTable[i].SenReg = LM80_VT2_IN;
+                        break;
+                case 4:
+                        if (pAC->GIni.GIGenesis) {
+                                if (pPrt->PhyType == SK_PHY_BCOM) {
+                                        pAC->I2c.SenTable[i].SenDesc = "Voltage PHY A PLL";
+                                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
+                                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
+                                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
+                                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
+                                }
+                                else {
+                                        pAC->I2c.SenTable[i].SenDesc = "Voltage PMA";
+                                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
+                                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
+                                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
+                                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
+                                }
+                        }
+                        else {
+                                pAC->I2c.SenTable[i].SenDesc = "Voltage VAUX";
+                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_VAUX_3V3_HIGH_ERR;
+                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_VAUX_3V3_HIGH_WARN;
+                                if (pAC->GIni.GIVauxAvail) {
+                                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VAUX_3V3_LOW_WARN;
+                                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VAUX_3V3_LOW_ERR;
+                                }
+                                else {
+                                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_VAUX_0V_WARN_ERR;
+                                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_VAUX_0V_WARN_ERR;
+                                }
+                        }
+                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+                        pAC->I2c.SenTable[i].SenReg = LM80_VT3_IN;
+                        break;
+                case 5:
+                        if (pAC->GIni.GIGenesis) {
+                                pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 2V5";
+                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PHY_2V5_HIGH_ERR;
+                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PHY_2V5_HIGH_WARN;
+                                pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PHY_2V5_LOW_WARN;
+                                pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
+                        }
+                        else {
+                                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;
+                                pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_CORE_1V5_LOW_ERR;
+                        }
+                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+                        pAC->I2c.SenTable[i].SenReg = LM80_VT4_IN;
+                        break;
+                case 6:
+                        if (pAC->GIni.GIGenesis) {
+                                pAC->I2c.SenTable[i].SenDesc = "Voltage PHY B PLL";
+                        }
+                        else {
+                                pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 3V3";
+                        }
+                        pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+                        pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PLL_3V3_HIGH_ERR;
+                        pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PLL_3V3_HIGH_WARN;
+                        pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PLL_3V3_LOW_WARN;
+                        pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PLL_3V3_LOW_ERR;
+                        pAC->I2c.SenTable[i].SenReg = LM80_VT5_IN;
+                        break;
+                case 7:
+                        if (pAC->GIni.GIGenesis) {
+                                pAC->I2c.SenTable[i].SenDesc = "Speed Fan";
+                                pAC->I2c.SenTable[i].SenType = SK_SEN_FAN;
+                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_FAN_HIGH_ERR;
+                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_FAN_HIGH_WARN;
+                                pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_FAN_LOW_WARN;
+                                pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_FAN_LOW_ERR;
+                                pAC->I2c.SenTable[i].SenReg = LM80_FAN2_IN;
+                        }
+                        else {
+                                pAC->I2c.SenTable[i].SenDesc = "Voltage PHY 2V5";
+                                pAC->I2c.SenTable[i].SenType = SK_SEN_VOLT;
+                                pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_PHY_2V5_HIGH_ERR;
+                                pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_PHY_2V5_HIGH_WARN;
+                                pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_PHY_2V5_LOW_WARN;
+                                pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
+                                pAC->I2c.SenTable[i].SenReg = LM80_VT6_IN;
+                        }
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_INIT | SK_ERRCL_SW,
+                                SKERR_I2C_E001, SKERR_I2C_E001MSG);
+                        break;
+                }
+
+                pAC->I2c.SenTable[i].SenValue = 0;
+                pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_OK;
+                pAC->I2c.SenTable[i].SenErrCts = 0;
+                pAC->I2c.SenTable[i].SenBegErrTS = 0;
+                pAC->I2c.SenTable[i].SenState = SK_SEN_IDLE;
+                pAC->I2c.SenTable[i].SenRead = SkLm80ReadSensor;
+                pAC->I2c.SenTable[i].SenDev = LM80_ADDR;
+        }
+
+#ifndef SK_DIAG
+        pAC->I2c.DummyReads = pAC->I2c.MaxSens;
+#endif /* !SK_DIAG */
+        
+        /* Clear I2C IRQ */
+        SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+        
+        /* Now we are I/O initialized */
+        pAC->I2c.InitLevel = SK_INIT_IO;
+        return(0);
+}       /* SkI2cInit1 */
+
+
+/*
+ * Init level 2: Start first sensor read.
+ */
+static int SkI2cInit2(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC)    /* I/O Context */
+{
+        int             ReadComplete;
+        SK_SENSOR       *pSen;
+
+        if (pAC->I2c.InitLevel != SK_INIT_IO) {
+                /* ReInit not needed in I2C module */
+                /* Init0 and Init2 not permitted */
+                return(0);
+        }
+
+        pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+        ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
+
+        if (ReadComplete) {
+                SK_ERR_LOG(pAC, SK_ERRCL_INIT, SKERR_I2C_E008, SKERR_I2C_E008MSG);
+        }
+
+        /* Now we are correctly initialized */
+        pAC->I2c.InitLevel = SK_INIT_RUN;
+
+        return(0);
+}       /* SkI2cInit2*/
+
+
+/*
+ * Initialize I2C devices
+ *
+ * Get the first voltage value and discard it.
+ * Go into temperature read mode. A default pointer is not set.
+ *
+ * The things to be done depend on the init level in the parameter list:
+ * Level 0:
+ *      Initialize only the data structures. Do NOT access hardware.
+ * Level 1:
+ *      Initialize hardware through SK_IN / SK_OUT commands. Do NOT use interrupts.
+ * Level 2:
+ *      Everything is possible. Interrupts may be used from now on.
+ *
+ * return:
+ *      0 = success
+ *      other = error.
+ */
+int     SkI2cInit(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC,    /* I/O Context needed in levels 1 and 2 */
+int             Level)  /* Init Level */
+{
+
+        switch (Level) {
+        case SK_INIT_DATA:
+                return(SkI2cInit0(pAC));
+        case SK_INIT_IO:
+                return(SkI2cInit1(pAC, IoC));
+        case SK_INIT_RUN:
+                return(SkI2cInit2(pAC, IoC));
+        default:
+                break;
+        }
+
+        return(0);
+}       /* SkI2cInit */
+
+
+#ifndef SK_DIAG
+
+/*
+ * Interrupt service function for the I2C Interface
+ *
+ * Clears the Interrupt source
+ *
+ * Reads the register and check it for sending a trap.
+ *
+ * Starts the timer if necessary.
+ */
+void SkI2cIsr(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC)    /* I/O Context */
+{
+        SK_EVPARA       Para;
+
+        /* Clear I2C IRQ */
+        SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+
+        Para.Para64 = 0;
+        SkEventQueue(pAC, SKGE_I2C, SK_I2CEV_IRQ, Para);
+}       /* SkI2cIsr */
+
+
+/*
+ * Check this sensors Value against the threshold and send events.
+ */
+static void SkI2cCheckSensor(
+SK_AC           *pAC,   /* Adapter Context */
+SK_SENSOR       *pSen)
+{
+        SK_EVPARA       ParaLocal;
+        SK_BOOL         TooHigh;        /* Is sensor too high? */
+        SK_BOOL         TooLow;         /* Is sensor too low? */
+        SK_U64          CurrTime;       /* Current Time */
+        SK_BOOL         DoTrapSend;     /* We need to send a trap */
+        SK_BOOL         DoErrLog;       /* We need to log the error */
+        SK_BOOL         IsError;        /* We need to log the error */
+
+        /* Check Dummy Reads first */
+        if (pAC->I2c.DummyReads > 0) {
+                pAC->I2c.DummyReads--;
+                return;
+        }
+
+        /* Get the current time */
+        CurrTime = SkOsGetTime(pAC);
+
+        /* Set para to the most useful setting: The current sensor. */
+        ParaLocal.Para64 = (SK_U64)pAC->I2c.CurrSens;
+
+        /* Check the Value against the thresholds. First: Error Thresholds */
+        TooHigh = (pSen->SenValue > pSen->SenThreErrHigh);
+        TooLow = (pSen->SenValue < pSen->SenThreErrLow);
+                
+        IsError = SK_FALSE;
+        if (TooHigh || TooLow) {
+                /* Error condition is satisfied */
+                DoTrapSend = SK_TRUE;
+                DoErrLog = SK_TRUE;
+
+                /* Now error condition is satisfied */
+                IsError = SK_TRUE;
+
+                if (pSen->SenErrFlag == SK_SEN_ERR_ERR) {
+                        /* This state is the former one */
+
+                        /* So check first whether we have to send a trap */
+                        if (pSen->SenLastErrTrapTS + SK_SEN_ERR_TR_HOLD >
+                            CurrTime) {
+                                /*
+                                 * Do NOT send the Trap. The hold back time
+                                 * has to run out first.
+                                 */
+                                DoTrapSend = SK_FALSE;
+                        }
+
+                        /* Check now whether we have to log an Error */
+                        if (pSen->SenLastErrLogTS + SK_SEN_ERR_LOG_HOLD >
+                            CurrTime) {
+                                /*
+                                 * Do NOT log the error. The hold back time
+                                 * has to run out first.
+                                 */
+                                DoErrLog = SK_FALSE;
+                        }
+                }
+                else {
+                        /* We came from a different state -> Set Begin Time Stamp */
+                        pSen->SenBegErrTS = CurrTime;
+                        pSen->SenErrFlag = SK_SEN_ERR_ERR;
+                }
+
+                if (DoTrapSend) {
+                        /* Set current Time */
+                        pSen->SenLastErrTrapTS = CurrTime;
+                        pSen->SenErrCts++;
+
+                        /* Queue PNMI Event */
+                        SkEventQueue(pAC, SKGE_PNMI, (TooHigh ?
+                                SK_PNMI_EVT_SEN_ERR_UPP :
+                                SK_PNMI_EVT_SEN_ERR_LOW),
+                                ParaLocal);
+                }
+
+                if (DoErrLog) {
+                        /* Set current Time */
+                        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);
+                        }
+                }
+        }
+
+        /* Check the Value against the thresholds */
+        /* 2nd: Warning thresholds */
+        TooHigh = (pSen->SenValue > pSen->SenThreWarnHigh);
+        TooLow = (pSen->SenValue < pSen->SenThreWarnLow);
+                
+        if (!IsError && (TooHigh || TooLow)) {
+                /* Error condition is satisfied */
+                DoTrapSend = SK_TRUE;
+                DoErrLog = SK_TRUE;
+
+                if (pSen->SenErrFlag == SK_SEN_ERR_WARN) {
+                        /* 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) {
+                                /*
+                                 * Do NOT send the Trap. The hold back time
+                                 * has to run out first.
+                                 */
+                                DoTrapSend = SK_FALSE;
+                        }
+
+                        /* Check now whether we have to log an Error */
+                        if (pSen->SenLastWarnLogTS + SK_SEN_WARN_LOG_HOLD > CurrTime) {
+                                /*
+                                 * Do NOT log the error. The hold back time
+                                 * has to run out first.
+                                 */
+                                DoErrLog = SK_FALSE;
+                        }
+                }
+                else {
+                        /* We came from a different state -> Set Begin Time Stamp */
+                        pSen->SenBegWarnTS = CurrTime;
+                        pSen->SenErrFlag = SK_SEN_ERR_WARN;
+                }
+
+                if (DoTrapSend) {
+                        /* Set current Time */
+                        pSen->SenLastWarnTrapTS = CurrTime;
+                        pSen->SenWarnCts++;
+
+                        /* Queue PNMI Event */
+                        SkEventQueue(pAC, SKGE_PNMI, (TooHigh ?
+                                SK_PNMI_EVT_SEN_WAR_UPP :
+                                SK_PNMI_EVT_SEN_WAR_LOW),
+                                ParaLocal);
+                }
+
+                if (DoErrLog) {
+                        /* Set current Time */
+                        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);
+                        }
+                }
+        }
+
+        /* Check for NO error at all */
+        if (!IsError && !TooHigh && !TooLow) {
+                /* Set o.k. Status if no error and no warning condition */
+                pSen->SenErrFlag = SK_SEN_ERR_OK;
+        }
+
+        /* End of check against the thresholds */
+
+        /* Bug fix AF: 16.Aug.2001: Correct the init base
+         * of LM80 sensor.
+         */
+        if (pSen->SenInit == SK_SEN_DYN_INIT_PCI_IO) {
+
+        pSen->SenInit = SK_SEN_DYN_INIT_NONE;
+
+                if (pSen->SenValue > SK_SEN_PCI_IO_RANGE_LIMITER) {
+                        /* 5V PCI-IO Voltage */
+                        pSen->SenThreWarnLow = SK_SEN_PCI_IO_5V_LOW_WARN;
+                        pSen->SenThreErrLow = SK_SEN_PCI_IO_5V_LOW_ERR;
+                }
+                else {
+                        /* 3.3V PCI-IO Voltage */
+                        pSen->SenThreWarnHigh = SK_SEN_PCI_IO_3V3_HIGH_WARN;
+                        pSen->SenThreErrHigh = SK_SEN_PCI_IO_3V3_HIGH_ERR;
+                }
+        }
+        
+#ifdef TEST_ONLY
+    /* Dynamic thresholds also for VAUX of LM80 sensor */
+        if (pSen->SenInit == SK_SEN_DYN_INIT_VAUX) {
+
+        pSen->SenInit = SK_SEN_DYN_INIT_NONE;
+
+                /* 3.3V VAUX Voltage */
+                if (pSen->SenValue > SK_SEN_VAUX_RANGE_LIMITER) {
+                        pSen->SenThreWarnLow = SK_SEN_VAUX_3V3_LOW_WARN;
+                        pSen->SenThreErrLow = SK_SEN_VAUX_3V3_LOW_ERR;
+                }
+                /* 0V VAUX Voltage */
+                else {
+                        pSen->SenThreWarnHigh = SK_SEN_VAUX_0V_WARN_ERR;
+                        pSen->SenThreErrHigh = SK_SEN_VAUX_0V_WARN_ERR;
+                }
+        }
+
+        /*
+         * Check initialization state:
+         * The VIO Thresholds need adaption
+         */
+        if (!pSen->SenInit && pSen->SenReg == LM80_VT1_IN &&
+             pSen->SenValue > SK_SEN_WARNLOW2C &&
+             pSen->SenValue < SK_SEN_WARNHIGH2) {
+                pSen->SenThreErrLow = SK_SEN_ERRLOW2C;
+                pSen->SenThreWarnLow = SK_SEN_WARNLOW2C;
+                pSen->SenInit = SK_TRUE;
+        }
+
+        if (!pSen->SenInit && pSen->SenReg == LM80_VT1_IN &&
+             pSen->SenValue > SK_SEN_WARNLOW2 &&
+             pSen->SenValue < SK_SEN_WARNHIGH2C) {
+                pSen->SenThreErrHigh = SK_SEN_ERRHIGH2C;
+                pSen->SenThreWarnHigh = SK_SEN_WARNHIGH2C;
+                pSen->SenInit = SK_TRUE;
+        }
+#endif
+
+        if (pSen->SenInit != SK_SEN_DYN_INIT_NONE) {
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E013, SKERR_I2C_E013MSG);
+        }
+}       /* SkI2cCheckSensor */
+
+
+/*
+ * The only Event to be served is the timeout event
+ *
+ */
+int     SkI2cEvent(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_U32          Event,  /* Module specific Event */
+SK_EVPARA       Para)   /* Event specific Parameter */
+{
+        int                     ReadComplete;
+        SK_SENSOR       *pSen;
+        SK_U32          Time;
+        SK_EVPARA       ParaLocal;
+        int                     i;
+
+        /* New case: no sensors */
+        if (pAC->I2c.MaxSens == 0) {
+                return(0);
+        }
+
+        switch (Event) {
+        case SK_I2CEV_IRQ:
+                pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+                ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
+
+                if (ReadComplete) {
+                        /* Check sensor against defined thresholds */
+                        SkI2cCheckSensor(pAC, pSen);
+
+                        /* Increment Current sensor and set appropriate Timeout */
+                        pAC->I2c.CurrSens++;
+                        if (pAC->I2c.CurrSens >= pAC->I2c.MaxSens) {
+                                pAC->I2c.CurrSens = 0;
+                                Time = SK_I2C_TIM_LONG;
+                        }
+                        else {
+                                Time = SK_I2C_TIM_SHORT;
+                        }
+
+                        /* Start Timer */
+                        ParaLocal.Para64 = (SK_U64)0;
+
+                        pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
+                        
+                        SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
+                                SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+                }
+        else {
+                        /* Start Timer */
+                        ParaLocal.Para64 = (SK_U64)0;
+
+                        pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
+
+            SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, SK_I2C_TIM_WATCH,
+                                SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+                }
+                break;
+        case SK_I2CEV_TIM:
+                if (pAC->I2c.TimerMode == SK_TIMER_NEW_GAUGING) {
+
+                        ParaLocal.Para64 = (SK_U64)0;
+                        SkTimerStop(pAC, IoC, &pAC->I2c.SenTimer);
+
+                        pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+                        ReadComplete = SkI2cReadSensor(pAC, IoC, pSen);
+
+                        if (ReadComplete) {
+                                /* Check sensor against defined thresholds */
+                                SkI2cCheckSensor(pAC, pSen);
+
+                                /* Increment Current sensor and set appropriate Timeout */
+                                pAC->I2c.CurrSens++;
+                                if (pAC->I2c.CurrSens == pAC->I2c.MaxSens) {
+                                        pAC->I2c.CurrSens = 0;
+                                        Time = SK_I2C_TIM_LONG;
+                                }
+                                else {
+                                        Time = SK_I2C_TIM_SHORT;
+                                }
+
+                                /* Start Timer */
+                                ParaLocal.Para64 = (SK_U64)0;
+
+                                pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
+
+                                SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
+                                        SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+                        }
+                }
+                else {
+                        pSen = &pAC->I2c.SenTable[pAC->I2c.CurrSens];
+                        pSen->SenErrFlag = SK_SEN_ERR_FAULTY;
+                        SK_I2C_STOP(IoC);
+
+                        /* Increment Current sensor and set appropriate Timeout */
+                        pAC->I2c.CurrSens++;
+                        if (pAC->I2c.CurrSens == pAC->I2c.MaxSens) {
+                                pAC->I2c.CurrSens = 0;
+                                Time = SK_I2C_TIM_LONG;
+                        }
+                        else {
+                                Time = SK_I2C_TIM_SHORT;
+                        }
+
+                        /* Start Timer */
+                        ParaLocal.Para64 = (SK_U64)0;
+
+                        pAC->I2c.TimerMode = SK_TIMER_NEW_GAUGING;
+
+                        SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, Time,
+                                SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+                }
+                break;
+        case SK_I2CEV_CLEAR:
+                for (i = 0; i < SK_MAX_SENSORS; i++) {
+                        pAC->I2c.SenTable[i].SenErrFlag = SK_SEN_ERR_OK;
+                        pAC->I2c.SenTable[i].SenErrCts = 0;
+                        pAC->I2c.SenTable[i].SenWarnCts = 0;
+                        pAC->I2c.SenTable[i].SenBegErrTS = 0;
+                        pAC->I2c.SenTable[i].SenBegWarnTS = 0;
+                        pAC->I2c.SenTable[i].SenLastErrTrapTS = (SK_U64)0;
+                        pAC->I2c.SenTable[i].SenLastErrLogTS = (SK_U64)0;
+                        pAC->I2c.SenTable[i].SenLastWarnTrapTS = (SK_U64)0;
+                        pAC->I2c.SenTable[i].SenLastWarnLogTS = (SK_U64)0;
+                }
+                break;
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E006, SKERR_I2C_E006MSG);
+        }
+
+        return(0);
+}       /* SkI2cEvent*/
+
+#endif /* !SK_DIAG */
diff --git a/drivers/net/sk98lin/sklm80.c b/drivers/net/sk98lin/sklm80.c
new file mode 100644
index 0000000000..a204f5bb55
--- /dev/null
+++ b/drivers/net/sk98lin/sklm80.c
@@ -0,0 +1,141 @@
+/******************************************************************************
+ *
+ * Name:        sklm80.c
+ * 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.
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+        LM80 functions
+*/
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $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"
+#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
+
+#define BREAK_OR_WAIT(pAC,IoC,Event)    break
+
+/*
+ * read a sensors value (LM80 specific)
+ *
+ * This function reads a sensors value from the I2C sensor chip LM80.
+ * The sensor is defined by its index into the sensors database in the struct
+ * pAC points to.
+ *
+ * Returns      1 if the read is completed
+ *              0 if the read must be continued (I2C Bus still allocated)
+ */
+int SkLm80ReadSensor(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context needed in level 1 and 2 */
+SK_SENSOR       *pSen)  /* Sensor to be read */
+{
+        SK_I32          Value;
+
+        switch (pSen->SenState) {
+        case SK_SEN_IDLE:
+                /* Send address to ADDR register */
+                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);
+        
+        case SK_SEN_VALUE:
+                /* Read value from data register */
+                SK_IN32(IoC, B2_I2C_DATA, ((SK_U32 *)&Value));
+                
+                Value &= 0xff; /* only least significant byte is valid */
+
+                /* Do NOT check the Value against the thresholds */
+                /* Checking is done in the calling instance */
+
+                if (pSen->SenType == SK_SEN_VOLT) {
+                        /* Voltage sensor */
+                        pSen->SenValue = Value * SK_LM80_VT_LSB;
+                        pSen->SenState = SK_SEN_IDLE ;
+                        return(1);
+                }
+
+                if (pSen->SenType == SK_SEN_FAN) {
+                        if (Value != 0 && Value != 0xff) {
+                                /* Fan speed counter */
+                                pSen->SenValue = SK_LM80_FAN_FAKTOR/Value;
+                        }
+                        else {
+                                /* Indicate Fan error */
+                                pSen->SenValue = 0;
+                        }
+                        pSen->SenState = SK_SEN_IDLE ;
+                        return(1);
+                }
+
+                /* First: correct the value: it might be negative */
+                if ((Value & 0x80) != 0) {
+                        /* Value is negative */
+                        Value = Value - 256;
+                }
+
+                /* We have a temperature sensor and need to get the signed extension.
+                 * For now we get the extension from the last reading, so in the normal
+                 * case we won't see flickering temperatures.
+                 */
+                pSen->SenValue = (Value * SK_LM80_TEMP_LSB) +
+                        (pSen->SenValue % SK_LM80_TEMP_LSB);
+
+                /* Send address to ADDR register */
+                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);
+        
+        case SK_SEN_VALEXT:
+                /* Read value from data register */
+                SK_IN32(IoC, B2_I2C_DATA, ((SK_U32 *)&Value));
+                Value &= LM80_TEMP_LSB_9; /* only bit 7 is valid */
+
+                /* cut the LSB bit */
+                pSen->SenValue = ((pSen->SenValue / SK_LM80_TEMP_LSB) *
+                        SK_LM80_TEMP_LSB);
+
+                if (pSen->SenValue < 0) {
+                        /* Value negative: The bit value must be subtracted */
+                        pSen->SenValue -= ((Value >> 7) * SK_LM80_TEMPEXT_LSB);
+                }
+                else {
+                        /* Value positive: The bit value must be added */
+                        pSen->SenValue += ((Value >> 7) * SK_LM80_TEMPEXT_LSB);
+                }
+
+                pSen->SenState = SK_SEN_IDLE ;
+                return(1);
+        
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E007, SKERR_I2C_E007MSG);
+                return(1);
+        }
+
+        /* Not completed */
+        return(0);
+}
+
diff --git a/drivers/net/sk98lin/skqueue.c b/drivers/net/sk98lin/skqueue.c
new file mode 100644
index 0000000000..0275b4f71d
--- /dev/null
+++ b/drivers/net/sk98lin/skqueue.c
@@ -0,0 +1,179 @@
+/******************************************************************************
+ *
+ * Name:        skqueue.c
+ * 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.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+
+/*
+ *      Event queue and dispatcher
+ */
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skqueue.c,v 1.20 2003/09/16 13:44:00 rschmidt Exp $ (C) Marvell.";
+#endif
+
+#include "h/skdrv1st.h"         /* Driver Specific Definitions */
+#include "h/skqueue.h"          /* Queue Definitions */
+#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
+
+#ifdef __C2MAN__
+/*
+        Event queue management.
+
+        General Description:
+
+ */
+intro()
+{}
+#endif
+
+#define PRINTF(a,b,c)
+
+/*
+ * init event queue management
+ *
+ * Must be called during init level 0.
+ */
+void    SkEventInit(
+SK_AC   *pAC,   /* Adapter context */
+SK_IOC  Ioc,    /* IO context */
+int             Level)  /* Init level */
+{
+        switch (Level) {
+        case SK_INIT_DATA:
+                pAC->Event.EvPut = pAC->Event.EvGet = pAC->Event.EvQueue;
+                break;
+        default:
+                break;
+        }
+}
+
+/*
+ * add event to queue
+ */
+void    SkEventQueue(
+SK_AC           *pAC,   /* Adapters context */
+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;
+        
+        if (++pAC->Event.EvPut == &pAC->Event.EvQueue[SK_MAX_EVENT])
+                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);
+        }
+}
+
+/*
+ * event dispatcher
+ *      while event queue is not empty
+ *              get event from queue
+ *              send command to state machine
+ *      end
+ *      return error reported by individual Event function
+ *              0 if no error occured.
+ */
+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);
+        
+        while (pEv != pAC->Event.EvPut) {
+                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:         /* 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;
+#else /* !SK_USE_SW_TIMER */
+        case SKGE_SWT :
+                        Rtv = SkSwtEvent(pAC, Ioc, pEv->Event, pEv->Para);
+                        break;
+#endif /* !SK_USE_SW_TIMER */
+#ifdef SK_USE_LAC_EV
+                case SKGE_LACP :
+                        Rtv = SkLacpEvent(pAC, Ioc, pEv->Event, pEv->Para);
+                        break;
+                case SKGE_RSF :
+                        Rtv = SkRsfEvent(pAC, Ioc, pEv->Event, pEv->Para);
+                        break;
+                case SKGE_MARKER :
+                        Rtv = SkMarkerEvent(pAC, Ioc, pEv->Event, pEv->Para);
+                        break;
+                case SKGE_FD :
+                        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;
+#endif  /* SK_USE_CSUM */
+                default :
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_Q_E002, SKERR_Q_E002MSG);
+                        Rtv = 0;
+                }
+
+                if (Rtv != 0) {
+                        return(Rtv);
+                }
+
+                if (++pEv == &pAC->Event.EvQueue[SK_MAX_EVENT])
+                        pEv = pAC->Event.EvQueue;
+
+                /* Renew get: it is used in queue_events to detect overruns */
+                pAC->Event.EvGet = pEv;
+        }
+
+        return(0);
+}
+
+/* End of file */
diff --git a/drivers/net/sk98lin/skrlmt.c b/drivers/net/sk98lin/skrlmt.c
new file mode 100644
index 0000000000..be8d1ccddf
--- /dev/null
+++ b/drivers/net/sk98lin/skrlmt.c
@@ -0,0 +1,3257 @@
+/******************************************************************************
+ *
+ * Name:        skrlmt.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.69 $
+ * Date:        $Date: 2003/04/15 09:39:22 $
+ * Purpose:     Manage links on SK-NET Adapters, esp. redundant ones.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * This module contains code for Link ManagemenT (LMT) of SK-NET Adapters.
+ * It is mainly intended for adapters with more than one link.
+ * For such adapters, this module realizes Redundant Link ManagemenT (RLMT).
+ *
+ * Include File Hierarchy:
+ *
+ *      "skdrv1st.h"
+ *      "skdrv2nd.h"
+ *
+ ******************************************************************************/
+
+#ifndef lint
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skrlmt.c,v 1.69 2003/04/15 09:39:22 tschilli Exp $ (C) Marvell.";
+#endif  /* !defined(lint) */
+
+#define __SKRLMT_C
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* cplusplus */
+
+#include "h/skdrv1st.h"
+#include "h/skdrv2nd.h"
+
+/* defines ********************************************************************/
+
+#ifndef SK_HWAC_LINK_LED
+#define SK_HWAC_LINK_LED(a,b,c,d)
+#endif  /* !defined(SK_HWAC_LINK_LED) */
+
+#ifndef DEBUG
+#define RLMT_STATIC     static
+#else   /* DEBUG */
+#define RLMT_STATIC
+
+#ifndef SK_LITTLE_ENDIAN
+/* First 32 bits */
+#define OFFS_LO32       1
+
+/* Second 32 bits */
+#define OFFS_HI32       0
+#else   /* SK_LITTLE_ENDIAN */
+/* First 32 bits */
+#define OFFS_LO32       0
+
+/* Second 32 bits */
+#define OFFS_HI32       1
+#endif  /* SK_LITTLE_ENDIAN */
+
+#endif  /* DEBUG */
+
+/* ----- Private timeout values ----- */
+
+#define SK_RLMT_MIN_TO_VAL                         125000       /* 1/8 sec. */
+#define SK_RLMT_DEF_TO_VAL                        1000000       /* 1 sec. */
+#define SK_RLMT_PORTDOWN_TIM_VAL           900000       /* another 0.9 sec. */
+#define SK_RLMT_PORTSTART_TIM_VAL          100000       /* 0.1 sec. */
+#define SK_RLMT_PORTUP_TIM_VAL            2500000       /* 2.5 sec. */
+#define SK_RLMT_SEG_TO_VAL                      900000000       /* 15 min. */
+
+/* Assume tick counter increment is 1 - may be set OS-dependent. */
+#ifndef SK_TICK_INCR
+#define SK_TICK_INCR    SK_CONSTU64(1)
+#endif  /* !defined(SK_TICK_INCR) */
+
+/*
+ * Amount that a time stamp must be later to be recognized as "substantially
+ * later". This is about 1/128 sec, but above 1 tick counter increment.
+ */
+#define SK_RLMT_BC_DELTA                (1 + ((SK_TICKS_PER_SEC >> 7) > SK_TICK_INCR ? \
+                                                                        (SK_TICKS_PER_SEC >> 7) : SK_TICK_INCR))
+
+/* ----- Private RLMT defaults ----- */
+
+#define SK_RLMT_DEF_PREF_PORT   0                                       /* "Lower" port. */
+#define SK_RLMT_DEF_MODE                SK_RLMT_CHECK_LINK      /* Default RLMT Mode. */
+
+/* ----- Private RLMT checking states ----- */
+
+#define SK_RLMT_RCS_SEG                 1               /* RLMT Check State: check seg. */
+#define SK_RLMT_RCS_START_SEG   2               /* RLMT Check State: start check seg. */
+#define SK_RLMT_RCS_SEND_SEG    4               /* RLMT Check State: send BPDU packet */
+#define SK_RLMT_RCS_REPORT_SEG  8               /* RLMT Check State: report seg. */
+
+/* ----- Private PORT checking states ----- */
+
+#define SK_RLMT_PCS_TX                  1               /* Port Check State: check tx. */
+#define SK_RLMT_PCS_RX                  2               /* Port Check State: check rx. */
+
+/* ----- Private PORT events ----- */
+
+/* Note: Update simulation when changing these. */
+#define SK_RLMT_PORTSTART_TIM   1100    /* Port start timeout. */
+#define SK_RLMT_PORTUP_TIM              1101    /* Port can now go up. */
+#define SK_RLMT_PORTDOWN_RX_TIM 1102    /* Port did not receive once ... */
+#define SK_RLMT_PORTDOWN                1103    /* Port went down. */
+#define SK_RLMT_PORTDOWN_TX_TIM 1104    /* Partner did not receive ... */
+
+/* ----- Private RLMT events ----- */
+
+/* Note: Update simulation when changing these. */
+#define SK_RLMT_TIM                             2100    /* RLMT timeout. */
+#define SK_RLMT_SEG_TIM                 2101    /* RLMT segmentation check timeout. */
+
+#define TO_SHORTEN(tim) ((tim) / 2)
+
+/* Error numbers and messages. */
+#define SKERR_RLMT_E001         (SK_ERRBASE_RLMT + 0)
+#define SKERR_RLMT_E001_MSG     "No Packet."
+#define SKERR_RLMT_E002         (SKERR_RLMT_E001 + 1)
+#define SKERR_RLMT_E002_MSG     "Short Packet."
+#define SKERR_RLMT_E003         (SKERR_RLMT_E002 + 1)
+#define SKERR_RLMT_E003_MSG     "Unknown RLMT event."
+#define SKERR_RLMT_E004         (SKERR_RLMT_E003 + 1)
+#define SKERR_RLMT_E004_MSG     "PortsUp incorrect."
+#define SKERR_RLMT_E005         (SKERR_RLMT_E004 + 1)
+#define SKERR_RLMT_E005_MSG     \
+ "Net seems to be segmented (different root bridges are reported on the ports)."
+#define SKERR_RLMT_E006         (SKERR_RLMT_E005 + 1)
+#define SKERR_RLMT_E006_MSG     "Duplicate MAC Address detected."
+#define SKERR_RLMT_E007         (SKERR_RLMT_E006 + 1)
+#define SKERR_RLMT_E007_MSG     "LinksUp incorrect."
+#define SKERR_RLMT_E008         (SKERR_RLMT_E007 + 1)
+#define SKERR_RLMT_E008_MSG     "Port not started but link came up."
+#define SKERR_RLMT_E009         (SKERR_RLMT_E008 + 1)
+#define SKERR_RLMT_E009_MSG     "Corrected illegal setting of Preferred Port."
+#define SKERR_RLMT_E010         (SKERR_RLMT_E009 + 1)
+#define SKERR_RLMT_E010_MSG     "Ignored illegal Preferred Port."
+
+/* LLC field values. */
+#define LLC_COMMAND_RESPONSE_BIT                1
+#define LLC_TEST_COMMAND                                0xE3
+#define LLC_UI                                                  0x03
+
+/* RLMT Packet fields. */
+#define SK_RLMT_DSAP                                    0
+#define SK_RLMT_SSAP                                    0
+#define SK_RLMT_CTRL                                    (LLC_TEST_COMMAND)
+#define SK_RLMT_INDICATOR0                              0x53    /* S */
+#define SK_RLMT_INDICATOR1                              0x4B    /* K */
+#define SK_RLMT_INDICATOR2                              0x2D    /* - */
+#define SK_RLMT_INDICATOR3                              0x52    /* R */
+#define SK_RLMT_INDICATOR4                              0x4C    /* L */
+#define SK_RLMT_INDICATOR5                              0x4D    /* M */
+#define SK_RLMT_INDICATOR6                              0x54    /* T */
+#define SK_RLMT_PACKET_VERSION                  0
+
+/* RLMT SPT Flag values. */
+#define SK_RLMT_SPT_FLAG_CHANGE                 0x01
+#define SK_RLMT_SPT_FLAG_CHANGE_ACK             0x80
+
+/* RLMT SPT Packet fields. */
+#define SK_RLMT_SPT_DSAP                                0x42
+#define SK_RLMT_SPT_SSAP                                0x42
+#define SK_RLMT_SPT_CTRL                                (LLC_UI)
+#define SK_RLMT_SPT_PROTOCOL_ID0                0x00
+#define SK_RLMT_SPT_PROTOCOL_ID1                0x00
+#define SK_RLMT_SPT_PROTOCOL_VERSION_ID 0x00
+#define SK_RLMT_SPT_BPDU_TYPE                   0x00
+#define SK_RLMT_SPT_FLAGS                               0x00    /* ?? */
+#define SK_RLMT_SPT_ROOT_ID0                    0xFF    /* Lowest possible priority. */
+#define SK_RLMT_SPT_ROOT_ID1                    0xFF    /* Lowest possible priority. */
+
+/* Remaining 6 bytes will be the current port address. */
+#define SK_RLMT_SPT_ROOT_PATH_COST0             0x00
+#define SK_RLMT_SPT_ROOT_PATH_COST1             0x00
+#define SK_RLMT_SPT_ROOT_PATH_COST2             0x00
+#define SK_RLMT_SPT_ROOT_PATH_COST3             0x00
+#define SK_RLMT_SPT_BRIDGE_ID0                  0xFF    /* Lowest possible priority. */
+#define SK_RLMT_SPT_BRIDGE_ID1                  0xFF    /* Lowest possible priority. */
+
+/* Remaining 6 bytes will be the current port address. */
+#define SK_RLMT_SPT_PORT_ID0                    0xFF    /* Lowest possible priority. */
+#define SK_RLMT_SPT_PORT_ID1                    0xFF    /* Lowest possible priority. */
+#define SK_RLMT_SPT_MSG_AGE0                    0x00
+#define SK_RLMT_SPT_MSG_AGE1                    0x00
+#define SK_RLMT_SPT_MAX_AGE0                    0x00
+#define SK_RLMT_SPT_MAX_AGE1                    0xFF
+#define SK_RLMT_SPT_HELLO_TIME0                 0x00
+#define SK_RLMT_SPT_HELLO_TIME1                 0xFF
+#define SK_RLMT_SPT_FWD_DELAY0                  0x00
+#define SK_RLMT_SPT_FWD_DELAY1                  0x40
+
+/* Size defines. */
+#define SK_RLMT_MIN_PACKET_SIZE                 34
+#define SK_RLMT_MAX_PACKET_SIZE                 (SK_RLMT_MAX_TX_BUF_SIZE)
+#define SK_PACKET_DATA_LEN                              (SK_RLMT_MAX_PACKET_SIZE - \
+                                                                                SK_RLMT_MIN_PACKET_SIZE)
+
+/* ----- RLMT packet types ----- */
+#define SK_PACKET_ANNOUNCE                              1       /* Port announcement. */
+#define SK_PACKET_ALIVE                                 2       /* Alive packet to port. */
+#define SK_PACKET_ADDR_CHANGED                  3       /* Port address changed. */
+#define SK_PACKET_CHECK_TX                              4       /* Check your tx line. */
+
+#ifdef SK_LITTLE_ENDIAN
+#define SK_U16_TO_NETWORK_ORDER(Val,Addr) { \
+        SK_U8   *_Addr = (SK_U8*)(Addr); \
+        SK_U16  _Val = (SK_U16)(Val); \
+        *_Addr++ = (SK_U8)(_Val >> 8); \
+        *_Addr = (SK_U8)(_Val & 0xFF); \
+}
+#endif  /* SK_LITTLE_ENDIAN */
+
+#ifdef SK_BIG_ENDIAN
+#define SK_U16_TO_NETWORK_ORDER(Val,Addr) (*(SK_U16*)(Addr) = (SK_U16)(Val))
+#endif  /* SK_BIG_ENDIAN */
+
+#define AUTONEG_FAILED  SK_FALSE
+#define AUTONEG_SUCCESS SK_TRUE
+
+
+/* typedefs *******************************************************************/
+
+/* RLMT packet.  Length: SK_RLMT_MAX_PACKET_SIZE (60) bytes. */
+typedef struct s_RlmtPacket {
+        SK_U8   DstAddr[SK_MAC_ADDR_LEN];
+        SK_U8   SrcAddr[SK_MAC_ADDR_LEN];
+        SK_U8   TypeLen[2];
+        SK_U8   DSap;
+        SK_U8   SSap;
+        SK_U8   Ctrl;
+        SK_U8   Indicator[7];
+        SK_U8   RlmtPacketType[2];
+        SK_U8   Align1[2];
+        SK_U8   Random[4];                              /* Random value of requesting(!) station. */
+        SK_U8   RlmtPacketVersion[2];   /* RLMT Packet version. */
+        SK_U8   Data[SK_PACKET_DATA_LEN];
+} SK_RLMT_PACKET;
+
+typedef struct s_SpTreeRlmtPacket {
+        SK_U8   DstAddr[SK_MAC_ADDR_LEN];
+        SK_U8   SrcAddr[SK_MAC_ADDR_LEN];
+        SK_U8   TypeLen[2];
+        SK_U8   DSap;
+        SK_U8   SSap;
+        SK_U8   Ctrl;
+        SK_U8   ProtocolId[2];
+        SK_U8   ProtocolVersionId;
+        SK_U8   BpduType;
+        SK_U8   Flags;
+        SK_U8   RootId[8];
+        SK_U8   RootPathCost[4];
+        SK_U8   BridgeId[8];
+        SK_U8   PortId[2];
+        SK_U8   MessageAge[2];
+        SK_U8   MaxAge[2];
+        SK_U8   HelloTime[2];
+        SK_U8   ForwardDelay[2];
+} SK_SPTREE_PACKET;
+
+/* global variables ***********************************************************/
+
+SK_MAC_ADDR     SkRlmtMcAddr =  {{0x01,  0x00,  0x5A,  0x52,  0x4C,  0x4D}};
+SK_MAC_ADDR     BridgeMcAddr =  {{0x01,  0x80,  0xC2,  0x00,  0x00,  0x00}};
+
+/* local variables ************************************************************/
+
+/* None. */
+
+/* functions ******************************************************************/
+
+RLMT_STATIC void        SkRlmtCheckSwitch(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        SK_U32  NetIdx);
+RLMT_STATIC void        SkRlmtCheckSeg(
+        SK_AC   *pAC,
+        SK_IOC  IoC,
+        SK_U32  NetIdx);
+RLMT_STATIC void        SkRlmtEvtSetNets(
+        SK_AC           *pAC,
+        SK_IOC          IoC,
+        SK_EVPARA       Para);
+
+/******************************************************************************
+ *
+ *      SkRlmtInit - initialize data, set state to init
+ *
+ * Description:
+ *
+ *      SK_INIT_DATA
+ *      ============
+ *
+ *      This routine initializes all RLMT-related variables to a known state.
+ *      The initial state is SK_RLMT_RS_INIT.
+ *      All ports are initialized to SK_RLMT_PS_INIT.
+ *
+ *
+ *      SK_INIT_IO
+ *      ==========
+ *
+ *      Nothing.
+ *
+ *
+ *      SK_INIT_RUN
+ *      ===========
+ *
+ *      Determine the adapter's random value.
+ *      Set the hw registers, the "logical MAC address", the
+ *      RLMT multicast address, and eventually the BPDU multicast address.
+ *
+ * Context:
+ *      init, pageable
+ *
+ * Returns:
+ *      Nothing.
+ */
+void    SkRlmtInit(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC,    /* I/O Context */
+int             Level)  /* Initialization Level */
+{
+        SK_U32          i, j;
+        SK_U64          Random;
+        SK_EVPARA       Para;
+    SK_MAC_ADDR         VirtualMacAddress;
+    SK_MAC_ADDR         PhysicalAMacAddress;
+    SK_BOOL             VirtualMacAddressSet;
+    SK_BOOL             PhysicalAMacAddressSet;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_INIT,
+                ("RLMT Init level %d.\n", Level))
+
+        switch (Level) {
+        case SK_INIT_DATA:      /* Initialize data structures. */
+                SK_MEMSET((char *)&pAC->Rlmt, 0, sizeof(SK_RLMT));
+
+                for (i = 0; i < SK_MAX_MACS; i++) {
+                        pAC->Rlmt.Port[i].PortState = SK_RLMT_PS_INIT;
+                        pAC->Rlmt.Port[i].LinkDown = SK_TRUE;
+                        pAC->Rlmt.Port[i].PortDown = SK_TRUE;
+                        pAC->Rlmt.Port[i].PortStarted = SK_FALSE;
+                        pAC->Rlmt.Port[i].PortNoRx = SK_FALSE;
+                        pAC->Rlmt.Port[i].RootIdSet = SK_FALSE;
+                        pAC->Rlmt.Port[i].PortNumber = i;
+                        pAC->Rlmt.Port[i].Net = &pAC->Rlmt.Net[0];
+                        pAC->Rlmt.Port[i].AddrPort = &pAC->Addr.Port[i];
+                }
+
+                pAC->Rlmt.NumNets = 1;
+                for (i = 0; i < SK_MAX_NETS; i++) {
+                        pAC->Rlmt.Net[i].RlmtState = SK_RLMT_RS_INIT;
+                        pAC->Rlmt.Net[i].RootIdSet = SK_FALSE;
+                        pAC->Rlmt.Net[i].PrefPort = SK_RLMT_DEF_PREF_PORT;
+                        pAC->Rlmt.Net[i].Preference = 0xFFFFFFFF;         /* Automatic. */
+                        /* Just assuming. */
+                        pAC->Rlmt.Net[i].ActivePort = pAC->Rlmt.Net[i].PrefPort;
+                        pAC->Rlmt.Net[i].RlmtMode = SK_RLMT_DEF_MODE;
+                        pAC->Rlmt.Net[i].TimeoutValue = SK_RLMT_DEF_TO_VAL;
+                        pAC->Rlmt.Net[i].NetNumber = i;
+                }
+
+                pAC->Rlmt.Net[0].Port[0] = &pAC->Rlmt.Port[0];
+                pAC->Rlmt.Net[0].Port[1] = &pAC->Rlmt.Port[1];
+#if SK_MAX_NETS > 1
+                pAC->Rlmt.Net[1].Port[0] = &pAC->Rlmt.Port[1];
+#endif  /* SK_MAX_NETS > 1 */
+                break;
+
+        case SK_INIT_IO:        /* GIMacsFound first available here. */
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_INIT,
+                        ("RLMT: %d MACs were detected.\n", pAC->GIni.GIMacsFound))
+
+                pAC->Rlmt.Net[0].NumPorts = pAC->GIni.GIMacsFound;
+
+                /* Initialize HW registers? */
+                if (pAC->GIni.GIMacsFound == 1) {
+                        Para.Para32[0] = SK_RLMT_MODE_CLS;
+                        Para.Para32[1] = 0;
+                        (void)SkRlmtEvent(pAC, IoC, SK_RLMT_MODE_CHANGE, Para);
+                }
+                break;
+
+        case SK_INIT_RUN:
+                /* Ensure RLMT is set to one net. */
+                if (pAC->Rlmt.NumNets > 1) {
+                        Para.Para32[0] = 1;
+                        Para.Para32[1] = -1;
+                        SkRlmtEvtSetNets(pAC, IoC, Para);
+                }
+
+                for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+                        Random = SkOsGetTime(pAC);
+                        *(SK_U32*)&pAC->Rlmt.Port[i].Random = *(SK_U32*)&Random;
+
+                        for (j = 0; j < 4; j++) {
+                                pAC->Rlmt.Port[i].Random[j] ^= pAC->Rlmt.Port[i].AddrPort->
+                                        CurrentMacAddress.a[SK_MAC_ADDR_LEN - 1 - j];
+                        }
+
+                        (void)SkAddrMcClear(pAC, IoC, i, SK_ADDR_PERMANENT | SK_MC_SW_ONLY);
+                        
+                        /* Add RLMT MC address. */
+                        (void)SkAddrMcAdd(pAC, IoC, i, &SkRlmtMcAddr, SK_ADDR_PERMANENT);
+
+                        if (pAC->Rlmt.Net[0].RlmtMode & SK_RLMT_CHECK_SEG) {
+                                /* Add BPDU MC address. */
+                                (void)SkAddrMcAdd(pAC, IoC, i, &BridgeMcAddr, SK_ADDR_PERMANENT);
+                        }
+
+                        (void)SkAddrMcUpdate(pAC, IoC, i);
+                }
+
+        VirtualMacAddressSet = SK_FALSE;
+                /* Read virtual MAC address from Control Register File. */
+                for (j = 0; j < SK_MAC_ADDR_LEN; j++) {
+                        
+            SK_IN8(IoC, B2_MAC_1 + j, &VirtualMacAddress.a[j]);
+            VirtualMacAddressSet |= VirtualMacAddress.a[j];
+                }
+        
+        PhysicalAMacAddressSet = SK_FALSE;
+                /* Read physical MAC address for MAC A from Control Register File. */
+                for (j = 0; j < SK_MAC_ADDR_LEN; j++) {
+                        
+            SK_IN8(IoC, B2_MAC_2 + j, &PhysicalAMacAddress.a[j]);
+            PhysicalAMacAddressSet |= PhysicalAMacAddress.a[j];
+                }
+
+        /* check if the two mac addresses contain reasonable values */
+        if (!VirtualMacAddressSet || !PhysicalAMacAddressSet) {
+
+            pAC->Rlmt.RlmtOff = SK_TRUE;
+        }
+
+        /* if the two mac addresses are equal switch off the RLMT_PRE_LOOKAHEAD
+           and the RLMT_LOOKAHEAD macros */
+        else if (SK_ADDR_EQUAL(PhysicalAMacAddress.a, VirtualMacAddress.a)) {
+
+            pAC->Rlmt.RlmtOff = SK_TRUE;
+        }
+                else {
+                        pAC->Rlmt.RlmtOff = SK_FALSE;
+                }
+                break;
+
+        default:        /* error */
+                break;
+        }
+        return;
+}       /* SkRlmtInit */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtBuildCheckChain - build the check chain
+ *
+ * Description:
+ *      This routine builds the local check chain:
+ *      - Each port that is up checks the next port.
+ *      - The last port that is up checks the first port that is up.
+ *
+ * Notes:
+ *      - Currently only local ports are considered when building the chain.
+ *      - Currently the SuspectState is just reset;
+ *        it would be better to save it ...
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtBuildCheckChain(
+SK_AC   *pAC,   /* Adapter Context */
+SK_U32  NetIdx) /* Net Number */
+{
+        SK_U32                  i;
+        SK_U32                  NumMacsUp;
+        SK_RLMT_PORT *  FirstMacUp;
+        SK_RLMT_PORT *  PrevMacUp;
+
+        FirstMacUp      = NULL;
+        PrevMacUp       = NULL;
+        
+        if (!(pAC->Rlmt.Net[NetIdx].RlmtMode & SK_RLMT_CHECK_LOC_LINK)) {
+                for (i = 0; i < pAC->Rlmt.Net[i].NumPorts; i++) {
+                        pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked = 0;
+                }
+                return; /* Done. */
+        }
+                        
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SkRlmtBuildCheckChain.\n"))
+
+        NumMacsUp = 0;
+
+        for (i = 0; i < pAC->Rlmt.Net[NetIdx].NumPorts; i++) {
+                pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked = 0;
+                pAC->Rlmt.Net[NetIdx].Port[i]->PortsSuspect = 0;
+                pAC->Rlmt.Net[NetIdx].Port[i]->CheckingState &=
+                        ~(SK_RLMT_PCS_RX | SK_RLMT_PCS_TX);
+
+                /*
+                 * If more than two links are detected we should consider
+                 * checking at least two other ports:
+                 * 1. the next port that is not LinkDown and
+                 * 2. the next port that is not PortDown.
+                 */
+                if (!pAC->Rlmt.Net[NetIdx].Port[i]->LinkDown) {
+                        if (NumMacsUp == 0) {
+                                FirstMacUp = pAC->Rlmt.Net[NetIdx].Port[i];
+                        }
+                        else {
+                                PrevMacUp->PortCheck[
+                                        pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked].CheckAddr =
+                                        pAC->Rlmt.Net[NetIdx].Port[i]->AddrPort->CurrentMacAddress;
+                                PrevMacUp->PortCheck[
+                                        PrevMacUp->PortsChecked].SuspectTx = SK_FALSE;
+                                PrevMacUp->PortsChecked++;
+                        }
+                        PrevMacUp = pAC->Rlmt.Net[NetIdx].Port[i];
+                        NumMacsUp++;
+                }
+        }
+
+        if (NumMacsUp > 1) {
+                PrevMacUp->PortCheck[PrevMacUp->PortsChecked].CheckAddr =
+                        FirstMacUp->AddrPort->CurrentMacAddress;
+                PrevMacUp->PortCheck[PrevMacUp->PortsChecked].SuspectTx =
+                        SK_FALSE;
+                PrevMacUp->PortsChecked++;
+        }
+
+#ifdef DEBUG
+        for (i = 0; i < pAC->Rlmt.Net[NetIdx].NumPorts; i++) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Port %d checks %d other ports: %2X.\n", i,
+                                pAC->Rlmt.Net[NetIdx].Port[i]->PortsChecked,
+                                pAC->Rlmt.Net[NetIdx].Port[i]->PortCheck[0].CheckAddr.a[5]))
+        }
+#endif  /* DEBUG */
+
+        return;
+}       /* SkRlmtBuildCheckChain */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtBuildPacket - build an RLMT packet
+ *
+ * Description:
+ *      This routine sets up an RLMT packet.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      NULL or pointer to RLMT mbuf
+ */
+RLMT_STATIC SK_MBUF     *SkRlmtBuildPacket(
+SK_AC           *pAC,           /* Adapter Context */
+SK_IOC          IoC,            /* I/O Context */
+SK_U32          PortNumber,     /* Sending port */
+SK_U16          PacketType,     /* RLMT packet type */
+SK_MAC_ADDR     *SrcAddr,       /* Source address */
+SK_MAC_ADDR     *DestAddr)      /* Destination address */
+{
+        int             i;
+        SK_U16          Length;
+        SK_MBUF         *pMb;
+        SK_RLMT_PACKET  *pPacket;
+
+#ifdef DEBUG
+        SK_U8   CheckSrc  = 0;
+        SK_U8   CheckDest = 0;
+        
+        for (i = 0; i < SK_MAC_ADDR_LEN; ++i) {
+                CheckSrc  |= SrcAddr->a[i];
+                CheckDest |= DestAddr->a[i];
+        }
+
+        if ((CheckSrc == 0) || (CheckDest == 0)) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_ERR,
+                        ("SkRlmtBuildPacket: Invalid %s%saddr.\n",
+                         (CheckSrc == 0 ? "Src" : ""), (CheckDest == 0 ? "Dest" : "")))
+        }
+#endif
+
+        if ((pMb = SkDrvAllocRlmtMbuf(pAC, IoC, SK_RLMT_MAX_PACKET_SIZE)) != NULL) {
+                pPacket = (SK_RLMT_PACKET*)pMb->pData;
+                for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
+                        pPacket->DstAddr[i] = DestAddr->a[i];
+                        pPacket->SrcAddr[i] = SrcAddr->a[i];
+                }
+                pPacket->DSap = SK_RLMT_DSAP;
+                pPacket->SSap = SK_RLMT_SSAP;
+                pPacket->Ctrl = SK_RLMT_CTRL;
+                pPacket->Indicator[0] = SK_RLMT_INDICATOR0;
+                pPacket->Indicator[1] = SK_RLMT_INDICATOR1;
+                pPacket->Indicator[2] = SK_RLMT_INDICATOR2;
+                pPacket->Indicator[3] = SK_RLMT_INDICATOR3;
+                pPacket->Indicator[4] = SK_RLMT_INDICATOR4;
+                pPacket->Indicator[5] = SK_RLMT_INDICATOR5;
+                pPacket->Indicator[6] = SK_RLMT_INDICATOR6;
+
+                SK_U16_TO_NETWORK_ORDER(PacketType, &pPacket->RlmtPacketType[0]);
+
+                for (i = 0; i < 4; i++) {
+                        pPacket->Random[i] = pAC->Rlmt.Port[PortNumber].Random[i];
+                }
+                
+                SK_U16_TO_NETWORK_ORDER(
+                        SK_RLMT_PACKET_VERSION, &pPacket->RlmtPacketVersion[0]);
+
+                for (i = 0; i < SK_PACKET_DATA_LEN; i++) {
+                        pPacket->Data[i] = 0x00;
+                }
+
+                Length = SK_RLMT_MAX_PACKET_SIZE;       /* Or smaller. */
+                pMb->Length = Length;
+                pMb->PortIdx = PortNumber;
+                Length -= 14;
+                SK_U16_TO_NETWORK_ORDER(Length, &pPacket->TypeLen[0]);
+
+                if (PacketType == SK_PACKET_ALIVE) {
+                        pAC->Rlmt.Port[PortNumber].TxHelloCts++;
+                }
+        }
+
+        return (pMb);
+}       /* SkRlmtBuildPacket */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtBuildSpanningTreePacket - build spanning tree check packet
+ *
+ * Description:
+ *      This routine sets up a BPDU packet for spanning tree check.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      NULL or pointer to RLMT mbuf
+ */
+RLMT_STATIC SK_MBUF     *SkRlmtBuildSpanningTreePacket(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+SK_U32  PortNumber)     /* Sending port */
+{
+        unsigned                        i;
+        SK_U16                          Length;
+        SK_MBUF                         *pMb;
+        SK_SPTREE_PACKET        *pSPacket;
+
+        if ((pMb = SkDrvAllocRlmtMbuf(pAC, IoC, SK_RLMT_MAX_PACKET_SIZE)) !=
+                NULL) {
+                pSPacket = (SK_SPTREE_PACKET*)pMb->pData;
+                for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
+                        pSPacket->DstAddr[i] = BridgeMcAddr.a[i];
+                        pSPacket->SrcAddr[i] =
+                                pAC->Addr.Port[PortNumber].CurrentMacAddress.a[i];
+                }
+                pSPacket->DSap = SK_RLMT_SPT_DSAP;
+                pSPacket->SSap = SK_RLMT_SPT_SSAP;
+                pSPacket->Ctrl = SK_RLMT_SPT_CTRL;
+
+                pSPacket->ProtocolId[0] = SK_RLMT_SPT_PROTOCOL_ID0;
+                pSPacket->ProtocolId[1] = SK_RLMT_SPT_PROTOCOL_ID1;
+                pSPacket->ProtocolVersionId = SK_RLMT_SPT_PROTOCOL_VERSION_ID;
+                pSPacket->BpduType = SK_RLMT_SPT_BPDU_TYPE;
+                pSPacket->Flags = SK_RLMT_SPT_FLAGS;
+                pSPacket->RootId[0] = SK_RLMT_SPT_ROOT_ID0;
+                pSPacket->RootId[1] = SK_RLMT_SPT_ROOT_ID1;
+                pSPacket->RootPathCost[0] = SK_RLMT_SPT_ROOT_PATH_COST0;
+                pSPacket->RootPathCost[1] = SK_RLMT_SPT_ROOT_PATH_COST1;
+                pSPacket->RootPathCost[2] = SK_RLMT_SPT_ROOT_PATH_COST2;
+                pSPacket->RootPathCost[3] = SK_RLMT_SPT_ROOT_PATH_COST3;
+                pSPacket->BridgeId[0] = SK_RLMT_SPT_BRIDGE_ID0;
+                pSPacket->BridgeId[1] = SK_RLMT_SPT_BRIDGE_ID1;
+
+                /*
+                 * Use logical MAC address as bridge ID and filter these packets
+                 * on receive.
+                 */
+                for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
+                        pSPacket->BridgeId[i + 2] = pSPacket->RootId[i + 2] =
+                                pAC->Addr.Net[pAC->Rlmt.Port[PortNumber].Net->NetNumber].
+                                        CurrentMacAddress.a[i];
+                }
+                pSPacket->PortId[0] = SK_RLMT_SPT_PORT_ID0;
+                pSPacket->PortId[1] = SK_RLMT_SPT_PORT_ID1;
+                pSPacket->MessageAge[0] = SK_RLMT_SPT_MSG_AGE0;
+                pSPacket->MessageAge[1] = SK_RLMT_SPT_MSG_AGE1;
+                pSPacket->MaxAge[0] = SK_RLMT_SPT_MAX_AGE0;
+                pSPacket->MaxAge[1] = SK_RLMT_SPT_MAX_AGE1;
+                pSPacket->HelloTime[0] = SK_RLMT_SPT_HELLO_TIME0;
+                pSPacket->HelloTime[1] = SK_RLMT_SPT_HELLO_TIME1;
+                pSPacket->ForwardDelay[0] = SK_RLMT_SPT_FWD_DELAY0;
+                pSPacket->ForwardDelay[1] = SK_RLMT_SPT_FWD_DELAY1;
+
+                Length = SK_RLMT_MAX_PACKET_SIZE;       /* Or smaller. */
+                pMb->Length = Length;
+                pMb->PortIdx = PortNumber;
+                Length -= 14;
+                SK_U16_TO_NETWORK_ORDER(Length, &pSPacket->TypeLen[0]);
+
+                pAC->Rlmt.Port[PortNumber].TxSpHelloReqCts++;
+        }
+
+        return (pMb);
+}       /* SkRlmtBuildSpanningTreePacket */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtSend - build and send check packets
+ *
+ * Description:
+ *      Depending on the RLMT state and the checking state, several packets
+ *      are sent through the indicated port.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      Nothing.
+ */
+RLMT_STATIC void        SkRlmtSend(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+SK_U32  PortNumber)     /* Sending port */
+{
+        unsigned        j;
+        SK_EVPARA       Para;
+        SK_RLMT_PORT    *pRPort;
+
+        pRPort = &pAC->Rlmt.Port[PortNumber];
+        if (pAC->Rlmt.Port[PortNumber].Net->RlmtMode & SK_RLMT_CHECK_LOC_LINK) {
+                if (pRPort->CheckingState & (SK_RLMT_PCS_TX | SK_RLMT_PCS_RX)) {
+                        /* Port is suspicious. Send the RLMT packet to the RLMT mc addr. */
+                        if ((Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC, PortNumber,
+                                SK_PACKET_ALIVE, &pAC->Addr.Port[PortNumber].CurrentMacAddress,
+                                &SkRlmtMcAddr)) != NULL) {
+                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
+                        }
+                }
+                else {
+                        /*
+                         * Send a directed RLMT packet to all ports that are
+                         * checked by the indicated port.
+                         */
+                        for (j = 0; j < pRPort->PortsChecked; j++) {
+                                if ((Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC, PortNumber,
+                                        SK_PACKET_ALIVE, &pAC->Addr.Port[PortNumber].CurrentMacAddress,
+                                        &pRPort->PortCheck[j].CheckAddr)) != NULL) {
+                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
+                                }
+                        }
+                }
+        }
+
+        if ((pAC->Rlmt.Port[PortNumber].Net->RlmtMode & SK_RLMT_CHECK_SEG) &&
+                (pAC->Rlmt.Port[PortNumber].Net->CheckingState & SK_RLMT_RCS_SEND_SEG)) {
+                /*
+                 * Send a BPDU packet to make a connected switch tell us
+                 * the correct root bridge.
+                 */
+                if ((Para.pParaPtr =
+                        SkRlmtBuildSpanningTreePacket(pAC, IoC, PortNumber)) != NULL) {
+                        pAC->Rlmt.Port[PortNumber].Net->CheckingState &= ~SK_RLMT_RCS_SEND_SEG;
+                        pRPort->RootIdSet = SK_FALSE;
+
+                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_TX,
+                                ("SkRlmtSend: BPDU Packet on Port %u.\n", PortNumber))
+                }
+        }
+        return;
+}       /* SkRlmtSend */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtPortReceives - check if port is (going) down and bring it up
+ *
+ * Description:
+ *      This routine checks if a port who received a non-BPDU packet
+ *      needs to go up or needs to be stopped going down.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      Nothing.
+ */
+RLMT_STATIC void        SkRlmtPortReceives(
+SK_AC   *pAC,                   /* Adapter Context */
+SK_IOC  IoC,                    /* I/O Context */
+SK_U32  PortNumber)             /* Port to check */
+{
+        SK_RLMT_PORT    *pRPort;
+        SK_EVPARA               Para;
+
+        pRPort = &pAC->Rlmt.Port[PortNumber];
+        pRPort->PortNoRx = SK_FALSE;
+
+        if ((pRPort->PortState == SK_RLMT_PS_DOWN) &&
+                !(pRPort->CheckingState & SK_RLMT_PCS_TX)) {
+                /*
+                 * Port is marked down (rx), but received a non-BPDU packet.
+                 * Bring it up.
+                 */
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                        ("SkRlmtPacketReceive: Received on PortDown.\n"))
+
+                pRPort->PortState = SK_RLMT_PS_GOING_UP;
+                pRPort->GuTimeStamp = SkOsGetTime(pAC);
+                Para.Para32[0] = PortNumber;
+                Para.Para32[1] = (SK_U32)-1;
+                SkTimerStart(pAC, IoC, &pRPort->UpTimer, SK_RLMT_PORTUP_TIM_VAL,
+                        SKGE_RLMT, SK_RLMT_PORTUP_TIM, Para);
+                pRPort->CheckingState &= ~SK_RLMT_PCS_RX;
+                /* pAC->Rlmt.CheckSwitch = SK_TRUE; */
+                SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
+        }       /* PortDown && !SuspectTx */
+        else if (pRPort->CheckingState & SK_RLMT_PCS_RX) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                        ("SkRlmtPacketReceive: Stop bringing port down.\n"))
+                SkTimerStop(pAC, IoC, &pRPort->DownRxTimer);
+                pRPort->CheckingState &= ~SK_RLMT_PCS_RX;
+                /* pAC->Rlmt.CheckSwitch = SK_TRUE; */
+                SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
+        }       /* PortGoingDown */
+
+        return;
+}       /* SkRlmtPortReceives */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtPacketReceive - receive a packet for closer examination
+ *
+ * Description:
+ *      This routine examines a packet more closely than SK_RLMT_LOOKAHEAD.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      Nothing.
+ */
+RLMT_STATIC void        SkRlmtPacketReceive(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC,    /* I/O Context */
+SK_MBUF *pMb)   /* Received packet */
+{
+#ifdef xDEBUG
+        extern  void DumpData(char *p, int size);
+#endif  /* DEBUG */
+        int                                     i;
+        unsigned                        j;
+        SK_U16                          PacketType;
+        SK_U32                          PortNumber;
+        SK_ADDR_PORT            *pAPort;
+        SK_RLMT_PORT            *pRPort;
+        SK_RLMT_PACKET          *pRPacket;
+        SK_SPTREE_PACKET        *pSPacket;
+        SK_EVPARA                       Para;
+
+        PortNumber      = pMb->PortIdx;
+        pAPort = &pAC->Addr.Port[PortNumber];
+        pRPort = &pAC->Rlmt.Port[PortNumber];
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                ("SkRlmtPacketReceive: PortNumber == %d.\n", PortNumber))
+
+        pRPacket = (SK_RLMT_PACKET*)pMb->pData;
+        pSPacket = (SK_SPTREE_PACKET*)pRPacket;
+
+#ifdef xDEBUG
+        DumpData((char *)pRPacket, 32);
+#endif  /* DEBUG */
+
+        if ((pRPort->PacketsPerTimeSlot - pRPort->BpduPacketsPerTimeSlot) != 0) {
+                SkRlmtPortReceives(pAC, IoC, PortNumber);
+        }
+        
+        /* Check destination address. */
+
+        if (!SK_ADDR_EQUAL(pAPort->CurrentMacAddress.a, pRPacket->DstAddr) &&
+                !SK_ADDR_EQUAL(SkRlmtMcAddr.a, pRPacket->DstAddr) &&
+                !SK_ADDR_EQUAL(BridgeMcAddr.a, pRPacket->DstAddr)) {
+
+                /* Not sent to current MAC or registered MC address => Trash it. */
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                        ("SkRlmtPacketReceive: Not for me.\n"))
+
+                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+                return;
+        }
+        else if (SK_ADDR_EQUAL(pAPort->CurrentMacAddress.a, pRPacket->SrcAddr)) {
+
+                /*
+                 * Was sent by same port (may happen during port switching
+                 * or in case of duplicate MAC addresses).
+                 */
+
+                /*
+                 * Check for duplicate address here:
+                 * If Packet.Random != My.Random => DupAddr.
+                 */
+                for (i = 3; i >= 0; i--) {
+                        if (pRPort->Random[i] != pRPacket->Random[i]) {
+                                break;
+                        }
+                }
+
+                /*
+                 * CAUTION: Do not check for duplicate MAC address in RLMT Alive Reply
+                 * packets (they have the LLC_COMMAND_RESPONSE_BIT set in
+                 * pRPacket->SSap).
+                 */
+                if (i >= 0 && pRPacket->DSap == SK_RLMT_DSAP &&
+                        pRPacket->Ctrl == SK_RLMT_CTRL &&
+                        pRPacket->SSap == SK_RLMT_SSAP &&
+                        pRPacket->Indicator[0] == SK_RLMT_INDICATOR0 &&
+                        pRPacket->Indicator[1] == SK_RLMT_INDICATOR1 &&
+                        pRPacket->Indicator[2] == SK_RLMT_INDICATOR2 &&
+                        pRPacket->Indicator[3] == SK_RLMT_INDICATOR3 &&
+                        pRPacket->Indicator[4] == SK_RLMT_INDICATOR4 &&
+                        pRPacket->Indicator[5] == SK_RLMT_INDICATOR5 &&
+                        pRPacket->Indicator[6] == SK_RLMT_INDICATOR6) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                                ("SkRlmtPacketReceive: Duplicate MAC Address.\n"))
+
+                        /* Error Log entry. */
+                        SK_ERR_LOG(pAC, SK_ERRCL_COMM, SKERR_RLMT_E006, SKERR_RLMT_E006_MSG);
+                }
+                else {
+                        /* Simply trash it. */
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                                ("SkRlmtPacketReceive: Sent by me.\n"))
+                }
+
+                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+                return;
+        }
+
+        /* Check SuspectTx entries. */
+        if (pRPort->PortsSuspect > 0) {
+                for (j = 0; j < pRPort->PortsChecked; j++) {
+                        if (pRPort->PortCheck[j].SuspectTx &&
+                                SK_ADDR_EQUAL(
+                                        pRPacket->SrcAddr, pRPort->PortCheck[j].CheckAddr.a)) {
+                                pRPort->PortCheck[j].SuspectTx = SK_FALSE;
+                                pRPort->PortsSuspect--;
+                                break;
+                        }
+                }
+        }
+
+        /* Determine type of packet. */
+        if (pRPacket->DSap == SK_RLMT_DSAP &&
+                pRPacket->Ctrl == SK_RLMT_CTRL &&
+                (pRPacket->SSap & ~LLC_COMMAND_RESPONSE_BIT) == SK_RLMT_SSAP &&
+                pRPacket->Indicator[0] == SK_RLMT_INDICATOR0 &&
+                pRPacket->Indicator[1] == SK_RLMT_INDICATOR1 &&
+                pRPacket->Indicator[2] == SK_RLMT_INDICATOR2 &&
+                pRPacket->Indicator[3] == SK_RLMT_INDICATOR3 &&
+                pRPacket->Indicator[4] == SK_RLMT_INDICATOR4 &&
+                pRPacket->Indicator[5] == SK_RLMT_INDICATOR5 &&
+                pRPacket->Indicator[6] == SK_RLMT_INDICATOR6) {
+
+                /* It's an RLMT packet. */
+                PacketType = (SK_U16)((pRPacket->RlmtPacketType[0] << 8) |
+                        pRPacket->RlmtPacketType[1]);
+
+                switch (PacketType) {
+                case SK_PACKET_ANNOUNCE:        /* Not yet used. */
+#if 0
+                        /* Build the check chain. */
+                        SkRlmtBuildCheckChain(pAC);
+#endif  /* 0 */
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                                ("SkRlmtPacketReceive: Announce.\n"))
+
+                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+                        break;
+
+                case SK_PACKET_ALIVE:
+                        if (pRPacket->SSap & LLC_COMMAND_RESPONSE_BIT) {
+                                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                                        ("SkRlmtPacketReceive: Alive Reply.\n"))
+
+                                if (!(pAC->Addr.Port[PortNumber].PromMode & SK_PROM_MODE_LLC) ||
+                                        SK_ADDR_EQUAL(
+                                                pRPacket->DstAddr, pAPort->CurrentMacAddress.a)) {
+                                        /* Obviously we could send something. */
+                                        if (pRPort->CheckingState & SK_RLMT_PCS_TX) {
+                                                pRPort->CheckingState &=  ~SK_RLMT_PCS_TX;
+                                                SkTimerStop(pAC, IoC, &pRPort->DownTxTimer);
+                                        }
+
+                                        if ((pRPort->PortState == SK_RLMT_PS_DOWN) &&
+                                                !(pRPort->CheckingState & SK_RLMT_PCS_RX)) {
+                                                pRPort->PortState = SK_RLMT_PS_GOING_UP;
+                                                pRPort->GuTimeStamp = SkOsGetTime(pAC);
+
+                                                SkTimerStop(pAC, IoC, &pRPort->DownTxTimer);
+
+                                                Para.Para32[0] = PortNumber;
+                                                Para.Para32[1] = (SK_U32)-1;
+                                                SkTimerStart(pAC, IoC, &pRPort->UpTimer,
+                                                        SK_RLMT_PORTUP_TIM_VAL, SKGE_RLMT,
+                                                        SK_RLMT_PORTUP_TIM, Para);
+                                        }
+                                }
+
+                                /* Mark sending port as alive? */
+                                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+                        }
+                        else {  /* Alive Request Packet. */
+                                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                                        ("SkRlmtPacketReceive: Alive Request.\n"))
+
+                                pRPort->RxHelloCts++;
+
+                                /* Answer. */
+                                for (i = 0; i < SK_MAC_ADDR_LEN; i++) {
+                                        pRPacket->DstAddr[i] = pRPacket->SrcAddr[i];
+                                        pRPacket->SrcAddr[i] =
+                                                pAC->Addr.Port[PortNumber].CurrentMacAddress.a[i];
+                                }
+                                pRPacket->SSap |= LLC_COMMAND_RESPONSE_BIT;
+
+                                Para.pParaPtr = pMb;
+                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
+                        }
+                        break;
+
+                case SK_PACKET_CHECK_TX:
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                                ("SkRlmtPacketReceive: Check your tx line.\n"))
+
+                        /* A port checking us requests us to check our tx line. */
+                        pRPort->CheckingState |= SK_RLMT_PCS_TX;
+
+                        /* Start PortDownTx timer. */
+                        Para.Para32[0] = PortNumber;
+                        Para.Para32[1] = (SK_U32)-1;
+                        SkTimerStart(pAC, IoC, &pRPort->DownTxTimer,
+                                SK_RLMT_PORTDOWN_TIM_VAL, SKGE_RLMT,
+                                SK_RLMT_PORTDOWN_TX_TIM, Para);
+
+                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+
+                        if ((Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC, PortNumber,
+                                SK_PACKET_ALIVE, &pAC->Addr.Port[PortNumber].CurrentMacAddress,
+                                &SkRlmtMcAddr)) != NULL) {
+                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
+                        }
+                        break;
+
+                case SK_PACKET_ADDR_CHANGED:
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                                ("SkRlmtPacketReceive: Address Change.\n"))
+
+                        /* Build the check chain. */
+                        SkRlmtBuildCheckChain(pAC, pRPort->Net->NetNumber);
+                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+                        break;
+
+                default:
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                                ("SkRlmtPacketReceive: Unknown RLMT packet.\n"))
+
+                        /* RA;:;: ??? */
+                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+                }
+        }
+        else if (pSPacket->DSap == SK_RLMT_SPT_DSAP &&
+                pSPacket->Ctrl == SK_RLMT_SPT_CTRL &&
+                (pSPacket->SSap & ~LLC_COMMAND_RESPONSE_BIT) == SK_RLMT_SPT_SSAP) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                        ("SkRlmtPacketReceive: BPDU Packet.\n"))
+
+                /* Spanning Tree packet. */
+                pRPort->RxSpHelloCts++;
+
+                if (!SK_ADDR_EQUAL(&pSPacket->RootId[2], &pAC->Addr.Net[pAC->Rlmt.
+                        Port[PortNumber].Net->NetNumber].CurrentMacAddress.a[0])) {
+                        /*
+                         * Check segmentation if a new root bridge is set and
+                         * the segmentation check is not currently running.
+                         */
+                        if (!SK_ADDR_EQUAL(&pSPacket->RootId[2], &pRPort->Root.Id[2]) &&
+                                (pAC->Rlmt.Port[PortNumber].Net->LinksUp > 1) &&
+                                (pAC->Rlmt.Port[PortNumber].Net->RlmtMode & SK_RLMT_CHECK_SEG)
+                                != 0 && (pAC->Rlmt.Port[PortNumber].Net->CheckingState &
+                                SK_RLMT_RCS_SEG) == 0) {
+                                pAC->Rlmt.Port[PortNumber].Net->CheckingState |=
+                                        SK_RLMT_RCS_START_SEG | SK_RLMT_RCS_SEND_SEG;
+                        }
+
+                        /* Store tree view of this port. */
+                        for (i = 0; i < 8; i++) {
+                                pRPort->Root.Id[i] = pSPacket->RootId[i];
+                        }
+                        pRPort->RootIdSet = SK_TRUE;
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_DUMP,
+                                ("Root ID %d: %02x %02x %02x %02x %02x %02x %02x %02x.\n",
+                                        PortNumber,
+                                        pRPort->Root.Id[0], pRPort->Root.Id[1],
+                                        pRPort->Root.Id[2], pRPort->Root.Id[3],
+                                        pRPort->Root.Id[4], pRPort->Root.Id[5],
+                                        pRPort->Root.Id[6], pRPort->Root.Id[7]))
+                }
+
+                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+                if ((pAC->Rlmt.Port[PortNumber].Net->CheckingState &
+                        SK_RLMT_RCS_REPORT_SEG) != 0) {
+                        SkRlmtCheckSeg(pAC, IoC, pAC->Rlmt.Port[PortNumber].Net->NetNumber);
+                }
+        }
+        else {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_RX,
+                        ("SkRlmtPacketReceive: Unknown Packet Type.\n"))
+
+                /* Unknown packet. */
+                SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+        }
+        return;
+}       /* SkRlmtPacketReceive */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtCheckPort - check if a port works
+ *
+ * Description:
+ *      This routine checks if a port whose link is up received something
+ *      and if it seems to transmit successfully.
+ *
+ *      # PortState: PsInit, PsLinkDown, PsDown, PsGoingUp, PsUp
+ *      # PortCheckingState (Bitfield): ChkTx, ChkRx, ChkSeg
+ *      # RlmtCheckingState (Bitfield): ChkSeg, StartChkSeg, ReportSeg
+ *
+ *      if (Rx - RxBpdu == 0) { # No rx.
+ *              if (state == PsUp) {
+ *                      PortCheckingState |= ChkRx
+ *              }
+ *              if (ModeCheckSeg && (Timeout ==
+ *                      TO_SHORTEN(RLMT_DEFAULT_TIMEOUT))) {
+ *                      RlmtCheckingState |= ChkSeg)
+ *                      PortCheckingState |= ChkSeg
+ *              }
+ *              NewTimeout = TO_SHORTEN(Timeout)
+ *              if (NewTimeout < RLMT_MIN_TIMEOUT) {
+ *                      NewTimeout = RLMT_MIN_TIMEOUT
+ *                      PortState = PsDown
+ *                      ...
+ *              }
+ *      }
+ *      else {  # something was received
+ *              # Set counter to 0 at LinkDown?
+ *              #   No - rx may be reported after LinkDown ???
+ *              PortCheckingState &= ~ChkRx
+ *              NewTimeout = RLMT_DEFAULT_TIMEOUT
+ *              if (RxAck == 0) {
+ *                      possible reasons:
+ *                      is my tx line bad? --
+ *                              send RLMT multicast and report
+ *                              back internally? (only possible
+ *                              between ports on same adapter)
+ *              }
+ *              if (RxChk == 0) {
+ *                      possible reasons:
+ *                      - tx line of port set to check me
+ *                        maybe bad
+ *                      - no other port/adapter available or set
+ *                        to check me
+ *                      - adapter checking me has a longer
+ *                        timeout
+ *                      ??? anything that can be done here?
+ *              }
+ *      }
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      New timeout value.
+ */
+RLMT_STATIC SK_U32      SkRlmtCheckPort(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+SK_U32  PortNumber)     /* Port to check */
+{
+        unsigned                i;
+        SK_U32                  NewTimeout;
+        SK_RLMT_PORT    *pRPort;
+        SK_EVPARA               Para;
+
+        pRPort = &pAC->Rlmt.Port[PortNumber];
+
+        if ((pRPort->PacketsPerTimeSlot - pRPort->BpduPacketsPerTimeSlot) == 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SkRlmtCheckPort %d: No (%d) receives in last time slot.\n",
+                                PortNumber, pRPort->PacketsPerTimeSlot))
+
+                /*
+                 * Check segmentation if there was no receive at least twice
+                 * in a row (PortNoRx is already set) and the segmentation
+                 * check is not currently running.
+                 */
+
+                if (pRPort->PortNoRx && (pAC->Rlmt.Port[PortNumber].Net->LinksUp > 1) &&
+                        (pAC->Rlmt.Port[PortNumber].Net->RlmtMode & SK_RLMT_CHECK_SEG) &&
+                        !(pAC->Rlmt.Port[PortNumber].Net->CheckingState & SK_RLMT_RCS_SEG)) {
+                        pAC->Rlmt.Port[PortNumber].Net->CheckingState |=
+                                SK_RLMT_RCS_START_SEG | SK_RLMT_RCS_SEND_SEG;
+                }
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SkRlmtCheckPort: PortsSuspect %d, PcsRx %d.\n",
+                                pRPort->PortsSuspect, pRPort->CheckingState & SK_RLMT_PCS_RX))
+
+                if (pRPort->PortState != SK_RLMT_PS_DOWN) {
+                        NewTimeout = TO_SHORTEN(pAC->Rlmt.Port[PortNumber].Net->TimeoutValue);
+                        if (NewTimeout < SK_RLMT_MIN_TO_VAL) {
+                                NewTimeout = SK_RLMT_MIN_TO_VAL;
+                        }
+
+                        if (!(pRPort->CheckingState & SK_RLMT_PCS_RX)) {
+                                Para.Para32[0] = PortNumber;
+                                pRPort->CheckingState |= SK_RLMT_PCS_RX;
+
+                                /*
+                                 * What shall we do if the port checked by this one receives
+                                 * our request frames?  What's bad - our rx line or his tx line?
+                                 */
+                                Para.Para32[1] = (SK_U32)-1;
+                                SkTimerStart(pAC, IoC, &pRPort->DownRxTimer,
+                                        SK_RLMT_PORTDOWN_TIM_VAL, SKGE_RLMT,
+                                        SK_RLMT_PORTDOWN_RX_TIM, Para);
+
+                                for (i = 0; i < pRPort->PortsChecked; i++) {
+                                        if (pRPort->PortCheck[i].SuspectTx) {
+                                                continue;
+                                        }
+                                        pRPort->PortCheck[i].SuspectTx = SK_TRUE;
+                                        pRPort->PortsSuspect++;
+                                        if ((Para.pParaPtr =
+                                                SkRlmtBuildPacket(pAC, IoC, PortNumber, SK_PACKET_CHECK_TX,
+                                                        &pAC->Addr.Port[PortNumber].CurrentMacAddress,
+                                                        &pRPort->PortCheck[i].CheckAddr)) != NULL) {
+                                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
+                                        }
+                                }
+                        }
+                }
+                else {  /* PortDown -- or all partners suspect. */
+                        NewTimeout = SK_RLMT_DEF_TO_VAL;
+                }
+                pRPort->PortNoRx = SK_TRUE;
+        }
+        else {  /* A non-BPDU packet was received. */
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SkRlmtCheckPort %d: %d (%d) receives in last time slot.\n",
+                                PortNumber,
+                                pRPort->PacketsPerTimeSlot - pRPort->BpduPacketsPerTimeSlot,
+                                pRPort->PacketsPerTimeSlot))
+                
+                SkRlmtPortReceives(pAC, IoC, PortNumber);
+                if (pAC->Rlmt.CheckSwitch) {
+                        SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
+                }
+
+                NewTimeout = SK_RLMT_DEF_TO_VAL;
+        }
+
+        return (NewTimeout);
+}       /* SkRlmtCheckPort */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtSelectBcRx - select new active port, criteria 1 (CLP)
+ *
+ * Description:
+ *      This routine selects the port that received a broadcast frame
+ *      substantially later than all other ports.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      SK_BOOL
+ */
+RLMT_STATIC SK_BOOL     SkRlmtSelectBcRx(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+SK_U32  Active,         /* Active port */
+SK_U32  PrefPort,       /* Preferred port */
+SK_U32  *pSelect)       /* New active port */
+{
+        SK_U64          BcTimeStamp;
+        SK_U32          i;
+        SK_BOOL         PortFound;
+
+        BcTimeStamp = 0;        /* Not totally necessary, but feeling better. */
+        PortFound = SK_FALSE;
+        
+        /* Select port with the latest TimeStamp. */
+        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("TimeStamp Port %d (Down: %d, NoRx: %d): %08x %08x.\n",
+                                i,
+                                pAC->Rlmt.Port[i].PortDown, pAC->Rlmt.Port[i].PortNoRx,
+                                *((SK_U32*)(&pAC->Rlmt.Port[i].BcTimeStamp) + OFFS_HI32),
+                                *((SK_U32*)(&pAC->Rlmt.Port[i].BcTimeStamp) + OFFS_LO32)))
+
+                if (!pAC->Rlmt.Port[i].PortDown && !pAC->Rlmt.Port[i].PortNoRx) {
+                        if (!PortFound || pAC->Rlmt.Port[i].BcTimeStamp > BcTimeStamp) {
+                                BcTimeStamp = pAC->Rlmt.Port[i].BcTimeStamp;
+                                *pSelect = i;
+                                PortFound = SK_TRUE;
+                        }
+                }
+        }
+
+        if (PortFound) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Port %d received the last broadcast.\n", *pSelect))
+
+                /* Look if another port's time stamp is similar. */
+                for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+                        if (i == *pSelect) {
+                                continue;
+                        }
+                        if (!pAC->Rlmt.Port[i].PortDown && !pAC->Rlmt.Port[i].PortNoRx &&
+                                (pAC->Rlmt.Port[i].BcTimeStamp >
+                                 BcTimeStamp - SK_RLMT_BC_DELTA ||
+                                pAC->Rlmt.Port[i].BcTimeStamp +
+                                 SK_RLMT_BC_DELTA > BcTimeStamp)) {
+                                PortFound = SK_FALSE;
+                                
+                                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                                        ("Port %d received a broadcast at a similar time.\n", i))
+                                break;
+                        }
+                }
+        }
+
+#ifdef DEBUG
+        if (PortFound) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_SELECT_BCRX found Port %d receiving the substantially "
+                         "latest broadcast (%u).\n",
+                                *pSelect,
+                                BcTimeStamp - pAC->Rlmt.Port[1 - *pSelect].BcTimeStamp))
+        }
+#endif  /* DEBUG */
+
+        return (PortFound);
+}       /* SkRlmtSelectBcRx */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtSelectNotSuspect - select new active port, criteria 2 (CLP)
+ *
+ * Description:
+ *      This routine selects a good port (it is PortUp && !SuspectRx).
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      SK_BOOL
+ */
+RLMT_STATIC SK_BOOL     SkRlmtSelectNotSuspect(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+SK_U32  Active,         /* Active port */
+SK_U32  PrefPort,       /* Preferred port */
+SK_U32  *pSelect)       /* New active port */
+{
+        SK_U32          i;
+        SK_BOOL         PortFound;
+
+        PortFound = SK_FALSE;
+
+        /* Select first port that is PortUp && !SuspectRx. */
+        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+                if (!pAC->Rlmt.Port[i].PortDown &&
+                        !(pAC->Rlmt.Port[i].CheckingState & SK_RLMT_PCS_RX)) {
+                        *pSelect = i;
+                        if (!pAC->Rlmt.Port[Active].PortDown &&
+                                !(pAC->Rlmt.Port[Active].CheckingState & SK_RLMT_PCS_RX)) {
+                                *pSelect = Active;
+                        }
+                        if (!pAC->Rlmt.Port[PrefPort].PortDown &&
+                                !(pAC->Rlmt.Port[PrefPort].CheckingState & SK_RLMT_PCS_RX)) {
+                                *pSelect = PrefPort;
+                        }
+                        PortFound = SK_TRUE;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                                ("SK_RLMT_SELECT_NOTSUSPECT found Port %d up and not check RX.\n",
+                                        *pSelect))
+                        break;
+                }
+        }
+        return (PortFound);
+}       /* SkRlmtSelectNotSuspect */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtSelectUp - select new active port, criteria 3, 4 (CLP)
+ *
+ * Description:
+ *      This routine selects a port that is up.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      SK_BOOL
+ */
+RLMT_STATIC SK_BOOL     SkRlmtSelectUp(
+SK_AC   *pAC,                   /* Adapter Context */
+SK_IOC  IoC,                    /* I/O Context */
+SK_U32  Active,                 /* Active port */
+SK_U32  PrefPort,               /* Preferred port */
+SK_U32  *pSelect,               /* New active port */
+SK_BOOL AutoNegDone)    /* Successfully auto-negotiated? */
+{
+        SK_U32          i;
+        SK_BOOL         PortFound;
+
+        PortFound = SK_FALSE;
+
+        /* Select first port that is PortUp. */
+        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+                if (pAC->Rlmt.Port[i].PortState == SK_RLMT_PS_UP &&
+                        pAC->GIni.GP[i].PAutoNegFail != AutoNegDone) {
+                        *pSelect = i;
+                        if (pAC->Rlmt.Port[Active].PortState == SK_RLMT_PS_UP &&
+                                pAC->GIni.GP[Active].PAutoNegFail != AutoNegDone) {
+                                *pSelect = Active;
+                        }
+                        if (pAC->Rlmt.Port[PrefPort].PortState == SK_RLMT_PS_UP &&
+                                pAC->GIni.GP[PrefPort].PAutoNegFail != AutoNegDone) {
+                                *pSelect = PrefPort;
+                        }
+                        PortFound = SK_TRUE;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                                ("SK_RLMT_SELECT_UP found Port %d up.\n", *pSelect))
+                        break;
+                }
+        }
+        return (PortFound);
+}       /* SkRlmtSelectUp */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtSelectGoingUp - select new active port, criteria 5, 6 (CLP)
+ *
+ * Description:
+ *      This routine selects the port that is going up for the longest time.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      SK_BOOL
+ */
+RLMT_STATIC SK_BOOL     SkRlmtSelectGoingUp(
+SK_AC   *pAC,                   /* Adapter Context */
+SK_IOC  IoC,                    /* I/O Context */
+SK_U32  Active,                 /* Active port */
+SK_U32  PrefPort,               /* Preferred port */
+SK_U32  *pSelect,               /* New active port */
+SK_BOOL AutoNegDone)    /* Successfully auto-negotiated? */
+{
+        SK_U64          GuTimeStamp;
+        SK_U32          i;
+        SK_BOOL         PortFound;
+
+        GuTimeStamp = 0;
+        PortFound = SK_FALSE;
+
+        /* Select port that is PortGoingUp for the longest time. */
+        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+                if (pAC->Rlmt.Port[i].PortState == SK_RLMT_PS_GOING_UP &&
+                        pAC->GIni.GP[i].PAutoNegFail != AutoNegDone) {
+                        GuTimeStamp = pAC->Rlmt.Port[i].GuTimeStamp;
+                        *pSelect = i;
+                        PortFound = SK_TRUE;
+                        break;
+                }
+        }
+
+        if (!PortFound) {
+                return (SK_FALSE);
+        }
+
+        for (i = *pSelect + 1; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+                if (pAC->Rlmt.Port[i].PortState == SK_RLMT_PS_GOING_UP &&
+                        pAC->Rlmt.Port[i].GuTimeStamp < GuTimeStamp &&
+                        pAC->GIni.GP[i].PAutoNegFail != AutoNegDone) {
+                        GuTimeStamp = pAC->Rlmt.Port[i].GuTimeStamp;
+                        *pSelect = i;
+                }
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_SELECT_GOINGUP found Port %d going up.\n", *pSelect))
+        return (SK_TRUE);
+}       /* SkRlmtSelectGoingUp */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtSelectDown - select new active port, criteria 7, 8 (CLP)
+ *
+ * Description:
+ *      This routine selects a port that is down.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      SK_BOOL
+ */
+RLMT_STATIC SK_BOOL     SkRlmtSelectDown(
+SK_AC   *pAC,                   /* Adapter Context */
+SK_IOC  IoC,                    /* I/O Context */
+SK_U32  Active,                 /* Active port */
+SK_U32  PrefPort,               /* Preferred port */
+SK_U32  *pSelect,               /* New active port */
+SK_BOOL AutoNegDone)    /* Successfully auto-negotiated? */
+{
+        SK_U32          i;
+        SK_BOOL         PortFound;
+
+        PortFound = SK_FALSE;
+
+        /* Select first port that is PortDown. */
+        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+                if (pAC->Rlmt.Port[i].PortState == SK_RLMT_PS_DOWN &&
+                        pAC->GIni.GP[i].PAutoNegFail != AutoNegDone) {
+                        *pSelect = i;
+                        if (pAC->Rlmt.Port[Active].PortState == SK_RLMT_PS_DOWN &&
+                                pAC->GIni.GP[Active].PAutoNegFail != AutoNegDone) {
+                                *pSelect = Active;
+                        }
+                        if (pAC->Rlmt.Port[PrefPort].PortState == SK_RLMT_PS_DOWN &&
+                                pAC->GIni.GP[PrefPort].PAutoNegFail != AutoNegDone) {
+                                *pSelect = PrefPort;
+                        }
+                        PortFound = SK_TRUE;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                                ("SK_RLMT_SELECT_DOWN found Port %d down.\n", *pSelect))
+                        break;
+                }
+        }
+        return (PortFound);
+}       /* SkRlmtSelectDown */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtCheckSwitch - select new active port and switch to it
+ *
+ * Description:
+ *      This routine decides which port should be the active one and queues
+ *      port switching if necessary.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      Nothing.
+ */
+RLMT_STATIC void        SkRlmtCheckSwitch(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC,    /* I/O Context */
+SK_U32  NetIdx) /* Net index */
+{
+        SK_EVPARA       Para;
+        SK_U32          Active;
+        SK_U32          PrefPort;
+        SK_U32          i;
+        SK_BOOL         PortFound;
+
+        Active = pAC->Rlmt.Net[NetIdx].ActivePort;      /* Index of active port. */
+        PrefPort = pAC->Rlmt.Net[NetIdx].PrefPort;      /* Index of preferred port. */
+        PortFound = SK_FALSE;
+        pAC->Rlmt.CheckSwitch = SK_FALSE;
+
+#if 0   /* RW 2001/10/18 - active port becomes always prefered one */
+        if (pAC->Rlmt.Net[NetIdx].Preference == 0xFFFFFFFF) { /* Automatic */
+                /* disable auto-fail back */
+                PrefPort = Active;
+        }
+#endif
+
+        if (pAC->Rlmt.Net[NetIdx].LinksUp == 0) {
+                /* Last link went down - shut down the net. */
+                pAC->Rlmt.Net[NetIdx].RlmtState = SK_RLMT_RS_NET_DOWN;
+                Para.Para32[0] = SK_RLMT_NET_DOWN_TEMP;
+                Para.Para32[1] = NetIdx;
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_NET_DOWN, Para);
+
+                Para.Para32[0] = pAC->Rlmt.Net[NetIdx].
+                        Port[pAC->Rlmt.Net[NetIdx].ActivePort]->PortNumber;
+                Para.Para32[1] = NetIdx;
+                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_ACTIVE_DOWN, Para);
+                return;
+        }       /* pAC->Rlmt.LinksUp == 0 */
+        else if (pAC->Rlmt.Net[NetIdx].LinksUp == 1 &&
+                pAC->Rlmt.Net[NetIdx].RlmtState == SK_RLMT_RS_NET_DOWN) {
+                /* First link came up - get the net up. */
+                pAC->Rlmt.Net[NetIdx].RlmtState = SK_RLMT_RS_NET_UP;
+
+                /*
+                 * If pAC->Rlmt.ActivePort != Para.Para32[0],
+                 * the DRV switches to the port that came up.
+                 */
+                for (i = 0; i < pAC->Rlmt.Net[NetIdx].NumPorts; i++) {
+                        if (!pAC->Rlmt.Net[NetIdx].Port[i]->LinkDown) {
+                                if (!pAC->Rlmt.Net[NetIdx].Port[Active]->LinkDown) {
+                                        i = Active;
+                                }
+                                if (!pAC->Rlmt.Net[NetIdx].Port[PrefPort]->LinkDown) {
+                                        i = PrefPort;
+                                }
+                                PortFound = SK_TRUE;
+                                break;
+                        }
+                }
+
+                if (PortFound) {
+                        Para.Para32[0] = pAC->Rlmt.Net[NetIdx].Port[i]->PortNumber;
+                        Para.Para32[1] = NetIdx;
+                        SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_ACTIVE_UP, Para);
+
+                        pAC->Rlmt.Net[NetIdx].ActivePort = i;
+                        Para.Para32[0] = pAC->Rlmt.Net[NetIdx].Port[i]->PortNumber;
+                        Para.Para32[1] = NetIdx;
+                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_NET_UP, Para);
+
+                        if ((pAC->Rlmt.Net[NetIdx].RlmtMode & SK_RLMT_TRANSPARENT) == 0 &&
+                                (Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC,
+                                pAC->Rlmt.Net[NetIdx].Port[i]->PortNumber,
+                                SK_PACKET_ANNOUNCE, &pAC->Addr.Net[NetIdx].
+                                CurrentMacAddress, &SkRlmtMcAddr)) != NULL) {
+                                /*
+                                 * Send announce packet to RLMT multicast address to force
+                                 * switches to learn the new location of the logical MAC address.
+                                 */
+                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
+                        }
+                }
+                else {
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E007, SKERR_RLMT_E007_MSG);
+                }
+
+                return;
+        }       /* LinksUp == 1 && RlmtState == SK_RLMT_RS_NET_DOWN */
+        else {  /* Cannot be reached in dual-net mode. */
+                Para.Para32[0] = Active;
+
+                /*
+                 * Preselection:
+                 *      If RLMT Mode != CheckLinkState
+                 *              select port that received a broadcast frame substantially later
+                 *              than all other ports
+                 *      else select first port that is not SuspectRx
+                 *      else select first port that is PortUp
+                 *      else select port that is PortGoingUp for the longest time
+                 *      else select first port that is PortDown
+                 *      else stop.
+                 *
+                 * For the preselected port:
+                 *      If ActivePort is equal in quality, select ActivePort.
+                 *
+                 *      If PrefPort is equal in quality, select PrefPort.
+                 *
+                 *      If ActivePort != SelectedPort,
+                 *              If old ActivePort is LinkDown,
+                 *                      SwitchHard
+                 *              else
+                 *                      SwitchSoft
+                 */
+                /* check of ChgBcPrio flag added */
+                if ((pAC->Rlmt.Net[0].RlmtMode != SK_RLMT_MODE_CLS) &&
+                        (!pAC->Rlmt.Net[0].ChgBcPrio)) {
+                        
+                        if (!PortFound) {
+                                PortFound = SkRlmtSelectBcRx(
+                                        pAC, IoC, Active, PrefPort, &Para.Para32[1]);
+                        }
+
+                        if (!PortFound) {
+                                PortFound = SkRlmtSelectNotSuspect(
+                                        pAC, IoC, Active, PrefPort, &Para.Para32[1]);
+                        }
+                }       /* pAC->Rlmt.RlmtMode != SK_RLMT_MODE_CLS */
+
+                /* with changed priority for last broadcast received */
+                if ((pAC->Rlmt.Net[0].RlmtMode != SK_RLMT_MODE_CLS) &&
+                        (pAC->Rlmt.Net[0].ChgBcPrio)) {
+                        if (!PortFound) {
+                                PortFound = SkRlmtSelectNotSuspect(
+                                        pAC, IoC, Active, PrefPort, &Para.Para32[1]);
+                        }
+
+                        if (!PortFound) {
+                                PortFound = SkRlmtSelectBcRx(
+                                        pAC, IoC, Active, PrefPort, &Para.Para32[1]);
+                        }
+                }       /* pAC->Rlmt.RlmtMode != SK_RLMT_MODE_CLS */
+
+                if (!PortFound) {
+                        PortFound = SkRlmtSelectUp(
+                                pAC, IoC, Active, PrefPort, &Para.Para32[1], AUTONEG_SUCCESS);
+                }
+
+                if (!PortFound) {
+                        PortFound = SkRlmtSelectUp(
+                                pAC, IoC, Active, PrefPort, &Para.Para32[1], AUTONEG_FAILED);
+                }
+
+                if (!PortFound) {
+                        PortFound = SkRlmtSelectGoingUp(
+                                pAC, IoC, Active, PrefPort, &Para.Para32[1], AUTONEG_SUCCESS);
+                }
+
+                if (!PortFound) {
+                        PortFound = SkRlmtSelectGoingUp(
+                                pAC, IoC, Active, PrefPort, &Para.Para32[1], AUTONEG_FAILED);
+                }
+
+                if (pAC->Rlmt.Net[0].RlmtMode != SK_RLMT_MODE_CLS) {
+                        if (!PortFound) {
+                                PortFound = SkRlmtSelectDown(pAC, IoC,
+                                        Active, PrefPort, &Para.Para32[1], AUTONEG_SUCCESS);
+                        }
+
+                        if (!PortFound) {
+                                PortFound = SkRlmtSelectDown(pAC, IoC,
+                                        Active, PrefPort, &Para.Para32[1], AUTONEG_FAILED);
+                        }
+                }       /* pAC->Rlmt.RlmtMode != SK_RLMT_MODE_CLS */
+
+                if (PortFound) {
+
+                        if (Para.Para32[1] != Active) {
+                                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                                        ("Active: %d, Para1: %d.\n", Active, Para.Para32[1]))
+                                pAC->Rlmt.Net[NetIdx].ActivePort = Para.Para32[1];
+                                Para.Para32[0] = pAC->Rlmt.Net[NetIdx].
+                                        Port[Para.Para32[0]]->PortNumber;
+                                Para.Para32[1] = pAC->Rlmt.Net[NetIdx].
+                                        Port[Para.Para32[1]]->PortNumber;
+                                SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[1], SK_LED_ACTIVE);
+                                if (pAC->Rlmt.Port[Active].LinkDown) {
+                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_SWITCH_HARD, Para);
+                                }
+                                else {
+                                        SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[0], SK_LED_STANDBY);
+                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_SWITCH_SOFT, Para);
+                                }
+                                Para.Para32[1] = NetIdx;
+                                Para.Para32[0] =
+                                        pAC->Rlmt.Net[NetIdx].Port[Para.Para32[0]]->PortNumber;
+                                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_ACTIVE_DOWN, Para);
+                                Para.Para32[0] = pAC->Rlmt.Net[NetIdx].
+                                        Port[pAC->Rlmt.Net[NetIdx].ActivePort]->PortNumber;
+                                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_ACTIVE_UP, Para);
+                                if ((pAC->Rlmt.Net[NetIdx].RlmtMode & SK_RLMT_TRANSPARENT) == 0 &&
+                                        (Para.pParaPtr = SkRlmtBuildPacket(pAC, IoC, Para.Para32[0],
+                                        SK_PACKET_ANNOUNCE, &pAC->Addr.Net[NetIdx].CurrentMacAddress,
+                                        &SkRlmtMcAddr)) != NULL) {
+                                        /*
+                                         * Send announce packet to RLMT multicast address to force
+                                         * switches to learn the new location of the logical
+                                         * MAC address.
+                                         */
+                                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para);
+                                }       /* (Para.pParaPtr = SkRlmtBuildPacket(...)) != NULL */
+                        }       /* Para.Para32[1] != Active */
+                }       /* PortFound */
+                else {
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E004, SKERR_RLMT_E004_MSG);
+                }
+        }       /* LinksUp > 1 || LinksUp == 1 && RlmtState != SK_RLMT_RS_NET_DOWN */
+        return;
+}       /* SkRlmtCheckSwitch */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtCheckSeg - Report if segmentation is detected
+ *
+ * Description:
+ *      This routine checks if the ports see different root bridges and reports
+ *      segmentation in such a case.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      Nothing.
+ */
+RLMT_STATIC void        SkRlmtCheckSeg(
+SK_AC   *pAC,   /* Adapter Context */
+SK_IOC  IoC,    /* I/O Context */
+SK_U32  NetIdx) /* Net number */
+{
+        SK_EVPARA       Para;
+        SK_RLMT_NET     *pNet;
+        SK_U32          i, j;
+        SK_BOOL         Equal;
+
+        pNet = &pAC->Rlmt.Net[NetIdx];
+        pNet->RootIdSet = SK_FALSE;
+        Equal = SK_TRUE;
+
+        for (i = 0; i < pNet->NumPorts; i++) {
+                if (pNet->Port[i]->LinkDown || !pNet->Port[i]->RootIdSet) {
+                        continue;
+                }
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_DUMP,
+                        ("Root ID %d: %02x %02x %02x %02x %02x %02x %02x %02x.\n", i,
+                                pNet->Port[i]->Root.Id[0], pNet->Port[i]->Root.Id[1],
+                                pNet->Port[i]->Root.Id[2], pNet->Port[i]->Root.Id[3],
+                                pNet->Port[i]->Root.Id[4], pNet->Port[i]->Root.Id[5],
+                                pNet->Port[i]->Root.Id[6], pNet->Port[i]->Root.Id[7]))
+
+                if (!pNet->RootIdSet) {
+                        pNet->Root = pNet->Port[i]->Root;
+                        pNet->RootIdSet = SK_TRUE;
+                        continue;
+                }
+
+                for (j = 0; j < 8; j ++) {
+                        Equal &= pNet->Port[i]->Root.Id[j] == pNet->Root.Id[j];
+                        if (!Equal) {
+                                break;
+                        }
+                }
+                
+                if (!Equal) {
+                        SK_ERR_LOG(pAC, SK_ERRCL_COMM, SKERR_RLMT_E005, SKERR_RLMT_E005_MSG);
+                        Para.Para32[0] = NetIdx;
+                        Para.Para32[1] = (SK_U32)-1;
+                        SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_SEGMENTATION, Para);
+
+                        pNet->CheckingState &= ~SK_RLMT_RCS_REPORT_SEG;
+
+                        /* 2000-03-06 RA: New. */
+                        Para.Para32[0] = NetIdx;
+                        Para.Para32[1] = (SK_U32)-1;
+                        SkTimerStart(pAC, IoC, &pNet->SegTimer, SK_RLMT_SEG_TO_VAL,
+                                SKGE_RLMT, SK_RLMT_SEG_TIM, Para);
+                        break;
+                }
+        }       /* for (i = 0; i < pNet->NumPorts; i++) */
+
+        /* 2000-03-06 RA: Moved here. */
+        /* Segmentation check not running anymore. */
+        pNet->CheckingState &= ~SK_RLMT_RCS_SEG;
+
+}       /* SkRlmtCheckSeg */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtPortStart - initialize port variables and start port
+ *
+ * Description:
+ *      This routine initializes a port's variables and issues a PORT_START
+ *      to the HWAC module.  This handles retries if the start fails or the
+ *      link eventually goes down.
+ *
+ * Context:
+ *      runtime, pageable?
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtPortStart(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+SK_U32  PortNumber)     /* Port number */
+{
+        SK_EVPARA       Para;
+
+        pAC->Rlmt.Port[PortNumber].PortState = SK_RLMT_PS_LINK_DOWN;
+        pAC->Rlmt.Port[PortNumber].PortStarted = SK_TRUE;
+        pAC->Rlmt.Port[PortNumber].LinkDown = SK_TRUE;
+        pAC->Rlmt.Port[PortNumber].PortDown = SK_TRUE;
+        pAC->Rlmt.Port[PortNumber].CheckingState = 0;
+        pAC->Rlmt.Port[PortNumber].RootIdSet = SK_FALSE;
+        Para.Para32[0] = PortNumber;
+        Para.Para32[1] = (SK_U32)-1;
+        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_START, Para);
+}       /* SkRlmtPortStart */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtPortStartTim - PORT_START_TIM
+ *
+ * Description:
+ *      This routine handles PORT_START_TIM events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtPortStartTim(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 -1 */
+{
+        SK_U32                  i;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PORTSTART_TIMEOUT Port %d Event BEGIN.\n", Para.Para32[0]))
+
+                if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_PORTSTART_TIMEOUT Event EMPTY.\n"))
+                return;
+        }
+
+        /*
+         * Used to start non-preferred ports if the preferred one
+         * does not come up.
+         * This timeout needs only be set when starting the first
+         * (preferred) port.
+         */
+        if (pAC->Rlmt.Port[Para.Para32[0]].LinkDown) {
+                /* PORT_START failed. */
+                for (i = 0; i < pAC->Rlmt.Port[Para.Para32[0]].Net->NumPorts; i++) {
+                        if (!pAC->Rlmt.Port[Para.Para32[0]].Net->Port[i]->PortStarted) {
+                                SkRlmtPortStart(pAC, IoC,
+                                        pAC->Rlmt.Port[Para.Para32[0]].Net->Port[i]->PortNumber);
+                        }
+                }
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PORTSTART_TIMEOUT Event END.\n"))
+}       /* SkRlmtEvtPortStartTim */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtLinkUp - LINK_UP
+ *
+ * Description:
+ *      This routine handles LLINK_UP events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtLinkUp(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 Undefined */
+{
+        SK_U32                  i;
+        SK_RLMT_PORT    *pRPort;
+        SK_EVPARA               Para2;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_LINK_UP Port %d Event BEGIN.\n", Para.Para32[0]))
+
+        pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
+        if (!pRPort->PortStarted) {
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E008, SKERR_RLMT_E008_MSG);
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                                ("SK_RLMT_LINK_UP Event EMPTY.\n"))
+                return;
+        }
+
+        if (!pRPort->LinkDown) {
+                /* RA;:;: Any better solution? */
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_LINK_UP Event EMPTY.\n"))
+                return;
+        }
+
+        SkTimerStop(pAC, IoC, &pRPort->UpTimer);
+        SkTimerStop(pAC, IoC, &pRPort->DownRxTimer);
+        SkTimerStop(pAC, IoC, &pRPort->DownTxTimer);
+
+        /* Do something if timer already fired? */
+
+        pRPort->LinkDown = SK_FALSE;
+        pRPort->PortState = SK_RLMT_PS_GOING_UP;
+        pRPort->GuTimeStamp = SkOsGetTime(pAC);
+        pRPort->BcTimeStamp = 0;
+        pRPort->Net->LinksUp++;
+        if (pRPort->Net->LinksUp == 1) {
+                SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[0], SK_LED_ACTIVE);
+        }
+        else {
+                SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[0], SK_LED_STANDBY);
+        }
+
+        for (i = 0; i < pRPort->Net->NumPorts; i++) {
+                if (!pRPort->Net->Port[i]->PortStarted) {
+                        SkRlmtPortStart(pAC, IoC, pRPort->Net->Port[i]->PortNumber);
+                }
+        }
+
+        SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
+
+        if (pRPort->Net->LinksUp >= 2) {
+                if (pRPort->Net->RlmtMode & SK_RLMT_CHECK_LOC_LINK) {
+                        /* Build the check chain. */
+                        SkRlmtBuildCheckChain(pAC, pRPort->Net->NetNumber);
+                }
+        }
+
+        /* If the first link comes up, start the periodical RLMT timeout. */
+        if (pRPort->Net->NumPorts > 1 && pRPort->Net->LinksUp == 1 &&
+                (pRPort->Net->RlmtMode & SK_RLMT_CHECK_OTHERS) != 0) {
+                Para2.Para32[0] = pRPort->Net->NetNumber;
+                Para2.Para32[1] = (SK_U32)-1;
+                SkTimerStart(pAC, IoC, &pRPort->Net->LocTimer,
+                        pRPort->Net->TimeoutValue, SKGE_RLMT, SK_RLMT_TIM, Para2);
+        }
+
+        Para2 = Para;
+        Para2.Para32[1] = (SK_U32)-1;
+        SkTimerStart(pAC, IoC, &pRPort->UpTimer, SK_RLMT_PORTUP_TIM_VAL,
+                SKGE_RLMT, SK_RLMT_PORTUP_TIM, Para2);
+        
+        /* Later: if (pAC->Rlmt.RlmtMode & SK_RLMT_CHECK_LOC_LINK) && */
+        if ((pRPort->Net->RlmtMode & SK_RLMT_TRANSPARENT) == 0 &&
+                (pRPort->Net->RlmtMode & SK_RLMT_CHECK_LINK) != 0 &&
+                (Para2.pParaPtr =
+                        SkRlmtBuildPacket(pAC, IoC, Para.Para32[0], SK_PACKET_ANNOUNCE,
+                        &pAC->Addr.Port[Para.Para32[0]].CurrentMacAddress, &SkRlmtMcAddr)
+                ) != NULL) {
+                /* Send "new" packet to RLMT multicast address. */
+                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para2);
+        }
+
+        if (pRPort->Net->RlmtMode & SK_RLMT_CHECK_SEG) {
+                if ((Para2.pParaPtr =
+                        SkRlmtBuildSpanningTreePacket(pAC, IoC, Para.Para32[0])) != NULL) {
+                        pAC->Rlmt.Port[Para.Para32[0]].RootIdSet = SK_FALSE;
+                        pRPort->Net->CheckingState |=
+                                SK_RLMT_RCS_SEG | SK_RLMT_RCS_REPORT_SEG;
+
+                        SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para2);
+
+                        Para.Para32[1] = (SK_U32)-1;
+                        SkTimerStart(pAC, IoC, &pRPort->Net->SegTimer,
+                                SK_RLMT_SEG_TO_VAL, SKGE_RLMT, SK_RLMT_SEG_TIM, Para);
+                }
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_LINK_UP Event END.\n"))
+}       /* SkRlmtEvtLinkUp */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtPortUpTim - PORT_UP_TIM
+ *
+ * Description:
+ *      This routine handles PORT_UP_TIM events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtPortUpTim(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 -1 */
+{
+        SK_RLMT_PORT    *pRPort;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PORTUP_TIM Port %d Event BEGIN.\n", Para.Para32[0]))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_PORTUP_TIM Event EMPTY.\n"))
+                return;
+        }
+
+        pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
+        if (pRPort->LinkDown || (pRPort->PortState == SK_RLMT_PS_UP)) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_PORTUP_TIM Port %d Event EMPTY.\n", Para.Para32[0]))
+                return;
+        }
+
+        pRPort->PortDown = SK_FALSE;
+        pRPort->PortState = SK_RLMT_PS_UP;
+        pRPort->Net->PortsUp++;
+        if (pRPort->Net->RlmtState != SK_RLMT_RS_INIT) {
+                if (pAC->Rlmt.NumNets <= 1) {
+                        SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
+                }
+                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_PORT_UP, Para);
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PORTUP_TIM Event END.\n"))
+}       /* SkRlmtEvtPortUpTim */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtPortDownTim - PORT_DOWN_*
+ *
+ * Description:
+ *      This routine handles PORT_DOWN_* events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtPortDownX(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_U32          Event,  /* Event code */
+SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 -1 */
+{
+        SK_RLMT_PORT    *pRPort;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PORTDOWN* Port %d Event (%d) BEGIN.\n",
+                        Para.Para32[0], Event))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_PORTDOWN* Event EMPTY.\n"))
+                return;
+        }
+
+        pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
+        if (!pRPort->PortStarted || (Event == SK_RLMT_PORTDOWN_TX_TIM &&
+                !(pRPort->CheckingState & SK_RLMT_PCS_TX))) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_PORTDOWN* Event (%d) EMPTY.\n", Event))
+                return;
+        }
+        
+        /* Stop port's timers. */
+        SkTimerStop(pAC, IoC, &pRPort->UpTimer);
+        SkTimerStop(pAC, IoC, &pRPort->DownRxTimer);
+        SkTimerStop(pAC, IoC, &pRPort->DownTxTimer);
+
+        if (pRPort->PortState != SK_RLMT_PS_LINK_DOWN) {
+                pRPort->PortState = SK_RLMT_PS_DOWN;
+        }
+
+        if (!pRPort->PortDown) {
+                pRPort->Net->PortsUp--;
+                pRPort->PortDown = SK_TRUE;
+                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_PORT_DOWN, Para);
+        }
+
+        pRPort->PacketsPerTimeSlot = 0;
+        /* pRPort->DataPacketsPerTimeSlot = 0; */
+        pRPort->BpduPacketsPerTimeSlot = 0;
+        pRPort->BcTimeStamp = 0;
+
+        /*
+         * RA;:;: To be checked:
+         * - actions at RLMT_STOP: We should not switch anymore.
+         */
+        if (pRPort->Net->RlmtState != SK_RLMT_RS_INIT) {
+                if (Para.Para32[0] ==
+                        pRPort->Net->Port[pRPort->Net->ActivePort]->PortNumber) {
+                        /* Active Port went down. */
+                        SkRlmtCheckSwitch(pAC, IoC, pRPort->Net->NetNumber);
+                }
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PORTDOWN* Event (%d) END.\n", Event))
+}       /* SkRlmtEvtPortDownX */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtLinkDown - LINK_DOWN
+ *
+ * Description:
+ *      This routine handles LINK_DOWN events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtLinkDown(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 Undefined */
+{
+        SK_RLMT_PORT    *pRPort;
+
+        pRPort = &pAC->Rlmt.Port[Para.Para32[0]];
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_LINK_DOWN Port %d Event BEGIN.\n", Para.Para32[0]))
+
+        if (!pAC->Rlmt.Port[Para.Para32[0]].LinkDown) {
+                pRPort->Net->LinksUp--;
+                pRPort->LinkDown = SK_TRUE;
+                pRPort->PortState = SK_RLMT_PS_LINK_DOWN;
+                SK_HWAC_LINK_LED(pAC, IoC, Para.Para32[0], SK_LED_OFF);
+
+                if ((pRPort->Net->RlmtMode & SK_RLMT_CHECK_LOC_LINK) != 0) {
+                        /* Build the check chain. */
+                        SkRlmtBuildCheckChain(pAC, pRPort->Net->NetNumber);
+                }
+
+                /* Ensure that port is marked down. */
+                Para.Para32[1] = -1;
+                (void)SkRlmtEvent(pAC, IoC, SK_RLMT_PORTDOWN, Para);
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_LINK_DOWN Event END.\n"))
+}       /* SkRlmtEvtLinkDown */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtPortAddr - PORT_ADDR
+ *
+ * Description:
+ *      This routine handles PORT_ADDR events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtPortAddr(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 PortNumber; SK_U32 -1 */
+{
+        SK_U32                  i, j;
+        SK_RLMT_PORT    *pRPort;
+        SK_MAC_ADDR             *pOldMacAddr;
+        SK_MAC_ADDR             *pNewMacAddr;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PORT_ADDR Port %d Event BEGIN.\n", Para.Para32[0]))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_PORT_ADDR Event EMPTY.\n"))
+                return;
+        }
+
+        /* Port's physical MAC address changed. */
+        pOldMacAddr = &pAC->Addr.Port[Para.Para32[0]].PreviousMacAddress;
+        pNewMacAddr = &pAC->Addr.Port[Para.Para32[0]].CurrentMacAddress;
+
+        /*
+         * NOTE: This is not scalable for solutions where ports are
+         *       checked remotely.  There, we need to send an RLMT
+         *       address change packet - and how do we ensure delivery?
+         */
+        for (i = 0; i < (SK_U32)pAC->GIni.GIMacsFound; i++) {
+                pRPort = &pAC->Rlmt.Port[i];
+                for (j = 0; j < pRPort->PortsChecked; j++) {
+                        if (SK_ADDR_EQUAL(
+                                pRPort->PortCheck[j].CheckAddr.a, pOldMacAddr->a)) {
+                                pRPort->PortCheck[j].CheckAddr = *pNewMacAddr;
+                        }
+                }
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_PORT_ADDR Event END.\n"))
+}       /* SkRlmtEvtPortAddr */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtStart - START
+ *
+ * Description:
+ *      This routine handles START events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtStart(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
+{
+        SK_EVPARA       Para2;
+        SK_U32          PortIdx;
+        SK_U32          PortNumber;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_START Net %d Event BEGIN.\n", Para.Para32[0]))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_START Event EMPTY.\n"))
+                return;
+        }
+
+        if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad NetNumber %d.\n", Para.Para32[0]))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_START Event EMPTY.\n"))
+                return;
+        }
+
+        if (pAC->Rlmt.Net[Para.Para32[0]].RlmtState != SK_RLMT_RS_INIT) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_START Event EMPTY.\n"))
+                return;
+        }
+
+        if (pAC->Rlmt.NetsStarted >= pAC->Rlmt.NumNets) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("All nets should have been started.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_START Event EMPTY.\n"))
+                return;
+        }
+
+        if (pAC->Rlmt.Net[Para.Para32[0]].PrefPort >=
+                pAC->Rlmt.Net[Para.Para32[0]].NumPorts) {
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E009, SKERR_RLMT_E009_MSG);
+
+                /* Change PrefPort to internal default. */
+                Para2.Para32[0] = 0xFFFFFFFF;
+                Para2.Para32[1] = Para.Para32[0];
+                (void)SkRlmtEvent(pAC, IoC, SK_RLMT_PREFPORT_CHANGE, Para2);
+        }
+
+        PortIdx = pAC->Rlmt.Net[Para.Para32[0]].PrefPort;
+        PortNumber = pAC->Rlmt.Net[Para.Para32[0]].Port[PortIdx]->PortNumber;
+
+        pAC->Rlmt.Net[Para.Para32[0]].LinksUp = 0;
+        pAC->Rlmt.Net[Para.Para32[0]].PortsUp = 0;
+        pAC->Rlmt.Net[Para.Para32[0]].CheckingState = 0;
+        pAC->Rlmt.Net[Para.Para32[0]].RlmtState = SK_RLMT_RS_NET_DOWN;
+
+        /* Start preferred port. */
+        SkRlmtPortStart(pAC, IoC, PortNumber);
+
+        /* Start Timer (for first port only). */
+        Para2.Para32[0] = PortNumber;
+        Para2.Para32[1] = (SK_U32)-1;
+        SkTimerStart(pAC, IoC, &pAC->Rlmt.Port[PortNumber].UpTimer,
+                SK_RLMT_PORTSTART_TIM_VAL, SKGE_RLMT, SK_RLMT_PORTSTART_TIM, Para2);
+
+        pAC->Rlmt.NetsStarted++;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_START Event END.\n"))
+}       /* SkRlmtEvtStart */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtStop - STOP
+ *
+ * Description:
+ *      This routine handles STOP events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtStop(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
+{
+        SK_EVPARA       Para2;
+        SK_U32          PortNumber;
+        SK_U32          i;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_STOP Net %d Event BEGIN.\n", Para.Para32[0]))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_STOP Event EMPTY.\n"))
+                return;
+        }
+
+        if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad NetNumber %d.\n", Para.Para32[0]))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_STOP Event EMPTY.\n"))
+                return;
+        }
+
+        if (pAC->Rlmt.Net[Para.Para32[0]].RlmtState == SK_RLMT_RS_INIT) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_STOP Event EMPTY.\n"))
+                return;
+        }
+
+        if (pAC->Rlmt.NetsStarted == 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("All nets are stopped.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_STOP Event EMPTY.\n"))
+                return;
+        }
+
+        /* Stop RLMT timers. */
+        SkTimerStop(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[0]].LocTimer);
+        SkTimerStop(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[0]].SegTimer);
+
+        /* Stop net. */
+        pAC->Rlmt.Net[Para.Para32[0]].RlmtState = SK_RLMT_RS_INIT;
+        pAC->Rlmt.Net[Para.Para32[0]].RootIdSet = SK_FALSE;
+        Para2.Para32[0] = SK_RLMT_NET_DOWN_FINAL;
+        Para2.Para32[1] = Para.Para32[0];                       /* Net# */
+        SkEventQueue(pAC, SKGE_DRV, SK_DRV_NET_DOWN, Para2);
+
+        /* Stop ports. */
+        for (i = 0; i < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; i++) {
+                PortNumber = pAC->Rlmt.Net[Para.Para32[0]].Port[i]->PortNumber;
+                if (pAC->Rlmt.Port[PortNumber].PortState != SK_RLMT_PS_INIT) {
+                        SkTimerStop(pAC, IoC, &pAC->Rlmt.Port[PortNumber].UpTimer);
+                        SkTimerStop(pAC, IoC, &pAC->Rlmt.Port[PortNumber].DownRxTimer);
+                        SkTimerStop(pAC, IoC, &pAC->Rlmt.Port[PortNumber].DownTxTimer);
+
+                        pAC->Rlmt.Port[PortNumber].PortState = SK_RLMT_PS_INIT;
+                        pAC->Rlmt.Port[PortNumber].RootIdSet = SK_FALSE;
+                        pAC->Rlmt.Port[PortNumber].PortStarted = SK_FALSE;
+                        Para2.Para32[0] = PortNumber;
+                        Para2.Para32[1] = (SK_U32)-1;
+                        SkEventQueue(pAC, SKGE_HWAC, SK_HWEV_PORT_STOP, Para2);
+                }
+        }
+
+        pAC->Rlmt.NetsStarted--;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_STOP Event END.\n"))
+}       /* SkRlmtEvtStop */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtTim - TIM
+ *
+ * Description:
+ *      This routine handles TIM events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtTim(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
+{
+        SK_RLMT_PORT    *pRPort;
+        SK_U32                  Timeout;
+        SK_U32                  NewTimeout;
+        SK_U32                  PortNumber;
+        SK_U32                  i;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_TIM Event BEGIN.\n"))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_TIM Event EMPTY.\n"))
+                return;
+        }
+
+        if ((pAC->Rlmt.Net[Para.Para32[0]].RlmtMode & SK_RLMT_CHECK_OTHERS) == 0 ||
+                pAC->Rlmt.Net[Para.Para32[0]].LinksUp == 0) {
+                /* Mode changed or all links down: No more link checking. */
+                return;
+        }
+
+#if 0
+        pAC->Rlmt.SwitchCheckCounter--;
+        if (pAC->Rlmt.SwitchCheckCounter == 0) {
+                pAC->Rlmt.SwitchCheckCounter;
+        }
+#endif  /* 0 */
+
+        NewTimeout = SK_RLMT_DEF_TO_VAL;
+        for (i = 0; i < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; i++) {
+                PortNumber = pAC->Rlmt.Net[Para.Para32[0]].Port[i]->PortNumber;
+                pRPort = &pAC->Rlmt.Port[PortNumber];
+                if (!pRPort->LinkDown) {
+                        Timeout = SkRlmtCheckPort(pAC, IoC, PortNumber);
+                        if (Timeout < NewTimeout) {
+                                NewTimeout = Timeout;
+                        }
+
+                        /*
+                         * These counters should be set to 0 for all ports before the
+                         * first frame is sent in the next loop.
+                         */
+                        pRPort->PacketsPerTimeSlot = 0;
+                        /* pRPort->DataPacketsPerTimeSlot = 0; */
+                        pRPort->BpduPacketsPerTimeSlot = 0;
+                }
+        }
+        pAC->Rlmt.Net[Para.Para32[0]].TimeoutValue = NewTimeout;
+
+        if (pAC->Rlmt.Net[Para.Para32[0]].LinksUp > 1) {
+                /*
+                 * If checking remote ports, also send packets if
+                 *   (LinksUp == 1) &&
+                 *   this port checks at least one (remote) port.
+                 */
+
+                /*
+                 * Must be new loop, as SkRlmtCheckPort can request to
+                 * check segmentation when e.g. checking the last port.
+                 */
+                for (i = 0; i < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; i++) {
+                        if (!pAC->Rlmt.Net[Para.Para32[0]].Port[i]->LinkDown) {
+                                SkRlmtSend(pAC, IoC,
+                                        pAC->Rlmt.Net[Para.Para32[0]].Port[i]->PortNumber);
+                        }
+                }
+        }
+
+        SkTimerStart(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[0]].LocTimer,
+                pAC->Rlmt.Net[Para.Para32[0]].TimeoutValue, SKGE_RLMT, SK_RLMT_TIM,
+                Para);
+
+        if (pAC->Rlmt.Net[Para.Para32[0]].LinksUp > 1 &&
+                (pAC->Rlmt.Net[Para.Para32[0]].RlmtMode & SK_RLMT_CHECK_SEG) &&
+                (pAC->Rlmt.Net[Para.Para32[0]].CheckingState & SK_RLMT_RCS_START_SEG)) {
+                SkTimerStart(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[0]].SegTimer,
+                        SK_RLMT_SEG_TO_VAL, SKGE_RLMT, SK_RLMT_SEG_TIM, Para);
+                pAC->Rlmt.Net[Para.Para32[0]].CheckingState &= ~SK_RLMT_RCS_START_SEG;
+                pAC->Rlmt.Net[Para.Para32[0]].CheckingState |=
+                        SK_RLMT_RCS_SEG | SK_RLMT_RCS_REPORT_SEG;
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_TIM Event END.\n"))
+}       /* SkRlmtEvtTim */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtSegTim - SEG_TIM
+ *
+ * Description:
+ *      This routine handles SEG_TIM events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtSegTim(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
+{
+#ifdef xDEBUG
+        int j;
+#endif  /* DEBUG */
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_SEG_TIM Event BEGIN.\n"))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_SEG_TIM Event EMPTY.\n"))
+                return;
+        }
+
+#ifdef xDEBUG
+        for (j = 0; j < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; j++) {
+                SK_ADDR_PORT    *pAPort;
+                SK_U32                  k;
+                SK_U16                  *InAddr;
+                SK_U8                   InAddr8[6];
+
+                InAddr = (SK_U16 *)&InAddr8[0];
+                pAPort = pAC->Rlmt.Net[Para.Para32[0]].Port[j]->AddrPort;
+                for (k = 0; k < pAPort->NextExactMatchRlmt; k++) {
+                        /* Get exact match address k from port j. */
+                        XM_INADDR(IoC, pAC->Rlmt.Net[Para.Para32[0]].Port[j]->PortNumber,
+                                XM_EXM(k), InAddr);
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                                ("MC address %d on Port %u: %02x %02x %02x %02x %02x %02x --  %02x %02x %02x %02x %02x %02x.\n",
+                                        k, pAC->Rlmt.Net[Para.Para32[0]].Port[j]->PortNumber,
+                                        InAddr8[0], InAddr8[1], InAddr8[2],
+                                        InAddr8[3], InAddr8[4], InAddr8[5],
+                                        pAPort->Exact[k].a[0], pAPort->Exact[k].a[1],
+                                        pAPort->Exact[k].a[2], pAPort->Exact[k].a[3],
+                                        pAPort->Exact[k].a[4], pAPort->Exact[k].a[5]))
+                }
+        }
+#endif  /* xDEBUG */
+                                
+        SkRlmtCheckSeg(pAC, IoC, Para.Para32[0]);
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_SEG_TIM Event END.\n"))
+}       /* SkRlmtEvtSegTim */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtPacketRx - PACKET_RECEIVED
+ *
+ * Description:
+ *      This routine handles PACKET_RECEIVED events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtPacketRx(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_MBUF *pMb */
+{
+        SK_MBUF *pMb;
+        SK_MBUF *pNextMb;
+        SK_U32  NetNumber;
+
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PACKET_RECEIVED Event BEGIN.\n"))
+
+        /* Should we ignore frames during port switching? */
+
+#ifdef DEBUG
+        pMb = Para.pParaPtr;
+        if (pMb == NULL) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL, ("No mbuf.\n"))
+        }
+        else if (pMb->pNext != NULL) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("More than one mbuf or pMb->pNext not set.\n"))
+        }
+#endif  /* DEBUG */
+
+        for (pMb = Para.pParaPtr; pMb != NULL; pMb = pNextMb) {
+                pNextMb = pMb->pNext;
+                pMb->pNext = NULL;
+
+                NetNumber = pAC->Rlmt.Port[pMb->PortIdx].Net->NetNumber;
+                if (pAC->Rlmt.Net[NetNumber].RlmtState == SK_RLMT_RS_INIT) {
+                        SkDrvFreeRlmtMbuf(pAC, IoC, pMb);
+                }
+                else {
+                        SkRlmtPacketReceive(pAC, IoC, pMb);
+                }
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PACKET_RECEIVED Event END.\n"))
+}       /* SkRlmtEvtPacketRx */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtStatsClear - STATS_CLEAR
+ *
+ * Description:
+ *      This routine handles STATS_CLEAR events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtStatsClear(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
+{
+        SK_U32                  i;
+        SK_RLMT_PORT    *pRPort;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_STATS_CLEAR Event BEGIN.\n"))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_STATS_CLEAR Event EMPTY.\n"))
+                return;
+        }
+
+        if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad NetNumber %d.\n", Para.Para32[0]))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_STATS_CLEAR Event EMPTY.\n"))
+                return;
+        }
+
+        /* Clear statistics for logical and physical ports. */
+        for (i = 0; i < pAC->Rlmt.Net[Para.Para32[0]].NumPorts; i++) {
+                pRPort =
+                        &pAC->Rlmt.Port[pAC->Rlmt.Net[Para.Para32[0]].Port[i]->PortNumber];
+                pRPort->TxHelloCts = 0;
+                pRPort->RxHelloCts = 0;
+                pRPort->TxSpHelloReqCts = 0;
+                pRPort->RxSpHelloCts = 0;
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_STATS_CLEAR Event END.\n"))
+}       /* SkRlmtEvtStatsClear */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtStatsUpdate - STATS_UPDATE
+ *
+ * Description:
+ *      This routine handles STATS_UPDATE events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtStatsUpdate(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 NetNumber; SK_U32 -1 */
+{
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_STATS_UPDATE Event BEGIN.\n"))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_STATS_UPDATE Event EMPTY.\n"))
+                return;
+        }
+
+        if (Para.Para32[0] >= pAC->Rlmt.NumNets) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad NetNumber %d.\n", Para.Para32[0]))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_STATS_UPDATE Event EMPTY.\n"))
+                return;
+        }
+
+        /* Update statistics - currently always up-to-date. */
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_STATS_UPDATE Event END.\n"))
+}       /* SkRlmtEvtStatsUpdate */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtPrefportChange - PREFPORT_CHANGE
+ *
+ * Description:
+ *      This routine handles PREFPORT_CHANGE events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtPrefportChange(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 PortIndex; SK_U32 NetNumber */
+{
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PREFPORT_CHANGE to Port %d Event BEGIN.\n", Para.Para32[0]))
+
+        if (Para.Para32[1] >= pAC->Rlmt.NumNets) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad NetNumber %d.\n", Para.Para32[1]))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_PREFPORT_CHANGE Event EMPTY.\n"))
+                return;
+        }
+
+        /* 0xFFFFFFFF == auto-mode. */
+        if (Para.Para32[0] == 0xFFFFFFFF) {
+                pAC->Rlmt.Net[Para.Para32[1]].PrefPort = SK_RLMT_DEF_PREF_PORT;
+        }
+        else {
+                if (Para.Para32[0] >= pAC->Rlmt.Net[Para.Para32[1]].NumPorts) {
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E010, SKERR_RLMT_E010_MSG);
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                                ("SK_RLMT_PREFPORT_CHANGE Event EMPTY.\n"))
+                        return;
+                }
+
+                pAC->Rlmt.Net[Para.Para32[1]].PrefPort = Para.Para32[0];
+        }
+
+        pAC->Rlmt.Net[Para.Para32[1]].Preference = Para.Para32[0];
+
+        if (pAC->Rlmt.Net[Para.Para32[1]].RlmtState != SK_RLMT_RS_INIT) {
+                SkRlmtCheckSwitch(pAC, IoC, Para.Para32[1]);
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_PREFPORT_CHANGE Event END.\n"))
+}       /* SkRlmtEvtPrefportChange */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtSetNets - SET_NETS
+ *
+ * Description:
+ *      This routine handles SET_NETS events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtSetNets(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 NumNets; SK_U32 -1 */
+{
+        int i;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_SET_NETS Event BEGIN.\n"))
+
+        if (Para.Para32[1] != (SK_U32)-1) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad Parameter.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
+                return;
+        }
+
+        if (Para.Para32[0] == 0 || Para.Para32[0] > SK_MAX_NETS ||
+                Para.Para32[0] > (SK_U32)pAC->GIni.GIMacsFound) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad number of nets: %d.\n", Para.Para32[0]))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
+                return;
+        }
+
+        if (Para.Para32[0] == pAC->Rlmt.NumNets) {      /* No change. */
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
+                return;
+        }
+
+        /* Entering and leaving dual mode only allowed while nets are stopped. */
+        if (pAC->Rlmt.NetsStarted > 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Changing dual mode only allowed while all nets are stopped.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
+                return;
+        }
+
+        if (Para.Para32[0] == 1) {
+                if (pAC->Rlmt.NumNets > 1) {
+                        /* Clear logical MAC addr from second net's active port. */
+                        (void)SkAddrOverride(pAC, IoC, pAC->Rlmt.Net[1].Port[pAC->Addr.
+                                Net[1].ActivePort]->PortNumber, NULL, SK_ADDR_CLEAR_LOGICAL);
+                        pAC->Rlmt.Net[1].NumPorts = 0;
+                }
+
+                pAC->Rlmt.NumNets = Para.Para32[0];
+                for (i = 0; (SK_U32)i < pAC->Rlmt.NumNets; i++) {
+                        pAC->Rlmt.Net[i].RlmtState = SK_RLMT_RS_INIT;
+                        pAC->Rlmt.Net[i].RootIdSet = SK_FALSE;
+                        pAC->Rlmt.Net[i].Preference = 0xFFFFFFFF;         /* "Automatic" */
+                        pAC->Rlmt.Net[i].PrefPort = SK_RLMT_DEF_PREF_PORT;
+                        /* Just assuming. */
+                        pAC->Rlmt.Net[i].ActivePort = pAC->Rlmt.Net[i].PrefPort;
+                        pAC->Rlmt.Net[i].RlmtMode = SK_RLMT_DEF_MODE;
+                        pAC->Rlmt.Net[i].TimeoutValue = SK_RLMT_DEF_TO_VAL;
+                        pAC->Rlmt.Net[i].NetNumber = i;
+                }
+
+                pAC->Rlmt.Port[1].Net= &pAC->Rlmt.Net[0];
+                pAC->Rlmt.Net[0].NumPorts = pAC->GIni.GIMacsFound;
+
+                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_SET_NETS, Para);
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("RLMT: Changed to one net with two ports.\n"))
+        }
+        else if (Para.Para32[0] == 2) {
+                pAC->Rlmt.Port[1].Net= &pAC->Rlmt.Net[1];
+                pAC->Rlmt.Net[1].NumPorts = pAC->GIni.GIMacsFound - 1;
+                pAC->Rlmt.Net[0].NumPorts =
+                        pAC->GIni.GIMacsFound - pAC->Rlmt.Net[1].NumPorts;
+                
+                pAC->Rlmt.NumNets = Para.Para32[0];
+                for (i = 0; (SK_U32)i < pAC->Rlmt.NumNets; i++) {
+                        pAC->Rlmt.Net[i].RlmtState = SK_RLMT_RS_INIT;
+                        pAC->Rlmt.Net[i].RootIdSet = SK_FALSE;
+                        pAC->Rlmt.Net[i].Preference = 0xFFFFFFFF;         /* "Automatic" */
+                        pAC->Rlmt.Net[i].PrefPort = SK_RLMT_DEF_PREF_PORT;
+                        /* Just assuming. */
+                        pAC->Rlmt.Net[i].ActivePort = pAC->Rlmt.Net[i].PrefPort;
+                        pAC->Rlmt.Net[i].RlmtMode = SK_RLMT_DEF_MODE;
+                        pAC->Rlmt.Net[i].TimeoutValue = SK_RLMT_DEF_TO_VAL;
+
+                        pAC->Rlmt.Net[i].NetNumber = i;
+                }
+
+                /* Set logical MAC addr on second net's active port. */
+                (void)SkAddrOverride(pAC, IoC, pAC->Rlmt.Net[1].Port[pAC->Addr.
+                        Net[1].ActivePort]->PortNumber, NULL, SK_ADDR_SET_LOGICAL);
+
+                SkEventQueue(pAC, SKGE_PNMI, SK_PNMI_EVT_RLMT_SET_NETS, Para);
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("RLMT: Changed to two nets with one port each.\n"))
+        }
+        else {
+                /* Not implemented for more than two nets. */
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SetNets not implemented for more than two nets.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_SET_NETS Event EMPTY.\n"))
+                return;
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_SET_NETS Event END.\n"))
+}       /* SkRlmtSetNets */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvtModeChange - MODE_CHANGE
+ *
+ * Description:
+ *      This routine handles MODE_CHANGE events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      Nothing
+ */
+RLMT_STATIC void        SkRlmtEvtModeChange(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_EVPARA       Para)   /* SK_U32 NewMode; SK_U32 NetNumber */
+{
+        SK_EVPARA       Para2;
+        SK_U32          i;
+        SK_U32          PrevRlmtMode;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                ("SK_RLMT_MODE_CHANGE Event BEGIN.\n"))
+
+        if (Para.Para32[1] >= pAC->Rlmt.NumNets) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Bad NetNumber %d.\n", Para.Para32[1]))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_MODE_CHANGE Event EMPTY.\n"))
+                return;
+        }
+
+        Para.Para32[0] |= SK_RLMT_CHECK_LINK;
+
+        if ((pAC->Rlmt.Net[Para.Para32[1]].NumPorts == 1) &&
+                Para.Para32[0] != SK_RLMT_MODE_CLS) {
+                pAC->Rlmt.Net[Para.Para32[1]].RlmtMode = SK_RLMT_MODE_CLS;
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Forced RLMT mode to CLS on single port net.\n"))
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_MODE_CHANGE Event EMPTY.\n"))
+                return;
+        }
+
+        /* Update RLMT mode. */
+        PrevRlmtMode = pAC->Rlmt.Net[Para.Para32[1]].RlmtMode;
+        pAC->Rlmt.Net[Para.Para32[1]].RlmtMode = Para.Para32[0];
+
+        if ((PrevRlmtMode & SK_RLMT_CHECK_LOC_LINK) !=
+                (pAC->Rlmt.Net[Para.Para32[1]].RlmtMode & SK_RLMT_CHECK_LOC_LINK)) {
+                /* SK_RLMT_CHECK_LOC_LINK bit changed. */
+                if ((PrevRlmtMode & SK_RLMT_CHECK_OTHERS) == 0 &&
+                        pAC->Rlmt.Net[Para.Para32[1]].NumPorts > 1 &&
+                        pAC->Rlmt.Net[Para.Para32[1]].PortsUp >= 1) {
+                        /* 20001207 RA: Was "PortsUp == 1". */
+                        Para2.Para32[0] = Para.Para32[1];
+                        Para2.Para32[1] = (SK_U32)-1;
+                        SkTimerStart(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[1]].LocTimer,
+                                pAC->Rlmt.Net[Para.Para32[1]].TimeoutValue,
+                                SKGE_RLMT, SK_RLMT_TIM, Para2);
+                }
+        }
+
+        if ((PrevRlmtMode & SK_RLMT_CHECK_SEG) !=
+                (pAC->Rlmt.Net[Para.Para32[1]].RlmtMode & SK_RLMT_CHECK_SEG)) {
+                /* SK_RLMT_CHECK_SEG bit changed. */
+                for (i = 0; i < pAC->Rlmt.Net[Para.Para32[1]].NumPorts; i++) {
+                        (void)SkAddrMcClear(pAC, IoC,
+                                pAC->Rlmt.Net[Para.Para32[1]].Port[i]->PortNumber,
+                                SK_ADDR_PERMANENT | SK_MC_SW_ONLY);
+
+                        /* Add RLMT MC address. */
+                        (void)SkAddrMcAdd(pAC, IoC,
+                                pAC->Rlmt.Net[Para.Para32[1]].Port[i]->PortNumber,
+                                &SkRlmtMcAddr, SK_ADDR_PERMANENT);
+
+                        if ((pAC->Rlmt.Net[Para.Para32[1]].RlmtMode &
+                                SK_RLMT_CHECK_SEG) != 0) {
+                                /* Add BPDU MC address. */
+                                (void)SkAddrMcAdd(pAC, IoC,
+                                        pAC->Rlmt.Net[Para.Para32[1]].Port[i]->PortNumber,
+                                        &BridgeMcAddr, SK_ADDR_PERMANENT);
+
+                                if (pAC->Rlmt.Net[Para.Para32[1]].RlmtState != SK_RLMT_RS_INIT) {
+                                        if (!pAC->Rlmt.Net[Para.Para32[1]].Port[i]->LinkDown &&
+                                                (Para2.pParaPtr = SkRlmtBuildSpanningTreePacket(
+                                                pAC, IoC, i)) != NULL) {
+                                                pAC->Rlmt.Net[Para.Para32[1]].Port[i]->RootIdSet =
+                                                        SK_FALSE;
+                                                SkEventQueue(pAC, SKGE_DRV, SK_DRV_RLMT_SEND, Para2);
+                                        }
+                                }
+                        }
+                        (void)SkAddrMcUpdate(pAC, IoC,
+                                pAC->Rlmt.Net[Para.Para32[1]].Port[i]->PortNumber);
+                }       /* for ... */
+
+                if ((pAC->Rlmt.Net[Para.Para32[1]].RlmtMode & SK_RLMT_CHECK_SEG) != 0) {
+                        Para2.Para32[0] = Para.Para32[1];
+                        Para2.Para32[1] = (SK_U32)-1;
+                        SkTimerStart(pAC, IoC, &pAC->Rlmt.Net[Para.Para32[1]].SegTimer,
+                                SK_RLMT_SEG_TO_VAL, SKGE_RLMT, SK_RLMT_SEG_TIM, Para2);
+                }
+        }       /* SK_RLMT_CHECK_SEG bit changed. */
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("SK_RLMT_MODE_CHANGE Event END.\n"))
+}       /* SkRlmtEvtModeChange */
+
+
+/******************************************************************************
+ *
+ *      SkRlmtEvent - a PORT- or an RLMT-specific event happened
+ *
+ * Description:
+ *      This routine calls subroutines to handle PORT- and RLMT-specific events.
+ *
+ * Context:
+ *      runtime, pageable?
+ *      may be called after SK_INIT_IO
+ *
+ * Returns:
+ *      0
+ */
+int     SkRlmtEvent(
+SK_AC           *pAC,   /* Adapter Context */
+SK_IOC          IoC,    /* I/O Context */
+SK_U32          Event,  /* Event code */
+SK_EVPARA       Para)   /* Event-specific parameter */
+{
+        switch (Event) {
+        
+        /* ----- PORT events ----- */
+
+        case SK_RLMT_PORTSTART_TIM:     /* From RLMT via TIME. */
+                SkRlmtEvtPortStartTim(pAC, IoC, Para);
+                break;
+        case SK_RLMT_LINK_UP:           /* From SIRQ. */
+                SkRlmtEvtLinkUp(pAC, IoC, Para);
+                break;
+        case SK_RLMT_PORTUP_TIM:        /* From RLMT via TIME. */
+                SkRlmtEvtPortUpTim(pAC, IoC, Para);
+                break;
+        case SK_RLMT_PORTDOWN:                  /* From RLMT. */
+        case SK_RLMT_PORTDOWN_RX_TIM:   /* From RLMT via TIME. */
+        case SK_RLMT_PORTDOWN_TX_TIM:   /* From RLMT via TIME. */
+                SkRlmtEvtPortDownX(pAC, IoC, Event, Para);
+                break;
+        case SK_RLMT_LINK_DOWN:         /* From SIRQ. */
+                SkRlmtEvtLinkDown(pAC, IoC, Para);
+                break;
+        case SK_RLMT_PORT_ADDR:         /* From ADDR. */
+                SkRlmtEvtPortAddr(pAC, IoC, Para);
+                break;
+
+        /* ----- RLMT events ----- */
+
+        case SK_RLMT_START:             /* From DRV. */
+                SkRlmtEvtStart(pAC, IoC, Para);
+                break;
+        case SK_RLMT_STOP:              /* From DRV. */
+                SkRlmtEvtStop(pAC, IoC, Para);
+                break;
+        case SK_RLMT_TIM:               /* From RLMT via TIME. */
+                SkRlmtEvtTim(pAC, IoC, Para);
+                break;
+        case SK_RLMT_SEG_TIM:
+                SkRlmtEvtSegTim(pAC, IoC, Para);
+                break;
+        case SK_RLMT_PACKET_RECEIVED:   /* From DRV. */
+                SkRlmtEvtPacketRx(pAC, IoC, Para);
+                break;
+        case SK_RLMT_STATS_CLEAR:       /* From PNMI. */
+                SkRlmtEvtStatsClear(pAC, IoC, Para);
+                break;
+        case SK_RLMT_STATS_UPDATE:      /* From PNMI. */
+                SkRlmtEvtStatsUpdate(pAC, IoC, Para);
+                break;
+        case SK_RLMT_PREFPORT_CHANGE:   /* From PNMI. */
+                SkRlmtEvtPrefportChange(pAC, IoC, Para);
+                break;
+        case SK_RLMT_MODE_CHANGE:       /* From PNMI. */
+                SkRlmtEvtModeChange(pAC, IoC, Para);
+                break;
+        case SK_RLMT_SET_NETS:  /* From DRV. */
+                SkRlmtEvtSetNets(pAC, IoC, Para);
+                break;
+
+        /* ----- Unknown events ----- */
+
+        default:        /* Create error log entry. */
+                SK_DBG_MSG(pAC, SK_DBGMOD_RLMT, SK_DBGCAT_CTRL,
+                        ("Unknown RLMT Event %d.\n", Event))
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E003, SKERR_RLMT_E003_MSG);
+                break;
+        }       /* switch() */
+
+        return (0);
+}       /* SkRlmtEvent */
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
diff --git a/drivers/net/sk98lin/sktimer.c b/drivers/net/sk98lin/sktimer.c
new file mode 100644
index 0000000000..4e462955ec
--- /dev/null
+++ b/drivers/net/sk98lin/sktimer.c
@@ -0,0 +1,250 @@
+/******************************************************************************
+ *
+ * Name:        sktimer.c
+ * Project:     Gigabit Ethernet Adapters, Event Scheduler Module
+ * Version:     $Revision: 1.14 $
+ * Date:        $Date: 2003/09/16 13:46:51 $
+ * Purpose:     High level timer functions.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+
+/*
+ *      Event queue and dispatcher
+ */
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $Id: sktimer.c,v 1.14 2003/09/16 13:46:51 rschmidt Exp $ (C) Marvell.";
+#endif
+
+#include "h/skdrv1st.h"         /* Driver Specific Definitions */
+#include "h/skdrv2nd.h"         /* Adapter Control- and Driver specific Def. */
+
+#ifdef __C2MAN__
+/*
+        Event queue management.
+
+        General Description:
+
+ */
+intro()
+{}
+#endif
+
+
+/* Forward declaration */
+static void timer_done(SK_AC *pAC,SK_IOC Ioc,int Restart);
+
+
+/*
+ * Inits the software timer
+ *
+ * needs to be called during Init level 1.
+ */
+void    SkTimerInit(
+SK_AC   *pAC,           /* Adapters context */
+SK_IOC  Ioc,            /* IoContext */
+int             Level)          /* Init Level */
+{
+        switch (Level) {
+        case SK_INIT_DATA:
+                pAC->Tim.StQueue = NULL;
+                break;
+        case SK_INIT_IO:
+                SkHwtInit(pAC, Ioc);
+                SkTimerDone(pAC, Ioc);
+                break;
+        default:
+                break;
+        }
+}
+
+/*
+ * Stops a high level timer
+ * - If a timer is not in the queue the function returns normally, too.
+ */
+void    SkTimerStop(
+SK_AC           *pAC,           /* Adapters context */
+SK_IOC          Ioc,            /* IoContext */
+SK_TIMER        *pTimer)        /* Timer Pointer to be started */
+{
+        SK_TIMER        **ppTimPrev;
+        SK_TIMER        *pTm;
+
+        /*
+         * remove timer from queue
+         */
+        pTimer->TmActive = SK_FALSE;
+        
+        if (pAC->Tim.StQueue == pTimer && !pTimer->TmNext) {
+                SkHwtStop(pAC, Ioc);
+        }
+        
+        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;
+
+                        if (pTm->TmNext) {
+                                /* correct delta of next timer in queue */
+                                pTm->TmNext->TmDelta += pTm->TmDelta;
+                        }
+                        return;
+                }
+        }
+}
+
+/*
+ * Start a high level software timer
+ */
+void    SkTimerStart(
+SK_AC           *pAC,           /* Adapters context */
+SK_IOC          Ioc,            /* IoContext */
+SK_TIMER        *pTimer,        /* Timer Pointer to be started */
+SK_U32          Time,           /* Time value */
+SK_U32          Class,          /* Event Class for this timer */
+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;
+
+        Time /= 16;             /* input is uS, clock ticks are 16uS */
+        
+        if (!Time)
+                Time = 1;
+
+        SkTimerStop(pAC, Ioc, pTimer);
+
+        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 = NULL;
+                pTimer->TmDelta = Time;
+                
+                SkHwtStart(pAC, Ioc, Time);
+                
+                return;
+        }
+
+        /*
+         * timer correction
+         */
+        timer_done(pAC, Ioc, 0);
+
+        /*
+         * find position in queue
+         */
+        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;
+                }
+                Delta += pTm->TmDelta;
+        }
+
+        /* insert in queue */
+        *ppTimPrev = pTimer;
+        pTimer->TmNext = pTm;
+        pTimer->TmDelta = Time - Delta;
+
+        if (pTm) {
+                /* There is a next timer
+                 * -> correct its Delta value.
+                 */
+                pTm->TmDelta -= pTimer->TmDelta;
+        }
+
+        /* restart with first */
+        SkHwtStart(pAC, Ioc, pAC->Tim.StQueue->TmDelta);
+}
+
+
+void    SkTimerDone(
+SK_AC   *pAC,           /* Adapters context */
+SK_IOC  Ioc)            /* IoContext */
+{
+        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 ? */
+{
+        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 {
+                        /* We found the first timer that did not run out */
+                        pTm->TmDelta -= Delta;
+                        Delta = 0;
+                        Done = 1;
+                }
+        }
+        *ppLast = NULL;
+        /*
+         * 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);
+        }
+
+        /* Set head of timer queue to the first timer that did not run out */
+        pAC->Tim.StQueue = pTm;
+
+        if (Restart && pAC->Tim.StQueue) {
+                /* Restart HW timer */
+                SkHwtStart(pAC, Ioc, pAC->Tim.StQueue->TmDelta);
+        }
+}
+
+/* End of file */
diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c
new file mode 100644
index 0000000000..1e662aaebf
--- /dev/null
+++ b/drivers/net/sk98lin/skvpd.c
@@ -0,0 +1,1091 @@
+/******************************************************************************
+ *
+ * Name:        skvpd.c
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.37 $
+ * Date:        $Date: 2003/01/13 10:42:45 $
+ * Purpose:     Shared software to read and write VPD data
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (C)Copyright 1998-2003 SysKonnect 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 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/*
+        Please refer skvpd.txt for information how to include this module
+ */
+static const char SysKonnectFileId[] =
+        "@(#)$Id: skvpd.c,v 1.37 2003/01/13 10:42:45 rschmidt Exp $ (C) SK";
+
+#include "h/skdrv1st.h"
+#include "h/sktypes.h"
+#include "h/skdebug.h"
+#include "h/skdrv2nd.h"
+
+/*
+ * Static functions
+ */
+#ifndef SK_KR_PROTO
+static SK_VPD_PARA      *vpd_find_para(
+        SK_AC   *pAC,
+        const char      *key,
+        SK_VPD_PARA *p);
+#else   /* SK_KR_PROTO */
+static SK_VPD_PARA      *vpd_find_para();
+#endif  /* SK_KR_PROTO */
+
+/*
+ * waits for a completion of a VPD transfer
+ * The VPD transfer must complete within SK_TICKS_PER_SEC/16
+ *
+ * returns      0:      success, transfer completes
+ *              error   exit(9) with a error message
+ */
+static int VpdWait(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  IoC,    /* IO Context */
+int             event)  /* event to wait for (VPD_READ / VPD_write) completion*/
+{
+        SK_U64  start_time;
+        SK_U16  state;
+
+        SK_DBG_MSG(pAC,SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                ("VPD wait for %s\n", event?"Write":"Read"));
+        start_time = SkOsGetTime(pAC);
+        do {
+                if (SkOsGetTime(pAC) - start_time > SK_TICKS_PER_SEC) {
+
+                        /* Bug fix AF: Thu Mar 28 2002
+                         * Do not call: VPD_STOP(pAC, IoC);
+                         * A pending VPD read cycle can not be aborted by writing
+                         * VPD_WRITE to the PCI_VPD_ADR_REG (VPD address register).
+                         * Although the write threshold in the OUR-register protects
+                         * VPD read only space from being overwritten this does not
+                         * protect a VPD read from being `converted` into a VPD write
+                         * operation (on the fly). As a consequence the VPD_STOP would
+                         * delete VPD read only data. In case of any problems with the
+                         * I2C bus we exit the loop here. The I2C read operation can
+                         * not be aborted except by a reset (->LR).
+                         */
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_FATAL | SK_DBGCAT_ERR,
+                                ("ERROR:VPD wait timeout\n"));
+                        return(1);
+                }
+                
+                VPD_IN16(pAC, IoC, PCI_VPD_ADR_REG, &state);
+                
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                        ("state = %x, event %x\n",state,event));
+        } while((int)(state & PCI_VPD_FLAG) == event);
+
+        return(0);
+}
+
+#ifdef SKDIAG
+
+/*
+ * Read the dword at address 'addr' from the VPD EEPROM.
+ *
+ * Needed Time: MIN 1,3 ms      MAX 2,6 ms
+ *
+ * Note: The DWord is returned in the endianess of the machine the routine
+ *       is running on.
+ *
+ * Returns the data read.
+ */
+SK_U32 VpdReadDWord(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  IoC,    /* IO Context */
+int             addr)   /* VPD address */
+{
+        SK_U32  Rtv;
+
+        /* start VPD read */
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                ("VPD read dword at 0x%x\n",addr));
+        addr &= ~VPD_WRITE;             /* ensure the R/W bit is set to read */
+
+        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, (SK_U16)addr);
+
+        /* ignore return code here */
+        (void)VpdWait(pAC, IoC, VPD_READ);
+
+        /* Don't swap here, it's a data stream of bytes */
+        Rtv = 0;
+
+        VPD_IN32(pAC, IoC, PCI_VPD_DAT_REG, &Rtv);
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                ("VPD read dword data = 0x%x\n",Rtv));
+        return(Rtv);
+}
+
+#endif  /* SKDIAG */
+
+/*
+ *      Read one Stream of 'len' bytes of VPD data, starting at 'addr' from
+ *      or to the I2C EEPROM.
+ *
+ * Returns number of bytes read / written.
+ */
+static int VpdWriteStream(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  IoC,    /* IO Context */
+char    *buf,   /* data buffer */
+int             Addr,   /* VPD start address */
+int             Len)    /* number of bytes to read / to write */
+{
+        int             i;
+        int             j;
+        SK_U16  AdrReg;
+        int             Rtv;
+        SK_U8   * pComp;        /* Compare pointer */
+        SK_U8   Data;           /* Input Data for Compare */
+
+        /* Init Compare Pointer */
+        pComp = (SK_U8 *) buf;
+
+        for (i = 0; i < Len; i++, buf++) {
+                if ((i%sizeof(SK_U32)) == 0) {
+                        /*
+                         * At the begin of each cycle read the Data Reg
+                         * So it is initialized even if only a few bytes
+                         * are written.
+                         */
+                        AdrReg = (SK_U16) Addr;
+                        AdrReg &= ~VPD_WRITE;   /* READ operation */
+
+                        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, AdrReg);
+
+                        /* Wait for termination */
+                        Rtv = VpdWait(pAC, IoC, VPD_READ);
+                        if (Rtv != 0) {
+                                return(i);
+                        }
+                }
+
+                /* Write current Byte */
+                VPD_OUT8(pAC, IoC, PCI_VPD_DAT_REG + (i%sizeof(SK_U32)),
+                                *(SK_U8*)buf);
+
+                if (((i%sizeof(SK_U32)) == 3) || (i == (Len - 1))) {
+                        /* New Address needs to be written to VPD_ADDR reg */
+                        AdrReg = (SK_U16) Addr;
+                        Addr += sizeof(SK_U32);
+                        AdrReg |= VPD_WRITE;    /* WRITE operation */
+
+                        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, AdrReg);
+
+                        /* Wait for termination */
+                        Rtv = VpdWait(pAC, IoC, VPD_WRITE);
+                        if (Rtv != 0) {
+                                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                        ("Write Timed Out\n"));
+                                return(i - (i%sizeof(SK_U32)));
+                        }
+
+                        /*
+                         * Now re-read to verify
+                         */
+                        AdrReg &= ~VPD_WRITE;   /* READ operation */
+
+                        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, AdrReg);
+
+                        /* Wait for termination */
+                        Rtv = VpdWait(pAC, IoC, VPD_READ);
+                        if (Rtv != 0) {
+                                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                        ("Verify Timed Out\n"));
+                                return(i - (i%sizeof(SK_U32)));
+                        }
+
+                        for (j = 0; j <= (int)(i%sizeof(SK_U32)); j++, pComp++) {
+                                
+                                VPD_IN8(pAC, IoC, PCI_VPD_DAT_REG + j, &Data);
+                                
+                                if (Data != *pComp) {
+                                        /* Verify Error */
+                                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                                ("WriteStream Verify Error\n"));
+                                        return(i - (i%sizeof(SK_U32)) + j);
+                                }
+                        }
+                }
+        }
+
+        return(Len);
+}
+        
+
+/*
+ *      Read one Stream of 'len' bytes of VPD data, starting at 'addr' from
+ *      or to the I2C EEPROM.
+ *
+ * Returns number of bytes read / written.
+ */
+static int VpdReadStream(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  IoC,    /* IO Context */
+char    *buf,   /* data buffer */
+int             Addr,   /* VPD start address */
+int             Len)    /* number of bytes to read / to write */
+{
+        int             i;
+        SK_U16  AdrReg;
+        int             Rtv;
+
+        for (i = 0; i < Len; i++, buf++) {
+                if ((i%sizeof(SK_U32)) == 0) {
+                        /* New Address needs to be written to VPD_ADDR reg */
+                        AdrReg = (SK_U16) Addr;
+                        Addr += sizeof(SK_U32);
+                        AdrReg &= ~VPD_WRITE;   /* READ operation */
+
+                        VPD_OUT16(pAC, IoC, PCI_VPD_ADR_REG, AdrReg);
+
+                        /* Wait for termination */
+                        Rtv = VpdWait(pAC, IoC, VPD_READ);
+                        if (Rtv != 0) {
+                                return(i);
+                        }
+                }
+                VPD_IN8(pAC, IoC, PCI_VPD_DAT_REG + (i%sizeof(SK_U32)),
+                        (SK_U8 *)buf);
+        }
+
+        return(Len);
+}
+
+/*
+ *      Read ore writes 'len' bytes of VPD data, starting at 'addr' from
+ *      or to the I2C EEPROM.
+ *
+ * Returns number of bytes read / written.
+ */
+static int VpdTransferBlock(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  IoC,    /* IO Context */
+char    *buf,   /* data buffer */
+int             addr,   /* VPD start address */
+int             len,    /* number of bytes to read / to write */
+int             dir)    /* transfer direction may be VPD_READ or VPD_WRITE */
+{
+        int             Rtv;    /* Return value */
+        int             vpd_rom_size;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                ("VPD %s block, addr = 0x%x, len = %d\n",
+                dir ? "write" : "read", addr, len));
+
+        if (len == 0)
+                return(0);
+
+        vpd_rom_size = pAC->vpd.rom_size;
+        
+        if (addr > vpd_rom_size - 4) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("Address error: 0x%x, exp. < 0x%x\n",
+                        addr, vpd_rom_size - 4));
+                return(0);
+        }
+        
+        if (addr + len > vpd_rom_size) {
+                len = vpd_rom_size - addr;
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                        ("Warning: len was cut to %d\n", len));
+        }
+
+        if (dir == VPD_READ) {
+                Rtv = VpdReadStream(pAC, IoC, buf, addr, len);
+        }
+        else {
+                Rtv = VpdWriteStream(pAC, IoC, buf, addr, len);
+        }
+
+        return(Rtv);
+}
+
+#ifdef SKDIAG
+
+/*
+ *      Read 'len' bytes of VPD data, starting at 'addr'.
+ *
+ * Returns number of bytes read.
+ */
+int VpdReadBlock(
+SK_AC   *pAC,   /* pAC pointer */
+SK_IOC  IoC,    /* IO Context */
+char    *buf,   /* buffer were the data should be stored */
+int             addr,   /* start reading at the VPD address */
+int             len)    /* number of bytes to read */
+{
+        return(VpdTransferBlock(pAC, IoC, buf, addr, len, VPD_READ));
+}
+
+/*
+ *      Write 'len' bytes of *but to the VPD EEPROM, starting at 'addr'.
+ *
+ * Returns number of bytes writes.
+ */
+int VpdWriteBlock(
+SK_AC   *pAC,   /* pAC pointer */
+SK_IOC  IoC,    /* IO Context */
+char    *buf,   /* buffer, holds the data to write */
+int             addr,   /* start writing at the VPD address */
+int             len)    /* number of bytes to write */
+{
+        return(VpdTransferBlock(pAC, IoC, buf, addr, len, VPD_WRITE));
+}
+#endif  /* SKDIAG */
+
+/*
+ * (re)initialize the VPD buffer
+ *
+ * Reads the VPD data from the EEPROM into the VPD buffer.
+ * Get the remaining read only and read / write space.
+ *
+ * return       0:      success
+ *              1:      fatal VPD error
+ */
+static int VpdInit(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  IoC)    /* IO Context */
+{
+        SK_VPD_PARA *r, rp;     /* RW or RV */
+        int             i;
+        unsigned char   x;
+        int             vpd_size;
+        SK_U16  dev_id;
+        SK_U32  our_reg2;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_INIT, ("VpdInit .. "));
+        
+        VPD_IN16(pAC, IoC, PCI_DEVICE_ID, &dev_id);
+        
+        VPD_IN32(pAC, IoC, PCI_OUR_REG_2, &our_reg2);
+        
+        pAC->vpd.rom_size = 256 << ((our_reg2 & PCI_VPD_ROM_SZ) >> 14);
+        
+        /*
+         * this function might get used before the hardware is initialized
+         * therefore we cannot always trust in GIChipId
+         */
+        if (((pAC->vpd.v.vpd_status & VPD_VALID) == 0 &&
+                dev_id != VPD_DEV_ID_GENESIS) ||
+                ((pAC->vpd.v.vpd_status & VPD_VALID) != 0 &&
+                !pAC->GIni.GIGenesis)) {
+
+                /* for Yukon the VPD size is always 256 */
+                vpd_size = VPD_SIZE_YUKON;
+        }
+        else {
+                /* Genesis uses the maximum ROM size up to 512 for VPD */
+                if (pAC->vpd.rom_size > VPD_SIZE_GENESIS) {
+                        vpd_size = VPD_SIZE_GENESIS;
+                }
+                else {
+                        vpd_size = pAC->vpd.rom_size;
+                }
+        }
+
+        /* read the VPD data into the VPD buffer */
+        if (VpdTransferBlock(pAC, IoC, pAC->vpd.vpd_buf, 0, vpd_size, VPD_READ)
+                != vpd_size) {
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                        ("Block Read Error\n"));
+                return(1);
+        }
+        
+        pAC->vpd.vpd_size = vpd_size;
+
+        /* Asus K8V Se Deluxe bugfix. Correct VPD content */
+        /* MBo April 2004 */
+        if (((unsigned char)pAC->vpd.vpd_buf[0x3f] == 0x38) &&
+            ((unsigned char)pAC->vpd.vpd_buf[0x40] == 0x3c) &&
+            ((unsigned char)pAC->vpd.vpd_buf[0x41] == 0x45)) {
+                printk("sk98lin: Asus mainboard with buggy VPD? "
+                                "Correcting data.\n");
+                pAC->vpd.vpd_buf[0x40] = 0x38;
+        }
+
+
+        /* find the end tag of the RO area */
+        if (!(r = vpd_find_para(pAC, VPD_RV, &rp))) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("Encoding Error: RV Tag not found\n"));
+                return(1);
+        }
+        
+        if (r->p_val + r->p_len > pAC->vpd.vpd_buf + vpd_size/2) {
+                SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("Encoding Error: Invalid VPD struct size\n"));
+                return(1);
+        }
+        pAC->vpd.v.vpd_free_ro = r->p_len - 1;
+
+        /* test the checksum */
+        for (i = 0, x = 0; (unsigned)i <= (unsigned)vpd_size/2 - r->p_len; i++) {
+                x += pAC->vpd.vpd_buf[i];
+        }
+        
+        if (x != 0) {
+                /* checksum error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("VPD Checksum Error\n"));
+                return(1);
+        }
+
+        /* find and check the end tag of the RW area */
+        if (!(r = vpd_find_para(pAC, VPD_RW, &rp))) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("Encoding Error: RV Tag not found\n"));
+                return(1);
+        }
+        
+        if (r->p_val < pAC->vpd.vpd_buf + vpd_size/2) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("Encoding Error: Invalid VPD struct size\n"));
+                return(1);
+        }
+        pAC->vpd.v.vpd_free_rw = r->p_len;
+
+        /* everything seems to be ok */
+        if (pAC->GIni.GIChipId != 0) {
+                pAC->vpd.v.vpd_status |= VPD_VALID;
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_INIT,
+                ("done. Free RO = %d, Free RW = %d\n",
+                pAC->vpd.v.vpd_free_ro, pAC->vpd.v.vpd_free_rw));
+
+        return(0);
+}
+
+/*
+ *      find the Keyword 'key' in the VPD buffer and fills the
+ *      parameter struct 'p' with it's values
+ *
+ * returns      *p      success
+ *              0:      parameter was not found or VPD encoding error
+ */
+static SK_VPD_PARA *vpd_find_para(
+SK_AC           *pAC,   /* common data base */
+const char      *key,   /* keyword to find (e.g. "MN") */
+SK_VPD_PARA *p)         /* parameter description struct */
+{
+        char *v ;       /* points to VPD buffer */
+        int max;        /* Maximum Number of Iterations */
+
+        v = pAC->vpd.vpd_buf;
+        max = 128;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                ("VPD find para %s .. ",key));
+
+        /* check mandatory resource type ID string (Product Name) */
+        if (*v != (char)RES_ID) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("Error: 0x%x missing\n", RES_ID));
+                return NULL;
+        }
+
+        if (strcmp(key, VPD_NAME) == 0) {
+                p->p_len = VPD_GET_RES_LEN(v);
+                p->p_val = VPD_GET_VAL(v);
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                        ("found, len = %d\n", p->p_len));
+                return(p);
+        }
+
+        v += 3 + VPD_GET_RES_LEN(v) + 3;
+        for (;; ) {
+                if (SK_MEMCMP(key,v,2) == 0) {
+                        p->p_len = VPD_GET_VPD_LEN(v);
+                        p->p_val = VPD_GET_VAL(v);
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                                ("found, len = %d\n",p->p_len));
+                        return(p);
+                }
+
+                /* exit when reaching the "RW" Tag or the maximum of itera. */
+                max--;
+                if (SK_MEMCMP(VPD_RW,v,2) == 0 || max == 0) {
+                        break;
+                }
+
+                if (SK_MEMCMP(VPD_RV,v,2) == 0) {
+                        v += 3 + VPD_GET_VPD_LEN(v) + 3;        /* skip VPD-W */
+                }
+                else {
+                        v += 3 + VPD_GET_VPD_LEN(v);
+                }
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                        ("scanning '%c%c' len = %d\n",v[0],v[1],v[2]));
+        }
+
+#ifdef DEBUG
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL, ("not found\n"));
+        if (max == 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("Key/Len Encoding error\n"));
+        }
+#endif /* DEBUG */
+        return NULL;
+}
+
+/*
+ *      Move 'n' bytes. Begin with the last byte if 'n' is > 0,
+ *      Start with the last byte if n is < 0.
+ *
+ * returns nothing
+ */
+static void vpd_move_para(
+char    *start,         /* start of memory block */
+char    *end,           /* end of memory block to move */
+int             n)                      /* number of bytes the memory block has to be moved */
+{
+        char *p;
+        int i;          /* number of byte copied */
+
+        if (n == 0)
+                return;
+
+        i = (int) (end - start + 1);
+        if (n < 0) {
+                p = start + n;
+                while (i != 0) {
+                        *p++ = *start++;
+                        i--;
+                }
+        }
+        else {
+                p = end + n;
+                while (i != 0) {
+                        *p-- = *end--;
+                        i--;
+                }
+        }
+}
+
+/*
+ *      setup the VPD keyword 'key' at 'ip'.
+ *
+ * returns nothing
+ */
+static void vpd_insert_key(
+const char      *key,   /* keyword to insert */
+const char      *buf,   /* buffer with the keyword value */
+int             len,            /* length of the value string */
+char    *ip)            /* inseration point */
+{
+        SK_VPD_KEY *p;
+
+        p = (SK_VPD_KEY *) ip;
+        p->p_key[0] = key[0];
+        p->p_key[1] = key[1];
+        p->p_len = (unsigned char) len;
+        SK_MEMCPY(&p->p_val,buf,len);
+}
+
+/*
+ *      Setup the VPD end tag "RV" / "RW".
+ *      Also correct the remaining space variables vpd_free_ro / vpd_free_rw.
+ *
+ * returns      0:      success
+ *              1:      encoding error
+ */
+static int vpd_mod_endtag(
+SK_AC   *pAC,           /* common data base */
+char    *etp)           /* end pointer input position */
+{
+        SK_VPD_KEY *p;
+        unsigned char   x;
+        int     i;
+        int     vpd_size;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                ("VPD modify endtag at 0x%x = '%c%c'\n",etp,etp[0],etp[1]));
+
+        vpd_size = pAC->vpd.vpd_size;
+
+        p = (SK_VPD_KEY *) etp;
+
+        if (p->p_key[0] != 'R' || (p->p_key[1] != 'V' && p->p_key[1] != 'W')) {
+                /* something wrong here, encoding error */
+                SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR | SK_DBGCAT_FATAL,
+                        ("Encoding Error: invalid end tag\n"));
+                return(1);
+        }
+        if (etp > pAC->vpd.vpd_buf + vpd_size/2) {
+                /* create "RW" tag */
+                p->p_len = (unsigned char)(pAC->vpd.vpd_buf+vpd_size-etp-3-1);
+                pAC->vpd.v.vpd_free_rw = (int) p->p_len;
+                i = pAC->vpd.v.vpd_free_rw;
+                etp += 3;
+        }
+        else {
+                /* create "RV" tag */
+                p->p_len = (unsigned char)(pAC->vpd.vpd_buf+vpd_size/2-etp-3);
+                pAC->vpd.v.vpd_free_ro = (int) p->p_len - 1;
+
+                /* setup checksum */
+                for (i = 0, x = 0; i < vpd_size/2 - p->p_len; i++) {
+                        x += pAC->vpd.vpd_buf[i];
+                }
+                p->p_val = (char) 0 - x;
+                i = pAC->vpd.v.vpd_free_ro;
+                etp += 4;
+        }
+        while (i) {
+                *etp++ = 0x00;
+                i--;
+        }
+
+        return(0);
+}
+
+/*
+ *      Insert a VPD keyword into the VPD buffer.
+ *
+ *      The keyword 'key' is inserted at the position 'ip' in the
+ *      VPD buffer.
+ *      The keywords behind the input position will
+ *      be moved. The VPD end tag "RV" or "RW" is generated again.
+ *
+ * returns      0:      success
+ *              2:      value string was cut
+ *              4:      VPD full, keyword was not written
+ *              6:      fatal VPD error
+ *
+ */
+static int      VpdSetupPara(
+SK_AC   *pAC,           /* common data base */
+const char      *key,   /* keyword to insert */
+const char      *buf,   /* buffer with the keyword value */
+int             len,            /* length of the keyword value */
+int             type,           /* VPD_RO_KEY or VPD_RW_KEY */
+int             op)                     /* operation to do: ADD_KEY or OWR_KEY */
+{
+        SK_VPD_PARA vp;
+        char    *etp;           /* end tag position */
+        int     free;           /* remaining space in selected area */
+        char    *ip;            /* input position inside the VPD buffer */
+        int     rtv;            /* return code */
+        int     head;           /* additional haeder bytes to move */
+        int     found;          /* additinoal bytes if the keyword was found */
+        int vpd_size;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                ("VPD setup para key = %s, val = %s\n",key,buf));
+        
+        vpd_size = pAC->vpd.vpd_size;
+
+        rtv = 0;
+        ip = NULL;
+        if (type == VPD_RW_KEY) {
+                /* end tag is "RW" */
+                free = pAC->vpd.v.vpd_free_rw;
+                etp = pAC->vpd.vpd_buf + (vpd_size - free - 1 - 3);
+        }
+        else {
+                /* end tag is "RV" */
+                free = pAC->vpd.v.vpd_free_ro;
+                etp = pAC->vpd.vpd_buf + (vpd_size/2 - free - 4);
+        }
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                ("Free RO = %d, Free RW = %d\n",
+                pAC->vpd.v.vpd_free_ro, pAC->vpd.v.vpd_free_rw));
+
+        head = 0;
+        found = 0;
+        if (op == OWR_KEY) {
+                if (vpd_find_para(pAC, key, &vp)) {
+                        found = 3;
+                        ip = vp.p_val - 3;
+                        free += vp.p_len + 3;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                                ("Overwrite Key\n"));
+                }
+                else {
+                        op = ADD_KEY;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_CTRL,
+                                ("Add Key\n"));
+                }
+        }
+        if (op == ADD_KEY) {
+                ip = etp;
+                vp.p_len = 0;
+                head = 3;
+        }
+
+        if (len + 3 > free) {
+                if (free < 7) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("VPD Buffer Overflow, keyword not written\n"));
+                        return(4);
+                }
+                /* cut it again */
+                len = free - 3;
+                rtv = 2;
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                        ("VPD Buffer Full, Keyword was cut\n"));
+        }
+
+        vpd_move_para(ip + vp.p_len + found, etp+2, len-vp.p_len+head);
+        vpd_insert_key(key, buf, len, ip);
+        if (vpd_mod_endtag(pAC, etp + len - vp.p_len + head)) {
+                pAC->vpd.v.vpd_status &= ~VPD_VALID;
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                        ("VPD Encoding Error\n"));
+                return(6);
+        }
+
+        return(rtv);
+}
+
+
+/*
+ *      Read the contents of the VPD EEPROM and copy it to the
+ *      VPD buffer if not already done.
+ *
+ * return:      A pointer to the vpd_status structure. The structure contains
+ *              this fields.
+ */
+SK_VPD_STATUS *VpdStat(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  IoC)    /* IO Context */
+{
+        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
+                (void)VpdInit(pAC, IoC);
+        }
+        return(&pAC->vpd.v);
+}
+
+
+/*
+ *      Read the contents of the VPD EEPROM and copy it to the VPD
+ *      buffer if not already done.
+ *      Scan the VPD buffer for VPD keywords and create the VPD
+ *      keyword list by copying the keywords to 'buf', all after
+ *      each other and terminated with a '\0'.
+ *
+ * Exceptions:  o The Resource Type ID String (product name) is called "Name"
+ *              o The VPD end tags 'RV' and 'RW' are not listed
+ *
+ *      The number of copied keywords is counted in 'elements'.
+ *
+ * returns      0:      success
+ *              2:      buffer overfull, one or more keywords are missing
+ *              6:      fatal VPD error
+ *
+ *      example values after returning:
+ *
+ *              buf =   "Name\0PN\0EC\0MN\0SN\0CP\0VF\0VL\0YA\0"
+ *              *len =          30
+ *              *elements =      9
+ */
+int VpdKeys(
+SK_AC   *pAC,           /* common data base */
+SK_IOC  IoC,            /* IO Context */
+char    *buf,           /* buffer where to copy the keywords */
+int             *len,           /* buffer length */
+int             *elements)      /* number of keywords returned */
+{
+        char *v;
+        int n;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX, ("list VPD keys .. "));
+        *elements = 0;
+        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
+                if (VpdInit(pAC, IoC) != 0) {
+                        *len = 0;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("VPD Init Error, terminated\n"));
+                        return(6);
+                }
+        }
+
+        if ((signed)strlen(VPD_NAME) + 1 <= *len) {
+                v = pAC->vpd.vpd_buf;
+                strcpy(buf,VPD_NAME);
+                n = strlen(VPD_NAME) + 1;
+                buf += n;
+                *elements = 1;
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX,
+                        ("'%c%c' ",v[0],v[1]));
+        }
+        else {
+                *len = 0;
+                SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_ERR,
+                        ("buffer overflow\n"));
+                return(2);
+        }
+
+        v += 3 + VPD_GET_RES_LEN(v) + 3;
+        for (;; ) {
+                /* exit when reaching the "RW" Tag */
+                if (SK_MEMCMP(VPD_RW,v,2) == 0) {
+                        break;
+                }
+
+                if (SK_MEMCMP(VPD_RV,v,2) == 0) {
+                        v += 3 + VPD_GET_VPD_LEN(v) + 3;        /* skip VPD-W */
+                        continue;
+                }
+
+                if (n+3 <= *len) {
+                        SK_MEMCPY(buf,v,2);
+                        buf += 2;
+                        *buf++ = '\0';
+                        n += 3;
+                        v += 3 + VPD_GET_VPD_LEN(v);
+                        *elements += 1;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX,
+                                ("'%c%c' ",v[0],v[1]));
+                }
+                else {
+                        *len = n;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("buffer overflow\n"));
+                        return(2);
+                }
+        }
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX, ("\n"));
+        *len = n;
+        return(0);
+}
+
+
+/*
+ *      Read the contents of the VPD EEPROM and copy it to the
+ *      VPD buffer if not already done. Search for the VPD keyword
+ *      'key' and copy its value to 'buf'. Add a terminating '\0'.
+ *      If the value does not fit into the buffer cut it after
+ *      'len' - 1 bytes.
+ *
+ * returns      0:      success
+ *              1:      keyword not found
+ *              2:      value string was cut
+ *              3:      VPD transfer timeout
+ *              6:      fatal VPD error
+ */
+int VpdRead(
+SK_AC           *pAC,   /* common data base */
+SK_IOC          IoC,    /* IO Context */
+const char      *key,   /* keyword to read (e.g. "MN") */
+char            *buf,   /* buffer where to copy the keyword value */
+int                     *len)   /* buffer length */
+{
+        SK_VPD_PARA *p, vp;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX, ("VPD read %s .. ", key));
+        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
+                if (VpdInit(pAC, IoC) != 0) {
+                        *len = 0;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("VPD init error\n"));
+                        return(6);
+                }
+        }
+
+        if ((p = vpd_find_para(pAC, key, &vp)) != NULL) {
+                if (p->p_len > (*(unsigned *)len)-1) {
+                        p->p_len = *len - 1;
+                }
+                SK_MEMCPY(buf, p->p_val, p->p_len);
+                buf[p->p_len] = '\0';
+                *len = p->p_len;
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_RX,
+                        ("%c%c%c%c.., len = %d\n",
+                        buf[0],buf[1],buf[2],buf[3],*len));
+        }
+        else {
+                *len = 0;
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR, ("not found\n"));
+                return(1);
+        }
+        return(0);
+}
+
+
+/*
+ *      Check whether a given key may be written
+ *
+ * returns
+ *      SK_TRUE         Yes it may be written
+ *      SK_FALSE        No it may be written
+ */
+SK_BOOL VpdMayWrite(
+char    *key)   /* keyword to write (allowed values "Yx", "Vx") */
+{
+        if ((*key != 'Y' && *key != 'V') ||
+                key[1] < '0' || key[1] > 'Z' ||
+                (key[1] > '9' && key[1] < 'A') || strlen(key) != 2) {
+
+                return(SK_FALSE);
+        }
+        return(SK_TRUE);
+}
+
+/*
+ *      Read the contents of the VPD EEPROM and copy it to the VPD
+ *      buffer if not already done. Insert/overwrite the keyword 'key'
+ *      in the VPD buffer. Cut the keyword value if it does not fit
+ *      into the VPD read / write area.
+ *
+ * returns      0:      success
+ *              2:      value string was cut
+ *              3:      VPD transfer timeout
+ *              4:      VPD full, keyword was not written
+ *              5:      keyword cannot be written
+ *              6:      fatal VPD error
+ */
+int VpdWrite(
+SK_AC           *pAC,   /* common data base */
+SK_IOC          IoC,    /* IO Context */
+const char      *key,   /* keyword to write (allowed values "Yx", "Vx") */
+const char      *buf)   /* buffer where the keyword value can be read from */
+{
+        int len;                /* length of the keyword to write */
+        int rtv;                /* return code */
+        int rtv2;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_TX,
+                ("VPD write %s = %s\n",key,buf));
+
+        if ((*key != 'Y' && *key != 'V') ||
+                key[1] < '0' || key[1] > 'Z' ||
+                (key[1] > '9' && key[1] < 'A') || strlen(key) != 2) {
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                        ("illegal key tag, keyword not written\n"));
+                return(5);
+        }
+
+        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
+                if (VpdInit(pAC, IoC) != 0) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("VPD init error\n"));
+                        return(6);
+                }
+        }
+
+        rtv = 0;
+        len = strlen(buf);
+        if (len > VPD_MAX_LEN) {
+                /* cut it */
+                len = VPD_MAX_LEN;
+                rtv = 2;
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                        ("keyword too long, cut after %d bytes\n",VPD_MAX_LEN));
+        }
+        if ((rtv2 = VpdSetupPara(pAC, key, buf, len, VPD_RW_KEY, OWR_KEY)) != 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                        ("VPD write error\n"));
+                return(rtv2);
+        }
+
+        return(rtv);
+}
+
+/*
+ *      Read the contents of the VPD EEPROM and copy it to the
+ *      VPD buffer if not already done. Remove the VPD keyword
+ *      'key' from the VPD buffer.
+ *      Only the keywords in the read/write area can be deleted.
+ *      Keywords in the read only area cannot be deleted.
+ *
+ * returns      0:      success, keyword was removed
+ *              1:      keyword not found
+ *              5:      keyword cannot be deleted
+ *              6:      fatal VPD error
+ */
+int VpdDelete(
+SK_AC   *pAC,   /* common data base */
+SK_IOC  IoC,    /* IO Context */
+char    *key)   /* keyword to read (e.g. "MN") */
+{
+        SK_VPD_PARA *p, vp;
+        char *etp;
+        int     vpd_size;
+
+        vpd_size = pAC->vpd.vpd_size;
+
+        SK_DBG_MSG(pAC,SK_DBGMOD_VPD,SK_DBGCAT_TX,("VPD delete key %s\n",key));
+        if ((pAC->vpd.v.vpd_status & VPD_VALID) == 0) {
+                if (VpdInit(pAC, IoC) != 0) {
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("VPD init error\n"));
+                        return(6);
+                }
+        }
+
+        if ((p = vpd_find_para(pAC, key, &vp)) != NULL) {
+                if (p->p_val < pAC->vpd.vpd_buf + vpd_size/2) {
+                        /* try to delete read only keyword */
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("cannot delete RO keyword\n"));
+                        return(5);
+                }
+
+                etp = pAC->vpd.vpd_buf + (vpd_size-pAC->vpd.v.vpd_free_rw-1-3);
+
+                vpd_move_para(vp.p_val+vp.p_len, etp+2,
+                        - ((int)(vp.p_len + 3)));
+                if (vpd_mod_endtag(pAC, etp - vp.p_len - 3)) {
+                        pAC->vpd.v.vpd_status &= ~VPD_VALID;
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("VPD encoding error\n"));
+                        return(6);
+                }
+        }
+        else {
+                SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                        ("keyword not found\n"));
+                return(1);
+        }
+
+        return(0);
+}
+
+/*
+ *      If the VPD buffer contains valid data write the VPD
+ *      read/write area back to the VPD EEPROM.
+ *
+ * returns      0:      success
+ *              3:      VPD transfer timeout
+ */
+int VpdUpdate(
+SK_AC   *pAC,   /* Adapters context */
+SK_IOC  IoC)    /* IO Context */
+{
+        int vpd_size;
+
+        vpd_size = pAC->vpd.vpd_size;
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_TX, ("VPD update .. "));
+        if ((pAC->vpd.v.vpd_status & VPD_VALID) != 0) {
+                if (VpdTransferBlock(pAC, IoC, pAC->vpd.vpd_buf + vpd_size/2,
+                        vpd_size/2, vpd_size/2, VPD_WRITE) != vpd_size/2) {
+
+                        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR,
+                                ("transfer timed out\n"));
+                        return(3);
+                }
+        }
+        SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_TX, ("done\n"));
+        return(0);
+}
+
diff --git a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c
new file mode 100644
index 0000000000..b4e75022a6
--- /dev/null
+++ b/drivers/net/sk98lin/skxmac2.c
@@ -0,0 +1,4160 @@
+/******************************************************************************
+ *
+ * Name:        skxmac2.c
+ * Project:     Gigabit Ethernet Adapters, Common Modules
+ * Version:     $Revision: 1.102 $
+ * Date:        $Date: 2003/10/02 16:53:58 $
+ * Purpose:     Contains functions to initialize the MACs and PHYs
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (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
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#include "h/skdrv1st.h"
+#include "h/skdrv2nd.h"
+
+/* typedefs *******************************************************************/
+
+/* BCOM PHY magic pattern list */
+typedef struct s_PhyHack {
+        int             PhyReg;         /* Phy register */
+        SK_U16  PhyVal;         /* Value to write */
+} BCOM_HACK;
+
+/* local variables ************************************************************/
+
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+static const char SysKonnectFileId[] =
+        "@(#) $Id: skxmac2.c,v 1.102 2003/10/02 16:53:58 rschmidt Exp $ (C) Marvell.";
+#endif
+
+#ifdef GENESIS
+static BCOM_HACK BcomRegA1Hack[] = {
+ { 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1104 }, { 0x17, 0x0013 },
+ { 0x15, 0x0404 }, { 0x17, 0x8006 }, { 0x15, 0x0132 }, { 0x17, 0x8006 },
+ { 0x15, 0x0232 }, { 0x17, 0x800D }, { 0x15, 0x000F }, { 0x18, 0x0420 },
+ { 0, 0 }
+};
+static BCOM_HACK BcomRegC0Hack[] = {
+ { 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1204 }, { 0x17, 0x0013 },
+ { 0x15, 0x0A04 }, { 0x18, 0x0420 },
+ { 0, 0 }
+};
+#endif
+
+/* function prototypes ********************************************************/
+#ifdef GENESIS
+static void     SkXmInitPhyXmac(SK_AC*, SK_IOC, int, SK_BOOL);
+static void     SkXmInitPhyBcom(SK_AC*, SK_IOC, int, SK_BOOL);
+static int      SkXmAutoNegDoneXmac(SK_AC*, SK_IOC, int);
+static int      SkXmAutoNegDoneBcom(SK_AC*, SK_IOC, int);
+#endif /* GENESIS */
+#ifdef YUKON
+static void     SkGmInitPhyMarv(SK_AC*, SK_IOC, int, SK_BOOL);
+static int      SkGmAutoNegDoneMarv(SK_AC*, SK_IOC, int);
+#endif /* YUKON */
+#ifdef OTHER_PHY
+static void     SkXmInitPhyLone(SK_AC*, SK_IOC, int, SK_BOOL);
+static void     SkXmInitPhyNat (SK_AC*, SK_IOC, int, SK_BOOL);
+static int      SkXmAutoNegDoneLone(SK_AC*, SK_IOC, int);
+static int      SkXmAutoNegDoneNat (SK_AC*, SK_IOC, int);
+#endif /* OTHER_PHY */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmPhyRead() - Read from XMAC PHY register
+ *
+ * Description: reads a 16-bit word from XMAC PHY or ext. PHY
+ *
+ * Returns:
+ *      nothing
+ */
+void SkXmPhyRead(
+SK_AC   *pAC,                   /* Adapter Context */
+SK_IOC  IoC,                    /* I/O Context */
+int             Port,                   /* Port Index (MAC_1 + n) */
+int             PhyReg,                 /* Register Address (Offset) */
+SK_U16  SK_FAR *pVal)   /* Pointer to Value */
+{
+        SK_U16          Mmu;
+        SK_GEPORT       *pPrt;
+
+        pPrt = &pAC->GIni.GP[Port];
+        
+        /* write the PHY register's address */
+        XM_OUT16(IoC, Port, XM_PHY_ADDR, PhyReg | pPrt->PhyAddr);
+        
+        /* get the PHY register's value */
+        XM_IN16(IoC, Port, XM_PHY_DATA, pVal);
+        
+        if (pPrt->PhyType != SK_PHY_XMAC) {
+                do {
+                        XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
+                        /* wait until 'Ready' is set */
+                } while ((Mmu & XM_MMU_PHY_RDY) == 0);
+
+                /* get the PHY register's value */
+                XM_IN16(IoC, Port, XM_PHY_DATA, pVal);
+        }
+}       /* SkXmPhyRead */
+
+
+/******************************************************************************
+ *
+ *      SkXmPhyWrite() - Write to XMAC PHY register
+ *
+ * Description: writes a 16-bit word to XMAC PHY or ext. PHY
+ *
+ * Returns:
+ *      nothing
+ */
+void SkXmPhyWrite(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+int             Port,           /* Port Index (MAC_1 + n) */
+int             PhyReg,         /* Register Address (Offset) */
+SK_U16  Val)            /* Value */
+{
+        SK_U16          Mmu;
+        SK_GEPORT       *pPrt;
+
+        pPrt = &pAC->GIni.GP[Port];
+        
+        if (pPrt->PhyType != SK_PHY_XMAC) {
+                do {
+                        XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
+                        /* wait until 'Busy' is cleared */
+                } while ((Mmu & XM_MMU_PHY_BUSY) != 0);
+        }
+        
+        /* write the PHY register's address */
+        XM_OUT16(IoC, Port, XM_PHY_ADDR, PhyReg | pPrt->PhyAddr);
+        
+        /* write the PHY register's value */
+        XM_OUT16(IoC, Port, XM_PHY_DATA, Val);
+        
+        if (pPrt->PhyType != SK_PHY_XMAC) {
+                do {
+                        XM_IN16(IoC, Port, XM_MMU_CMD, &Mmu);
+                        /* wait until 'Busy' is cleared */
+                } while ((Mmu & XM_MMU_PHY_BUSY) != 0);
+        }
+}       /* SkXmPhyWrite */
+#endif /* GENESIS */
+
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ *      SkGmPhyRead() - Read from GPHY register
+ *
+ * Description: reads a 16-bit word from GPHY through MDIO
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGmPhyRead(
+SK_AC   *pAC,                   /* Adapter Context */
+SK_IOC  IoC,                    /* I/O Context */
+int             Port,                   /* Port Index (MAC_1 + n) */
+int             PhyReg,                 /* Register Address (Offset) */
+SK_U16  SK_FAR *pVal)   /* Pointer to Value */
+{
+        SK_U16  Ctrl;
+        SK_GEPORT       *pPrt;
+#ifdef VCPU
+        u_long SimCyle;
+        u_long SimLowTime;
+        
+        VCPUgetTime(&SimCyle, &SimLowTime);
+        VCPUprintf(0, "SkGmPhyRead(%u), SimCyle=%u, SimLowTime=%u\n",
+                PhyReg, SimCyle, SimLowTime);
+#endif /* VCPU */
+        
+        pPrt = &pAC->GIni.GP[Port];
+        
+        /* set PHY-Register offset and 'Read' OpCode (= 1) */
+        *pVal = (SK_U16)(GM_SMI_CT_PHY_AD(pPrt->PhyAddr) |
+                GM_SMI_CT_REG_AD(PhyReg) | GM_SMI_CT_OP_RD);
+
+        GM_OUT16(IoC, Port, GM_SMI_CTRL, *pVal);
+
+        GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
+        
+        /* additional check for MDC/MDIO activity */
+        if ((Ctrl & GM_SMI_CT_BUSY) == 0) {
+                *pVal = 0;
+                return;
+        }
+
+        *pVal |= GM_SMI_CT_BUSY;
+        
+        do {
+#ifdef VCPU
+                VCPUwaitTime(1000);
+#endif /* VCPU */
+
+                GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
+
+        /* wait until 'ReadValid' is set */
+        } while (Ctrl == *pVal);
+        
+        /* get the PHY register's value */
+        GM_IN16(IoC, Port, GM_SMI_DATA, pVal);
+
+#ifdef VCPU
+        VCPUgetTime(&SimCyle, &SimLowTime);
+        VCPUprintf(0, "VCPUgetTime(), SimCyle=%u, SimLowTime=%u\n",
+                SimCyle, SimLowTime);
+#endif /* VCPU */
+
+}       /* SkGmPhyRead */
+
+
+/******************************************************************************
+ *
+ *      SkGmPhyWrite() - Write to GPHY register
+ *
+ * Description: writes a 16-bit word to GPHY through MDIO
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGmPhyWrite(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+int             Port,           /* Port Index (MAC_1 + n) */
+int             PhyReg,         /* Register Address (Offset) */
+SK_U16  Val)            /* Value */
+{
+        SK_U16  Ctrl;
+        SK_GEPORT       *pPrt;
+#ifdef VCPU
+        SK_U32  DWord;
+        u_long  SimCyle;
+        u_long  SimLowTime;
+        
+        VCPUgetTime(&SimCyle, &SimLowTime);
+        VCPUprintf(0, "SkGmPhyWrite(Reg=%u, Val=0x%04x), SimCyle=%u, SimLowTime=%u\n",
+                PhyReg, Val, SimCyle, SimLowTime);
+#endif /* VCPU */
+        
+        pPrt = &pAC->GIni.GP[Port];
+        
+        /* write the PHY register's value */
+        GM_OUT16(IoC, Port, GM_SMI_DATA, Val);
+        
+        /* set PHY-Register offset and 'Write' OpCode (= 0) */
+        Val = GM_SMI_CT_PHY_AD(pPrt->PhyAddr) | GM_SMI_CT_REG_AD(PhyReg);
+
+        GM_OUT16(IoC, Port, GM_SMI_CTRL, Val);
+
+        GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
+        
+        /* additional check for MDC/MDIO activity */
+        if ((Ctrl & GM_SMI_CT_BUSY) == 0) {
+                return;
+        }
+        
+        Val |= GM_SMI_CT_BUSY;
+
+        do {
+#ifdef VCPU
+                /* read Timer value */
+                SK_IN32(IoC, B2_TI_VAL, &DWord);
+
+                VCPUwaitTime(1000);
+#endif /* VCPU */
+
+                GM_IN16(IoC, Port, GM_SMI_CTRL, &Ctrl);
+
+        /* wait until 'Busy' is cleared */
+        } while (Ctrl == Val);
+        
+#ifdef VCPU
+        VCPUgetTime(&SimCyle, &SimLowTime);
+        VCPUprintf(0, "VCPUgetTime(), SimCyle=%u, SimLowTime=%u\n",
+                SimCyle, SimLowTime);
+#endif /* VCPU */
+
+}       /* SkGmPhyWrite */
+#endif /* YUKON */
+
+
+#ifdef SK_DIAG
+/******************************************************************************
+ *
+ *      SkGePhyRead() - Read from PHY register
+ *
+ * Description: calls a read PHY routine dep. on board type
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGePhyRead(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+int             Port,           /* Port Index (MAC_1 + n) */
+int             PhyReg,         /* Register Address (Offset) */
+SK_U16  *pVal)          /* Pointer to Value */
+{
+        void (*r_func)(SK_AC *pAC, SK_IOC IoC, int Port, int Reg, SK_U16 *pVal);
+
+        if (pAC->GIni.GIGenesis) {
+                r_func = SkXmPhyRead;
+        }
+        else {
+                r_func = SkGmPhyRead;
+        }
+        
+        r_func(pAC, IoC, Port, PhyReg, pVal);
+}       /* SkGePhyRead */
+
+
+/******************************************************************************
+ *
+ *      SkGePhyWrite() - Write to PHY register
+ *
+ * Description: calls a write PHY routine dep. on board type
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGePhyWrite(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* I/O Context */
+int             Port,           /* Port Index (MAC_1 + n) */
+int             PhyReg,         /* Register Address (Offset) */
+SK_U16  Val)            /* Value */
+{
+        void (*w_func)(SK_AC *pAC, SK_IOC IoC, int Port, int Reg, SK_U16 Val);
+
+        if (pAC->GIni.GIGenesis) {
+                w_func = SkXmPhyWrite;
+        }
+        else {
+                w_func = SkGmPhyWrite;
+        }
+        
+        w_func(pAC, IoC, Port, PhyReg, Val);
+}       /* SkGePhyWrite */
+#endif /* SK_DIAG */
+
+
+/******************************************************************************
+ *
+ *      SkMacPromiscMode() - Enable / Disable Promiscuous Mode
+ *
+ * Description:
+ *   enables / disables promiscuous mode by setting Mode Register (XMAC) or
+ *   Receive Control Register (GMAC) dep. on board type         
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacPromiscMode(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port,   /* Port Index (MAC_1 + n) */
+SK_BOOL Enable) /* Enable / Disable */
+{
+#ifdef YUKON
+        SK_U16  RcReg;
+#endif
+#ifdef GENESIS
+        SK_U32  MdReg;
+#endif  
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                XM_IN32(IoC, Port, XM_MODE, &MdReg);
+                /* enable or disable promiscuous mode */
+                if (Enable) {
+                        MdReg |= XM_MD_ENA_PROM;
+                }
+                else {
+                        MdReg &= ~XM_MD_ENA_PROM;
+                }
+                /* setup Mode Register */
+                XM_OUT32(IoC, Port, XM_MODE, MdReg);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                GM_IN16(IoC, Port, GM_RX_CTRL, &RcReg);
+                
+                /* enable or disable unicast and multicast filtering */
+                if (Enable) {
+                        RcReg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
+                }
+                else {
+                        RcReg |= (GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
+                }
+                /* setup Receive Control Register */
+                GM_OUT16(IoC, Port, GM_RX_CTRL, RcReg);
+        }
+#endif /* YUKON */
+
+}       /* SkMacPromiscMode*/
+
+
+/******************************************************************************
+ *
+ *      SkMacHashing() - Enable / Disable Hashing
+ *
+ * Description:
+ *   enables / disables hashing by setting Mode Register (XMAC) or
+ *   Receive Control Register (GMAC) dep. on board type         
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacHashing(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port,   /* Port Index (MAC_1 + n) */
+SK_BOOL Enable) /* Enable / Disable */
+{
+#ifdef YUKON
+        SK_U16  RcReg;
+#endif  
+#ifdef GENESIS
+        SK_U32  MdReg;
+#endif
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                XM_IN32(IoC, Port, XM_MODE, &MdReg);
+                /* enable or disable hashing */
+                if (Enable) {
+                        MdReg |= XM_MD_ENA_HASH;
+                }
+                else {
+                        MdReg &= ~XM_MD_ENA_HASH;
+                }
+                /* setup Mode Register */
+                XM_OUT32(IoC, Port, XM_MODE, MdReg);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                GM_IN16(IoC, Port, GM_RX_CTRL, &RcReg);
+                
+                /* enable or disable multicast filtering */
+                if (Enable) {
+                        RcReg |= GM_RXCR_MCF_ENA;
+                }
+                else {
+                        RcReg &= ~GM_RXCR_MCF_ENA;
+                }
+                /* setup Receive Control Register */
+                GM_OUT16(IoC, Port, GM_RX_CTRL, RcReg);
+        }
+#endif /* YUKON */
+
+}       /* SkMacHashing*/
+
+
+#ifdef SK_DIAG
+/******************************************************************************
+ *
+ *      SkXmSetRxCmd() - Modify the value of the XMAC's Rx Command Register
+ *
+ * Description:
+ *      The features
+ *       - FCS stripping,                                       SK_STRIP_FCS_ON/OFF
+ *       - pad byte stripping,                          SK_STRIP_PAD_ON/OFF
+ *       - don't set XMR_FS_ERR in status       SK_LENERR_OK_ON/OFF
+ *         for inrange length error frames
+ *       - don't set XMR_FS_ERR in status       SK_BIG_PK_OK_ON/OFF
+ *         for frames > 1514 bytes
+ *   - enable Rx of own packets         SK_SELF_RX_ON/OFF
+ *
+ *      for incoming packets may be enabled/disabled by this function.
+ *      Additional modes may be added later.
+ *      Multiple modes can be enabled/disabled at the same time.
+ *      The new configuration is written to the Rx Command register immediately.
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmSetRxCmd(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+int             Mode)           /* Mode is SK_STRIP_FCS_ON/OFF, SK_STRIP_PAD_ON/OFF,
+                                           SK_LENERR_OK_ON/OFF, or SK_BIG_PK_OK_ON/OFF */
+{
+        SK_U16  OldRxCmd;
+        SK_U16  RxCmd;
+
+        XM_IN16(IoC, Port, XM_RX_CMD, &OldRxCmd);
+
+        RxCmd = OldRxCmd;
+        
+        switch (Mode & (SK_STRIP_FCS_ON | SK_STRIP_FCS_OFF)) {
+        case SK_STRIP_FCS_ON:
+                RxCmd |= XM_RX_STRIP_FCS;
+                break;
+        case SK_STRIP_FCS_OFF:
+                RxCmd &= ~XM_RX_STRIP_FCS;
+                break;
+        }
+
+        switch (Mode & (SK_STRIP_PAD_ON | SK_STRIP_PAD_OFF)) {
+        case SK_STRIP_PAD_ON:
+                RxCmd |= XM_RX_STRIP_PAD;
+                break;
+        case SK_STRIP_PAD_OFF:
+                RxCmd &= ~XM_RX_STRIP_PAD;
+                break;
+        }
+
+        switch (Mode & (SK_LENERR_OK_ON | SK_LENERR_OK_OFF)) {
+        case SK_LENERR_OK_ON:
+                RxCmd |= XM_RX_LENERR_OK;
+                break;
+        case SK_LENERR_OK_OFF:
+                RxCmd &= ~XM_RX_LENERR_OK;
+                break;
+        }
+
+        switch (Mode & (SK_BIG_PK_OK_ON | SK_BIG_PK_OK_OFF)) {
+        case SK_BIG_PK_OK_ON:
+                RxCmd |= XM_RX_BIG_PK_OK;
+                break;
+        case SK_BIG_PK_OK_OFF:
+                RxCmd &= ~XM_RX_BIG_PK_OK;
+                break;
+        }
+
+        switch (Mode & (SK_SELF_RX_ON | SK_SELF_RX_OFF)) {
+        case SK_SELF_RX_ON:
+                RxCmd |= XM_RX_SELF_RX;
+                break;
+        case SK_SELF_RX_OFF:
+                RxCmd &= ~XM_RX_SELF_RX;
+                break;
+        }
+
+        /* Write the new mode to the Rx command register if required */
+        if (OldRxCmd != RxCmd) {
+                XM_OUT16(IoC, Port, XM_RX_CMD, RxCmd);
+        }
+}       /* SkXmSetRxCmd */
+
+
+/******************************************************************************
+ *
+ *      SkGmSetRxCmd() - Modify the value of the GMAC's Rx Control Register
+ *
+ * Description:
+ *      The features
+ *       - FCS (CRC) stripping,                         SK_STRIP_FCS_ON/OFF
+ *       - don't set GMR_FS_LONG_ERR            SK_BIG_PK_OK_ON/OFF
+ *         for frames > 1514 bytes
+ *   - enable Rx of own packets         SK_SELF_RX_ON/OFF
+ *
+ *      for incoming packets may be enabled/disabled by this function.
+ *      Additional modes may be added later.
+ *      Multiple modes can be enabled/disabled at the same time.
+ *      The new configuration is written to the Rx Command register immediately.
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGmSetRxCmd(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+int             Mode)           /* Mode is SK_STRIP_FCS_ON/OFF, SK_STRIP_PAD_ON/OFF,
+                                           SK_LENERR_OK_ON/OFF, or SK_BIG_PK_OK_ON/OFF */
+{
+        SK_U16  OldRxCmd;
+        SK_U16  RxCmd;
+
+        if ((Mode & (SK_STRIP_FCS_ON | SK_STRIP_FCS_OFF)) != 0) {
+                
+                GM_IN16(IoC, Port, GM_RX_CTRL, &OldRxCmd);
+
+                RxCmd = OldRxCmd;
+
+                if ((Mode & SK_STRIP_FCS_ON) != 0) {
+                        RxCmd |= GM_RXCR_CRC_DIS;
+                }
+                else {
+                        RxCmd &= ~GM_RXCR_CRC_DIS;
+                }
+                /* Write the new mode to the Rx control register if required */
+                if (OldRxCmd != RxCmd) {
+                        GM_OUT16(IoC, Port, GM_RX_CTRL, RxCmd);
+                }
+        }
+
+        if ((Mode & (SK_BIG_PK_OK_ON | SK_BIG_PK_OK_OFF)) != 0) {
+                
+                GM_IN16(IoC, Port, GM_SERIAL_MODE, &OldRxCmd);
+
+                RxCmd = OldRxCmd;
+
+                if ((Mode & SK_BIG_PK_OK_ON) != 0) {
+                        RxCmd |= GM_SMOD_JUMBO_ENA;
+                }
+                else {
+                        RxCmd &= ~GM_SMOD_JUMBO_ENA;
+                }
+                /* Write the new mode to the Rx control register if required */
+                if (OldRxCmd != RxCmd) {
+                        GM_OUT16(IoC, Port, GM_SERIAL_MODE, RxCmd);
+                }
+        }
+}       /* SkGmSetRxCmd */
+
+
+/******************************************************************************
+ *
+ *      SkMacSetRxCmd() - Modify the value of the MAC's Rx Control Register
+ *
+ * Description: modifies the MAC's Rx Control reg. dep. on board type
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacSetRxCmd(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+int             Mode)           /* Rx Mode */
+{
+        if (pAC->GIni.GIGenesis) {
+                
+                SkXmSetRxCmd(pAC, IoC, Port, Mode);
+        }
+        else {
+                
+                SkGmSetRxCmd(pAC, IoC, Port, Mode);
+        }
+
+}       /* SkMacSetRxCmd */
+
+
+/******************************************************************************
+ *
+ *      SkMacCrcGener() - Enable / Disable CRC Generation
+ *
+ * Description: enables / disables CRC generation dep. on board type
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacCrcGener(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port,   /* Port Index (MAC_1 + n) */
+SK_BOOL Enable) /* Enable / Disable */
+{
+        SK_U16  Word;
+
+        if (pAC->GIni.GIGenesis) {
+                
+                XM_IN16(IoC, Port, XM_TX_CMD, &Word);
+
+                if (Enable) {
+                        Word &= ~XM_TX_NO_CRC;
+                }
+                else {
+                        Word |= XM_TX_NO_CRC;
+                }
+                /* setup Tx Command Register */
+                XM_OUT16(IoC, Port, XM_TX_CMD, Word);
+        }
+        else {
+                
+                GM_IN16(IoC, Port, GM_TX_CTRL, &Word);
+                
+                if (Enable) {
+                        Word &= ~GM_TXCR_CRC_DIS;
+                }
+                else {
+                        Word |= GM_TXCR_CRC_DIS;
+                }
+                /* setup Tx Control Register */
+                GM_OUT16(IoC, Port, GM_TX_CTRL, Word);
+        }
+
+}       /* SkMacCrcGener*/
+
+#endif /* SK_DIAG */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmClrExactAddr() - Clear Exact Match Address Registers
+ *
+ * Description:
+ *      All Exact Match Address registers of the XMAC 'Port' will be
+ *      cleared starting with 'StartNum' up to (and including) the
+ *      Exact Match address number of 'StopNum'.
+ *
+ * Returns:
+ *      nothing
+ */
+void SkXmClrExactAddr(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+int             StartNum,       /* Begin with this Address Register Index (0..15) */
+int             StopNum)        /* Stop after finished with this Register Idx (0..15) */
+{
+        int             i;
+        SK_U16  ZeroAddr[3] = {0x0000, 0x0000, 0x0000};
+
+        if ((unsigned)StartNum > 15 || (unsigned)StopNum > 15 ||
+                StartNum > StopNum) {
+
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E001, SKERR_HWI_E001MSG);
+                return;
+        }
+
+        for (i = StartNum; i <= StopNum; i++) {
+                XM_OUTADDR(IoC, Port, XM_EXM(i), &ZeroAddr[0]);
+        }
+}       /* SkXmClrExactAddr */
+#endif /* GENESIS */
+
+
+/******************************************************************************
+ *
+ *      SkMacFlushTxFifo() - Flush the MAC's transmit FIFO
+ *
+ * Description:
+ *      Flush the transmit FIFO of the MAC specified by the index 'Port'
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacFlushTxFifo(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+#ifdef GENESIS
+        SK_U32  MdReg;
+
+        if (pAC->GIni.GIGenesis) {
+                
+                XM_IN32(IoC, Port, XM_MODE, &MdReg);
+
+                XM_OUT32(IoC, Port, XM_MODE, MdReg | XM_MD_FTF);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /* no way to flush the FIFO we have to issue a reset */
+                /* TBD */
+        }
+#endif /* YUKON */
+
+}       /* SkMacFlushTxFifo */
+
+
+/******************************************************************************
+ *
+ *      SkMacFlushRxFifo() - Flush the MAC's receive FIFO
+ *
+ * Description:
+ *      Flush the receive FIFO of the MAC specified by the index 'Port'
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkMacFlushRxFifo(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+#ifdef GENESIS
+        SK_U32  MdReg;
+
+        if (pAC->GIni.GIGenesis) {
+
+                XM_IN32(IoC, Port, XM_MODE, &MdReg);
+
+                XM_OUT32(IoC, Port, XM_MODE, MdReg | XM_MD_FRF);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /* no way to flush the FIFO we have to issue a reset */
+                /* TBD */
+        }
+#endif /* YUKON */
+
+}       /* SkMacFlushRxFifo */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmSoftRst() - Do a XMAC software reset
+ *
+ * Description:
+ *      The PHY registers should not be destroyed during this
+ *      kind of software reset. Therefore the XMAC Software Reset
+ *      (XM_GP_RES_MAC bit in XM_GP_PORT) must not be used!
+ *
+ *      The software reset is done by
+ *              - disabling the Rx and Tx state machine,
+ *              - resetting the statistics module,
+ *              - clear all other significant XMAC Mode,
+ *                Command, and Control Registers
+ *              - clearing the Hash Register and the
+ *                Exact Match Address registers, and
+ *              - flushing the XMAC's Rx and Tx FIFOs.
+ *
+ * Note:
+ *      Another requirement when stopping the XMAC is to
+ *      avoid sending corrupted frames on the network.
+ *      Disabling the Tx state machine will NOT interrupt
+ *      the currently transmitted frame. But we must take care
+ *      that the Tx FIFO is cleared AFTER the current frame
+ *      is complete sent to the network.
+ *
+ *      It takes about 12ns to send a frame with 1538 bytes.
+ *      One PCI clock goes at least 15ns (66MHz). Therefore
+ *      after reading XM_GP_PORT back, we are sure that the
+ *      transmitter is disabled AND idle. And this means
+ *      we may flush the transmit FIFO now.
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmSoftRst(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+        SK_U16  ZeroAddr[4] = {0x0000, 0x0000, 0x0000, 0x0000};
+        
+        /* reset the statistics module */
+        XM_OUT32(IoC, Port, XM_GP_PORT, XM_GP_RES_STAT);
+
+        /* disable all XMAC IRQs */
+        XM_OUT16(IoC, Port, XM_IMSK, 0xffff);
+        
+        XM_OUT32(IoC, Port, XM_MODE, 0);                /* clear Mode Reg */
+        
+        XM_OUT16(IoC, Port, XM_TX_CMD, 0);              /* reset TX CMD Reg */
+        XM_OUT16(IoC, Port, XM_RX_CMD, 0);              /* reset RX CMD Reg */
+        
+        /* disable all PHY IRQs */
+        switch (pAC->GIni.GP[Port].PhyType) {
+        case SK_PHY_BCOM:
+                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK, 0xffff);
+                        break;
+#ifdef OTHER_PHY
+                case SK_PHY_LONE:
+                        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_INT_ENAB, 0);
+                        break;
+                case SK_PHY_NAT:
+                        /* todo: National
+                         SkXmPhyWrite(pAC, IoC, Port, PHY_NAT_INT_MASK, 0xffff); */
+                        break;
+#endif /* OTHER_PHY */
+        }
+
+        /* clear the Hash Register */
+        XM_OUTHASH(IoC, Port, XM_HSM, &ZeroAddr);
+
+        /* clear the Exact Match Address registers */
+        SkXmClrExactAddr(pAC, IoC, Port, 0, 15);
+        
+        /* clear the Source Check Address registers */
+        XM_OUTHASH(IoC, Port, XM_SRC_CHK, &ZeroAddr);
+
+}       /* SkXmSoftRst */
+
+
+/******************************************************************************
+ *
+ *      SkXmHardRst() - Do a XMAC hardware reset
+ *
+ * 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 by clearing a bit in the GPIO register
+ *  (Timing requirements: Broadcom: 400ns, Level One: none, National: 80ns).
+ *
+ * ATTENTION:
+ *      It is absolutely necessary to reset the SW_RST Bit first
+ *      before calling this function.
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmHardRst(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+        SK_U32  Reg;
+        int             i;
+        int             TOut;
+        SK_U16  Word;
+
+        for (i = 0; i < 4; i++) {
+                /* TX_MFF_CTRL1 has 32 bits, but only the lowest 16 bits are used */
+                SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
+
+                TOut = 0;
+                do {
+                        if (TOut++ > 10000) {
+                                /*
+                                 * Adapter seems to be in RESET state.
+                                 * Registers cannot be written.
+                                 */
+                                return;
+                        }
+
+                        SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
+                        
+                        SK_IN16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), &Word);
+                
+                } while ((Word & MFF_SET_MAC_RST) == 0);
+        }
+
+        /* For external PHYs there must be special handling */
+        if (pAC->GIni.GP[Port].PhyType != SK_PHY_XMAC) {
+                
+                SK_IN32(IoC, B2_GP_IO, &Reg);
+                
+                if (Port == 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;        /* 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 */
+
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ *      SkGmSoftRst() - Do a GMAC software reset
+ *
+ * Description:
+ *      The GPHY registers should not be destroyed during this
+ *      kind of software reset.
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGmSoftRst(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+        SK_U16  EmptyHash[4] = {0x0000, 0x0000, 0x0000, 0x0000};
+        SK_U16  RxCtrl;
+
+        /* reset the statistics module */
+
+        /* disable all GMAC IRQs */
+        SK_OUT8(IoC, GMAC_IRQ_MSK, 0);
+        
+        /* disable all PHY IRQs */
+        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK, 0);
+        
+        /* clear the Hash Register */
+        GM_OUTHASH(IoC, Port, GM_MC_ADDR_H1, EmptyHash);
+
+        /* Enable Unicast and Multicast filtering */
+        GM_IN16(IoC, Port, GM_RX_CTRL, &RxCtrl);
+        
+        GM_OUT16(IoC, Port, GM_RX_CTRL,
+                (SK_U16)(RxCtrl | GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA));
+
+}       /* SkGmSoftRst */
+
+
+/******************************************************************************
+ *
+ *      SkGmHardRst() - Do a GMAC hardware reset
+ *
+ * Description:
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGmHardRst(
+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);
+
+        /* set GMAC Control reset */
+        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 */
+
+
+/******************************************************************************
+ *
+ *      SkMacSoftRst() - Do a MAC software reset
+ *
+ * Description: calls a MAC software reset routine dep. on board type
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacSoftRst(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* disable receiver and transmitter */
+        SkMacRxTxDisable(pAC, IoC, Port);
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                SkXmSoftRst(pAC, IoC, Port);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                SkGmSoftRst(pAC, IoC, Port);
+        }
+#endif /* YUKON */
+
+        /* flush the MAC's Rx and Tx FIFOs */
+        SkMacFlushTxFifo(pAC, IoC, Port);
+        
+        SkMacFlushRxFifo(pAC, IoC, Port);
+
+        pPrt->PState = SK_PRT_STOP;
+
+}       /* SkMacSoftRst */
+
+
+/******************************************************************************
+ *
+ *      SkMacHardRst() - Do a MAC hardware reset
+ *
+ * Description: calls a MAC hardware reset routine dep. on board type
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacHardRst(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port)   /* Port Index (MAC_1 + n) */
+{
+        
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                SkXmHardRst(pAC, IoC, Port);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                SkGmHardRst(pAC, IoC, Port);
+        }
+#endif /* YUKON */
+
+        pAC->GIni.GP[Port].PState = SK_PRT_RESET;
+
+}       /* SkMacHardRst */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmInitMac() - Initialize the XMAC II
+ *
+ * Description:
+ *      Initialize the XMAC of the specified port.
+ *      The XMAC must be reset or stopped before calling this function.
+ *
+ * Note:
+ *      The XMAC's Rx and Tx state machine is still disabled when returning.
+ *
+ * Returns:
+ *      nothing
+ */
+void SkXmInitMac(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        int                     i;
+        SK_U16          SWord;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PState == SK_PRT_STOP) {
+                /* Port State: SK_PRT_STOP */
+                /* Verify that the reset bit is cleared */
+                SK_IN16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), &SWord);
+
+                if ((SWord & MFF_SET_MAC_RST) != 0) {
+                        /* PState does not match HW state */
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E006, SKERR_HWI_E006MSG);
+                        /* Correct it */
+                        pPrt->PState = SK_PRT_RESET;
+                }
+        }
+
+        if (pPrt->PState == SK_PRT_RESET) {
+
+                SkXmClearRst(pAC, IoC, Port);
+
+                if (pPrt->PhyType != SK_PHY_XMAC) {
+                        /* read Id from external PHY (all have the same address) */
+                        SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_ID1, &pPrt->PhyId1);
+
+                        /*
+                         * Optimize MDIO transfer by suppressing preamble.
+                         * Must be done AFTER first access to BCOM chip.
+                         */
+                        XM_IN16(IoC, Port, XM_MMU_CMD, &SWord);
+                        
+                        XM_OUT16(IoC, Port, XM_MMU_CMD, SWord | XM_MMU_NO_PRE);
+
+                        if (pPrt->PhyId1 == PHY_BCOM_ID1_C0) {
+                                /*
+                                 * Workaround BCOM Errata for the C0 type.
+                                 * Write magic patterns to reserved registers.
+                                 */
+                                i = 0;
+                                while (BcomRegC0Hack[i].PhyReg != 0) {
+                                        SkXmPhyWrite(pAC, IoC, Port, BcomRegC0Hack[i].PhyReg,
+                                                BcomRegC0Hack[i].PhyVal);
+                                        i++;
+                                }
+                        }
+                        else if (pPrt->PhyId1 == PHY_BCOM_ID1_A1) {
+                                /*
+                                 * Workaround BCOM Errata for the A1 type.
+                                 * Write magic patterns to reserved registers.
+                                 */
+                                i = 0;
+                                while (BcomRegA1Hack[i].PhyReg != 0) {
+                                        SkXmPhyWrite(pAC, IoC, Port, BcomRegA1Hack[i].PhyReg,
+                                                BcomRegA1Hack[i].PhyVal);
+                                        i++;
+                                }
+                        }
+
+                        /*
+                         * Workaround BCOM Errata (#10523) for all BCom PHYs.
+                         * Disable Power Management after reset.
+                         */
+                        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &SWord);
+                        
+                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL,
+                                (SK_U16)(SWord | PHY_B_AC_DIS_PM));
+
+                        /* PHY LED initialization is done in SkGeXmitLED() */
+                }
+
+                /* Dummy read the Interrupt source register */
+                XM_IN16(IoC, Port, XM_ISRC, &SWord);
+                
+                /*
+                 * The auto-negotiation process starts immediately after
+                 * clearing the reset. The auto-negotiation process should be
+                 * started by the SIRQ, therefore stop it here immediately.
+                 */
+                SkMacInitPhy(pAC, IoC, Port, SK_FALSE);
+
+#ifdef TEST_ONLY
+                /* temp. code: enable signal detect */
+                /* WARNING: do not override GMII setting above */
+                XM_OUT16(IoC, Port, XM_HW_CFG, XM_HW_COM4SIG);
+#endif
+        }
+
+        /*
+         * configure the XMACs Station Address
+         * B2_MAC_2 = xx xx xx xx xx x1 is programmed to XMAC A
+         * B2_MAC_3 = xx xx xx xx xx x2 is programmed to XMAC B
+         */
+        for (i = 0; i < 3; i++) {
+                /*
+                 * The following 2 statements are together endianess
+                 * independent. Remember this when changing.
+                 */
+                SK_IN16(IoC, (B2_MAC_2 + Port * 8 + i * 2), &SWord);
+                
+                XM_OUT16(IoC, Port, (XM_SA + i * 2), SWord);
+        }
+
+        /* Tx Inter Packet Gap (XM_TX_IPG):     use default */
+        /* Tx High Water Mark (XM_TX_HI_WM):    use default */
+        /* Tx Low Water Mark (XM_TX_LO_WM):     use default */
+        /* Host Request Threshold (XM_HT_THR):  use default */
+        /* Rx Request Threshold (XM_RX_THR):    use default */
+        /* Rx Low Water Mark (XM_RX_LO_WM):     use default */
+
+        /* configure Rx High Water Mark (XM_RX_HI_WM) */
+        XM_OUT16(IoC, Port, XM_RX_HI_WM, SK_XM_RX_HI_WM);
+
+        /* Configure Tx Request Threshold */
+        SWord = SK_XM_THR_SL;                           /* for single port */
+
+        if (pAC->GIni.GIMacsFound > 1) {
+                switch (pAC->GIni.GIPortUsage) {
+                case SK_RED_LINK:
+                        SWord = SK_XM_THR_REDL;         /* redundant link */
+                        break;
+                case SK_MUL_LINK:
+                        SWord = SK_XM_THR_MULL;         /* load balancing */
+                        break;
+                case SK_JUMBO_LINK:
+                        SWord = SK_XM_THR_JUMBO;        /* jumbo frames */
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E014, SKERR_HWI_E014MSG);
+                        break;
+                }
+        }
+        XM_OUT16(IoC, Port, XM_TX_THR, SWord);
+
+        /* setup register defaults for the Tx Command Register */
+        XM_OUT16(IoC, Port, XM_TX_CMD, XM_TX_AUTO_PAD);
+
+        /* setup register defaults for the Rx Command Register */
+        SWord = XM_RX_STRIP_FCS | XM_RX_LENERR_OK;
+
+        if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK) {
+                SWord |= XM_RX_BIG_PK_OK;
+        }
+
+        if (pPrt->PLinkMode == SK_LMODE_HALF) {
+                /*
+                 * If in manual half duplex mode the other side might be in
+                 * full duplex mode, so ignore if a carrier extension is not seen
+                 * on frames received
+                 */
+                SWord |= XM_RX_DIS_CEXT;
+        }
+        
+        XM_OUT16(IoC, Port, XM_RX_CMD, SWord);
+
+        /*
+         * setup register defaults for the Mode Register
+         *      - Don't strip error frames to avoid Store & Forward
+         *        on the Rx side.
+         *      - Enable 'Check Station Address' bit
+         *      - Enable 'Check Address Array' bit
+         */
+        XM_OUT32(IoC, Port, XM_MODE, XM_DEF_MODE);
+
+        /*
+         * Initialize the Receive Counter Event Mask (XM_RX_EV_MSK)
+         *      - Enable all bits excepting 'Octets Rx OK Low CntOv'
+         *        and 'Octets Rx OK Hi Cnt Ov'.
+         */
+        XM_OUT32(IoC, Port, XM_RX_EV_MSK, XMR_DEF_MSK);
+
+        /*
+         * Initialize the Transmit Counter Event Mask (XM_TX_EV_MSK)
+         *      - Enable all bits excepting 'Octets Tx OK Low CntOv'
+         *        and 'Octets Tx OK Hi Cnt Ov'.
+         */
+        XM_OUT32(IoC, Port, XM_TX_EV_MSK, XMT_DEF_MSK);
+
+        /*
+         * Do NOT init XMAC interrupt mask here.
+         * All interrupts remain disable until link comes up!
+         */
+
+        /*
+         * Any additional configuration changes may be done now.
+         * The last action is to enable the Rx and Tx state machine.
+         * This should be done after the auto-negotiation process
+         * has been completed successfully.
+         */
+}       /* SkXmInitMac */
+#endif /* GENESIS */
+
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ *      SkGmInitMac() - Initialize the GMAC
+ *
+ * Description:
+ *      Initialize the GMAC of the specified port.
+ *      The GMAC must be reset or stopped before calling this function.
+ *
+ * Note:
+ *      The GMAC's Rx and Tx state machine is still disabled when returning.
+ *
+ * Returns:
+ *      nothing
+ */
+void SkGmInitMac(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        int                     i;
+        SK_U16          SWord;
+        SK_U32          DWord;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PState == SK_PRT_STOP) {
+                /* Port State: SK_PRT_STOP */
+                /* Verify that the reset bit is cleared */
+                SK_IN32(IoC, MR_ADDR(Port, GMAC_CTRL), &DWord);
+                
+                if ((DWord & GMC_RST_SET) != 0) {
+                        /* PState does not match HW state */
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E006, SKERR_HWI_E006MSG);
+                        /* Correct it */
+                        pPrt->PState = SK_PRT_RESET;
+                }
+        }
+
+        if (pPrt->PState == SK_PRT_RESET) {
+                
+                SkGmHardRst(pAC, IoC, Port);
+
+                SkGmClearRst(pAC, IoC, Port);
+                
+                /* Auto-negotiation ? */
+                if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+                        /* Auto-negotiation disabled */
+
+                        /* get General Purpose Control */
+                        GM_IN16(IoC, Port, GM_GP_CTRL, &SWord);
+
+                        /* disable auto-update for speed, duplex and flow-control */
+                        SWord |= GM_GPCR_AU_ALL_DIS;
+                        
+                        /* setup General Purpose Control Register */
+                        GM_OUT16(IoC, Port, GM_GP_CTRL, SWord);
+                        
+                        SWord = GM_GPCR_AU_ALL_DIS;
+                }
+                else {
+                        SWord = 0;
+                }
+
+                /* speed settings */
+                switch (pPrt->PLinkSpeed) {
+                case SK_LSPEED_AUTO:
+                case SK_LSPEED_1000MBPS:
+                        SWord |= GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100;
+                        break;
+                case SK_LSPEED_100MBPS:
+                        SWord |= GM_GPCR_SPEED_100;
+                        break;
+                case SK_LSPEED_10MBPS:
+                        break;
+                }
+
+                /* duplex settings */
+                if (pPrt->PLinkMode != SK_LMODE_HALF) {
+                        /* set full duplex */
+                        SWord |= GM_GPCR_DUP_FULL;
+                }
+
+                /* flow-control settings */
+                switch (pPrt->PFlowCtrlMode) {
+                case SK_FLOW_MODE_NONE:
+                        /* set Pause Off */
+                        SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_PAUSE_OFF);
+                        /* disable Tx & Rx flow-control */
+                        SWord |= GM_GPCR_FC_TX_DIS | GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
+                        break;
+                case SK_FLOW_MODE_LOC_SEND:
+                        /* disable Rx flow-control */
+                        SWord |= GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
+                        break;
+                case SK_FLOW_MODE_SYMMETRIC:
+                case SK_FLOW_MODE_SYM_OR_REM:
+                        /* enable Tx & Rx flow-control */
+                        break;
+                }
+
+                /* setup General Purpose Control Register */
+                GM_OUT16(IoC, Port, GM_GP_CTRL, SWord);
+
+                /* dummy read the Interrupt Source Register */
+                SK_IN16(IoC, GMAC_IRQ_SRC, &SWord);
+                
+#ifndef VCPU
+                /* read Id from PHY */
+                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_ID1, &pPrt->PhyId1);
+                
+                SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
+#endif /* VCPU */
+        }
+
+        (void)SkGmResetCounter(pAC, IoC, Port);
+
+        /* setup Transmit Control Register */
+        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 |
+                GM_RXCR_CRC_DIS);
+
+        /* setup Transmit Flow Control Register */
+        GM_OUT16(IoC, Port, GM_TX_FLOW_CTRL, 0xffff);
+
+        /* setup Transmit Parameter Register */
+#ifdef VCPU
+        GM_IN16(IoC, Port, GM_TX_PARAM, &SWord);
+#endif /* VCPU */
+
+    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);
+
+        /* configure the Serial Mode Register */
+#ifdef VCPU
+        GM_IN16(IoC, Port, GM_SERIAL_MODE, &SWord);
+#endif /* VCPU */
+        
+        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) */
+                SWord |= GM_SMOD_JUMBO_ENA;
+        }
+        
+        GM_OUT16(IoC, Port, GM_SERIAL_MODE, SWord);
+        
+        /*
+         * configure the GMACs Station Addresses
+         * in PROM you can find our addresses at:
+         * B2_MAC_1 = xx xx xx xx xx x0 virtual address
+         * B2_MAC_2 = xx xx xx xx xx x1 is programmed to GMAC A
+         * B2_MAC_3 = xx xx xx xx xx x2 is reserved for DualPort
+         */
+
+        for (i = 0; i < 3; i++) {
+                /*
+                 * The following 2 statements are together endianess
+                 * independent. Remember this when changing.
+                 */
+                /* physical address: will be used for pause frames */
+                SK_IN16(IoC, (B2_MAC_2 + Port * 8 + i * 2), &SWord);
+
+#ifdef WA_DEV_16
+                /* WA for deviation #16 */
+                if (pAC->GIni.GIChipId == CHIP_ID_YUKON && pAC->GIni.GIChipRev == 0) {
+                        /* swap the address bytes */
+                        SWord = ((SWord & 0xff00) >> 8) | ((SWord & 0x00ff) << 8);
+
+                        /* write to register in reversed order */
+                        GM_OUT16(IoC, Port, (GM_SRC_ADDR_1L + (2 - i) * 4), SWord);
+                }
+                else {
+                        GM_OUT16(IoC, Port, (GM_SRC_ADDR_1L + i * 4), SWord);
+                }
+#else           
+                GM_OUT16(IoC, Port, (GM_SRC_ADDR_1L + i * 4), SWord);
+#endif /* WA_DEV_16 */
+                
+                /* virtual address: will be used for data */
+                SK_IN16(IoC, (B2_MAC_1 + Port * 8 + i * 2), &SWord);
+
+                GM_OUT16(IoC, Port, (GM_SRC_ADDR_2L + i * 4), SWord);
+                
+                /* reset Multicast filtering Hash registers 1-3 */
+                GM_OUT16(IoC, Port, GM_MC_ADDR_H1 + 4*i, 0);
+        }
+
+        /* reset Multicast filtering Hash register 4 */
+        GM_OUT16(IoC, Port, GM_MC_ADDR_H4, 0);
+
+        /* enable interrupt mask for counter overflows */
+        GM_OUT16(IoC, Port, GM_TX_IRQ_MSK, 0);
+        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));
+#endif /* SK_DIAG || DEBUG */
+
+#ifdef SK_DIAG
+        c_print("MAC Stat Reg=0x%04X\n", SWord);
+#endif /* SK_DIAG */
+
+}       /* SkGmInitMac */
+#endif /* YUKON */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmInitDupMd() - Initialize the XMACs Duplex Mode
+ *
+ * Description:
+ *      This function initializes the XMACs Duplex Mode.
+ *      It should be called after successfully finishing
+ *      the Auto-negotiation Process
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmInitDupMd(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        switch (pAC->GIni.GP[Port].PLinkModeStatus) {
+        case SK_LMODE_STAT_AUTOHALF:
+        case SK_LMODE_STAT_HALF:
+                /* Configuration Actions for Half Duplex Mode */
+                /*
+                 * XM_BURST = default value. We are probable not quick
+                 *      enough at the 'XMAC' bus to burst 8kB.
+                 *      The XMAC stops bursting if no transmit frames
+                 *      are available or the burst limit is exceeded.
+                 */
+                /* XM_TX_RT_LIM = default value (15) */
+                /* XM_TX_STIME = default value (0xff = 4096 bit times) */
+                break;
+        case SK_LMODE_STAT_AUTOFULL:
+        case SK_LMODE_STAT_FULL:
+                /* Configuration Actions for Full Duplex Mode */
+                /*
+                 * The duplex mode is configured by the PHY,
+                 * therefore it seems to be that there is nothing
+                 * to do here.
+                 */
+                break;
+        case SK_LMODE_STAT_UNKNOWN:
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E007, SKERR_HWI_E007MSG);
+                break;
+        }
+}       /* SkXmInitDupMd */
+
+
+/******************************************************************************
+ *
+ *      SkXmInitPauseMd() - initialize the Pause Mode to be used for this port
+ *
+ * Description:
+ *      This function initializes the Pause Mode which should
+ *      be used for this port.
+ *      It should be called after successfully finishing
+ *      the Auto-negotiation Process
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmInitPauseMd(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U32          DWord;
+        SK_U16          Word;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
+        
+        if (pPrt->PFlowCtrlStatus == SK_FLOW_STAT_NONE ||
+                pPrt->PFlowCtrlStatus == SK_FLOW_STAT_LOC_SEND) {
+
+                /* Disable Pause Frame Reception */
+                Word |= XM_MMU_IGN_PF;
+        }
+        else {
+                /*
+                 * enabling pause frame reception is required for 1000BT
+                 * because the XMAC is not reset if the link is going down
+                 */
+                /* Enable Pause Frame Reception */
+                Word &= ~XM_MMU_IGN_PF;
+        }       
+        
+        XM_OUT16(IoC, Port, XM_MMU_CMD, Word);
+
+        XM_IN32(IoC, Port, XM_MODE, &DWord);
+
+        if (pPrt->PFlowCtrlStatus == SK_FLOW_STAT_SYMMETRIC ||
+                pPrt->PFlowCtrlStatus == SK_FLOW_STAT_LOC_SEND) {
+
+                /*
+                 * Configure Pause Frame Generation
+                 * Use internal and external Pause Frame Generation.
+                 * Sending pause frames is edge triggered.
+                 * Send a Pause frame with the maximum pause time if
+                 * internal oder external FIFO full condition occurs.
+                 * Send a zero pause time frame to re-start transmission.
+                 */
+
+                /* XM_PAUSE_DA = '010000C28001' (default) */
+
+                /* XM_MAC_PTIME = 0xffff (maximum) */
+                /* remember this value is defined in big endian (!) */
+                XM_OUT16(IoC, Port, XM_MAC_PTIME, 0xffff);
+
+                /* Set Pause Mode in Mode Register */
+                DWord |= XM_PAUSE_MODE;
+
+                /* Set Pause Mode in MAC Rx FIFO */
+                SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_ENA_PAUSE);
+        }
+        else {
+                /*
+                 * disable pause frame generation is required for 1000BT
+                 * because the XMAC is not reset if the link is going down
+                 */
+                /* Disable Pause Mode in Mode Register */
+                DWord &= ~XM_PAUSE_MODE;
+
+                /* Disable Pause Mode in MAC Rx FIFO */
+                SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_DIS_PAUSE);
+        }
+        
+        XM_OUT32(IoC, Port, XM_MODE, DWord);
+}       /* SkXmInitPauseMd*/
+
+
+/******************************************************************************
+ *
+ *      SkXmInitPhyXmac() - Initialize the XMAC Phy registers
+ *
+ * Description: initializes all the XMACs Phy registers
+ *
+ * Note:
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmInitPhyXmac(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          Ctrl;
+
+        pPrt = &pAC->GIni.GP[Port];
+        Ctrl = 0;
+        
+        /* Auto-negotiation ? */
+        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("InitPhyXmac: no auto-negotiation Port %d\n", Port));
+                /* Set DuplexMode in Config register */
+                if (pPrt->PLinkMode == SK_LMODE_FULL) {
+                        Ctrl |= PHY_CT_DUP_MD;
+                }
+
+                /*
+                 * Do NOT enable Auto-negotiation here. This would hold
+                 * the link down because no IDLEs are transmitted
+                 */
+        }
+        else {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("InitPhyXmac: with auto-negotiation Port %d\n", Port));
+                /* Set Auto-negotiation advertisement */
+
+                /* Set Full/half duplex capabilities */
+                switch (pPrt->PLinkMode) {
+                case SK_LMODE_AUTOHALF:
+                        Ctrl |= PHY_X_AN_HD;
+                        break;
+                case SK_LMODE_AUTOFULL:
+                        Ctrl |= PHY_X_AN_FD;
+                        break;
+                case SK_LMODE_AUTOBOTH:
+                        Ctrl |= PHY_X_AN_FD | PHY_X_AN_HD;
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
+                                SKERR_HWI_E015MSG);
+                }
+
+                /* Set Flow-control capabilities */
+                switch (pPrt->PFlowCtrlMode) {
+                case SK_FLOW_MODE_NONE:
+                        Ctrl |= PHY_X_P_NO_PAUSE;
+                        break;
+                case SK_FLOW_MODE_LOC_SEND:
+                        Ctrl |= PHY_X_P_ASYM_MD;
+                        break;
+                case SK_FLOW_MODE_SYMMETRIC:
+                        Ctrl |= PHY_X_P_SYM_MD;
+                        break;
+                case SK_FLOW_MODE_SYM_OR_REM:
+                        Ctrl |= PHY_X_P_BOTH_MD;
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
+                                SKERR_HWI_E016MSG);
+                }
+
+                /* Write AutoNeg Advertisement Register */
+                SkXmPhyWrite(pAC, IoC, Port, PHY_XMAC_AUNE_ADV, Ctrl);
+
+                /* Restart Auto-negotiation */
+                Ctrl = PHY_CT_ANE | PHY_CT_RE_CFG;
+        }
+
+        if (DoLoop) {
+                /* Set the Phy Loopback bit, too */
+                Ctrl |= PHY_CT_LOOP;
+        }
+
+        /* Write to the Phy control register */
+        SkXmPhyWrite(pAC, IoC, Port, PHY_XMAC_CTRL, Ctrl);
+}       /* SkXmInitPhyXmac */
+
+
+/******************************************************************************
+ *
+ *      SkXmInitPhyBcom() - Initialize the Broadcom Phy registers
+ *
+ * Description: initializes all the Broadcom Phy registers
+ *
+ * Note:
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmInitPhyBcom(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          Ctrl1;
+        SK_U16          Ctrl2;
+        SK_U16          Ctrl3;
+        SK_U16          Ctrl4;
+        SK_U16          Ctrl5;
+
+        Ctrl1 = PHY_CT_SP1000;
+        Ctrl2 = 0;
+        Ctrl3 = PHY_SEL_TYPE;
+        Ctrl4 = PHY_B_PEC_EN_LTR;
+        Ctrl5 = PHY_B_AC_TX_TST;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* manually Master/Slave ? */
+        if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
+                Ctrl2 |= PHY_B_1000C_MSE;
+                
+                if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
+                        Ctrl2 |= PHY_B_1000C_MSC;
+                }
+        }
+        /* Auto-negotiation ? */
+        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("InitPhyBcom: no auto-negotiation Port %d\n", Port));
+                /* Set DuplexMode in Config register */
+                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) {
+                        Ctrl2 |= PHY_B_1000C_MSE;       /* set it to Slave */
+                }
+
+                /*
+                 * Do NOT enable Auto-negotiation here. This would hold
+                 * the link down because no IDLES are transmitted
+                 */
+        }
+        else {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("InitPhyBcom: with auto-negotiation Port %d\n", Port));
+                /* Set Auto-negotiation advertisement */
+
+                /*
+                 * Workaround BCOM Errata #1 for the C5 type.
+                 * 1000Base-T Link Acquisition Failure in Slave Mode
+                 * Set Repeater/DTE bit 10 of the 1000Base-T Control Register
+                 */
+                Ctrl2 |= PHY_B_1000C_RD;
+                
+                 /* Set Full/half duplex capabilities */
+                switch (pPrt->PLinkMode) {
+                case SK_LMODE_AUTOHALF:
+                        Ctrl2 |= PHY_B_1000C_AHD;
+                        break;
+                case SK_LMODE_AUTOFULL:
+                        Ctrl2 |= PHY_B_1000C_AFD;
+                        break;
+                case SK_LMODE_AUTOBOTH:
+                        Ctrl2 |= PHY_B_1000C_AFD | PHY_B_1000C_AHD;
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
+                                SKERR_HWI_E015MSG);
+                }
+
+                /* Set Flow-control capabilities */
+                switch (pPrt->PFlowCtrlMode) {
+                case SK_FLOW_MODE_NONE:
+                        Ctrl3 |= PHY_B_P_NO_PAUSE;
+                        break;
+                case SK_FLOW_MODE_LOC_SEND:
+                        Ctrl3 |= PHY_B_P_ASYM_MD;
+                        break;
+                case SK_FLOW_MODE_SYMMETRIC:
+                        Ctrl3 |= PHY_B_P_SYM_MD;
+                        break;
+                case SK_FLOW_MODE_SYM_OR_REM:
+                        Ctrl3 |= PHY_B_P_BOTH_MD;
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
+                                SKERR_HWI_E016MSG);
+                }
+
+                /* Restart Auto-negotiation */
+                Ctrl1 |= PHY_CT_ANE | PHY_CT_RE_CFG;
+        }
+        
+        /* Initialize LED register here? */
+        /* No. Please do it in SkDgXmitLed() (if required) and swap
+           init order of LEDs and XMAC. (MAl) */
+        
+        /* Write 1000Base-T Control Register */
+        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, Ctrl2);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("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,
+                ("Set Auto-Neg.Adv.Reg=0x%04X\n", Ctrl3));
+        
+        if (DoLoop) {
+                /* Set the Phy Loopback bit, too */
+                Ctrl1 |= PHY_CT_LOOP;
+        }
+
+        if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK) {
+                /* configure FIFO to high latency for transmission of ext. packets */
+                Ctrl4 |= PHY_B_PEC_HIGH_LA;
+
+                /* configure reception of extended packets */
+                Ctrl5 |= PHY_B_AC_LONG_PACK;
+
+                SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, Ctrl5);
+        }
+
+        /* Configure LED Traffic Mode and Jumbo Frame usage if specified */
+        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_P_EXT_CTRL, Ctrl4);
+        
+        /* Write to the Phy control register */
+        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_CTRL, Ctrl1);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("PHY Control Reg=0x%04X\n", Ctrl1));
+}       /* SkXmInitPhyBcom */
+#endif /* GENESIS */
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ *      SkGmInitPhyMarv() - Initialize the Marvell Phy registers
+ *
+ * Description: initializes all the Marvell Phy registers
+ *
+ * Note:
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGmInitPhyMarv(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          PhyCtrl;
+        SK_U16          C1000BaseT;
+        SK_U16          AutoNegAdv;
+        SK_U16          ExtPhyCtrl;
+        SK_U16          LedCtrl;
+        SK_BOOL         AutoNeg;
+#if defined(SK_DIAG) || defined(DEBUG)
+        SK_U16          PhyStat;
+        SK_U16          PhyStat1;
+        SK_U16          PhySpecStat;
+#endif /* SK_DIAG || DEBUG */
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* Auto-negotiation ? */
+        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+                AutoNeg = SK_FALSE;
+        }
+        else {
+                AutoNeg = SK_TRUE;
+        }
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("InitPhyMarv: Port %d, auto-negotiation %s\n",
+                 Port, AutoNeg ? "ON" : "OFF"));
+
+#ifdef VCPU
+        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,
+                        PHY_M_PC_MAC_POW_UP);
+        }
+        else if (AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_AUTO) {
+                /* Read Ext. PHY Specific Control */
+                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_EXT_CTRL, &ExtPhyCtrl);
+                
+                ExtPhyCtrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
+                        PHY_M_EC_MAC_S_MSK);
+                
+                ExtPhyCtrl |= PHY_M_EC_MAC_S(MAC_TX_CLK_25_MHZ) |
+                        PHY_M_EC_M_DSC(0) | PHY_M_EC_S_DSC(1);
+        
+                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL, ExtPhyCtrl);
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("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 */;
+        C1000BaseT = 0;
+        AutoNegAdv = PHY_SEL_TYPE;
+
+        /* manually Master/Slave ? */
+        if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
+                /* enable Manual Master/Slave */
+                C1000BaseT |= PHY_M_1000C_MSE;
+                
+                if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
+                        C1000BaseT |= PHY_M_1000C_MSC;  /* set it to Master */
+                }
+        }
+        
+        /* Auto-negotiation ? */
+        if (!AutoNeg) {
+                
+                if (pPrt->PLinkMode == SK_LMODE_FULL) {
+                        /* Set Full Duplex Mode */
+                        PhyCtrl |= PHY_CT_DUP_MD;
+                }
+
+                /* Set Master/Slave manually if not already done */
+                if (pPrt->PMSMode == SK_MS_MODE_AUTO) {
+                        C1000BaseT |= PHY_M_1000C_MSE;  /* set it to Slave */
+                }
+
+                /* Set Speed */
+                switch (pPrt->PLinkSpeed) {
+                case SK_LSPEED_AUTO:
+                case SK_LSPEED_1000MBPS:
+                        PhyCtrl |= PHY_CT_SP1000;
+                        break;
+                case SK_LSPEED_100MBPS:
+                        PhyCtrl |= PHY_CT_SP100;
+                        break;
+                case SK_LSPEED_10MBPS:
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E019,
+                                SKERR_HWI_E019MSG);
+                }
+
+                if (!DoLoop) {
+                        PhyCtrl |= PHY_CT_RESET;
+                }
+        }
+        else {
+                /* Set Auto-negotiation advertisement */
+                
+                if (pAC->GIni.GICopperType) {
+                        /* Set Speed capabilities */
+                        switch (pPrt->PLinkSpeed) {
+                        case SK_LSPEED_AUTO:
+                                C1000BaseT |= PHY_M_1000C_AHD | PHY_M_1000C_AFD;
+                                AutoNegAdv |= PHY_M_AN_100_FD | PHY_M_AN_100_HD |
+                                        PHY_M_AN_10_FD | PHY_M_AN_10_HD;
+                                break;
+                        case SK_LSPEED_1000MBPS:
+                                C1000BaseT |= PHY_M_1000C_AHD | PHY_M_1000C_AFD;
+                                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:
+                                AutoNegAdv |= PHY_M_AN_10_FD | PHY_M_AN_10_HD;
+                                break;
+                        default:
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E019,
+                                        SKERR_HWI_E019MSG);
+                        }
+
+                        /* Set Full/half duplex capabilities */
+                        switch (pPrt->PLinkMode) {
+                        case SK_LMODE_AUTOHALF:
+                                C1000BaseT &= ~PHY_M_1000C_AFD;
+                                AutoNegAdv &= ~(PHY_M_AN_100_FD | PHY_M_AN_10_FD);
+                                break;
+                        case SK_LMODE_AUTOFULL:
+                                C1000BaseT &= ~PHY_M_1000C_AHD;
+                                AutoNegAdv &= ~(PHY_M_AN_100_HD | PHY_M_AN_10_HD);
+                                break;
+                        case SK_LMODE_AUTOBOTH:
+                                break;
+                        default:
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
+                                        SKERR_HWI_E015MSG);
+                        }
+                        
+                        /* Set Flow-control capabilities */
+                        switch (pPrt->PFlowCtrlMode) {
+                        case SK_FLOW_MODE_NONE:
+                                AutoNegAdv |= PHY_B_P_NO_PAUSE;
+                                break;
+                        case SK_FLOW_MODE_LOC_SEND:
+                                AutoNegAdv |= PHY_B_P_ASYM_MD;
+                                break;
+                        case SK_FLOW_MODE_SYMMETRIC:
+                                AutoNegAdv |= PHY_B_P_SYM_MD;
+                                break;
+                        case SK_FLOW_MODE_SYM_OR_REM:
+                                AutoNegAdv |= PHY_B_P_BOTH_MD;
+                                break;
+                        default:
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
+                                        SKERR_HWI_E016MSG);
+                        }
+                }
+                else {  /* special defines for FIBER (88E1011S only) */
+                        
+                        /* Set Full/half duplex capabilities */
+                        switch (pPrt->PLinkMode) {
+                        case SK_LMODE_AUTOHALF:
+                                AutoNegAdv |= PHY_M_AN_1000X_AHD;
+                                break;
+                        case SK_LMODE_AUTOFULL:
+                                AutoNegAdv |= PHY_M_AN_1000X_AFD;
+                                break;
+                        case SK_LMODE_AUTOBOTH:
+                                AutoNegAdv |= PHY_M_AN_1000X_AHD | PHY_M_AN_1000X_AFD;
+                                break;
+                        default:
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
+                                        SKERR_HWI_E015MSG);
+                        }
+                        
+                        /* Set Flow-control capabilities */
+                        switch (pPrt->PFlowCtrlMode) {
+                        case SK_FLOW_MODE_NONE:
+                                AutoNegAdv |= PHY_M_P_NO_PAUSE_X;
+                                break;
+                        case SK_FLOW_MODE_LOC_SEND:
+                                AutoNegAdv |= PHY_M_P_ASYM_MD_X;
+                                break;
+                        case SK_FLOW_MODE_SYMMETRIC:
+                                AutoNegAdv |= PHY_M_P_SYM_MD_X;
+                                break;
+                        case SK_FLOW_MODE_SYM_OR_REM:
+                                AutoNegAdv |= PHY_M_P_BOTH_MD_X;
+                                break;
+                        default:
+                                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
+                                        SKERR_HWI_E016MSG);
+                        }
+                }
+
+                if (!DoLoop) {
+                        /* Restart Auto-negotiation */
+                        PhyCtrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
+                }
+        }
+        
+#ifdef VCPU
+        /*
+         * E-mail from Gu Lin (08-03-2002):
+         */
+        
+        /* Program PHY register 30 as 16'h0708 for simulation speed up */
+        SkGmPhyWrite(pAC, IoC, Port, 30, 0x0700 /* 0x0708 */);
+        
+        VCpuWait(2000);
+
+#else /* VCPU */
+        
+        /* Write 1000Base-T Control Register */
+        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_1000T_CTRL, C1000BaseT);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("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,
+                ("Set Auto-Neg.Adv.=0x%04X\n", AutoNegAdv));
+#endif /* VCPU */
+        
+        if (DoLoop) {
+                /* Set the PHY Loopback bit */
+                PhyCtrl |= PHY_CT_LOOP;
+
+#ifdef XXX
+                /* Program PHY register 16 as 16'h0400 to force link good */
+                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, PHY_M_PC_FL_GOOD);
+#endif /* XXX */
+
+#ifndef VCPU
+                if (pPrt->PLinkSpeed != SK_LSPEED_AUTO) {
+                        /* Write Ext. PHY Specific Control */
+                        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL,
+                                (SK_U16)((pPrt->PLinkSpeed + 2) << 4));
+                }
+#endif /* VCPU */
+        }
+#ifdef TEST_ONLY
+        else if (pPrt->PLinkSpeed == SK_LSPEED_10MBPS) {
+                        /* Write PHY Specific Control */
+                        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL,
+                                PHY_M_PC_EN_DET_MSK);
+        }
+#endif
+
+        /* 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);
+#else
+
+        LedCtrl = PHY_M_LED_PULS_DUR(PULS_170MS) | PHY_M_LED_BLINK_RT(BLINK_84MS);
+
+        if ((pAC->GIni.GILedBlinkCtrl & SK_ACT_LED_BLINK) != 0) {
+                LedCtrl |= PHY_M_LEDC_RX_CTRL | PHY_M_LEDC_TX_CTRL;
+        }
+
+        if ((pAC->GIni.GILedBlinkCtrl & SK_DUP_LED_NORMAL) != 0) {
+                LedCtrl |= PHY_M_LEDC_DP_CTRL;
+        }
+        
+        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_CTRL, LedCtrl);
+
+        if ((pAC->GIni.GILedBlinkCtrl & SK_LED_LINK100_ON) != 0) {
+                /* only in forced 100 Mbps mode */
+                if (!AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_100MBPS) {
+
+                        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_OVER,
+                                PHY_M_LED_MO_100(MO_LED_ON));
+                }
+        }
+
+#ifdef SK_DIAG
+        c_print("Set PHY Ctrl=0x%04X\n", PhyCtrl);
+        c_print("Set 1000 B-T=0x%04X\n", C1000BaseT);
+        c_print("Set Auto-Neg=0x%04X\n", AutoNegAdv);
+        c_print("Set Ext Ctrl=0x%04X\n", ExtPhyCtrl);
+#endif /* SK_DIAG */
+
+#if defined(SK_DIAG) || defined(DEBUG)
+        /* Read PHY Control */
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &PhyCtrl);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("PHY Ctrl Reg.=0x%04X\n", PhyCtrl));
+        
+        /* Read 1000Base-T Control Register */
+        SkGmPhyRead(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));
+        
+        /* 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.Adv.=0x%04X\n", AutoNegAdv));
+        
+        /* Read Ext. PHY Specific Control */
+        SkGmPhyRead(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));
+        
+        /* Read PHY Status */
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("PHY Stat Reg.=0x%04X\n", PhyStat));
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat1);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("PHY Stat Reg.=0x%04X\n", PhyStat1));
+        
+        /* Read PHY Specific Status */
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("PHY Spec Stat=0x%04X\n", PhySpecStat));
+#endif /* SK_DIAG || DEBUG */
+
+#ifdef SK_DIAG
+        c_print("PHY Ctrl Reg=0x%04X\n", PhyCtrl);
+        c_print("PHY 1000 Reg=0x%04X\n", C1000BaseT);
+        c_print("PHY AnAd Reg=0x%04X\n", AutoNegAdv);
+        c_print("Ext Ctrl Reg=0x%04X\n", ExtPhyCtrl);
+        c_print("PHY Stat Reg=0x%04X\n", PhyStat);
+        c_print("PHY Stat Reg=0x%04X\n", PhyStat1);
+        c_print("PHY Spec Reg=0x%04X\n", PhySpecStat);
+#endif /* SK_DIAG */
+
+#endif /* VCPU */
+
+}       /* SkGmInitPhyMarv */
+#endif /* YUKON */
+
+
+#ifdef OTHER_PHY
+/******************************************************************************
+ *
+ *      SkXmInitPhyLone() - Initialize the Level One Phy registers
+ *
+ * Description: initializes all the Level One Phy registers
+ *
+ * Note:
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmInitPhyLone(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          Ctrl1;
+        SK_U16          Ctrl2;
+        SK_U16          Ctrl3;
+
+        Ctrl1 = PHY_CT_SP1000;
+        Ctrl2 = 0;
+        Ctrl3 = PHY_SEL_TYPE;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* manually Master/Slave ? */
+        if (pPrt->PMSMode != SK_MS_MODE_AUTO) {
+                Ctrl2 |= PHY_L_1000C_MSE;
+                
+                if (pPrt->PMSMode == SK_MS_MODE_MASTER) {
+                        Ctrl2 |= PHY_L_1000C_MSC;
+                }
+        }
+        /* Auto-negotiation ? */
+        if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+                /*
+                 * 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 */
+                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) {
+                        Ctrl2 |= PHY_L_1000C_MSE;       /* set it to Slave */
+                }
+
+                /*
+                 * Do NOT enable Auto-negotiation here. This would hold
+                 * the link down because no IDLES are transmitted
+                 */
+        }
+        else {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("InitPhyLone: with auto-negotiation Port %d\n", Port));
+                /* Set Auto-negotiation advertisement */
+
+                /* Set Full/half duplex capabilities */
+                switch (pPrt->PLinkMode) {
+                case SK_LMODE_AUTOHALF:
+                        Ctrl2 |= PHY_L_1000C_AHD;
+                        break;
+                case SK_LMODE_AUTOFULL:
+                        Ctrl2 |= PHY_L_1000C_AFD;
+                        break;
+                case SK_LMODE_AUTOBOTH:
+                        Ctrl2 |= PHY_L_1000C_AFD | PHY_L_1000C_AHD;
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E015,
+                                SKERR_HWI_E015MSG);
+                }
+
+                /* Set Flow-control capabilities */
+                switch (pPrt->PFlowCtrlMode) {
+                case SK_FLOW_MODE_NONE:
+                        Ctrl3 |= PHY_L_P_NO_PAUSE;
+                        break;
+                case SK_FLOW_MODE_LOC_SEND:
+                        Ctrl3 |= PHY_L_P_ASYM_MD;
+                        break;
+                case SK_FLOW_MODE_SYMMETRIC:
+                        Ctrl3 |= PHY_L_P_SYM_MD;
+                        break;
+                case SK_FLOW_MODE_SYM_OR_REM:
+                        Ctrl3 |= PHY_L_P_BOTH_MD;
+                        break;
+                default:
+                        SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
+                                SKERR_HWI_E016MSG);
+                }
+
+                /* Restart Auto-negotiation */
+                Ctrl1 = PHY_CT_ANE | PHY_CT_RE_CFG;
+        }
+        
+        /* Write 1000Base-T Control Register */
+        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_1000T_CTRL, Ctrl2);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("1000B-T Ctrl Reg=0x%04X\n", Ctrl2));
+        
+        /* Write AutoNeg Advertisement Register */
+        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_AUNE_ADV, Ctrl3);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("Auto-Neg.Adv.Reg=0x%04X\n", Ctrl3));
+
+        if (DoLoop) {
+                /* Set the Phy Loopback bit, too */
+                Ctrl1 |= PHY_CT_LOOP;
+        }
+
+        /* Write to the Phy control register */
+        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_CTRL, Ctrl1);
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("PHY Control Reg=0x%04X\n", Ctrl1));
+}       /* SkXmInitPhyLone */
+
+
+/******************************************************************************
+ *
+ *      SkXmInitPhyNat() - Initialize the National Phy registers
+ *
+ * Description: initializes all the National Phy registers
+ *
+ * Note:
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmInitPhyNat(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
+{
+/* todo: National */
+}       /* SkXmInitPhyNat */
+#endif /* OTHER_PHY */
+
+
+/******************************************************************************
+ *
+ *      SkMacInitPhy() - Initialize the PHY registers
+ *
+ * Description: calls the Init PHY routines dep. on board type
+ *
+ * Note:
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacInitPhy(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_BOOL DoLoop)         /* Should a Phy LoopBack be set-up? */
+{
+        SK_GEPORT       *pPrt;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                switch (pPrt->PhyType) {
+                case SK_PHY_XMAC:
+                        SkXmInitPhyXmac(pAC, IoC, Port, DoLoop);
+                        break;
+                case SK_PHY_BCOM:
+                        SkXmInitPhyBcom(pAC, IoC, Port, DoLoop);
+                        break;
+#ifdef OTHER_PHY
+                case SK_PHY_LONE:
+                        SkXmInitPhyLone(pAC, IoC, Port, DoLoop);
+                        break;
+                case SK_PHY_NAT:
+                        SkXmInitPhyNat(pAC, IoC, Port, DoLoop);
+                        break;
+#endif /* OTHER_PHY */
+                }
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                SkGmInitPhyMarv(pAC, IoC, Port, DoLoop);
+        }
+#endif /* YUKON */
+
+}       /* SkMacInitPhy */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmAutoNegDoneXmac() - Auto-negotiation handling
+ *
+ * Description:
+ *      This function handles the auto-negotiation if the Done bit is set.
+ *
+ * Returns:
+ *      SK_AND_OK       o.k.
+ *      SK_AND_DUP_CAP  Duplex capability error happened
+ *      SK_AND_OTHER    Other error happened
+ */
+static int SkXmAutoNegDoneXmac(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          ResAb;          /* Resolved Ability */
+        SK_U16          LPAb;           /* Link Partner Ability */
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("AutoNegDoneXmac, Port %d\n", Port));
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* Get PHY parameters */
+        SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_AUNE_LP, &LPAb);
+        SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_RES_ABI, &ResAb);
+
+        if ((LPAb & PHY_X_AN_RFB) != 0) {
+                /* At least one of the remote fault bit is set */
+                /* Error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("AutoNegFail: Remote fault bit set Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                return(SK_AND_OTHER);
+        }
+
+        /* Check Duplex mismatch */
+        if ((ResAb & (PHY_X_RS_HD | PHY_X_RS_FD)) == PHY_X_RS_FD) {
+                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_U8)SK_LMODE_STAT_AUTOHALF;
+        }
+        else {
+                /* Error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("AutoNegFail: Duplex mode mismatch Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                return(SK_AND_DUP_CAP);
+        }
+
+        /* Check PAUSE mismatch */
+        /* We are NOT using chapter 4.23 of the Xaqti manual */
+        /* We are using IEEE 802.3z/D5.0 Table 37-4 */
+        if ((pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYMMETRIC ||
+             pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM) &&
+            (LPAb & PHY_X_P_SYM_MD) != 0) {
+                /* Symmetric PAUSE */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
+        }
+        else if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM &&
+                   (LPAb & PHY_X_RS_PAUSE) == PHY_X_P_ASYM_MD) {
+                /* Enable PAUSE receive, disable PAUSE transmit */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
+        }
+        else if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_LOC_SEND &&
+                   (LPAb & PHY_X_RS_PAUSE) == PHY_X_P_BOTH_MD) {
+                /* Disable PAUSE receive, enable PAUSE transmit */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
+        }
+        else {
+                /* PAUSE mismatch -> no PAUSE */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+        }
+        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+
+        return(SK_AND_OK);
+}       /* SkXmAutoNegDoneXmac */
+
+
+/******************************************************************************
+ *
+ *      SkXmAutoNegDoneBcom() - Auto-negotiation handling
+ *
+ * Description:
+ *      This function handles the auto-negotiation if the Done bit is set.
+ *
+ * Returns:
+ *      SK_AND_OK       o.k.
+ *      SK_AND_DUP_CAP  Duplex capability error happened
+ *      SK_AND_OTHER    Other error happened
+ */
+static int SkXmAutoNegDoneBcom(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          LPAb;           /* Link Partner Ability */
+        SK_U16          AuxStat;        /* Auxiliary Status */
+
+#ifdef TEST_ONLY
+01-Sep-2000 RA;:;:
+        SK_U16          ResAb;          /* Resolved Ability */
+#endif  /* 0 */
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("AutoNegDoneBcom, Port %d\n", Port));
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* Get PHY parameters */
+        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &LPAb);
+#ifdef TEST_ONLY
+01-Sep-2000 RA;:;:
+        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
+#endif  /* 0 */
+        
+        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_STAT, &AuxStat);
+
+        if ((LPAb & PHY_B_AN_RF) != 0) {
+                /* Remote fault bit is set: Error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("AutoNegFail: Remote fault bit set Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                return(SK_AND_OTHER);
+        }
+
+        /* Check Duplex mismatch */
+        if ((AuxStat & PHY_B_AS_AN_RES_MSK) == PHY_B_RES_1000FD) {
+                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
+        }
+        else if ((AuxStat & PHY_B_AS_AN_RES_MSK) == PHY_B_RES_1000HD) {
+                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
+        }
+        else {
+                /* Error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("AutoNegFail: Duplex mode mismatch Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                return(SK_AND_DUP_CAP);
+        }
+        
+#ifdef TEST_ONLY
+01-Sep-2000 RA;:;:
+        /* Check Master/Slave resolution */
+        if ((ResAb & PHY_B_1000S_MSF) != 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("Master/Slave Fault Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                pPrt->PMSStatus = SK_MS_STAT_FAULT;
+                return(SK_AND_OTHER);
+        }
+        
+        pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
+                SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
+#endif  /* 0 */
+
+        /* Check PAUSE mismatch ??? */
+        /* We are using IEEE 802.3z/D5.0 Table 37-4 */
+        if ((AuxStat & PHY_B_AS_PAUSE_MSK) == PHY_B_AS_PAUSE_MSK) {
+                /* Symmetric PAUSE */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
+        }
+        else if ((AuxStat & PHY_B_AS_PAUSE_MSK) == PHY_B_AS_PRR) {
+                /* Enable PAUSE receive, disable PAUSE transmit */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
+        }
+        else if ((AuxStat & PHY_B_AS_PAUSE_MSK) == PHY_B_AS_PRT) {
+                /* Disable PAUSE receive, enable PAUSE transmit */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
+        }
+        else {
+                /* PAUSE mismatch -> no PAUSE */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+        }
+        pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+
+        return(SK_AND_OK);
+}       /* SkXmAutoNegDoneBcom */
+#endif /* GENESIS */
+
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ *      SkGmAutoNegDoneMarv() - Auto-negotiation handling
+ *
+ * Description:
+ *      This function handles the auto-negotiation if the Done bit is set.
+ *
+ * Returns:
+ *      SK_AND_OK       o.k.
+ *      SK_AND_DUP_CAP  Duplex capability error happened
+ *      SK_AND_OTHER    Other error happened
+ */
+static int SkGmAutoNegDoneMarv(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          LPAb;           /* Link Partner Ability */
+        SK_U16          ResAb;          /* Resolved Ability */
+        SK_U16          AuxStat;        /* Auxiliary Status */
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("AutoNegDoneMarv, Port %d\n", Port));
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* 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,
+                        ("AutoNegFail: Remote fault bit set Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                return(SK_AND_OTHER);
+        }
+
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
+        
+        /* Check Master/Slave resolution */
+        if ((ResAb & PHY_B_1000S_MSF) != 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("Master/Slave Fault Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                pPrt->PMSStatus = SK_MS_STAT_FAULT;
+                return(SK_AND_OTHER);
+        }
+        
+        pPrt->PMSStatus = ((ResAb & PHY_B_1000S_MSR) != 0) ?
+                (SK_U8)SK_MS_STAT_MASTER : (SK_U8)SK_MS_STAT_SLAVE;
+        
+        /* Read PHY Specific Status */
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &AuxStat);
+        
+        /* Check Speed & Duplex resolved */
+        if ((AuxStat & PHY_M_PS_SPDUP_RES) == 0) {
+                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_U8)SK_LMODE_STAT_UNKNOWN;
+                return(SK_AND_DUP_CAP);
+        }
+        
+        if ((AuxStat & PHY_M_PS_FULL_DUP) != 0) {
+                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
+        }
+        else {
+                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
+        }
+        
+        /* Check PAUSE mismatch ??? */
+        /* We are using IEEE 802.3z/D5.0 Table 37-4 */
+        if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_PAUSE_MSK) {
+                /* Symmetric PAUSE */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
+        }
+        else if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_RX_P_EN) {
+                /* Enable PAUSE receive, disable PAUSE transmit */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
+        }
+        else if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_TX_P_EN) {
+                /* Disable PAUSE receive, enable PAUSE transmit */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
+        }
+        else {
+                /* PAUSE mismatch -> no PAUSE */
+                pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+        }
+        
+        /* set used link speed */
+        switch ((unsigned)(AuxStat & PHY_M_PS_SPEED_MSK)) {
+        case (unsigned)PHY_M_PS_SPEED_1000:
+                pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+                break;
+        case PHY_M_PS_SPEED_100:
+                pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_100MBPS;
+                break;
+        default:
+                pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_10MBPS;
+        }
+
+        return(SK_AND_OK);
+}       /* SkGmAutoNegDoneMarv */
+#endif /* YUKON */
+
+
+#ifdef OTHER_PHY
+/******************************************************************************
+ *
+ *      SkXmAutoNegDoneLone() - Auto-negotiation handling
+ *
+ * Description:
+ *      This function handles the auto-negotiation if the Done bit is set.
+ *
+ * Returns:
+ *      SK_AND_OK       o.k.
+ *      SK_AND_DUP_CAP  Duplex capability error happened
+ *      SK_AND_OTHER    Other error happened
+ */
+static int SkXmAutoNegDoneLone(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          ResAb;          /* Resolved Ability */
+        SK_U16          LPAb;           /* Link Partner Ability */
+        SK_U16          QuickStat;      /* Auxiliary Status */
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("AutoNegDoneLone, Port %d\n", Port));
+        pPrt = &pAC->GIni.GP[Port];
+
+        /* Get PHY parameters */
+        SkXmPhyRead(pAC, IoC, Port, PHY_LONE_AUNE_LP, &LPAb);
+        SkXmPhyRead(pAC, IoC, Port, PHY_LONE_1000T_STAT, &ResAb);
+        SkXmPhyRead(pAC, IoC, Port, PHY_LONE_Q_STAT, &QuickStat);
+
+        if ((LPAb & PHY_L_AN_RF) != 0) {
+                /* Remote fault bit is set */
+                /* Error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("AutoNegFail: Remote fault bit set Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                return(SK_AND_OTHER);
+        }
+
+        /* Check Duplex mismatch */
+        if ((QuickStat & PHY_L_QS_DUP_MOD) != 0) {
+                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
+        }
+        else {
+                pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
+        }
+        
+        /* Check Master/Slave resolution */
+        if ((ResAb & PHY_L_1000S_MSF) != 0) {
+                /* Error */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("Master/Slave Fault Port %d\n", Port));
+                pPrt->PAutoNegFail = SK_TRUE;
+                pPrt->PMSStatus = SK_MS_STAT_FAULT;
+                return(SK_AND_OTHER);
+        }
+        else if (ResAb & PHY_L_1000S_MSR) {
+                pPrt->PMSStatus = SK_MS_STAT_MASTER;
+        }
+        else {
+                pPrt->PMSStatus = SK_MS_STAT_SLAVE;
+        }
+
+        /* Check PAUSE mismatch */
+        /* 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 */
+                break;
+        case SK_FLOW_MODE_LOC_SEND:
+                if ((QuickStat & (PHY_L_QS_PAUSE | PHY_L_QS_AS_PAUSE)) ==
+                        (PHY_L_QS_PAUSE | PHY_L_QS_AS_PAUSE)) {
+                        /* Disable PAUSE receive, enable PAUSE transmit */
+                        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_LOC_SEND;
+                }
+                break;
+        case SK_FLOW_MODE_SYMMETRIC:
+                if ((QuickStat & PHY_L_QS_PAUSE) != 0) {
+                        /* Symmetric PAUSE */
+                        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
+                }
+                break;
+        case SK_FLOW_MODE_SYM_OR_REM:
+                if ((QuickStat & (PHY_L_QS_PAUSE | PHY_L_QS_AS_PAUSE)) ==
+                        PHY_L_QS_AS_PAUSE) {
+                        /* Enable PAUSE receive, disable PAUSE transmit */
+                        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_REM_SEND;
+                }
+                else if ((QuickStat & PHY_L_QS_PAUSE) != 0) {
+                        /* Symmetric PAUSE */
+                        pPrt->PFlowCtrlStatus = SK_FLOW_STAT_SYMMETRIC;
+                }
+                break;
+        default:
+                SK_ERR_LOG(pAC, SK_ERRCL_SW | SK_ERRCL_INIT, SKERR_HWI_E016,
+                        SKERR_HWI_E016MSG);
+        }
+        
+        return(SK_AND_OK);
+}       /* SkXmAutoNegDoneLone */
+
+
+/******************************************************************************
+ *
+ *      SkXmAutoNegDoneNat() - Auto-negotiation handling
+ *
+ * Description:
+ *      This function handles the auto-negotiation if the Done bit is set.
+ *
+ * Returns:
+ *      SK_AND_OK       o.k.
+ *      SK_AND_DUP_CAP  Duplex capability error happened
+ *      SK_AND_OTHER    Other error happened
+ */
+static int SkXmAutoNegDoneNat(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+/* todo: National */
+        return(SK_AND_OK);
+}       /* SkXmAutoNegDoneNat */
+#endif /* OTHER_PHY */
+
+
+/******************************************************************************
+ *
+ *      SkMacAutoNegDone() - Auto-negotiation handling
+ *
+ * Description: calls the auto-negotiation done routines dep. on board type
+ *
+ * Returns:
+ *      SK_AND_OK       o.k.
+ *      SK_AND_DUP_CAP  Duplex capability error happened
+ *      SK_AND_OTHER    Other error happened
+ */
+int     SkMacAutoNegDone(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        int     Rtv;
+
+        Rtv = SK_AND_OK;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                switch (pPrt->PhyType) {
+                
+                case SK_PHY_XMAC:
+                        Rtv = SkXmAutoNegDoneXmac(pAC, IoC, Port);
+                        break;
+                case SK_PHY_BCOM:
+                        Rtv = SkXmAutoNegDoneBcom(pAC, IoC, Port);
+                        break;
+#ifdef OTHER_PHY
+                case SK_PHY_LONE:
+                        Rtv = SkXmAutoNegDoneLone(pAC, IoC, Port);
+                        break;
+                case SK_PHY_NAT:
+                        Rtv = SkXmAutoNegDoneNat(pAC, IoC, Port);
+                        break;
+#endif /* OTHER_PHY */
+                default:
+                        return(SK_AND_OTHER);
+                }
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                Rtv = SkGmAutoNegDoneMarv(pAC, IoC, Port);
+        }
+#endif /* YUKON */
+        
+        if (Rtv != SK_AND_OK) {
+                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;
+
+        SkMacRxTxEnable(pAC, IoC, Port);
+        
+        return(SK_AND_OK);
+}       /* SkMacAutoNegDone */
+
+
+/******************************************************************************
+ *
+ *      SkMacRxTxEnable() - Enable Rx/Tx activity if port is up
+ *
+ * Description: enables Rx/Tx dep. on board type
+ *
+ * Returns:
+ *      0       o.k.
+ *      != 0    Error happened
+ */
+int SkMacRxTxEnable(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          Reg;            /* 16-bit register value */
+        SK_U16          IntMask;        /* MAC interrupt mask */
+#ifdef GENESIS
+        SK_U16          SWord;
+#endif
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (!pPrt->PHWLinkUp) {
+                /* The Hardware link is NOT up */
+                return(0);
+        }
+
+        if ((pPrt->PLinkMode == SK_LMODE_AUTOHALF ||
+             pPrt->PLinkMode == SK_LMODE_AUTOFULL ||
+             pPrt->PLinkMode == SK_LMODE_AUTOBOTH) &&
+             pPrt->PAutoNegFail) {
+                /* Auto-negotiation is not done or failed */
+                return(0);
+        }
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                /* set Duplex Mode and Pause Mode */
+                SkXmInitDupMd(pAC, IoC, Port);
+                
+                SkXmInitPauseMd(pAC, IoC, Port);
+        
+                /*
+                 * Initialize the Interrupt Mask Register. Default IRQs are...
+                 *      - Link Asynchronous Event
+                 *      - Link Partner requests config
+                 *      - Auto Negotiation Done
+                 *      - Rx Counter Event Overflow
+                 *      - Tx Counter Event Overflow
+                 *      - Transmit FIFO Underrun
+                 */
+                IntMask = XM_DEF_MSK;
+
+#ifdef DEBUG
+                /* add IRQ for Receive FIFO Overflow */
+                IntMask &= ~XM_IS_RXF_OV;
+#endif /* DEBUG */
+                
+                if (pPrt->PhyType != SK_PHY_XMAC) {
+                        /* disable GP0 interrupt bit */
+                        IntMask |= XM_IS_INP_ASS;
+                }
+                XM_OUT16(IoC, Port, XM_IMSK, IntMask);
+        
+                /* get MMU Command Reg. */
+                XM_IN16(IoC, Port, XM_MMU_CMD, &Reg);
+                
+                if (pPrt->PhyType != SK_PHY_XMAC &&
+                        (pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL ||
+                         pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL)) {
+                        /* set to Full Duplex */
+                        Reg |= XM_MMU_GMII_FD;
+                }
+                
+                switch (pPrt->PhyType) {
+                case SK_PHY_BCOM:
+                        /*
+                         * Workaround BCOM Errata (#10523) for all BCom Phys
+                         * Enable Power Management after link up
+                         */
+                        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &SWord);
+                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL,
+                                (SK_U16)(SWord & ~PHY_B_AC_DIS_PM));
+            SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK,
+                                (SK_U16)PHY_B_DEF_MSK);
+                        break;
+#ifdef OTHER_PHY
+                case SK_PHY_LONE:
+                        SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_INT_ENAB, PHY_L_DEF_MSK);
+                        break;
+                case SK_PHY_NAT:
+                        /* todo National:
+                        SkXmPhyWrite(pAC, IoC, Port, PHY_NAT_INT_MASK, PHY_N_DEF_MSK); */
+                        /* no interrupts possible from National ??? */
+                        break;
+#endif /* OTHER_PHY */
+                }
+                
+                /* enable Rx/Tx */
+                XM_OUT16(IoC, Port, XM_MMU_CMD, Reg | XM_MMU_ENA_RX | XM_MMU_ENA_TX);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /*
+                 * Initialize the Interrupt Mask Register. Default IRQs are...
+                 *      - Rx Counter Event Overflow
+                 *      - Tx Counter Event Overflow
+                 *      - Transmit FIFO Underrun
+                 */
+                IntMask = GMAC_DEF_MSK;
+
+#ifdef DEBUG
+                /* add IRQ for Receive FIFO Overrun */
+                IntMask |= GM_IS_RX_FF_OR;
+#endif /* DEBUG */
+                
+                SK_OUT8(IoC, GMAC_IRQ_MSK, (SK_U8)IntMask);
+                
+                /* get General Purpose Control */
+                GM_IN16(IoC, Port, GM_GP_CTRL, &Reg);
+                
+                if (pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL ||
+                        pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL) {
+                        /* set to Full Duplex */
+                        Reg |= GM_GPCR_DUP_FULL;
+                }
+                
+                /* enable Rx/Tx */
+        GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Reg | GM_GPCR_RX_ENA |
+                        GM_GPCR_TX_ENA));
+
+#ifndef VCPU
+                /* Enable all PHY interrupts */
+        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK,
+                        (SK_U16)PHY_M_DEF_MSK);
+#endif /* VCPU */
+        }
+#endif /* YUKON */
+                                        
+        return(0);
+
+}       /* SkMacRxTxEnable */
+
+
+/******************************************************************************
+ *
+ *      SkMacRxTxDisable() - Disable Receiver and Transmitter
+ *
+ * Description: disables Rx/Tx dep. on board type
+ *
+ * Returns: N/A
+ */
+void SkMacRxTxDisable(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_U16  Word;
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
+                
+                XM_OUT16(IoC, Port, XM_MMU_CMD, Word & ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX));
+        
+                /* dummy read to ensure writing */
+                XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                
+                GM_IN16(IoC, Port, GM_GP_CTRL, &Word);
+
+        GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Word & ~(GM_GPCR_RX_ENA |
+                        GM_GPCR_TX_ENA)));
+
+                /* dummy read to ensure writing */
+                GM_IN16(IoC, Port, GM_GP_CTRL, &Word);
+        }
+#endif /* YUKON */
+
+}       /* SkMacRxTxDisable */
+
+
+/******************************************************************************
+ *
+ *      SkMacIrqDisable() - Disable IRQ from MAC
+ *
+ * Description: sets the IRQ-mask to disable IRQ dep. on board type
+ *
+ * Returns: N/A
+ */
+void SkMacIrqDisable(
+SK_AC   *pAC,           /* Adapter Context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+#ifdef GENESIS
+        SK_U16          Word;
+#endif
+
+        pPrt = &pAC->GIni.GP[Port];
+
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                
+                /* disable all XMAC IRQs */
+                XM_OUT16(IoC, Port, XM_IMSK, 0xffff);   
+                
+                /* Disable all PHY interrupts */
+                switch (pPrt->PhyType) {
+                        case SK_PHY_BCOM:
+                                /* Make sure that PHY is initialized */
+                                if (pPrt->PState != SK_PRT_RESET) {
+                                        /* NOT allowed if BCOM is in RESET state */
+                                        /* Workaround BCOM Errata (#10523) all BCom */
+                                        /* Disable Power Management if link is down */
+                                        SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &Word);
+                                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL,
+                                                (SK_U16)(Word | PHY_B_AC_DIS_PM));
+                                        SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK, 0xffff);
+                                }
+                                break;
+#ifdef OTHER_PHY
+                        case SK_PHY_LONE:
+                                SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_INT_ENAB, 0);
+                                break;
+                        case SK_PHY_NAT:
+                                /* todo: National
+                                SkXmPhyWrite(pAC, IoC, Port, PHY_NAT_INT_MASK, 0xffff); */
+                                break;
+#endif /* OTHER_PHY */
+                }
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /* disable all GMAC IRQs */
+                SK_OUT8(IoC, GMAC_IRQ_MSK, 0);
+                
+#ifndef VCPU
+                /* Disable all PHY interrupts */
+                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK, 0);
+#endif /* VCPU */
+        }
+#endif /* YUKON */
+
+}       /* SkMacIrqDisable */
+
+
+#ifdef SK_DIAG
+/******************************************************************************
+ *
+ *      SkXmSendCont() - Enable / Disable Send Continuous Mode
+ *
+ * Description: enable / disable Send Continuous Mode on XMAC
+ *
+ * Returns:
+ *      nothing
+ */
+void SkXmSendCont(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port,   /* Port Index (MAC_1 + n) */
+SK_BOOL Enable) /* Enable / Disable */
+{
+        SK_U32  MdReg;
+
+        XM_IN32(IoC, Port, XM_MODE, &MdReg);
+
+        if (Enable) {
+                MdReg |= XM_MD_TX_CONT;
+        }
+        else {
+                MdReg &= ~XM_MD_TX_CONT;
+        }
+        /* setup Mode Register */
+        XM_OUT32(IoC, Port, XM_MODE, MdReg);
+
+}       /* SkXmSendCont */
+
+
+/******************************************************************************
+ *
+ *      SkMacTimeStamp() - Enable / Disable Time Stamp
+ *
+ * Description: enable / disable Time Stamp generation for Rx packets
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacTimeStamp(
+SK_AC   *pAC,   /* adapter context */
+SK_IOC  IoC,    /* IO context */
+int             Port,   /* Port Index (MAC_1 + n) */
+SK_BOOL Enable) /* Enable / Disable */
+{
+        SK_U32  MdReg;
+        SK_U8   TimeCtrl;
+
+        if (pAC->GIni.GIGenesis) {
+
+                XM_IN32(IoC, Port, XM_MODE, &MdReg);
+
+                if (Enable) {
+                        MdReg |= XM_MD_ATS;
+                }
+                else {
+                        MdReg &= ~XM_MD_ATS;
+                }
+                /* setup Mode Register */
+                XM_OUT32(IoC, Port, XM_MODE, MdReg);
+        }
+        else {
+                if (Enable) {
+                        TimeCtrl = GMT_ST_START | GMT_ST_CLR_IRQ;
+                }
+                else {
+                        TimeCtrl = GMT_ST_STOP | GMT_ST_CLR_IRQ;
+                }
+                /* Start/Stop Time Stamp Timer */
+                SK_OUT8(IoC, GMAC_TI_ST_CTRL, TimeCtrl);
+        }
+
+}       /* SkMacTimeStamp*/
+
+#else /* !SK_DIAG */
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmAutoNegLipaXmac() - Decides whether Link Partner could do auto-neg
+ *
+ *      This function analyses the Interrupt status word. If any of the
+ *      Auto-negotiating interrupt bits are set, the PLipaAutoNeg variable
+ *      is set true.
+ */
+void SkXmAutoNegLipaXmac(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_U16  IStatus)        /* Interrupt Status word to analyse */
+{
+        SK_GEPORT       *pPrt;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PLipaAutoNeg != SK_LIPA_AUTO &&
+                (IStatus & (XM_IS_LIPA_RC | XM_IS_RX_PAGE | XM_IS_AND)) != 0) {
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("AutoNegLipa: AutoNeg detected on Port %d, IStatus=0x%04X\n",
+                        Port, IStatus));
+                pPrt->PLipaAutoNeg = SK_LIPA_AUTO;
+        }
+}       /* SkXmAutoNegLipaXmac */
+#endif /* GENESIS */
+
+
+/******************************************************************************
+ *
+ *      SkMacAutoNegLipaPhy() - Decides whether Link Partner could do auto-neg
+ *
+ *      This function analyses the PHY status word.
+ *  If any of the Auto-negotiating bits are set, the PLipaAutoNeg variable
+ *      is set true.
+ */
+void SkMacAutoNegLipaPhy(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_U16  PhyStat)        /* PHY Status word to analyse */
+{
+        SK_GEPORT       *pPrt;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PLipaAutoNeg != SK_LIPA_AUTO &&
+                (PhyStat & PHY_ST_AN_OVER) != 0) {
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("AutoNegLipa: AutoNeg detected on Port %d, PhyStat=0x%04X\n",
+                        Port, PhyStat));
+                pPrt->PLipaAutoNeg = SK_LIPA_AUTO;
+        }
+}       /* SkMacAutoNegLipaPhy */
+
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmIrq() - Interrupt Service Routine
+ *
+ * Description: services an Interrupt Request of the XMAC
+ *
+ * Note:
+ *      With an external PHY, some interrupt bits are not meaningfull any more:
+ *      - LinkAsyncEvent (bit #14)              XM_IS_LNK_AE
+ *      - LinkPartnerReqConfig (bit #10)        XM_IS_LIPA_RC
+ *      - Page Received (bit #9)                XM_IS_RX_PAGE
+ *      - NextPageLoadedForXmt (bit #8)         XM_IS_TX_PAGE
+ *      - AutoNegDone (bit #7)                  XM_IS_AND
+ *      Also probably not valid any more is the GP0 input bit:
+ *      - GPRegisterBit0set                     XM_IS_INP_ASS
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkXmIrq(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_EVPARA       Para;
+        SK_U16          IStatus;        /* Interrupt status read from the XMAC */
+        SK_U16          IStatus2;
+#ifdef SK_SLIM
+    SK_U64      OverflowStatus;
+#endif  
+
+        pPrt = &pAC->GIni.GP[Port];
+        
+        XM_IN16(IoC, Port, XM_ISRC, &IStatus);
+        
+        /* LinkPartner Auto-negable? */
+        if (pPrt->PhyType == SK_PHY_XMAC) {
+                SkXmAutoNegLipaXmac(pAC, IoC, Port, IStatus);
+        }
+        else {
+                /* mask bits that are not used with ext. PHY */
+                IStatus &= ~(XM_IS_LNK_AE | XM_IS_LIPA_RC |
+                        XM_IS_RX_PAGE | XM_IS_TX_PAGE |
+                        XM_IS_AND | XM_IS_INP_ASS);
+        }
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                ("XmacIrq Port %d Isr 0x%04X\n", Port, IStatus));
+
+        if (!pPrt->PHWLinkUp) {
+                /* Spurious XMAC interrupt */
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                        ("SkXmIrq: spurious interrupt on Port %d\n", Port));
+                return;
+        }
+
+        if ((IStatus & XM_IS_INP_ASS) != 0) {
+                /* Reread ISR Register if link is not in sync */
+                XM_IN16(IoC, Port, XM_ISRC, &IStatus2);
+
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                        ("SkXmIrq: Link async. Double check Port %d 0x%04X 0x%04X\n",
+                         Port, IStatus, IStatus2));
+                IStatus &= ~XM_IS_INP_ASS;
+                IStatus |= IStatus2;
+        }
+
+        if ((IStatus & XM_IS_LNK_AE) != 0) {
+                /* not used, GP0 is used instead */
+        }
+
+        if ((IStatus & XM_IS_TX_ABORT) != 0) {
+                /* not used */
+        }
+
+        if ((IStatus & XM_IS_FRC_INT) != 0) {
+                /* not used, use ASIC IRQ instead if needed */
+        }
+
+        if ((IStatus & (XM_IS_INP_ASS | XM_IS_LIPA_RC | XM_IS_RX_PAGE)) != 0) {
+                SkHWLinkDown(pAC, IoC, Port);
+
+                /* Signal to RLMT */
+                Para.Para32[0] = (SK_U32)Port;
+                SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
+
+                /* Start workaround Errata #2 timer */
+                SkTimerStart(pAC, IoC, &pPrt->PWaTimer, SK_WA_INA_TIME,
+                        SKGE_HWAC, SK_HWEV_WATIM, Para);
+        }
+
+        if ((IStatus & XM_IS_RX_PAGE) != 0) {
+                /* not used */
+        }
+
+        if ((IStatus & XM_IS_TX_PAGE) != 0) {
+                /* not used */
+        }
+
+        if ((IStatus & XM_IS_AND) != 0) {
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                        ("SkXmIrq: AND on link that is up Port %d\n", Port));
+        }
+
+        if ((IStatus & XM_IS_TSC_OV) != 0) {
+                /* not used */
+        }
+
+        /* Combined Tx & Rx Counter Overflow SIRQ Event */
+        if ((IStatus & (XM_IS_RXC_OV | XM_IS_TXC_OV)) != 0) {
+#ifdef SK_SLIM
+                SkXmOverflowStatus(pAC, IoC, Port, IStatus, &OverflowStatus);
+#else
+                Para.Para32[0] = (SK_U32)Port;
+                Para.Para32[1] = (SK_U32)IStatus;
+                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_SIRQ_OVERFLOW, Para);
+#endif /* SK_SLIM */
+        }
+
+        if ((IStatus & XM_IS_RXF_OV) != 0) {
+                /* normal situation -> no effect */
+#ifdef DEBUG
+                pPrt->PRxOverCnt++;
+#endif /* DEBUG */
+        }
+
+        if ((IStatus & XM_IS_TXF_UR) != 0) {
+                /* may NOT happen -> error log */
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E020, SKERR_SIRQ_E020MSG);
+        }
+
+        if ((IStatus & XM_IS_TX_COMP) != 0) {
+                /* not served here */
+        }
+
+        if ((IStatus & XM_IS_RX_COMP) != 0) {
+                /* not served here */
+        }
+}       /* SkXmIrq */
+#endif /* GENESIS */
+
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ *      SkGmIrq() - Interrupt Service Routine
+ *
+ * Description: services an Interrupt Request of the GMAC
+ *
+ * Note:
+ *
+ * Returns:
+ *      nothing
+ */
+static void SkGmIrq(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U8           IStatus;        /* Interrupt status */
+#ifdef SK_SLIM
+    SK_U64      OverflowStatus;
+#else
+        SK_EVPARA       Para;
+#endif  
+
+        pPrt = &pAC->GIni.GP[Port];
+        
+        SK_IN8(IoC, GMAC_IRQ_SRC, &IStatus);
+        
+#ifdef XXX
+        /* LinkPartner Auto-negable? */
+        SkMacAutoNegLipaPhy(pAC, IoC, Port, IStatus);
+#endif /* XXX */
+        
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+                ("GmacIrq Port %d Isr 0x%04X\n", Port, IStatus));
+
+        /* Combined Tx & Rx Counter Overflow SIRQ Event */
+        if (IStatus & (GM_IS_RX_CO_OV | GM_IS_TX_CO_OV)) {
+                /* these IRQs will be cleared by reading GMACs register */
+#ifdef SK_SLIM
+        SkGmOverflowStatus(pAC, IoC, Port, IStatus, &OverflowStatus);
+#else
+                Para.Para32[0] = (SK_U32)Port;
+                Para.Para32[1] = (SK_U32)IStatus;
+                SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_SIRQ_OVERFLOW, Para);
+#endif          
+        }
+
+        if (IStatus & GM_IS_RX_FF_OR) {
+                /* clear GMAC Rx FIFO Overrun IRQ */
+                SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_CLI_RX_FO);
+#ifdef DEBUG
+                pPrt->PRxOverCnt++;
+#endif /* DEBUG */
+        }
+
+        if (IStatus & GM_IS_TX_FF_UR) {
+                /* clear GMAC Tx FIFO Underrun IRQ */
+                SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_CLI_TX_FU);
+                /* may NOT happen -> error log */
+                SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E020, SKERR_SIRQ_E020MSG);
+        }
+
+        if (IStatus & GM_IS_TX_COMPL) {
+                /* not served here */
+        }
+
+        if (IStatus & GM_IS_RX_COMPL) {
+                /* not served here */
+        }
+}       /* SkGmIrq */
+#endif /* YUKON */
+
+
+/******************************************************************************
+ *
+ *      SkMacIrq() - Interrupt Service Routine for MAC
+ *
+ * Description: calls the Interrupt Service Routine dep. on board type
+ *
+ * Returns:
+ *      nothing
+ */
+void SkMacIrq(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port)           /* Port Index (MAC_1 + n) */
+{
+#ifdef GENESIS
+        if (pAC->GIni.GIGenesis) {
+                /* IRQ from XMAC */
+                SkXmIrq(pAC, IoC, Port);
+        }
+#endif /* GENESIS */
+        
+#ifdef YUKON
+        if (pAC->GIni.GIYukon) {
+                /* IRQ from GMAC */
+                SkGmIrq(pAC, IoC, Port);
+        }
+#endif /* YUKON */
+
+}       /* SkMacIrq */
+
+#endif /* !SK_DIAG */
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *      SkXmUpdateStats() - Force the XMAC to output the current statistic
+ *
+ * Description:
+ *      The XMAC holds its statistic internally. To obtain the current
+ *      values a command must be sent so that the statistic data will
+ *      be written to a predefined memory area on the adapter.
+ *
+ * Returns:
+ *      0:  success
+ *      1:  something went wrong
+ */
+int SkXmUpdateStats(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+unsigned int Port)      /* Port Index (MAC_1 + n) */
+{
+        SK_GEPORT       *pPrt;
+        SK_U16          StatReg;
+        int                     WaitIndex;
+
+        pPrt = &pAC->GIni.GP[Port];
+        WaitIndex = 0;
+
+        /* Send an update command to XMAC specified */
+        XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_SNP_TXC | XM_SC_SNP_RXC);
+
+        /*
+         * It is an auto-clearing register. If the command bits
+         * went to zero again, the statistics are transferred.
+         * Normally the command should be executed immediately.
+         * But just to be sure we execute a loop.
+         */
+        do {
+
+                XM_IN16(IoC, Port, XM_STAT_CMD, &StatReg);
+                
+                if (++WaitIndex > 10) {
+
+                        SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_HWI_E021, SKERR_HWI_E021MSG);
+
+                        return(1);
+                }
+        } while ((StatReg & (XM_SC_SNP_TXC | XM_SC_SNP_RXC)) != 0);
+        
+        return(0);
+}       /* SkXmUpdateStats */
+
+
+/******************************************************************************
+ *
+ *      SkXmMacStatistic() - Get XMAC counter value
+ *
+ * Description:
+ *      Gets the 32bit counter value. Except for the octet counters
+ *      the lower 32bit are counted in hardware and the upper 32bit
+ *      must be counted in software by monitoring counter overflow interrupts.
+ *
+ * Returns:
+ *      0:  success
+ *      1:  something went wrong
+ */
+int SkXmMacStatistic(
+SK_AC   *pAC,                   /* adapter context */
+SK_IOC  IoC,                    /* IO context */
+unsigned int Port,              /* Port Index (MAC_1 + n) */
+SK_U16  StatAddr,               /* MIB counter base address */
+SK_U32  SK_FAR *pVal)   /* ptr to return statistic value */
+{
+        if ((StatAddr < XM_TXF_OK) || (StatAddr > XM_RXF_MAX_SZ)) {
+                
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E022, SKERR_HWI_E022MSG);
+                
+                return(1);
+        }
+        
+        XM_IN32(IoC, Port, StatAddr, pVal);
+
+        return(0);
+}       /* SkXmMacStatistic */
+
+
+/******************************************************************************
+ *
+ *      SkXmResetCounter() - Clear MAC statistic counter
+ *
+ * Description:
+ *      Force the XMAC to clear its statistic counter.
+ *
+ * Returns:
+ *      0:  success
+ *      1:  something went wrong
+ */
+int SkXmResetCounter(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+unsigned int Port)      /* Port Index (MAC_1 + n) */
+{
+        XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+        /* Clear two times according to Errata #3 */
+        XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+
+        return(0);
+}       /* SkXmResetCounter */
+
+
+/******************************************************************************
+ *
+ *      SkXmOverflowStatus() - Gets the status of counter overflow interrupt
+ *
+ * Description:
+ *      Checks the source causing an counter overflow interrupt. On success the
+ *      resulting counter overflow status is written to <pStatus>, whereas the
+ *      upper dword stores the XMAC ReceiveCounterEvent register and the lower
+ *      dword the XMAC TransmitCounterEvent register.
+ *
+ * Note:
+ *      For XMAC the interrupt source is a self-clearing register, so the source
+ *      must be checked only once. SIRQ module does another check to be sure
+ *      that no interrupt get lost during process time.
+ *
+ * Returns:
+ *      0:  success
+ *      1:  something went wrong
+ */
+int SkXmOverflowStatus(
+SK_AC   *pAC,                           /* adapter context */
+SK_IOC  IoC,                            /* IO context */
+unsigned int Port,                      /* Port Index (MAC_1 + n) */
+SK_U16  IStatus,                        /* Interupt Status from MAC */
+SK_U64  SK_FAR *pStatus)        /* ptr for return overflow status value */
+{
+        SK_U64  Status; /* Overflow status */
+        SK_U32  RegVal;
+
+        Status = 0;
+
+        if ((IStatus & XM_IS_RXC_OV) != 0) {
+
+                XM_IN32(IoC, Port, XM_RX_CNT_EV, &RegVal);
+                Status |= (SK_U64)RegVal << 32;
+        }
+        
+        if ((IStatus & XM_IS_TXC_OV) != 0) {
+
+                XM_IN32(IoC, Port, XM_TX_CNT_EV, &RegVal);
+                Status |= (SK_U64)RegVal;
+        }
+
+        *pStatus = Status;
+
+        return(0);
+}       /* SkXmOverflowStatus */
+#endif /* GENESIS */
+
+
+#ifdef YUKON
+/******************************************************************************
+ *
+ *      SkGmUpdateStats() - Force the GMAC to output the current statistic
+ *
+ * Description:
+ *      Empty function for GMAC. Statistic data is accessible in direct way.
+ *
+ * Returns:
+ *      0:  success
+ *      1:  something went wrong
+ */
+int SkGmUpdateStats(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+unsigned int Port)      /* Port Index (MAC_1 + n) */
+{
+        return(0);
+}
+
+
+/******************************************************************************
+ *
+ *      SkGmMacStatistic() - Get GMAC counter value
+ *
+ * Description:
+ *      Gets the 32bit counter value. Except for the octet counters
+ *      the lower 32bit are counted in hardware and the upper 32bit
+ *      must be counted in software by monitoring counter overflow interrupts.
+ *
+ * Returns:
+ *      0:  success
+ *      1:  something went wrong
+ */
+int SkGmMacStatistic(
+SK_AC   *pAC,                   /* adapter context */
+SK_IOC  IoC,                    /* IO context */
+unsigned int Port,              /* Port Index (MAC_1 + n) */
+SK_U16  StatAddr,               /* MIB counter base address */
+SK_U32  SK_FAR *pVal)   /* ptr to return statistic value */
+{
+
+        if ((StatAddr < GM_RXF_UC_OK) || (StatAddr > GM_TXE_FIFO_UR)) {
+                
+                SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E022, SKERR_HWI_E022MSG);
+                
+                SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                        ("SkGmMacStat: wrong MIB counter 0x%04X\n", StatAddr));
+                return(1);
+        }
+                
+        GM_IN32(IoC, Port, StatAddr, pVal);
+
+        return(0);
+}       /* SkGmMacStatistic */
+
+
+/******************************************************************************
+ *
+ *      SkGmResetCounter() - Clear MAC statistic counter
+ *
+ * Description:
+ *      Force GMAC to clear its statistic counter.
+ *
+ * Returns:
+ *      0:  success
+ *      1:  something went wrong
+ */
+int SkGmResetCounter(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+unsigned int Port)      /* Port Index (MAC_1 + n) */
+{
+        SK_U16  Reg;    /* Phy Address Register */
+        SK_U16  Word;
+        int             i;
+
+        GM_IN16(IoC, Port, GM_PHY_ADDR, &Reg);
+
+        /* set MIB Clear Counter Mode */
+        GM_OUT16(IoC, Port, GM_PHY_ADDR, Reg | GM_PAR_MIB_CLR);
+        
+        /* read all MIB Counters with Clear Mode set */
+        for (i = 0; i < GM_MIB_CNT_SIZE; i++) {
+                /* the reset is performed only when the lower 16 bits are read */
+                GM_IN16(IoC, Port, GM_MIB_CNT_BASE + 8*i, &Word);
+        }
+        
+        /* clear MIB Clear Counter Mode */
+        GM_OUT16(IoC, Port, GM_PHY_ADDR, Reg);
+        
+        return(0);
+}       /* SkGmResetCounter */
+
+
+/******************************************************************************
+ *
+ *      SkGmOverflowStatus() - Gets the status of counter overflow interrupt
+ *
+ * Description:
+ *      Checks the source causing an counter overflow interrupt. On success the
+ *      resulting counter overflow status is written to <pStatus>, whereas the
+ *      the following bit coding is used:
+ *      63:56 - unused
+ *      55:48 - TxRx interrupt register bit7:0
+ *      32:47 - Rx interrupt register
+ *      31:24 - unused
+ *      23:16 - TxRx interrupt register bit15:8
+ *      15:0  - Tx interrupt register
+ *
+ * Returns:
+ *      0:  success
+ *      1:  something went wrong
+ */
+int SkGmOverflowStatus(
+SK_AC   *pAC,                           /* adapter context */
+SK_IOC  IoC,                            /* IO context */
+unsigned int Port,                      /* Port Index (MAC_1 + n) */
+SK_U16  IStatus,                        /* Interupt Status from MAC */
+SK_U64  SK_FAR *pStatus)        /* ptr for return overflow status value */
+{
+        SK_U64  Status;         /* Overflow status */
+        SK_U16  RegVal;
+
+        Status = 0;
+
+        if ((IStatus & GM_IS_RX_CO_OV) != 0) {
+                /* this register is self-clearing after read */
+                GM_IN16(IoC, Port, GM_RX_IRQ_SRC, &RegVal);
+                Status |= (SK_U64)RegVal << 32;
+        }
+        
+        if ((IStatus & GM_IS_TX_CO_OV) != 0) {
+                /* this register is self-clearing after read */
+                GM_IN16(IoC, Port, GM_TX_IRQ_SRC, &RegVal);
+                Status |= (SK_U64)RegVal;
+        }
+        
+        /* this register is self-clearing after read */
+        GM_IN16(IoC, Port, GM_TR_IRQ_SRC, &RegVal);
+        /* Rx overflow interrupt register bits (LoByte)*/
+        Status |= (SK_U64)((SK_U8)RegVal) << 48;
+        /* Tx overflow interrupt register bits (HiByte)*/
+        Status |= (SK_U64)(RegVal >> 8) << 16;
+
+        *pStatus = Status;
+
+        return(0);
+}       /* SkGmOverflowStatus */
+
+
+#ifndef SK_SLIM
+/******************************************************************************
+ *
+ *      SkGmCableDiagStatus() - Starts / Gets status of cable diagnostic test
+ *
+ * Description:
+ *  starts the cable diagnostic test if 'StartTest' is true
+ *  gets the results if 'StartTest' is true
+ *
+ * NOTE:        this test is meaningful only when link is down
+ *      
+ * Returns:
+ *      0:  success
+ *      1:      no YUKON copper
+ *      2:      test in progress
+ */
+int SkGmCableDiagStatus(
+SK_AC   *pAC,           /* adapter context */
+SK_IOC  IoC,            /* IO context */
+int             Port,           /* Port Index (MAC_1 + n) */
+SK_BOOL StartTest)      /* flag for start / get result */
+{
+        int             i;
+        SK_U16  RegVal;
+        SK_GEPORT       *pPrt;
+
+        pPrt = &pAC->GIni.GP[Port];
+
+        if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
+                
+                return(1);
+        }
+
+        if (StartTest) {
+                /* only start the cable test */
+                if ((pPrt->PhyId1 & PHY_I1_REV_MSK) < 4) {
+                        /* apply TDR workaround from Marvell */
+                        SkGmPhyWrite(pAC, IoC, Port, 29, 0x001e);
+                        
+                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xcc00);
+                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xc800);
+                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xc400);
+                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xc000);
+                        SkGmPhyWrite(pAC, IoC, Port, 30, 0xc100);
+                }
+
+                /* set address to 0 for MDI[0] */
+                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, 0);
+
+                /* Read Cable Diagnostic Reg */
+                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
+
+                /* start Cable Diagnostic Test */
+                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CABLE_DIAG,
+                        (SK_U16)(RegVal | PHY_M_CABD_ENA_TEST));
+        
+                return(0);
+        }
+        
+        /* Read Cable Diagnostic Reg */
+        SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
+
+        SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+                ("PHY Cable Diag.=0x%04X\n", RegVal));
+
+        if ((RegVal & PHY_M_CABD_ENA_TEST) != 0) {
+                /* test is running */
+                return(2);
+        }
+
+        /* get the test results */
+        for (i = 0; i < 4; i++)  {
+                /* set address to i for MDI[i] */
+                SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_ADR, (SK_U16)i);
+
+                /* get Cable Diagnostic values */
+                SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CABLE_DIAG, &RegVal);
+
+                pPrt->PMdiPairLen[i] = (SK_U8)(RegVal & PHY_M_CABD_DIST_MSK);
+
+                pPrt->PMdiPairSts[i] = (SK_U8)((RegVal & PHY_M_CABD_STAT_MSK) >> 13);
+        }
+
+        return(0);
+}       /* SkGmCableDiagStatus */
+#endif /* !SK_SLIM */
+#endif /* YUKON */
+
+/* End of file */
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7575924363..ea117fc3d5 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -51,7 +51,7 @@
 #include "sky2.h"
 
 #define DRV_NAME                "sky2"
-#define DRV_VERSION             "1.16"
+#define DRV_VERSION             "1.18"
 #define PFX                     DRV_NAME " "
 
 /*
@@ -99,10 +99,6 @@ static int disable_msi = 0;
 module_param(disable_msi, int, 0);
 MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
 
-static int idle_timeout = 100;
-module_param(idle_timeout, int, 0);
-MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
-
 static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */
@@ -122,12 +118,15 @@ static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4351) }, /* 88E8036 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4352) }, /* 88E8038 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4353) }, /* 88E8039 */
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4354) }, /* 88E8040 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4356) }, /* 88EC033 */
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x435A) }, /* 88E8048 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4360) }, /* 88E8052 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4361) }, /* 88E8050 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4362) }, /* 88E8053 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4363) }, /* 88E8055 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4364) }, /* 88E8056 */
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4365) }, /* 88E8070 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4366) }, /* 88EC036 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4367) }, /* 88EC032 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4368) }, /* 88EC034 */
@@ -151,8 +150,11 @@ static const char *yukon2_name[] = {
         "Extreme",      /* 0xb5 */
         "EC",           /* 0xb6 */
         "FE",           /* 0xb7 */
+        "FE+",          /* 0xb8 */
 };
 
+static void sky2_set_multicast(struct net_device *dev);
+
 /* Access to external PHY */
 static int gm_phy_write(struct sky2_hw *hw, unsigned port, u16 reg, u16 val)
 {
@@ -219,9 +221,11 @@ static void sky2_power_on(struct sky2_hw *hw)
         else
                 sky2_write8(hw, B2_Y2_CLK_GATE, 0);
 
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX) {
+        if (hw->flags & SKY2_HW_ADV_POWER_CTL) {
                 u32 reg;
 
+                sky2_pci_write32(hw, PCI_DEV_REG3, 0);
+
                 reg = sky2_pci_read32(hw, PCI_DEV_REG4);
                 /* set all bits to 0 except bits 15..12 and 8 */
                 reg &= P_ASPM_CONTROL_MSK;
@@ -238,6 +242,8 @@ static void sky2_power_on(struct sky2_hw *hw)
                 reg = sky2_read32(hw, B2_GP_IO);
                 reg |= GLB_GPIO_STAT_RACE_DIS;
                 sky2_write32(hw, B2_GP_IO, reg);
+
+                sky2_read32(hw, B2_GP_IO);
         }
 }
 
@@ -308,10 +314,8 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
         struct sky2_port *sky2 = netdev_priv(hw->dev[port]);
         u16 ctrl, ct1000, adv, pg, ledctrl, ledover, reg;
 
-        if (sky2->autoneg == AUTONEG_ENABLE
-            && !(hw->chip_id == CHIP_ID_YUKON_XL
-                 || hw->chip_id == CHIP_ID_YUKON_EC_U
-                 || hw->chip_id == CHIP_ID_YUKON_EX)) {
+        if (sky2->autoneg == AUTONEG_ENABLE &&
+            !(hw->flags & SKY2_HW_NEWER_PHY)) {
                 u16 ectrl = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL);
 
                 ectrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
@@ -331,9 +335,19 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 
         ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);
         if (sky2_is_copper(hw)) {
-                if (hw->chip_id == CHIP_ID_YUKON_FE) {
+                if (!(hw->flags & SKY2_HW_GIGABIT)) {
                         /* enable automatic crossover */
                         ctrl |= PHY_M_PC_MDI_XMODE(PHY_M_PC_ENA_AUTO) >> 1;
+
+                        if (hw->chip_id == CHIP_ID_YUKON_FE_P &&
+                            hw->chip_rev == CHIP_REV_YU_FE2_A0) {
+                                u16 spec;
+
+                                /* Enable Class A driver for FE+ A0 */
+                                spec = gm_phy_read(hw, port, PHY_MARV_FE_SPEC_2);
+                                spec |= PHY_M_FESC_SEL_CL_A;
+                                gm_phy_write(hw, port, PHY_MARV_FE_SPEC_2, spec);
+                        }
                 } else {
                         /* disable energy detect */
                         ctrl &= ~PHY_M_PC_EN_DET_MSK;
@@ -343,9 +357,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 
                         /* downshift on PHY 88E1112 and 88E1149 is changed */
                         if (sky2->autoneg == AUTONEG_ENABLE
-                            && (hw->chip_id == CHIP_ID_YUKON_XL
-                                || hw->chip_id == CHIP_ID_YUKON_EC_U
-                                || hw->chip_id == CHIP_ID_YUKON_EX)) {
+                            && (hw->flags & SKY2_HW_NEWER_PHY)) {
                                 /* set downshift counter to 3x and enable downshift */
                                 ctrl &= ~PHY_M_PC_DSC_MSK;
                                 ctrl |= PHY_M_PC_DSC(2) | PHY_M_PC_DOWN_S_ENA;
@@ -361,7 +373,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
         gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);
 
         /* special setup for PHY 88E1112 Fiber */
-        if (hw->chip_id == CHIP_ID_YUKON_XL && !sky2_is_copper(hw)) {
+        if (hw->chip_id == CHIP_ID_YUKON_XL && (hw->flags & SKY2_HW_FIBRE_PHY)) {
                 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
 
                 /* Fiber: select 1000BASE-X only mode MAC Specific Ctrl Reg. */
@@ -452,7 +464,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 
         gma_write16(hw, port, GM_GP_CTRL, reg);
 
-        if (hw->chip_id != CHIP_ID_YUKON_FE)
+        if (hw->flags & SKY2_HW_GIGABIT)
                 gm_phy_write(hw, port, PHY_MARV_1000T_CTRL, ct1000);
 
         gm_phy_write(hw, port, PHY_MARV_AUNE_ADV, adv);
@@ -476,6 +488,23 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                 gm_phy_write(hw, port, PHY_MARV_FE_LED_PAR, ctrl);
                 break;
 
+        case CHIP_ID_YUKON_FE_P:
+                /* Enable Link Partner Next Page */
+                ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);
+                ctrl |= PHY_M_PC_ENA_LIP_NP;
+
+                /* disable Energy Detect and enable scrambler */
+                ctrl &= ~(PHY_M_PC_ENA_ENE_DT | PHY_M_PC_DIS_SCRAMB);
+                gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);
+
+                /* set LED2 -> ACT, LED1 -> LINK, LED0 -> SPEED */
+                ctrl = PHY_M_FELP_LED2_CTRL(LED_PAR_CTRL_ACT_BL) |
+                        PHY_M_FELP_LED1_CTRL(LED_PAR_CTRL_LINK) |
+                        PHY_M_FELP_LED0_CTRL(LED_PAR_CTRL_SPEED);
+
+                gm_phy_write(hw, port, PHY_MARV_FE_LED_PAR, ctrl);
+                break;
+
         case CHIP_ID_YUKON_XL:
                 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
 
@@ -545,7 +574,13 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 
                 /* set page register to 0 */
                 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 0);
+        } else if (hw->chip_id == CHIP_ID_YUKON_FE_P &&
+                   hw->chip_rev == CHIP_REV_YU_FE2_A0) {
+                /* apply workaround for integrated resistors calibration */
+                gm_phy_write(hw, port, PHY_MARV_PAGE_ADDR, 17);
+                gm_phy_write(hw, port, PHY_MARV_PAGE_DATA, 0x3f60);
         } else if (hw->chip_id != CHIP_ID_YUKON_EX) {
+                /* no effect on Yukon-XL */
                 gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
 
                 if (sky2->autoneg == AUTONEG_DISABLE || sky2->speed == SPEED_100) {
@@ -666,25 +701,25 @@ static void sky2_wol_init(struct sky2_port *sky2)
 
 static void sky2_set_tx_stfwd(struct sky2_hw *hw, unsigned port)
 {
-        if (hw->chip_id == CHIP_ID_YUKON_EX && hw->chip_rev != CHIP_REV_YU_EX_A0) {
+        struct net_device *dev = hw->dev[port];
+
+        if (dev->mtu <= ETH_DATA_LEN)
                 sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
-                             TX_STFW_ENA |
-                             (hw->dev[port]->mtu > ETH_DATA_LEN) ? TX_JUMBO_ENA : TX_JUMBO_DIS);
-        } else {
-                if (hw->dev[port]->mtu > ETH_DATA_LEN) {
-                        /* set Tx GMAC FIFO Almost Empty Threshold */
-                        sky2_write32(hw, SK_REG(port, TX_GMF_AE_THR),
-                                     (ECU_JUMBO_WM << 16) | ECU_AE_THR);
+                             TX_JUMBO_DIS | TX_STFW_ENA);
+
+        else if (hw->chip_id != CHIP_ID_YUKON_EC_U)
+                sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
+                             TX_STFW_ENA | TX_JUMBO_ENA);
+        else {
+                /* set Tx GMAC FIFO Almost Empty Threshold */
+                sky2_write32(hw, SK_REG(port, TX_GMF_AE_THR),
+                             (ECU_JUMBO_WM << 16) | ECU_AE_THR);
 
-                        sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
-                                     TX_JUMBO_ENA | TX_STFW_DIS);
+                sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
+                             TX_JUMBO_ENA | TX_STFW_DIS);
 
-                        /* Can't do offload because of lack of store/forward */
-                        hw->dev[port]->features &= ~(NETIF_F_TSO | NETIF_F_SG
-                                                     | NETIF_F_ALL_CSUM);
-                } else
-                        sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T),
-                                     TX_JUMBO_DIS | TX_STFW_ENA);
+                /* Can't do offload because of lack of store/forward */
+                dev->features &= ~(NETIF_F_TSO | NETIF_F_SG | NETIF_F_ALL_CSUM);
         }
 }
 
@@ -770,7 +805,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
         /* Configure Rx MAC FIFO */
         sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);
         rx_reg = GMF_OPER_ON | GMF_RX_F_FL_ON;
-        if (hw->chip_id == CHIP_ID_YUKON_EX)
+        if (hw->chip_id == CHIP_ID_YUKON_EX ||
+            hw->chip_id == CHIP_ID_YUKON_FE_P)
                 rx_reg |= GMF_RX_OVER_ON;
 
         sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), rx_reg);
@@ -779,13 +815,19 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
         sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR);
 
         /* Set threshold to 0xa (64 bytes) + 1 to workaround pause bug  */
-        sky2_write16(hw, SK_REG(port, RX_GMF_FL_THR), RX_GMF_FL_THR_DEF+1);
+        reg = RX_GMF_FL_THR_DEF + 1;
+        /* Another magic mystery workaround from sk98lin */
+        if (hw->chip_id == CHIP_ID_YUKON_FE_P &&
+            hw->chip_rev == CHIP_REV_YU_FE2_A0)
+                reg = 0x178;
+        sky2_write16(hw, SK_REG(port, RX_GMF_FL_THR), reg);
 
         /* Configure Tx MAC FIFO */
         sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
         sky2_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
 
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX) {
+        /* On chips without ram buffer, pause is controled by MAC level */
+        if (sky2_read8(hw, B2_E_0) == 0) {
                 sky2_write8(hw, SK_REG(port, RX_GMF_LP_THR), 768/8);
                 sky2_write8(hw, SK_REG(port, RX_GMF_UP_THR), 1024/8);
 
@@ -868,6 +910,20 @@ static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2)
         return le;
 }
 
+static void tx_init(struct sky2_port *sky2)
+{
+        struct sky2_tx_le *le;
+
+        sky2->tx_prod = sky2->tx_cons = 0;
+        sky2->tx_tcpsum = 0;
+        sky2->tx_last_mss = 0;
+
+        le = get_tx_le(sky2);
+        le->addr = 0;
+        le->opcode = OP_ADDR64 | HW_OWNER;
+        sky2->tx_addr64 = 0;
+}
+
 static inline struct tx_ring_info *tx_le_re(struct sky2_port *sky2,
                                             struct sky2_tx_le *le)
 {
@@ -964,19 +1020,15 @@ static void sky2_rx_unmap_skb(struct pci_dev *pdev, struct rx_ring_info *re)
  */
 static void rx_set_checksum(struct sky2_port *sky2)
 {
-        struct sky2_rx_le *le;
+        struct sky2_rx_le *le = sky2_next_rx(sky2);
 
-        if (sky2->hw->chip_id != CHIP_ID_YUKON_EX) {
-                le = sky2_next_rx(sky2);
-                le->addr = cpu_to_le32((ETH_HLEN << 16) | ETH_HLEN);
-                le->ctrl = 0;
-                le->opcode = OP_TCPSTART | HW_OWNER;
-
-                sky2_write32(sky2->hw,
-                             Q_ADDR(rxqaddr[sky2->port], Q_CSR),
-                             sky2->rx_csum ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
-        }
+        le->addr = cpu_to_le32((ETH_HLEN << 16) | ETH_HLEN);
+        le->ctrl = 0;
+        le->opcode = OP_TCPSTART | HW_OWNER;
 
+        sky2_write32(sky2->hw,
+                     Q_ADDR(rxqaddr[sky2->port], Q_CSR),
+                     sky2->rx_csum ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
 }
 
 /*
@@ -1172,7 +1224,8 @@ static int sky2_rx_start(struct sky2_port *sky2)
 
         sky2_prefetch_init(hw, rxq, sky2->rx_le_map, RX_LE_SIZE - 1);
 
-        rx_set_checksum(sky2);
+        if (!(hw->flags & SKY2_HW_NEW_LE))
+                rx_set_checksum(sky2);
 
         /* Space needed for frame data + headers rounded up */
         size = roundup(sky2->netdev->mtu + ETH_HLEN + VLAN_HLEN, 8);
@@ -1243,7 +1296,7 @@ static int sky2_up(struct net_device *dev)
         struct sky2_port *sky2 = netdev_priv(dev);
         struct sky2_hw *hw = sky2->hw;
         unsigned port = sky2->port;
-        u32 ramsize, imask;
+        u32 imask, ramsize;
         int cap, err = -ENOMEM;
         struct net_device *otherdev = hw->dev[sky2->port^1];
 
@@ -1281,7 +1334,8 @@ static int sky2_up(struct net_device *dev)
                                 GFP_KERNEL);
         if (!sky2->tx_ring)
                 goto err_out;
-        sky2->tx_prod = sky2->tx_cons = 0;
+
+        tx_init(sky2);
 
         sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
                                            &sky2->rx_le_map);
@@ -1300,11 +1354,10 @@ static int sky2_up(struct net_device *dev)
 
         /* Register is number of 4K blocks on internal RAM buffer. */
         ramsize = sky2_read8(hw, B2_E_0) * 4;
-        printk(KERN_INFO PFX "%s: ram buffer %dK\n", dev->name, ramsize);
-
         if (ramsize > 0) {
                 u32 rxspace;
 
+                pr_debug(PFX "%s: ram buffer %dK\n", dev->name, ramsize);
                 if (ramsize < 16)
                         rxspace = ramsize / 2;
                 else
@@ -1433,13 +1486,15 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
         /* Check for TCP Segmentation Offload */
         mss = skb_shinfo(skb)->gso_size;
         if (mss != 0) {
-                if (hw->chip_id != CHIP_ID_YUKON_EX)
+
+                if (!(hw->flags & SKY2_HW_NEW_LE))
                         mss += ETH_HLEN + ip_hdrlen(skb) + tcp_hdrlen(skb);
 
                 if (mss != sky2->tx_last_mss) {
                         le = get_tx_le(sky2);
                         le->addr = cpu_to_le32(mss);
-                        if (hw->chip_id == CHIP_ID_YUKON_EX)
+
+                        if (hw->flags & SKY2_HW_NEW_LE)
                                 le->opcode = OP_MSS | HW_OWNER;
                         else
                                 le->opcode = OP_LRGLEN | HW_OWNER;
@@ -1465,8 +1520,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
         /* Handle TCP checksum offload */
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 /* On Yukon EX (some versions) encoding change. */
-                if (hw->chip_id == CHIP_ID_YUKON_EX
-                    && hw->chip_rev != CHIP_REV_YU_EX_B0)
+                if (hw->flags & SKY2_HW_AUTO_TX_SUM)
                         ctrl |= CALSUM; /* auto checksum */
                 else {
                         const unsigned offset = skb_transport_offset(skb);
@@ -1702,11 +1756,15 @@ static int sky2_down(struct net_device *dev)
 
 static u16 sky2_phy_speed(const struct sky2_hw *hw, u16 aux)
 {
-        if (!sky2_is_copper(hw))
+        if (hw->flags & SKY2_HW_FIBRE_PHY)
                 return SPEED_1000;
 
-        if (hw->chip_id == CHIP_ID_YUKON_FE)
-                return (aux & PHY_M_PS_SPEED_100) ? SPEED_100 : SPEED_10;
+        if (!(hw->flags & SKY2_HW_GIGABIT)) {
+                if (aux & PHY_M_PS_SPEED_100)
+                        return SPEED_100;
+                else
+                        return SPEED_10;
+        }
 
         switch (aux & PHY_M_PS_SPEED_MSK) {
         case PHY_M_PS_SPEED_1000:
@@ -1739,13 +1797,13 @@ static void sky2_link_up(struct sky2_port *sky2)
 
         netif_carrier_on(sky2->netdev);
 
+        mod_timer(&hw->watchdog_timer, jiffies + 1);
+
         /* Turn on link LED */
         sky2_write8(hw, SK_REG(port, LNK_LED_REG),
                     LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);
 
-        if (hw->chip_id == CHIP_ID_YUKON_XL
-            || hw->chip_id == CHIP_ID_YUKON_EC_U
-            || hw->chip_id == CHIP_ID_YUKON_EX) {
+        if (hw->flags & SKY2_HW_NEWER_PHY) {
                 u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
                 u16 led = PHY_M_LEDC_LOS_CTRL(1);       /* link active */
 
@@ -1832,7 +1890,7 @@ static int sky2_autoneg_done(struct sky2_port *sky2, u16 aux)
         /* Since the pause result bits seem to in different positions on
          * different chips. look at registers.
          */
-        if (!sky2_is_copper(hw)) {
+        if (hw->flags & SKY2_HW_FIBRE_PHY) {
                 /* Shift for bits in fiber PHY */
                 advert &= ~(ADVERTISE_PAUSE_CAP|ADVERTISE_PAUSE_ASYM);
                 lpa &= ~(LPA_PAUSE_CAP|LPA_PAUSE_ASYM);
@@ -1943,7 +2001,9 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
         if (new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU)
                 return -EINVAL;
 
-        if (new_mtu > ETH_DATA_LEN && hw->chip_id == CHIP_ID_YUKON_FE)
+        if (new_mtu > ETH_DATA_LEN &&
+            (hw->chip_id == CHIP_ID_YUKON_FE ||
+             hw->chip_id == CHIP_ID_YUKON_FE_P))
                 return -EINVAL;
 
         if (!netif_running(dev)) {
@@ -1960,7 +2020,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
 
         synchronize_irq(hw->pdev->irq);
 
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX)
+        if (sky2_read8(hw, B2_E_0) == 0)
                 sky2_set_tx_stfwd(hw, port);
 
         ctl = gma_read16(hw, port, GM_GP_CTRL);
@@ -2088,6 +2148,13 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
         struct sky2_port *sky2 = netdev_priv(dev);
         struct rx_ring_info *re = sky2->rx_ring + sky2->rx_next;
         struct sk_buff *skb = NULL;
+        u16 count = (status & GMR_FS_LEN) >> 16;
+
+#ifdef SKY2_VLAN_TAG_USED
+        /* Account for vlan tag */
+        if (sky2->vlgrp && (status & GMR_FS_VLAN))
+                count -= VLAN_HLEN;
+#endif
 
         if (unlikely(netif_msg_rx_status(sky2)))
                 printk(KERN_DEBUG PFX "%s: rx slot %u status 0x%x len %d\n",
@@ -2096,15 +2163,26 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
         sky2->rx_next = (sky2->rx_next + 1) % sky2->rx_pending;
         prefetch(sky2->rx_ring + sky2->rx_next);
 
+        /* This chip has hardware problems that generates bogus status.
+         * So do only marginal checking and expect higher level protocols
+         * to handle crap frames.
+         */
+        if (sky2->hw->chip_id == CHIP_ID_YUKON_FE_P &&
+            sky2->hw->chip_rev == CHIP_REV_YU_FE2_A0 &&
+            length != count)
+                goto okay;
+
         if (status & GMR_FS_ANY_ERR)
                 goto error;
 
         if (!(status & GMR_FS_RX_OK))
                 goto resubmit;
 
-        if (status >> 16 != length)
-                goto len_mismatch;
+        /* if length reported by DMA does not match PHY, packet was truncated */
+        if (length != count)
+                goto len_error;
 
+okay:
         if (length < copybreak)
                 skb = receive_copy(sky2, re, length);
         else
@@ -2114,10 +2192,14 @@ resubmit:
 
         return skb;
 
-len_mismatch:
+len_error:
         /* Truncation of overlength packets
            causes PHY length to not match MAC length */
         ++sky2->net_stats.rx_length_errors;
+        if (netif_msg_rx_err(sky2) && net_ratelimit())
+                pr_info(PFX "%s: rx length error: status %#x length %d\n",
+                        dev->name, status, length);
+        goto resubmit;
 
 error:
         ++sky2->net_stats.rx_errors;
@@ -2187,7 +2269,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
                         }
 
                         /* This chip reports checksum status differently */
-                        if (hw->chip_id == CHIP_ID_YUKON_EX) {
+                        if (hw->flags & SKY2_HW_NEW_LE) {
                                 if (sky2->rx_csum &&
                                     (le->css & (CSS_ISIPV4 | CSS_ISIPV6)) &&
                                     (le->css & CSS_TCPUDPCSOK))
@@ -2228,8 +2310,14 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
                         if (!sky2->rx_csum)
                                 break;
 
-                        if (hw->chip_id == CHIP_ID_YUKON_EX)
+                        /* If this happens then driver assuming wrong format */
+                        if (unlikely(hw->flags & SKY2_HW_NEW_LE)) {
+                                if (net_ratelimit())
+                                        printk(KERN_NOTICE "%s: unexpected"
+                                               " checksum status\n",
+                                               dev->name);
                                 break;
+                        }
 
                         /* Both checksum counters are programmed to start at
                          * the same offset, so unless there is a problem they
@@ -2421,25 +2509,72 @@ static void sky2_le_error(struct sky2_hw *hw, unsigned port,
         sky2_write32(hw, Q_ADDR(q, Q_CSR), BMU_CLR_IRQ_CHK);
 }
 
-/* If idle then force a fake soft NAPI poll once a second
- * to work around cases where sharing an edge triggered interrupt.
- */
-static inline void sky2_idle_start(struct sky2_hw *hw)
+static int sky2_rx_hung(struct net_device *dev)
 {
-        if (idle_timeout > 0)
-                mod_timer(&hw->idle_timer,
-                          jiffies + msecs_to_jiffies(idle_timeout));
+        struct sky2_port *sky2 = netdev_priv(dev);
+        struct sky2_hw *hw = sky2->hw;
+        unsigned port = sky2->port;
+        unsigned rxq = rxqaddr[port];
+        u32 mac_rp = sky2_read32(hw, SK_REG(port, RX_GMF_RP));
+        u8 mac_lev = sky2_read8(hw, SK_REG(port, RX_GMF_RLEV));
+        u8 fifo_rp = sky2_read8(hw, Q_ADDR(rxq, Q_RP));
+        u8 fifo_lev = sky2_read8(hw, Q_ADDR(rxq, Q_RL));
+
+        /* If idle and MAC or PCI is stuck */
+        if (sky2->check.last == dev->last_rx &&
+            ((mac_rp == sky2->check.mac_rp &&
+              mac_lev != 0 && mac_lev >= sky2->check.mac_lev) ||
+             /* Check if the PCI RX hang */
+             (fifo_rp == sky2->check.fifo_rp &&
+              fifo_lev != 0 && fifo_lev >= sky2->check.fifo_lev))) {
+                printk(KERN_DEBUG PFX "%s: hung mac %d:%d fifo %d (%d:%d)\n",
+                       dev->name, mac_lev, mac_rp, fifo_lev, fifo_rp,
+                       sky2_read8(hw, Q_ADDR(rxq, Q_WP)));
+                return 1;
+        } else {
+                sky2->check.last = dev->last_rx;
+                sky2->check.mac_rp = mac_rp;
+                sky2->check.mac_lev = mac_lev;
+                sky2->check.fifo_rp = fifo_rp;
+                sky2->check.fifo_lev = fifo_lev;
+                return 0;
+        }
 }
 
-static void sky2_idle(unsigned long arg)
+static void sky2_watchdog(unsigned long arg)
 {
         struct sky2_hw *hw = (struct sky2_hw *) arg;
-        struct net_device *dev = hw->dev[0];
+        struct net_device *dev;
+
+        /* Check for lost IRQ once a second */
+        if (sky2_read32(hw, B0_ISRC)) {
+                dev = hw->dev[0];
+                if (__netif_rx_schedule_prep(dev))
+                        __netif_rx_schedule(dev);
+        } else {
+                int i, active = 0;
 
-        if (__netif_rx_schedule_prep(dev))
-                __netif_rx_schedule(dev);
+                for (i = 0; i < hw->ports; i++) {
+                        dev = hw->dev[i];
+                        if (!netif_running(dev))
+                                continue;
+                        ++active;
+
+                        /* For chips with Rx FIFO, check if stuck */
+                        if ((hw->flags & SKY2_HW_FIFO_HANG_CHECK) &&
+                             sky2_rx_hung(dev)) {
+                                pr_info(PFX "%s: receiver hang detected\n",
+                                        dev->name);
+                                schedule_work(&hw->restart_work);
+                                return;
+                        }
+                }
 
-        mod_timer(&hw->idle_timer, jiffies + msecs_to_jiffies(idle_timeout));
+                if (active == 0)
+                        return;
+        }
+
+        mod_timer(&hw->watchdog_timer, round_jiffies(jiffies + HZ));
 }
 
 /* Hardware/software error handling */
@@ -2536,17 +2671,25 @@ static void sky2_netpoll(struct net_device *dev)
 #endif
 
 /* Chip internal frequency for clock calculations */
-static inline u32 sky2_mhz(const struct sky2_hw *hw)
+static u32 sky2_mhz(const struct sky2_hw *hw)
 {
         switch (hw->chip_id) {
         case CHIP_ID_YUKON_EC:
         case CHIP_ID_YUKON_EC_U:
         case CHIP_ID_YUKON_EX:
-                return 125;     /* 125 Mhz */
+                return 125;
+
         case CHIP_ID_YUKON_FE:
-                return 100;     /* 100 Mhz */
-        default:                /* YUKON_XL */
-                return 156;     /* 156 Mhz */
+                return 100;
+
+        case CHIP_ID_YUKON_FE_P:
+                return 50;
+
+        case CHIP_ID_YUKON_XL:
+                return 156;
+
+        default:
+                BUG();
         }
 }
 
@@ -2571,23 +2714,63 @@ static int __devinit sky2_init(struct sky2_hw *hw)
         sky2_write8(hw, B0_CTST, CS_RST_CLR);
 
         hw->chip_id = sky2_read8(hw, B2_CHIP_ID);
-        if (hw->chip_id < CHIP_ID_YUKON_XL || hw->chip_id > CHIP_ID_YUKON_FE) {
+        hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4;
+
+        switch(hw->chip_id) {
+        case CHIP_ID_YUKON_XL:
+                hw->flags = SKY2_HW_GIGABIT
+                        | SKY2_HW_NEWER_PHY;
+                if (hw->chip_rev < 3)
+                        hw->flags |= SKY2_HW_FIFO_HANG_CHECK;
+
+                break;
+
+        case CHIP_ID_YUKON_EC_U:
+                hw->flags = SKY2_HW_GIGABIT
+                        | SKY2_HW_NEWER_PHY
+                        | SKY2_HW_ADV_POWER_CTL;
+                break;
+
+        case CHIP_ID_YUKON_EX:
+                hw->flags = SKY2_HW_GIGABIT
+                        | SKY2_HW_NEWER_PHY
+                        | SKY2_HW_NEW_LE
+                        | SKY2_HW_ADV_POWER_CTL;
+
+                /* New transmit checksum */
+                if (hw->chip_rev != CHIP_REV_YU_EX_B0)
+                        hw->flags |= SKY2_HW_AUTO_TX_SUM;
+                break;
+
+        case CHIP_ID_YUKON_EC:
+                /* This rev is really old, and requires untested workarounds */
+                if (hw->chip_rev == CHIP_REV_YU_EC_A1) {
+                        dev_err(&hw->pdev->dev, "unsupported revision Yukon-EC rev A1\n");
+                        return -EOPNOTSUPP;
+                }
+                hw->flags = SKY2_HW_GIGABIT | SKY2_HW_FIFO_HANG_CHECK;
+                break;
+
+        case CHIP_ID_YUKON_FE:
+                break;
+
+        case CHIP_ID_YUKON_FE_P:
+                hw->flags = SKY2_HW_NEWER_PHY
+                        | SKY2_HW_NEW_LE
+                        | SKY2_HW_AUTO_TX_SUM
+                        | SKY2_HW_ADV_POWER_CTL;
+                break;
+        default:
                 dev_err(&hw->pdev->dev, "unsupported chip type 0x%x\n",
                         hw->chip_id);
                 return -EOPNOTSUPP;
         }
 
-        hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4;
+        hw->pmd_type = sky2_read8(hw, B2_PMD_TYP);
+        if (hw->pmd_type == 'L' || hw->pmd_type == 'S' || hw->pmd_type == 'P')
+                hw->flags |= SKY2_HW_FIBRE_PHY;
 
-        /* This rev is really old, and requires untested workarounds */
-        if (hw->chip_id == CHIP_ID_YUKON_EC && hw->chip_rev == CHIP_REV_YU_EC_A1) {
-                dev_err(&hw->pdev->dev, "unsupported revision Yukon-%s (0x%x) rev %d\n",
-                        yukon2_name[hw->chip_id - CHIP_ID_YUKON_XL],
-                        hw->chip_id, hw->chip_rev);
-                return -EOPNOTSUPP;
-        }
 
-        hw->pmd_type = sky2_read8(hw, B2_PMD_TYP);
         hw->ports = 1;
         t8 = sky2_read8(hw, B2_Y2_HW_RES);
         if ((t8 & CFG_DUAL_MAC_MSK) == CFG_DUAL_MAC_MSK) {
@@ -2727,8 +2910,6 @@ static void sky2_restart(struct work_struct *work)
         struct net_device *dev;
         int i, err;
 
-        del_timer_sync(&hw->idle_timer);
-
         rtnl_lock();
         sky2_write32(hw, B0_IMSK, 0);
         sky2_read32(hw, B0_IMSK);
@@ -2757,8 +2938,6 @@ static void sky2_restart(struct work_struct *work)
                 }
         }
 
-        sky2_idle_start(hw);
-
         rtnl_unlock();
 }
 
@@ -2785,7 +2964,9 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 
         sky2->wol = wol->wolopts;
 
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX)
+        if (hw->chip_id == CHIP_ID_YUKON_EC_U ||
+            hw->chip_id == CHIP_ID_YUKON_EX ||
+            hw->chip_id == CHIP_ID_YUKON_FE_P)
                 sky2_write32(hw, B0_CTST, sky2->wol
                              ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);
 
@@ -2803,7 +2984,7 @@ static u32 sky2_supported_modes(const struct sky2_hw *hw)
                         | SUPPORTED_100baseT_Full
                         | SUPPORTED_Autoneg | SUPPORTED_TP;
 
-                if (hw->chip_id != CHIP_ID_YUKON_FE)
+                if (hw->flags & SKY2_HW_GIGABIT)
                         modes |= SUPPORTED_1000baseT_Half
                                 | SUPPORTED_1000baseT_Full;
                 return modes;
@@ -2823,13 +3004,6 @@ static int sky2_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         ecmd->supported = sky2_supported_modes(hw);
         ecmd->phy_address = PHY_ADDR_MARV;
         if (sky2_is_copper(hw)) {
-                ecmd->supported = SUPPORTED_10baseT_Half
-                    | SUPPORTED_10baseT_Full
-                    | SUPPORTED_100baseT_Half
-                    | SUPPORTED_100baseT_Full
-                    | SUPPORTED_1000baseT_Half
-                    | SUPPORTED_1000baseT_Full
-                    | SUPPORTED_Autoneg | SUPPORTED_TP;
                 ecmd->port = PORT_TP;
                 ecmd->speed = sky2->speed;
         } else {
@@ -2896,8 +3070,10 @@ static int sky2_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         sky2->autoneg = ecmd->autoneg;
         sky2->advertising = ecmd->advertising;
 
-        if (netif_running(dev))
+        if (netif_running(dev)) {
                 sky2_phy_reinit(sky2);
+                sky2_set_multicast(dev);
+        }
 
         return 0;
 }
@@ -2990,6 +3166,7 @@ static int sky2_nway_reset(struct net_device *dev)
                 return -EINVAL;
 
         sky2_phy_reinit(sky2);
+        sky2_set_multicast(dev);
 
         return 0;
 }
@@ -3805,8 +3982,12 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
                 dev->features |= NETIF_F_HIGHDMA;
 
 #ifdef SKY2_VLAN_TAG_USED
-        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-        dev->vlan_rx_register = sky2_vlan_rx_register;
+        /* The workaround for FE+ status conflicts with VLAN tag detection. */
+        if (!(sky2->hw->chip_id == CHIP_ID_YUKON_FE_P &&
+              sky2->hw->chip_rev == CHIP_REV_YU_FE2_A0)) {
+                dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+                dev->vlan_rx_register = sky2_vlan_rx_register;
+        }
 #endif
 
         /* read the mac address */
@@ -3837,7 +4018,7 @@ static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id)
                 return IRQ_NONE;
 
         if (status & Y2_IS_IRQ_SW) {
-                hw->msi = 1;
+                hw->flags |= SKY2_HW_USE_MSI;
                 wake_up(&hw->msi_wait);
                 sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ);
         }
@@ -3865,9 +4046,9 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
         sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ);
         sky2_read8(hw, B0_CTST);
 
-        wait_event_timeout(hw->msi_wait, hw->msi, HZ/10);
+        wait_event_timeout(hw->msi_wait, (hw->flags & SKY2_HW_USE_MSI), HZ/10);
 
-        if (!hw->msi) {
+        if (!(hw->flags & SKY2_HW_USE_MSI)) {
                 /* MSI test failed, go back to INTx mode */
                 dev_info(&pdev->dev, "No interrupt generated using MSI, "
                          "switching to INTx mode.\n");
@@ -4000,7 +4181,8 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                 goto err_out_free_netdev;
         }
 
-        err = request_irq(pdev->irq,  sky2_intr, hw->msi ? 0 : IRQF_SHARED,
+        err = request_irq(pdev->irq, sky2_intr,
+                          (hw->flags & SKY2_HW_USE_MSI) ? 0 : IRQF_SHARED,
                           dev->name, hw);
         if (err) {
                 dev_err(&pdev->dev, "cannot assign irq %d\n", pdev->irq);
@@ -4025,17 +4207,15 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                         sky2_show_addr(dev1);
         }
 
-        setup_timer(&hw->idle_timer, sky2_idle, (unsigned long) hw);
+        setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw);
         INIT_WORK(&hw->restart_work, sky2_restart);
 
-        sky2_idle_start(hw);
-
         pci_set_drvdata(pdev, hw);
 
         return 0;
 
 err_out_unregister:
-        if (hw->msi)
+        if (hw->flags & SKY2_HW_USE_MSI)
                 pci_disable_msi(pdev);
         unregister_netdev(dev);
 err_out_free_netdev:
@@ -4064,7 +4244,7 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
         if (!hw)
                 return;
 
-        del_timer_sync(&hw->idle_timer);
+        del_timer_sync(&hw->watchdog_timer);
 
         flush_scheduled_work();
 
@@ -4084,7 +4264,7 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
         sky2_read8(hw, B0_CTST);
 
         free_irq(pdev->irq, hw);
-        if (hw->msi)
+        if (hw->flags & SKY2_HW_USE_MSI)
                 pci_disable_msi(pdev);
         pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
         pci_release_regions(pdev);
@@ -4108,7 +4288,6 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
         if (!hw)
                 return 0;
 
-        del_timer_sync(&hw->idle_timer);
         netif_poll_disable(hw->dev[0]);
 
         for (i = 0; i < hw->ports; i++) {
@@ -4153,7 +4332,9 @@ static int sky2_resume(struct pci_dev *pdev)
         pci_enable_wake(pdev, PCI_D0, 0);
 
         /* Re-enable all clocks */
-        if (hw->chip_id == CHIP_ID_YUKON_EX || hw->chip_id == CHIP_ID_YUKON_EC_U)
+        if (hw->chip_id == CHIP_ID_YUKON_EX ||
+            hw->chip_id == CHIP_ID_YUKON_EC_U ||
+            hw->chip_id == CHIP_ID_YUKON_FE_P)
                 sky2_pci_write32(hw, PCI_DEV_REG3, 0);
 
         sky2_reset(hw);
@@ -4170,11 +4351,13 @@ static int sky2_resume(struct pci_dev *pdev)
                                 dev_close(dev);
                                 goto out;
                         }
+
+                        sky2_set_multicast(dev);
                 }
         }
 
         netif_poll_enable(hw->dev[0]);
-        sky2_idle_start(hw);
+
         return 0;
 out:
         dev_err(&pdev->dev, "resume failed (%d)\n", err);
@@ -4191,7 +4374,6 @@ static void sky2_shutdown(struct pci_dev *pdev)
         if (!hw)
                 return;
 
-        del_timer_sync(&hw->idle_timer);
         netif_poll_disable(hw->dev[0]);
 
         for (i = 0; i < hw->ports; i++) {
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index dce4d276d4..8bc5c54e3e 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -470,18 +470,24 @@ enum {
         CHIP_ID_YUKON_EX   = 0xb5, /* Chip ID for YUKON-2 Extreme */
         CHIP_ID_YUKON_EC   = 0xb6, /* Chip ID for YUKON-2 EC */
         CHIP_ID_YUKON_FE   = 0xb7, /* Chip ID for YUKON-2 FE */
-
+        CHIP_ID_YUKON_FE_P = 0xb8, /* Chip ID for YUKON-2 FE+ */
+};
+enum yukon_ec_rev {
         CHIP_REV_YU_EC_A1    = 0,  /* Chip Rev. for Yukon-EC A1/A0 */
         CHIP_REV_YU_EC_A2    = 1,  /* Chip Rev. for Yukon-EC A2 */
         CHIP_REV_YU_EC_A3    = 2,  /* Chip Rev. for Yukon-EC A3 */
-
+};
+enum yukon_ec_u_rev {
         CHIP_REV_YU_EC_U_A0  = 1,
         CHIP_REV_YU_EC_U_A1  = 2,
         CHIP_REV_YU_EC_U_B0  = 3,
-
+};
+enum yukon_fe_rev {
         CHIP_REV_YU_FE_A1    = 1,
         CHIP_REV_YU_FE_A2    = 2,
-
+};
+enum yukon_fe_p_rev {
+        CHIP_REV_YU_FE2_A0   = 0,
 };
 enum yukon_ex_rev {
         CHIP_REV_YU_EX_A0    = 1,
@@ -1668,7 +1674,7 @@ enum {
 
 /* Receive Frame Status Encoding */
 enum {
-        GMR_FS_LEN      = 0xffff<<16, /* Bit 31..16:    Rx Frame Length */
+        GMR_FS_LEN      = 0x7fff<<16, /* Bit 30..16:    Rx Frame Length */
         GMR_FS_VLAN     = 1<<13, /* VLAN Packet */
         GMR_FS_JABBER   = 1<<12, /* Jabber Packet */
         GMR_FS_UN_SIZE  = 1<<11, /* Undersize Packet */
@@ -1729,6 +1735,10 @@ enum {
         GMF_RX_CTRL_DEF = GMF_OPER_ON | GMF_RX_F_FL_ON,
 };
 
+/*      TX_GMF_EA               32 bit  Tx GMAC FIFO End Address */
+enum {
+        TX_DYN_WM_ENA   = 3,    /* Yukon-FE+ specific */
+};
 
 /*      TX_GMF_CTRL_T   32 bit  Tx GMAC FIFO Control/Test */
 enum {
@@ -2017,6 +2027,14 @@ struct sky2_port {
         u16                  rx_tag;
         struct vlan_group    *vlgrp;
 #endif
+        struct {
+                unsigned long last;
+                u32     mac_rp;
+                u8      mac_lev;
+                u8      fifo_rp;
+                u8      fifo_lev;
+        } check;
+
 
         dma_addr_t           rx_le_map;
         dma_addr_t           tx_le_map;
@@ -2040,6 +2058,15 @@ struct sky2_hw {
         void __iomem         *regs;
         struct pci_dev       *pdev;
         struct net_device    *dev[2];
+        unsigned long        flags;
+#define SKY2_HW_USE_MSI         0x00000001
+#define SKY2_HW_FIBRE_PHY       0x00000002
+#define SKY2_HW_GIGABIT         0x00000004
+#define SKY2_HW_NEWER_PHY       0x00000008
+#define SKY2_HW_FIFO_HANG_CHECK 0x00000010
+#define SKY2_HW_NEW_LE          0x00000020      /* new LSOv2 format */
+#define SKY2_HW_AUTO_TX_SUM     0x00000040      /* new IP decode for Tx */
+#define SKY2_HW_ADV_POWER_CTL   0x00000080      /* additional PHY power regs */
 
         u8                   chip_id;
         u8                   chip_rev;
@@ -2050,15 +2077,14 @@ struct sky2_hw {
         u32                  st_idx;
         dma_addr_t           st_dma;
 
-        struct timer_list    idle_timer;
+        struct timer_list    watchdog_timer;
         struct work_struct   restart_work;
-        int                  msi;
         wait_queue_head_t    msi_wait;
 };
 
 static inline int sky2_is_copper(const struct sky2_hw *hw)
 {
-        return !(hw->pmd_type == 'L' || hw->pmd_type == 'S' || hw->pmd_type == 'P');
+        return !(hw->flags & SKY2_HW_FIBRE_PHY);
 }
 
 /* Register accessor for memory mapped device */
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 65bd20fac8..3fd4735006 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -957,7 +957,7 @@ slip_close(struct tty_struct *tty)
   *                     STANDARD SLIP ENCAPSULATION                      *
   ************************************************************************/
 
-int
+static int
 slip_esc(unsigned char *s, unsigned char *d, int len)
 {
         unsigned char *ptr = d;
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 590b12c724..82d837ab4d 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1441,17 +1441,14 @@ static void
 spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
 {
         u32 error_reg1, error_reg2;
-        u32 mask_reg1, mask_reg2;
         u32 i;
         int show_error = 1;
 
         error_reg1 = spider_net_read_reg(card, SPIDER_NET_GHIINT1STS);
         error_reg2 = spider_net_read_reg(card, SPIDER_NET_GHIINT2STS);
-        mask_reg1 = spider_net_read_reg(card, SPIDER_NET_GHIINT1MSK);
-        mask_reg2 = spider_net_read_reg(card,SPIDER_NET_GHIINT2MSK);
 
-        error_reg1 &= mask_reg1;
-        error_reg2 &= mask_reg2;
+        error_reg1 &= SPIDER_NET_INT1_MASK_VALUE;
+        error_reg2 &= SPIDER_NET_INT2_MASK_VALUE;
 
         /* check GHIINT0STS ************************************/
         if (status_reg)
@@ -1679,11 +1676,10 @@ spider_net_interrupt(int irq, void *ptr)
 {
         struct net_device *netdev = ptr;
         struct spider_net_card *card = netdev_priv(netdev);
-        u32 status_reg, mask_reg;
+        u32 status_reg;
 
         status_reg = spider_net_read_reg(card, SPIDER_NET_GHIINT0STS);
-        mask_reg = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
-        status_reg &= mask_reg;
+        status_reg &= SPIDER_NET_INT0_MASK_VALUE;
 
         if (!status_reg)
                 return IRQ_NONE;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 58740428dd..9034a05734 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.80"
-#define DRV_MODULE_RELDATE      "August 2, 2007"
+#define DRV_MODULE_VERSION      "3.81"
+#define DRV_MODULE_RELDATE      "September 5, 2007"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -7127,6 +7127,10 @@ static int tg3_open(struct net_device *dev)
                 } else if (pci_enable_msi(tp->pdev) == 0) {
                         u32 msi_mode;
 
+                        /* Hardware bug - MSI won't work if INTX disabled. */
+                        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+                                pci_intx(tp->pdev, 1);
+
                         msi_mode = tr32(MSGINT_MODE);
                         tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE);
                         tp->tg3_flags2 |= TG3_FLG2_USING_MSI;
@@ -12172,6 +12176,11 @@ static int tg3_resume(struct pci_dev *pdev)
         if (err)
                 return err;
 
+        /* Hardware bug - MSI won't work if INTX disabled. */
+        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) &&
+            (tp->tg3_flags2 & TG3_FLG2_USING_MSI))
+                pci_intx(tp->pdev, 1);
+
         netif_device_attach(dev);
 
         tg3_full_lock(tp, 0);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 12e01b2410..9a38dfe45f 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -2148,7 +2148,7 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)
                 for (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) {
                         if (ugeth->tx_skbuff[i][j]) {
                                 dma_unmap_single(NULL,
-                                                 ((qe_bd_t *)bd)->buf,
+                                                 ((struct qe_bd *)bd)->buf,
                                                  (in_be32((u32 *)bd) &
                                                   BD_LENGTH_MASK),
                                                  DMA_TO_DEVICE);
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 16c7a0e878..a2de32fabc 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -405,7 +405,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
         dev->net->ethtool_ops = &dm9601_ethtool_ops;
         dev->net->hard_header_len += DM_TX_OVERHEAD;
         dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
-        dev->rx_urb_size = dev->net->mtu + DM_RX_OVERHEAD;
+        dev->rx_urb_size = dev->net->mtu + ETH_HLEN + DM_RX_OVERHEAD;
 
         dev->mii.dev = dev->net;
         dev->mii.mdio_read = dm9601_mdio_read;
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index ef35bc6c4a..4eb6d97528 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -43,7 +43,7 @@ obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
 obj-$(CONFIG_PCMCIA_WL3501)     += wl3501_cs.o
 
 obj-$(CONFIG_USB_ZD1201)        += zd1201.o
-obj-$(CONFIG_LIBERTAS_USB)     += libertas/
+obj-$(CONFIG_LIBERTAS)          += libertas/
 
 rtl8187-objs            := rtl8187_dev.o rtl8187_rtl8225.o
 obj-$(CONFIG_RTL8187)   += rtl8187.o
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index c5d6753a55..dfbd01eaaf 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3183,6 +3183,9 @@ static void bcm43xx_periodic_work_handler(struct work_struct *work)
         unsigned long orig_trans_start = 0;
 
         mutex_lock(&bcm->mutex);
+        /* keep from doing and rearming periodic work if shutting down */
+        if (bcm43xx_status(bcm) == BCM43xx_STAT_UNINIT)
+                goto unlock_mutex;
         if (unlikely(bcm->periodic_state % 60 == 0)) {
                 /* Periodic work will take a long time, so we want it to
                  * be preemtible.
@@ -3228,14 +3231,10 @@ static void bcm43xx_periodic_work_handler(struct work_struct *work)
         mmiowb();
         bcm->periodic_state++;
         spin_unlock_irqrestore(&bcm->irq_lock, flags);
+unlock_mutex:
         mutex_unlock(&bcm->mutex);
 }
 
-void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm)
-{
-        cancel_rearming_delayed_work(&bcm->periodic_work);
-}
-
 void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
 {
         struct delayed_work *work = &bcm->periodic_work;
@@ -3285,6 +3284,14 @@ static int bcm43xx_rng_init(struct bcm43xx_private *bcm)
         return err;
 }
 
+void bcm43xx_cancel_work(struct bcm43xx_private *bcm)
+{
+        /* The system must be unlocked when this routine is entered.
+         * If not, the next 2 steps may deadlock */
+        cancel_work_sync(&bcm->restart_work);
+        cancel_delayed_work_sync(&bcm->periodic_work);
+}
+
 static int bcm43xx_shutdown_all_wireless_cores(struct bcm43xx_private *bcm)
 {
         int ret = 0;
@@ -3321,7 +3328,12 @@ static void bcm43xx_free_board(struct bcm43xx_private *bcm)
 {
         bcm43xx_rng_exit(bcm);
         bcm43xx_sysfs_unregister(bcm);
-        bcm43xx_periodic_tasks_delete(bcm);
+
+        mutex_lock(&(bcm)->mutex);
+        bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
+        mutex_unlock(&(bcm)->mutex);
+
+        bcm43xx_cancel_work(bcm);
 
         mutex_lock(&(bcm)->mutex);
         bcm43xx_shutdown_all_wireless_cores(bcm);
@@ -4016,7 +4028,7 @@ static int bcm43xx_net_stop(struct net_device *net_dev)
         err = bcm43xx_disable_interrupts_sync(bcm);
         assert(!err);
         bcm43xx_free_board(bcm);
-        flush_scheduled_work();
+        bcm43xx_cancel_work(bcm);
 
         return 0;
 }
@@ -4148,9 +4160,9 @@ static void bcm43xx_chip_reset(struct work_struct *work)
         struct bcm43xx_phyinfo *phy;
         int err = -ENODEV;
 
+        bcm43xx_cancel_work(bcm);
         mutex_lock(&(bcm)->mutex);
         if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
-                bcm43xx_periodic_tasks_delete(bcm);
                 phy = bcm43xx_current_phy(bcm);
                 err = bcm43xx_select_wireless_core(bcm, phy->type);
                 if (!err)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.h b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
index c8f3c532ba..14cfbeb582 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
@@ -122,7 +122,7 @@ void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy);
 void bcm43xx_mac_suspend(struct bcm43xx_private *bcm);
 void bcm43xx_mac_enable(struct bcm43xx_private *bcm);
 
-void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm);
+void bcm43xx_cancel_work(struct bcm43xx_private *bcm);
 void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm);
 
 void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
index c71b998a36..8ab5f93d19 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
@@ -327,7 +327,7 @@ static ssize_t bcm43xx_attr_phymode_store(struct device *dev,
                 goto out;
         }
 
-        bcm43xx_periodic_tasks_delete(bcm);
+        bcm43xx_cancel_work(bcm);
         mutex_lock(&(bcm)->mutex);
         err = bcm43xx_select_wireless_core(bcm, phytype);
         if (!err)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index d6d9413d7f..6acfdc49dc 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -444,7 +444,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
         u16 maxpower;
 
         if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
-                printk(PFX KERN_ERR "TX power not in dBm.\n");
+                printk(KERN_ERR PFX "TX power not in dBm.\n");
                 return -EOPNOTSUPP;
         }
 
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 70db38c0ce..56829f82be 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -267,7 +267,10 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
 
         if (subevent == 0x80) {
                 dbg("%s: generationg bus event\n", __FUNCTION__);
-                acpi_bus_generate_event(note->device, note->event, detail);
+                acpi_bus_generate_proc_event(note->device, note->event, detail);
+                acpi_bus_generate_netlink_event(note->device->pnp.device_class,
+                                                  note->device->dev.bus_id,
+                                                  note->event, detail);
         } else
                 note->event = event;
 }
@@ -399,7 +402,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
 
         status = acpi_get_object_info(handle, &info_buffer);
         if (ACPI_FAILURE(status)) {
-                err("%s:  Failed to get device information", __FUNCTION__);
+                err("%s:  Failed to get device information\n", __FUNCTION__);
                 return 0;
         }
         info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index 79ff6b4de3..37d72f123a 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1746,10 +1746,8 @@ static void pushbutton_helper_thread(unsigned long data)
 static int event_thread(void* data)
 {
         struct controller *ctrl;
-        lock_kernel();
+
         daemonize("phpd_event");
-        
-        unlock_kernel();
 
         while (1) {
                 dbg("!!!!event_thread sleeping\n");
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index c6e132d7c0..4c36e80f6d 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -5,12 +5,7 @@ extern int pci_uevent(struct device *dev, char **envp, int num_envp,
 extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_cleanup_rom(struct pci_dev *dev);
-extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
-                                  resource_size_t size, resource_size_t align,
-                                  resource_size_t min, unsigned int type_mask,
-                                  void (*alignf)(void *, struct resource *,
-                                              resource_size_t, resource_size_t),
-                                  void *alignf_data);
+
 /* Firmware callbacks */
 extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
 extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state);
@@ -35,7 +30,6 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; }
 
 /* Functions for PCI Hotplug drivers to use */
 extern unsigned int pci_do_scan_bus(struct pci_bus *bus);
-extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);
 
 extern void pci_remove_legacy_files(struct pci_bus *bus);
 
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 34b8dae0d9..171ca712e5 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -285,7 +285,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
         }
 }
 
-void __devinit pci_read_bridge_bases(struct pci_bus *child)
+void pci_read_bridge_bases(struct pci_bus *child)
 {
         struct pci_dev *dev = child->self;
         u8 io_base_lo, io_limit_lo;
@@ -653,20 +653,20 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
 
         sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
 
+        /* Has only triggered on CardBus, fixup is in yenta_socket */
         while (bus->parent) {
                 if ((child->subordinate > bus->subordinate) ||
                     (child->number > bus->subordinate) ||
                     (child->number < bus->number) ||
                     (child->subordinate < bus->number)) {
-                        printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) is "
-                               "hidden behind%s bridge #%02x (-#%02x)%s\n",
-                               child->number, child->subordinate,
-                               bus->self->transparent ? " transparent" : " ",
-                               bus->number, bus->subordinate,
-                               pcibios_assign_all_busses() ? " " :
-                               " (try 'pci=assign-busses')");
-                        printk(KERN_WARNING "Please report the result to "
-                               "<bk@suse.de> to fix this permanently\n");
+                        pr_debug("PCI: Bus #%02x (-#%02x) is %s"
+                                "hidden behind%s bridge #%02x (-#%02x)\n",
+                                child->number, child->subordinate,
+                                (bus->number > child->subordinate &&
+                                 bus->subordinate < child->number) ?
+                                        "wholly " : " partially",
+                                bus->self->transparent ? " transparent" : " ",
+                                bus->number, bus->subordinate);
                 }
                 bus = bus->parent;
         }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index c559085c89..50f2dd9e1b 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -947,7 +947,7 @@ static void k8t_sound_hostbridge(struct pci_dev *dev)
         unsigned char val;
 
         pci_read_config_byte(dev, 0x50, &val);
-        if (val == 0x88 || val == 0xc8) {
+        if (val == 0xc8) {
                 /* Assume it's probably a MSI-K8T-Neo2Fir */
                 printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, attempting to turn soundcard ON\n");
                 pci_write_config_byte(dev, 0x50, val & (~0x40));
@@ -972,8 +972,8 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_ho
  *
  * The SMBus PCI Device can be activated by setting a bit in the ICH LPC 
  * bridge. Unfortunately, this device has no subvendor/subdevice ID. So it 
- * becomes necessary to do this tweak in two steps -- I've chosen the Host
- * bridge as trigger.
+ * becomes necessary to do this tweak in two steps -- the chosen trigger
+ * is either the Host bridge (preferred) or on-board VGA controller.
  *
  * Note that we used to unhide the SMBus that way on Toshiba laptops
  * (Satellite A40 and Tecra M2) but then found that the thermal management
@@ -1070,6 +1070,14 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                         case 0x0058: /* Compaq Evo N620c */
                                 asus_hides_smbus = 1;
                         }
+                else if (dev->device == PCI_DEVICE_ID_INTEL_82810_IG3)
+                        switch(dev->subsystem_device) {
+                        case 0xB16C: /* Compaq Deskpro EP 401963-001 (PCA# 010174) */
+                                /* Motherboard doesn't have Host bridge
+                                 * subvendor/subdevice IDs, therefore checking
+                                 * its on-board VGA controller */
+                                asus_hides_smbus = 1;
+                        }
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82845_HB,   asus_hides_smbus_hostbridge );
@@ -1082,6 +1090,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82855PM_HB,	as
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge );
 
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82810_IG3,  asus_hides_smbus_hostbridge );
+
 static void asus_hides_smbus_lpc(struct pci_dev *dev)
 {
         u16 val;
@@ -1099,12 +1109,14 @@ static void asus_hides_smbus_lpc(struct pci_dev *dev)
                         printk(KERN_INFO "PCI: Enabled i801 SMBus device\n");
         }
 }
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801AA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801AA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_0,  asus_hides_smbus_lpc );
@@ -1432,7 +1444,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID, quirk_netmos);
 static void __devinit quirk_e100_interrupt(struct pci_dev *dev)
 {
         u16 command;
-        u32 bar;
         u8 __iomem *csr;
         u8 cmd_hi;
 
@@ -1464,12 +1475,12 @@ static void __devinit quirk_e100_interrupt(struct pci_dev *dev)
          * re-enable them when it's ready.
          */
         pci_read_config_word(dev, PCI_COMMAND, &command);
-        pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar);
 
-        if (!(command & PCI_COMMAND_MEMORY) || !bar)
+        if (!(command & PCI_COMMAND_MEMORY) || !pci_resource_start(dev, 0))
                 return;
 
-        csr = ioremap(bar, 8);
+        /* Convert from PCI bus to resource space.  */
+        csr = ioremap(pci_resource_start(dev, 0), 8);
         if (!csr) {
                 printk(KERN_WARNING "PCI: Can't map %s e100 registers\n",
                         pci_name(dev));
@@ -1485,7 +1496,7 @@ static void __devinit quirk_e100_interrupt(struct pci_dev *dev)
 
         iounmap(csr);
 }
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_e100_interrupt);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_e100_interrupt);
 
 static void __devinit fixup_rev1_53c810(struct pci_dev* dev)
 {
@@ -1650,6 +1661,9 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCN
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000_PCIX, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RD580, quirk_disable_all_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RX790, quirk_disable_all_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS690, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi);
 
 /* Disable MSI on chipsets that are known to not support it */
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index b6a4f02b01..6c0440c20e 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -25,13 +25,13 @@ static const struct pnp_card_device_id *match_card(struct pnp_card_driver *drv,
                                 int found;
                                 struct pnp_dev *dev;
 
-                                if (i == PNP_MAX_DEVICES
-                                    || !*drv_id->devs[i].id)
+                                if (i == PNP_MAX_DEVICES ||
+                                    !*drv_id->devs[i].id)
                                         return drv_id;
                                 found = 0;
                                 card_for_each_dev(card, dev) {
-                                        if (compare_pnp_id
-                                            (dev->id, drv_id->devs[i].id)) {
+                                        if (compare_pnp_id(dev->id,
+                                                   drv_id->devs[i].id)) {
                                                 found = 1;
                                                 break;
                                         }
@@ -183,7 +183,7 @@ static int pnp_interface_attach_card(struct pnp_card *card)
 
         return 0;
 
-      err_name:
+err_name:
         device_remove_file(&card->dev, &dev_attr_name);
         return rc;
 }
@@ -321,10 +321,10 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
                 pos = pos->next;
         }
 
-      done:
+done:
         return NULL;
 
-      found:
+found:
         dev->card_link = clink;
         dev->dev.driver = &drv->link.driver;
         if (pnp_bus_type.probe(&dev->dev))
@@ -334,7 +334,7 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
 
         return dev;
 
-      err_out:
+err_out:
         dev->dev.driver = NULL;
         dev->card_link = NULL;
         return NULL;
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 61066fdb9e..d5964feb14 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -52,9 +52,6 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
         int nodenum;
         struct list_head *pos;
 
-        if (!protocol)
-                return -EINVAL;
-
         INIT_LIST_HEAD(&protocol->devices);
         INIT_LIST_HEAD(&protocol->cards);
         nodenum = 0;
@@ -94,8 +91,6 @@ static void pnp_free_ids(struct pnp_dev *dev)
         struct pnp_id *id;
         struct pnp_id *next;
 
-        if (!dev)
-                return;
         id = dev->id;
         while (id) {
                 next = id->next;
@@ -143,7 +138,7 @@ int __pnp_add_device(struct pnp_dev *dev)
  */
 int pnp_add_device(struct pnp_dev *dev)
 {
-        if (!dev || !dev->protocol || dev->card)
+        if (dev->card)
                 return -EINVAL;
         dev->dev.parent = &dev->protocol->dev;
         sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 30b8f6f325..2fa64a6b25 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -118,7 +118,7 @@ static int pnp_device_probe(struct device *dev)
                 goto fail;
         return error;
 
-      fail:
+fail:
         pnp_device_detach(pnp_dev);
         return error;
 }
@@ -232,10 +232,6 @@ int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)
 {
         struct pnp_id *ptr;
 
-        if (!id)
-                return -EINVAL;
-        if (!dev)
-                return -EINVAL;
         id->next = NULL;
         ptr = dev->id;
         while (ptr && ptr->next)
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index fe6684e13e..a0cfb75bbb 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -459,7 +459,8 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
                 up(&pnp_res_mutex);
                 goto done;
         }
-      done:
+
+done:
         if (retval < 0)
                 return retval;
         return count;
@@ -499,10 +500,10 @@ int pnp_interface_attach_device(struct pnp_dev *dev)
 
         return 0;
 
-      err_res:
+err_res:
         device_remove_file(&dev->dev, &dev_attr_resources);
-      err_opt:
+err_opt:
         device_remove_file(&dev->dev, &dev_attr_options);
-      err:
+err:
         return rc;
 }
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index b4e2aa995b..b035d60a1d 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -47,9 +47,6 @@
 #if 0
 #define ISAPNP_REGION_OK
 #endif
-#if 0
-#define ISAPNP_DEBUG
-#endif
 
 int isapnp_disable;             /* Disable ISA PnP */
 static int isapnp_rdp;          /* Read Data Port */
@@ -93,7 +90,6 @@ MODULE_LICENSE("GPL");
 
 static unsigned char isapnp_checksum_value;
 static DEFINE_MUTEX(isapnp_cfg_mutex);
-static int isapnp_detected;
 static int isapnp_csn_count;
 
 /* some prototypes */
@@ -335,7 +331,7 @@ static int __init isapnp_isolate(void)
                 } else if (iteration > 1) {
                         break;
                 }
-              __next:
+__next:
                 if (csn == 255)
                         break;
                 checksum = 0x6a;
@@ -733,7 +729,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
                                "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
                                type, dev->number, card->number);
                 }
-              __skip:
+__skip:
                 if (size > 0)
                         isapnp_skip_bytes(size);
         }
@@ -788,7 +784,7 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
                                "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
                                type, card->number);
                 }
-              __skip:
+__skip:
                 if (size > 0)
                         isapnp_skip_bytes(size);
         }
@@ -940,9 +936,6 @@ EXPORT_SYMBOL(isapnp_protocol);
 EXPORT_SYMBOL(isapnp_present);
 EXPORT_SYMBOL(isapnp_cfg_begin);
 EXPORT_SYMBOL(isapnp_cfg_end);
-#if 0
-EXPORT_SYMBOL(isapnp_read_byte);
-#endif
 EXPORT_SYMBOL(isapnp_write_byte);
 
 static int isapnp_read_resources(struct pnp_dev *dev,
@@ -993,6 +986,7 @@ static int isapnp_get_resources(struct pnp_dev *dev,
                                 struct pnp_resource_table *res)
 {
         int ret;
+
         pnp_init_resource_table(res);
         isapnp_cfg_begin(dev->card->number, dev->number);
         ret = isapnp_read_resources(dev, res);
@@ -1046,7 +1040,7 @@ static int isapnp_set_resources(struct pnp_dev *dev,
 
 static int isapnp_disable_resources(struct pnp_dev *dev)
 {
-        if (!dev || !dev->active)
+        if (!dev->active)
                 return -EINVAL;
         isapnp_cfg_begin(dev->card->number, dev->number);
         isapnp_deactivate(dev->number);
@@ -1069,7 +1063,6 @@ static int __init isapnp_init(void)
         struct pnp_dev *dev;
 
         if (isapnp_disable) {
-                isapnp_detected = 0;
                 printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
                 return 0;
         }
@@ -1117,7 +1110,6 @@ static int __init isapnp_init(void)
                 }
                 isapnp_set_rdp();
         }
-        isapnp_detected = 1;
         if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) {
                 cards = isapnp_isolate();
                 if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) {
@@ -1125,7 +1117,6 @@ static int __init isapnp_init(void)
                         release_region(_PIDXR, 1);
 #endif
                         release_region(_PNPWRP, 1);
-                        isapnp_detected = 0;
                         printk(KERN_INFO
                                "isapnp: No Plug & Play device found\n");
                         return 0;
@@ -1148,13 +1139,12 @@ static int __init isapnp_init(void)
                         }
                 }
         }
-        if (cards) {
+        if (cards)
                 printk(KERN_INFO
                        "isapnp: %i Plug & Play card%s detected total\n", cards,
                        cards > 1 ? "s" : "");
-        } else {
+        else
                 printk(KERN_INFO "isapnp: No Plug & Play card found\n");
-        }
 
         isapnp_proc_init();
         return 0;
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 3fbc0f9ffc..560ccb6408 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -112,33 +112,6 @@ static int isapnp_proc_attach_device(struct pnp_dev *dev)
         return 0;
 }
 
-#ifdef MODULE
-static int __exit isapnp_proc_detach_device(struct pnp_dev *dev)
-{
-        struct pnp_card *bus = dev->card;
-        struct proc_dir_entry *de;
-        char name[16];
-
-        if (!(de = bus->procdir))
-                return -EINVAL;
-        sprintf(name, "%02x", dev->number);
-        remove_proc_entry(name, de);
-        return 0;
-}
-
-static int __exit isapnp_proc_detach_bus(struct pnp_card *bus)
-{
-        struct proc_dir_entry *de;
-        char name[16];
-
-        if (!(de = bus->procdir))
-                return -EINVAL;
-        sprintf(name, "%02x", bus->number);
-        remove_proc_entry(name, isapnp_proc_bus_dir);
-        return 0;
-}
-#endif                          /* MODULE */
-
 int __init isapnp_proc_init(void)
 {
         struct pnp_dev *dev;
@@ -149,21 +122,3 @@ int __init isapnp_proc_init(void)
         }
         return 0;
 }
-
-#ifdef MODULE
-int __exit isapnp_proc_done(void)
-{
-        struct pnp_dev *dev;
-        struct pnp_bus *card;
-
-        isapnp_for_each_dev(dev) {
-                isapnp_proc_detach_device(dev);
-        }
-        isapnp_for_each_card(card) {
-                isapnp_proc_detach_bus(card);
-        }
-        if (isapnp_proc_bus_dir)
-                remove_proc_entry("isapnp", proc_bus);
-        return 0;
-}
-#endif                          /* MODULE */
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 3bda513a6b..0826287eef 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -21,9 +21,6 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
         resource_size_t *start, *end;
         unsigned long *flags;
 
-        if (!dev || !rule)
-                return -EINVAL;
-
         if (idx >= PNP_MAX_PORT) {
                 pnp_err
                     ("More than 4 ports is incompatible with pnp specifications.");
@@ -66,9 +63,6 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
         resource_size_t *start, *end;
         unsigned long *flags;
 
-        if (!dev || !rule)
-                return -EINVAL;
-
         if (idx >= PNP_MAX_MEM) {
                 pnp_err
                     ("More than 8 mems is incompatible with pnp specifications.");
@@ -127,9 +121,6 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
                 5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
         };
 
-        if (!dev || !rule)
-                return -EINVAL;
-
         if (idx >= PNP_MAX_IRQ) {
                 pnp_err
                     ("More than 2 irqs is incompatible with pnp specifications.");
@@ -181,9 +172,6 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                 1, 3, 5, 6, 7, 0, 2, 4
         };
 
-        if (!dev || !rule)
-                return -EINVAL;
-
         if (idx >= PNP_MAX_DMA) {
                 pnp_err
                     ("More than 2 dmas is incompatible with pnp specifications.");
@@ -390,7 +378,7 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
         up(&pnp_res_mutex);
         return 1;
 
-      fail:
+fail:
         pnp_clean_resource_table(&dev->res);
         up(&pnp_res_mutex);
         return 0;
@@ -410,8 +398,6 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
         int i;
         struct pnp_resource_table *bak;
 
-        if (!dev || !res)
-                return -EINVAL;
         if (!pnp_can_configure(dev))
                 return -ENODEV;
         bak = pnp_alloc(sizeof(struct pnp_resource_table));
@@ -444,7 +430,7 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
         kfree(bak);
         return 0;
 
-      fail:
+fail:
         dev->res = *bak;
         up(&pnp_res_mutex);
         kfree(bak);
@@ -460,9 +446,6 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
         struct pnp_option *dep;
         int i = 1;
 
-        if (!dev)
-                return -EINVAL;
-
         if (!pnp_can_configure(dev)) {
                 pnp_dbg("Device %s does not support resource configuration.",
                         dev->dev.bus_id);
@@ -541,8 +524,6 @@ int pnp_activate_dev(struct pnp_dev *dev)
 {
         int error;
 
-        if (!dev)
-                return -EINVAL;
         if (dev->active)
                 return 0;       /* the device is already active */
 
@@ -568,8 +549,6 @@ int pnp_disable_dev(struct pnp_dev *dev)
 {
         int error;
 
-        if (!dev)
-                return -EINVAL;
         if (!dev->active)
                 return 0;       /* the device is already disabled */
 
@@ -596,8 +575,6 @@ int pnp_disable_dev(struct pnp_dev *dev)
 void pnp_resource_change(struct resource *resource, resource_size_t start,
                          resource_size_t size)
 {
-        if (resource == NULL)
-                return;
         resource->flags &= ~(IORESOURCE_AUTO | IORESOURCE_UNSET);
         resource->start = start;
         resource->end = start + size - 1;
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 616fc72190..a5a372222d 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -248,9 +248,9 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         num++;
 
         return AE_OK;
-      err1:
+err1:
         kfree(dev_id);
-      err:
+err:
         kfree(dev);
         return -EINVAL;
 }
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index ce5027feb3..0e3b8d0ff0 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -34,19 +34,17 @@
  */
 static int irq_flags(int triggering, int polarity)
 {
-        int flag;
         if (triggering == ACPI_LEVEL_SENSITIVE) {
                 if (polarity == ACPI_ACTIVE_LOW)
-                        flag = IORESOURCE_IRQ_LOWLEVEL;
+                        return IORESOURCE_IRQ_LOWLEVEL;
                 else
-                        flag = IORESOURCE_IRQ_HIGHLEVEL;
+                        return IORESOURCE_IRQ_HIGHLEVEL;
         } else {
                 if (polarity == ACPI_ACTIVE_LOW)
-                        flag = IORESOURCE_IRQ_LOWEDGE;
+                        return IORESOURCE_IRQ_LOWEDGE;
                 else
-                        flag = IORESOURCE_IRQ_HIGHEDGE;
+                        return IORESOURCE_IRQ_HIGHEDGE;
         }
-        return flag;
 }
 
 static void decode_irq_flags(int flag, int *triggering, int *polarity)
@@ -242,8 +240,7 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res
 static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                                               void *data)
 {
-        struct pnp_resource_table *res_table =
-            (struct pnp_resource_table *)data;
+        struct pnp_resource_table *res_table = data;
         int i;
 
         switch (res->type) {
@@ -566,8 +563,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                                            void *data)
 {
         int priority = 0;
-        struct acpipnp_parse_option_s *parse_data =
-            (struct acpipnp_parse_option_s *)data;
+        struct acpipnp_parse_option_s *parse_data = data;
         struct pnp_dev *dev = parse_data->dev;
         struct pnp_option *option = parse_data->option;
 
@@ -705,7 +701,7 @@ static int pnpacpi_supported_resource(struct acpi_resource *res)
 static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
                                            void *data)
 {
-        int *res_cnt = (int *)data;
+        int *res_cnt = data;
 
         if (pnpacpi_supported_resource(res))
                 (*res_cnt)++;
@@ -714,7 +710,7 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
 
 static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
 {
-        struct acpi_resource **resource = (struct acpi_resource **)data;
+        struct acpi_resource **resource = data;
 
         if (pnpacpi_supported_resource(res)) {
                 (*resource)->type = res->type;
@@ -886,8 +882,7 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
         int i = 0;
         /* pnpacpi_build_resource_template allocates extra mem */
         int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1;
-        struct acpi_resource *resource =
-            (struct acpi_resource *)buffer->pointer;
+        struct acpi_resource *resource = buffer->pointer;
         int port = 0, irq = 0, dma = 0, mem = 0;
 
         pnp_dbg("res cnt %d", res_cnt);
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 3692a099b4..0691f473e9 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -419,7 +419,6 @@ static void __init build_devlist(void)
 static int pnpbios_disabled;
 int pnpbios_dont_use_current_config;
 
-#ifndef MODULE
 static int __init pnpbios_setup(char *str)
 {
         int invert;
@@ -443,7 +442,6 @@ static int __init pnpbios_setup(char *str)
 }
 
 __setup("pnpbios=", pnpbios_setup);
-#endif
 
 /* PnP BIOS signature: "$PnP" */
 #define PNP_SIGNATURE   (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24))
@@ -591,6 +589,7 @@ subsys_initcall(pnpbios_init);
 static int __init pnpbios_thread_init(void)
 {
         struct task_struct *task;
+
 #if defined(CONFIG_PPC_MERGE)
         if (check_legacy_ioport(PNPBIOS_BASE))
                 return 0;
@@ -606,48 +605,7 @@ static int __init pnpbios_thread_init(void)
         return 0;
 }
 
-#ifndef MODULE
-
-/* init/main.c calls pnpbios_init early */
-
 /* Start the kernel thread later: */
 module_init(pnpbios_thread_init);
 
-#else
-
-/*
- * N.B.: Building pnpbios as a module hasn't been fully implemented
- */
-
-MODULE_LICENSE("GPL");
-
-static int __init pnpbios_init_all(void)
-{
-        int r;
-
-        r = pnpbios_init();
-        if (r)
-                return r;
-        r = pnpbios_thread_init();
-        if (r)
-                return r;
-        return 0;
-}
-
-static void __exit pnpbios_exit(void)
-{
-#ifdef CONFIG_HOTPLUG
-        unloading = 1;
-        wait_for_completion(&unload_sem);
-#endif
-        pnpbios_proc_exit();
-        /* We ought to free resources here */
-        return;
-}
-
-module_init(pnpbios_init_all);
-module_exit(pnpbios_exit);
-
-#endif
-
 EXPORT_SYMBOL(pnpbios_protocol);
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 9c8c07701b..9d9841f24a 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -212,7 +212,7 @@ static int proc_write_node(struct file *file, const char __user * buf,
                 goto out;
         }
         ret = count;
-      out:
+out:
         kfree(node);
         return ret;
 }
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 04ecd7b672..3fabf11b00 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -238,7 +238,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
                         break;
 
                 default:        /* an unkown tag */
-                      len_err:
+len_err:
                         printk(KERN_ERR
                                "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
                                tag, len);
@@ -298,6 +298,7 @@ static void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
                                              struct pnp_option *option)
 {
         struct pnp_mem *mem;
+
         mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
@@ -468,7 +469,7 @@ static unsigned char *pnpbios_parse_resource_option_data(unsigned char *p,
                         return p + 2;
 
                 default:        /* an unkown tag */
-                      len_err:
+len_err:
                         printk(KERN_ERR
                                "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
                                tag, len);
@@ -562,7 +563,7 @@ static unsigned char *pnpbios_parse_compatible_ids(unsigned char *p,
                         break;
 
                 default:        /* an unkown tag */
-                      len_err:
+len_err:
                         printk(KERN_ERR
                                "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
                                tag, len);
@@ -756,7 +757,7 @@ static unsigned char *pnpbios_encode_allocated_resource_data(unsigned char *p,
                         break;
 
                 default:        /* an unkown tag */
-                      len_err:
+len_err:
                         printk(KERN_ERR
                                "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
                                tag, len);
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 90755d4cdb..6b0cf0c2a0 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -107,108 +107,6 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
                        "pnp: SB audio device quirk - increasing port range\n");
 }
 
-static int quirk_smc_fir_enabled(struct pnp_dev *dev)
-{
-        unsigned long firbase;
-        u8 bank, high, low, chip;
-
-        if (!pnp_port_valid(dev, 1))
-                return 0;
-
-        firbase = pnp_port_start(dev, 1);
-
-        /* Select register bank 3 */
-        bank = inb(firbase + 7);
-        bank &= 0xf0;
-        bank |= 3;
-        outb(bank, firbase + 7);
-
-        high = inb(firbase + 0);
-        low = inb(firbase + 1);
-        chip = inb(firbase + 2);
-
-        /* This corresponds to the check in smsc_ircc_present() */
-        if (high == 0x10 && low == 0xb8 && (chip == 0xf1 || chip == 0xf2))
-                return 1;
-
-        return 0;
-}
-
-static void quirk_smc_enable(struct pnp_dev *dev)
-{
-        struct resource fir, sir, irq;
-
-        pnp_activate_dev(dev);
-        if (quirk_smc_fir_enabled(dev))
-                return;
-
-        /*
-         * Sometimes the BIOS claims the device is enabled, but it reports
-         * the wrong FIR resources or doesn't properly configure ISA or LPC
-         * bridges on the way to the device.
-         *
-         * HP nc6000 and nc8000/nw8000 laptops have known problems like
-         * this.  Fortunately, they do fix things up if we auto-configure
-         * the device using its _PRS and _SRS methods.
-         */
-        dev_err(&dev->dev, "%s not responding at SIR 0x%lx, FIR 0x%lx; "
-                "auto-configuring\n", dev->id->id,
-                (unsigned long)pnp_port_start(dev, 0),
-                (unsigned long)pnp_port_start(dev, 1));
-
-        pnp_disable_dev(dev);
-        pnp_init_resource_table(&dev->res);
-        pnp_auto_config_dev(dev);
-        pnp_activate_dev(dev);
-        if (quirk_smc_fir_enabled(dev)) {
-                dev_err(&dev->dev, "responds at SIR 0x%lx, FIR 0x%lx\n",
-                        (unsigned long)pnp_port_start(dev, 0),
-                        (unsigned long)pnp_port_start(dev, 1));
-                return;
-        }
-
-        /*
-         * The Toshiba Portege 4000 _CRS reports the FIR region first,
-         * followed by the SIR region.  The BIOS will configure the bridge,
-         * but only if we call _SRS with SIR first, then FIR.  It also
-         * reports the IRQ as active high, when it is really active low.
-         */
-        dev_err(&dev->dev, "not responding at SIR 0x%lx, FIR 0x%lx; "
-                "swapping SIR/FIR and reconfiguring\n",
-                (unsigned long)pnp_port_start(dev, 0),
-                (unsigned long)pnp_port_start(dev, 1));
-
-        /*
-         * Clear IORESOURCE_AUTO so pnp_activate_dev() doesn't reassign
-         * these resources any more.
-         */
-        fir = dev->res.port_resource[0];
-        sir = dev->res.port_resource[1];
-        fir.flags &= ~IORESOURCE_AUTO;
-        sir.flags &= ~IORESOURCE_AUTO;
-
-        irq = dev->res.irq_resource[0];
-        irq.flags &= ~IORESOURCE_AUTO;
-        irq.flags &= ~IORESOURCE_BITS;
-        irq.flags |= IORESOURCE_IRQ_LOWEDGE;
-
-        pnp_disable_dev(dev);
-        dev->res.port_resource[0] = sir;
-        dev->res.port_resource[1] = fir;
-        dev->res.irq_resource[0] = irq;
-        pnp_activate_dev(dev);
-
-        if (quirk_smc_fir_enabled(dev)) {
-                dev_err(&dev->dev, "responds at SIR 0x%lx, FIR 0x%lx\n",
-                        (unsigned long)pnp_port_start(dev, 0),
-                        (unsigned long)pnp_port_start(dev, 1));
-                return;
-        }
-
-        dev_err(&dev->dev, "giving up; try \"smsc-ircc2.nopnp\" and "
-                "email bjorn.helgaas@hp.com\n");
-}
-
 /*
  *  PnP Quirks
  *  Cards or devices that need some tweaking due to incomplete resource info
@@ -229,7 +127,6 @@ static struct pnp_fixup pnp_fixups[] = {
         {"CTL0043", quirk_sb16audio_resources},
         {"CTL0044", quirk_sb16audio_resources},
         {"CTL0045", quirk_sb16audio_resources},
-        {"SMCf010", quirk_smc_enable},
         {""}
 };
 
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index ea6ec14a05..ef1286900d 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -47,9 +47,6 @@ struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev)
 {
         struct pnp_option *option;
 
-        if (!dev)
-                return NULL;
-
         option = pnp_build_option(PNP_RES_PRIORITY_PREFERRED);
 
         /* this should never happen but if it does we'll try to continue */
@@ -64,9 +61,6 @@ struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
 {
         struct pnp_option *option;
 
-        if (!dev)
-                return NULL;
-
         option = pnp_build_option(priority);
 
         if (dev->dependent) {
@@ -83,11 +77,6 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
 {
         struct pnp_irq *ptr;
 
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-
         ptr = option->irq;
         while (ptr && ptr->next)
                 ptr = ptr->next;
@@ -112,11 +101,6 @@ int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data)
 {
         struct pnp_dma *ptr;
 
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-
         ptr = option->dma;
         while (ptr && ptr->next)
                 ptr = ptr->next;
@@ -132,11 +116,6 @@ int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data)
 {
         struct pnp_port *ptr;
 
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-
         ptr = option->port;
         while (ptr && ptr->next)
                 ptr = ptr->next;
@@ -152,11 +131,6 @@ int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data)
 {
         struct pnp_mem *ptr;
 
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-
         ptr = option->mem;
         while (ptr && ptr->next)
                 ptr = ptr->next;
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index c7c4574729..de3155b212 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -289,6 +289,7 @@ int power_supply_uevent(struct device *dev, char **envp, int num_envp,
                 if (ret)
                         goto out;
         }
+        envp[i] = NULL;
 
 out:
         free_page((unsigned long)prop_buf);
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index 46da571493..5ab3492817 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -61,7 +61,7 @@
 struct rtc_plat_data {
         struct rtc_device *rtc;
         void __iomem *ioaddr;
-        unsigned long baseaddr;
+        resource_size_t baseaddr;
         unsigned long last_jiffies;
         int irq;
         unsigned int irqen;
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index b2e5481ba3..67291b0f82 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -55,7 +55,7 @@ struct rtc_plat_data {
         void __iomem *ioaddr_rtc;
         size_t size_nvram;
         size_t size;
-        unsigned long baseaddr;
+        resource_size_t baseaddr;
         unsigned long last_jiffies;
 };
 
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index f50f3fc353..839462659a 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -226,7 +226,7 @@ static int __devexit rs5c348_remove(struct spi_device *spi)
 
 static struct spi_driver rs5c348_driver = {
         .driver = {
-                .name   = "rs5c348",
+                .name   = "rtc-rs5c348",
                 .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index 3b58d3d5d3..a6b572978d 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -26,6 +26,7 @@
 #include <linux/types.h>
 #include <linux/bcd.h>
 #include <linux/rtc-v3020.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 
@@ -47,6 +48,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,
         for (i = 0; i < 4; i++) {
                 writel((tmp & 1) << chip->leftshift, chip->ioaddress);
                 tmp >>= 1;
+                udelay(1);
         }
 
         /* Commands dont have data */
@@ -54,6 +56,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,
                 for (i = 0; i < 8; i++) {
                         writel((data & 1) << chip->leftshift, chip->ioaddress);
                         data >>= 1;
+                        udelay(1);
                 }
         }
 }
@@ -66,12 +69,14 @@ static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)
         for (i = 0; i < 4; i++) {
                 writel((address & 1) << chip->leftshift, chip->ioaddress);
                 address >>= 1;
+                udelay(1);
         }
 
         for (i = 0; i < 8; i++) {
                 data >>= 1;
                 if (readl(chip->ioaddress) & (1 << chip->leftshift))
                         data |= 0x80;
+                udelay(1);
         }
 
         return data;
@@ -95,7 +100,7 @@ static int v3020_read_time(struct device *dev, struct rtc_time *dt)
         tmp = v3020_get_reg(chip, V3020_MONTH_DAY);
         dt->tm_mday     = BCD2BIN(tmp);
         tmp = v3020_get_reg(chip, V3020_MONTH);
-        dt->tm_mon      = BCD2BIN(tmp);
+        dt->tm_mon    = BCD2BIN(tmp) - 1;
         tmp = v3020_get_reg(chip, V3020_WEEK_DAY);
         dt->tm_wday     = BCD2BIN(tmp);
         tmp = v3020_get_reg(chip, V3020_YEAR);
@@ -135,7 +140,7 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)
         v3020_set_reg(chip, V3020_MINUTES,      BIN2BCD(dt->tm_min));
         v3020_set_reg(chip, V3020_HOURS,        BIN2BCD(dt->tm_hour));
         v3020_set_reg(chip, V3020_MONTH_DAY,    BIN2BCD(dt->tm_mday));
-        v3020_set_reg(chip, V3020_MONTH,        BIN2BCD(dt->tm_mon));
+        v3020_set_reg(chip, V3020_MONTH,     BIN2BCD(dt->tm_mon + 1));
         v3020_set_reg(chip, V3020_WEEK_DAY,     BIN2BCD(dt->tm_wday));
         v3020_set_reg(chip, V3020_YEAR,         BIN2BCD(dt->tm_year % 100));
 
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index ec18bae05d..6d4959807a 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -1178,9 +1178,9 @@ qeth_ipaddr_to_string(enum qeth_prot_versions proto, const __u8 *addr,
                       char *buf)
 {
         if (proto == QETH_PROT_IPV4)
-                return qeth_ipaddr4_to_string(addr, buf);
+                qeth_ipaddr4_to_string(addr, buf);
         else if (proto == QETH_PROT_IPV6)
-                return qeth_ipaddr6_to_string(addr, buf);
+                qeth_ipaddr6_to_string(addr, buf);
 }
 
 static inline int
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 57f69434fb..f3e6fbeb21 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -561,7 +561,7 @@ qeth_set_offline(struct ccwgroup_device *cgdev)
 }
 
 static int
-qeth_wait_for_threads(struct qeth_card *card, unsigned long threads);
+qeth_threads_running(struct qeth_card *card, unsigned long threads);
 
 
 static void
@@ -576,8 +576,7 @@ qeth_remove_device(struct ccwgroup_device *cgdev)
         if (!card)
                 return;
 
-        if (qeth_wait_for_threads(card, 0xffffffff))
-                return;
+        wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
 
         if (cgdev->state == CCWGROUP_ONLINE){
                 card->use_hard_stop = 1;
@@ -1542,16 +1541,21 @@ qeth_idx_write_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
         card = CARD_FROM_CDEV(channel->ccwdev);
 
         if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) {
-                PRINT_ERR("IDX_ACTIVATE on write channel device %s: negative "
-                          "reply\n", CARD_WDEV_ID(card));
+                if (QETH_IDX_ACT_CAUSE_CODE(iob->data) == 0x19)
+                        PRINT_ERR("IDX_ACTIVATE on write channel device %s: "
+                                "adapter exclusively used by another host\n",
+                                CARD_WDEV_ID(card));
+                else
+                        PRINT_ERR("IDX_ACTIVATE on write channel device %s: "
+                                "negative reply\n", CARD_WDEV_ID(card));
                 goto out;
         }
         memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);
         if ((temp & ~0x0100) != qeth_peer_func_level(card->info.func_level)) {
                 PRINT_WARN("IDX_ACTIVATE on write channel device %s: "
-                           "function level mismatch "
-                           "(sent: 0x%x, received: 0x%x)\n",
-                           CARD_WDEV_ID(card), card->info.func_level, temp);
+                        "function level mismatch "
+                        "(sent: 0x%x, received: 0x%x)\n",
+                        CARD_WDEV_ID(card), card->info.func_level, temp);
                 goto out;
         }
         channel->state = CH_STATE_UP;
@@ -1597,8 +1601,13 @@ qeth_idx_read_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
                         goto out;
         }
         if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) {
-                PRINT_ERR("IDX_ACTIVATE on read channel device %s: negative "
-                          "reply\n", CARD_RDEV_ID(card));
+                if (QETH_IDX_ACT_CAUSE_CODE(iob->data) == 0x19)
+                        PRINT_ERR("IDX_ACTIVATE on read channel device %s: "
+                                "adapter exclusively used by another host\n",
+                                CARD_RDEV_ID(card));
+                else
+                        PRINT_ERR("IDX_ACTIVATE on read channel device %s: "
+                                "negative reply\n", CARD_RDEV_ID(card));
                 goto out;
         }
 
@@ -1613,8 +1622,8 @@ qeth_idx_read_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
         memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);
         if (temp != qeth_peer_func_level(card->info.func_level)) {
                 PRINT_WARN("IDX_ACTIVATE on read channel device %s: function "
-                           "level mismatch (sent: 0x%x, received: 0x%x)\n",
-                           CARD_RDEV_ID(card), card->info.func_level, temp);
+                        "level mismatch (sent: 0x%x, received: 0x%x)\n",
+                        CARD_RDEV_ID(card), card->info.func_level, temp);
                 goto out;
         }
         memcpy(&card->token.issuer_rm_r,
@@ -2496,7 +2505,7 @@ qeth_rebuild_skb_fake_ll_tr(struct qeth_card *card, struct sk_buff *skb,
         struct iphdr *ip_hdr;
 
         QETH_DBF_TEXT(trace,5,"skbfktr");
-        skb_set_mac_header(skb, -QETH_FAKE_LL_LEN_TR);
+        skb_set_mac_header(skb, (int)-QETH_FAKE_LL_LEN_TR);
         /* this is a fake ethernet header */
         fake_hdr = tr_hdr(skb);
 
@@ -2804,13 +2813,16 @@ qeth_queue_input_buffer(struct qeth_card *card, int index)
                 if (newcount < count) {
                         /* we are in memory shortage so we switch back to
                            traditional skb allocation and drop packages */
-                        if (atomic_cmpxchg(&card->force_alloc_skb, 0, 1))
-                                printk(KERN_WARNING
-                                        "qeth: switch to alloc skb\n");
+                        if (!atomic_read(&card->force_alloc_skb) &&
+                            net_ratelimit())
+                                PRINT_WARN("Switch to alloc skb\n");
+                        atomic_set(&card->force_alloc_skb, 3);
                         count = newcount;
                 } else {
-                        if (atomic_cmpxchg(&card->force_alloc_skb, 1, 0))
-                                printk(KERN_WARNING "qeth: switch to sg\n");
+                        if ((atomic_read(&card->force_alloc_skb) == 1) &&
+                            net_ratelimit())
+                                PRINT_WARN("Switch to sg\n");
+                        atomic_add_unless(&card->force_alloc_skb, -1, 0);
                 }
 
                 /*
@@ -3354,10 +3366,12 @@ out_freeoutq:
         while (i > 0)
                 kfree(card->qdio.out_qs[--i]);
         kfree(card->qdio.out_qs);
+        card->qdio.out_qs = NULL;
 out_freepool:
         qeth_free_buffer_pool(card);
 out_freeinq:
         kfree(card->qdio.in_q);
+        card->qdio.in_q = NULL;
 out_nomem:
         atomic_set(&card->qdio.state, QETH_QDIO_UNINITIALIZED);
         return -ENOMEM;
@@ -3373,16 +3387,20 @@ qeth_free_qdio_buffers(struct qeth_card *card)
                 QETH_QDIO_UNINITIALIZED)
                 return;
         kfree(card->qdio.in_q);
+        card->qdio.in_q = NULL;
         /* inbound buffer pool */
         qeth_free_buffer_pool(card);
         /* free outbound qdio_qs */
-        for (i = 0; i < card->qdio.no_out_queues; ++i){
-                for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
-                        qeth_clear_output_buffer(card->qdio.out_qs[i],
-                                        &card->qdio.out_qs[i]->bufs[j]);
-                kfree(card->qdio.out_qs[i]);
+        if (card->qdio.out_qs) {
+                for (i = 0; i < card->qdio.no_out_queues; ++i) {
+                        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
+                                qeth_clear_output_buffer(card->qdio.out_qs[i],
+                                                &card->qdio.out_qs[i]->bufs[j]);
+                        kfree(card->qdio.out_qs[i]);
+                }
+                kfree(card->qdio.out_qs);
+                card->qdio.out_qs = NULL;
         }
-        kfree(card->qdio.out_qs);
 }
 
 static void
@@ -3393,7 +3411,7 @@ qeth_clear_qdio_buffers(struct qeth_card *card)
         QETH_DBF_TEXT(trace, 2, "clearqdbf");
         /* clear outbound buffers to free skbs */
         for (i = 0; i < card->qdio.no_out_queues; ++i)
-                if (card->qdio.out_qs[i]){
+                if (card->qdio.out_qs && card->qdio.out_qs[i]) {
                         for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
                                 qeth_clear_output_buffer(card->qdio.out_qs[i],
                                                 &card->qdio.out_qs[i]->bufs[j]);
@@ -4553,6 +4571,53 @@ qeth_get_elements_no(struct qeth_card *card, void *hdr,
         return elements_needed;
 }
 
+static void qeth_tx_csum(struct sk_buff *skb)
+{
+        int tlen;
+
+        if (skb->protocol == htons(ETH_P_IP)) {
+                tlen = ntohs(ip_hdr(skb)->tot_len) - (ip_hdr(skb)->ihl << 2);
+                switch (ip_hdr(skb)->protocol) {
+                case IPPROTO_TCP:
+                        tcp_hdr(skb)->check = 0;
+                        tcp_hdr(skb)->check = csum_tcpudp_magic(
+                                ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+                                tlen, ip_hdr(skb)->protocol,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        tlen, 0));
+                        break;
+                case IPPROTO_UDP:
+                        udp_hdr(skb)->check = 0;
+                        udp_hdr(skb)->check = csum_tcpudp_magic(
+                                ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+                                tlen, ip_hdr(skb)->protocol,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        tlen, 0));
+                        break;
+                }
+        } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                switch (ipv6_hdr(skb)->nexthdr) {
+                case IPPROTO_TCP:
+                        tcp_hdr(skb)->check = 0;
+                        tcp_hdr(skb)->check = csum_ipv6_magic(
+                                &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
+                                ipv6_hdr(skb)->payload_len,
+                                ipv6_hdr(skb)->nexthdr,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        ipv6_hdr(skb)->payload_len, 0));
+                        break;
+                case IPPROTO_UDP:
+                        udp_hdr(skb)->check = 0;
+                        udp_hdr(skb)->check = csum_ipv6_magic(
+                                &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
+                                ipv6_hdr(skb)->payload_len,
+                                ipv6_hdr(skb)->nexthdr,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        ipv6_hdr(skb)->payload_len, 0));
+                        break;
+                }
+        }
+}
 
 static int
 qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
@@ -4638,12 +4703,22 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                 elements_needed += elems;
         }
 
+        if ((large_send == QETH_LARGE_SEND_NO) &&
+            (skb->ip_summed == CHECKSUM_PARTIAL))
+                qeth_tx_csum(new_skb);
+
         if (card->info.type != QETH_CARD_TYPE_IQD)
                 rc = qeth_do_send_packet(card, queue, new_skb, hdr,
                                          elements_needed, ctx);
-        else
+        else {
+                if ((skb->protocol == htons(ETH_P_ARP)) &&
+                    (card->dev->flags & IFF_NOARP)) {
+                        __qeth_free_new_skb(skb, new_skb);
+                        return -EPERM;
+                }
                 rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr,
                                               elements_needed, ctx);
+        }
         if (!rc) {
                 card->stats.tx_packets++;
                 card->stats.tx_bytes += tx_bytes;
@@ -6385,20 +6460,18 @@ qeth_deregister_addr_entry(struct qeth_card *card, struct qeth_ipaddr *addr)
 static u32
 qeth_ethtool_get_tx_csum(struct net_device *dev)
 {
-        /* We may need to say that we support tx csum offload if
-         * we do EDDP or TSO. There are discussions going on to
-         * enforce rules in the stack and in ethtool that make
-         * SG and TSO depend on HW_CSUM. At the moment there are
-         * no such rules....
-         * If we say yes here, we have to checksum outbound packets
-         * any time. */
-        return 0;
+        return (dev->features & NETIF_F_HW_CSUM) != 0;
 }
 
 static int
 qeth_ethtool_set_tx_csum(struct net_device *dev, u32 data)
 {
-        return -EINVAL;
+        if (data)
+                dev->features |= NETIF_F_HW_CSUM;
+        else
+                dev->features &= ~NETIF_F_HW_CSUM;
+
+        return 0;
 }
 
 static u32
@@ -7412,7 +7485,8 @@ qeth_start_ipa_tso(struct qeth_card *card)
         }
         if (rc && (card->options.large_send == QETH_LARGE_SEND_TSO)){
                 card->options.large_send = QETH_LARGE_SEND_NO;
-                card->dev->features &= ~ (NETIF_F_TSO | NETIF_F_SG);
+                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM);
         }
         return rc;
 }
@@ -7552,22 +7626,26 @@ qeth_set_large_send(struct qeth_card *card, enum qeth_large_send_types type)
         card->options.large_send = type;
         switch (card->options.large_send) {
         case QETH_LARGE_SEND_EDDP:
-                card->dev->features |= NETIF_F_TSO | NETIF_F_SG;
+                card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM;
                 break;
         case QETH_LARGE_SEND_TSO:
                 if (qeth_is_supported(card, IPA_OUTBOUND_TSO)){
-                        card->dev->features |= NETIF_F_TSO | NETIF_F_SG;
+                        card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM;
                 } else {
                         PRINT_WARN("TSO not supported on %s. "
                                    "large_send set to 'no'.\n",
                                    card->dev->name);
-                        card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
+                        card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM);
                         card->options.large_send = QETH_LARGE_SEND_NO;
                         rc = -EOPNOTSUPP;
                 }
                 break;
         default: /* includes QETH_LARGE_SEND_NO */
-                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
+                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM);
                 break;
         }
         if (card->state == CARD_STATE_UP)
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index 1d8083c917..6de2da5ed5 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -565,6 +565,7 @@ extern unsigned char IDX_ACTIVATE_WRITE[];
 #define QETH_IDX_ACT_QDIO_DEV_REALADDR(buffer) (buffer+0x20)
 #define QETH_IS_IDX_ACT_POS_REPLY(buffer) (((buffer)[0x08]&3)==2)
 #define QETH_IDX_REPLY_LEVEL(buffer) (buffer+0x12)
+#define QETH_IDX_ACT_CAUSE_CODE(buffer) (buffer)[0x09]
 
 #define PDU_ENCAPSULATION(buffer) \
         (buffer + *(buffer + (*(buffer+0x0b)) + \
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index bb0287ad1a..2cc3f3a0e3 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -1760,10 +1760,10 @@ qeth_remove_device_attributes(struct device *dev)
 {
         struct qeth_card *card = dev->driver_data;
 
-        if (card->info.type == QETH_CARD_TYPE_OSN)
-                return sysfs_remove_group(&dev->kobj,
-                                          &qeth_osn_device_attr_group);
-
+        if (card->info.type == QETH_CARD_TYPE_OSN) {
+                sysfs_remove_group(&dev->kobj, &qeth_osn_device_attr_group);
+                return;
+        }
         sysfs_remove_group(&dev->kobj, &qeth_device_attr_group);
         sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group);
         sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group);
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index ab5ec1feaf..90aa53fc4f 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -1503,7 +1503,7 @@ zfcp_gid_pn_buffers_alloc(struct zfcp_gid_pn_data **gid_pn, mempool_t *pool)
                         data->ct.pool = pool;
                 }
         } else {
-                data = kmalloc(sizeof(struct zfcp_gid_pn_data), GFP_ATOMIC);
+                data = kmem_cache_alloc(zfcp_data.gid_pn_cache, GFP_ATOMIC);
         }
 
         if (NULL == data)
@@ -1531,7 +1531,7 @@ static void zfcp_gid_pn_buffers_free(struct zfcp_gid_pn_data *gid_pn)
         if (gid_pn->ct.pool)
                 mempool_free(gid_pn, gid_pn->ct.pool);
         else
-                kfree(gid_pn);
+                kmem_cache_free(zfcp_data.gid_pn_cache, gid_pn);
 }
 
 /**
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 81daa8204b..c6899efdc8 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -640,13 +640,9 @@ int
 zfcp_qdio_sbals_from_scsicmnd(struct zfcp_fsf_req *fsf_req,
                               unsigned long sbtype, struct scsi_cmnd *scsi_cmnd)
 {
-        if (scsi_sg_count(scsi_cmnd))
-                return zfcp_qdio_sbals_from_sg(fsf_req, sbtype,
-                                               scsi_sglist(scsi_cmnd),
-                                               scsi_sg_count(scsi_cmnd),
-                                               ZFCP_MAX_SBALS_PER_REQ);
-        else
-                return 0;
+        return zfcp_qdio_sbals_from_sg(fsf_req, sbtype, scsi_sglist(scsi_cmnd),
+                                       scsi_sg_count(scsi_cmnd),
+                                       ZFCP_MAX_SBALS_PER_REQ);
 }
 
 /**
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 0acf6db0a0..ad7eb4a926 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -764,7 +764,9 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost)
                 return;
 
         ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);
-        if (ret == 0) {
+        if (ret) {
+                kfree(data);
+        } else {
                 adapter->stats_reset = jiffies/HZ;
                 old_data = adapter->stats_reset_data;
                 adapter->stats_reset_data = data; /* finally freed in
diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index d5d8caba35..ab13824df8 100644
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -451,7 +451,7 @@ static int asd_build_smp_ascb(struct asd_ascb *ascb, struct sas_task *task,
         struct scb *scb;
 
         pci_map_sg(asd_ha->pcidev, &task->smp_task.smp_req, 1,
-                   PCI_DMA_FROMDEVICE);
+                   PCI_DMA_TODEVICE);
         pci_map_sg(asd_ha->pcidev, &task->smp_task.smp_resp, 1,
                    PCI_DMA_FROMDEVICE);
 
@@ -486,7 +486,7 @@ static void asd_unbuild_smp_ascb(struct asd_ascb *a)
 
         BUG_ON(!task);
         pci_unmap_sg(a->ha->pcidev, &task->smp_task.smp_req, 1,
-                     PCI_DMA_FROMDEVICE);
+                     PCI_DMA_TODEVICE);
         pci_unmap_sg(a->ha->pcidev, &task->smp_task.smp_resp, 1,
                      PCI_DMA_FROMDEVICE);
 }
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 77b06a983f..95cf7b6cd6 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2314,6 +2314,7 @@ int __devinit scsi_esp_register(struct esp *esp, struct device *dev)
         esp->host->transportt = esp_transport_template;
         esp->host->max_lun = ESP_MAX_LUN;
         esp->host->cmd_per_lun = 2;
+        esp->host->unique_id = instance;
 
         esp_set_clock_params(esp);
 
@@ -2337,7 +2338,7 @@ int __devinit scsi_esp_register(struct esp *esp, struct device *dev)
         if (err)
                 return err;
 
-        esp->host->unique_id = instance++;
+        instance++;
 
         scsi_scan_host(esp->host);
 
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 5606d1e629..efceed451b 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -737,12 +737,19 @@ check_mgmt:
                  */
                 conn->ctask = list_entry(conn->xmitqueue.next,
                                          struct iscsi_cmd_task, running);
-                if (conn->ctask->state == ISCSI_TASK_PENDING) {
+                switch (conn->ctask->state) {
+                case ISCSI_TASK_ABORTING:
+                        break;
+                case ISCSI_TASK_PENDING:
                         iscsi_prep_scsi_cmd_pdu(conn->ctask);
                         conn->session->tt->init_cmd_task(conn->ctask);
+                        /* fall through */
+                default:
+                        conn->ctask->state = ISCSI_TASK_RUNNING;
+                        break;
                 }
-                conn->ctask->state = ISCSI_TASK_RUNNING;
                 list_move_tail(conn->xmitqueue.next, &conn->run_list);
+
                 rc = iscsi_xmit_ctask(conn);
                 if (rc)
                         goto again;
@@ -1049,7 +1056,9 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
         ctask->mtask = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)hdr,
                                             NULL, 0);
         if (!ctask->mtask) {
+                spin_unlock_bh(&session->lock);
                 iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                spin_lock_bh(&session->lock)
                 debug_scsi("abort sent failure [itt 0x%x]\n", ctask->itt);
                 return -EPERM;
         }
@@ -1066,6 +1075,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
                 debug_scsi("abort set timeout [itt 0x%x]\n", ctask->itt);
         }
         spin_unlock_bh(&session->lock);
+        mutex_unlock(&session->eh_mutex);
         scsi_queue_work(session->host, &conn->xmitwork);
 
         /*
@@ -1083,6 +1093,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
         if (signal_pending(current))
                 flush_signals(current);
         del_timer_sync(&conn->tmabort_timer);
+        mutex_lock(&session->eh_mutex);
         spin_lock_bh(&session->lock);
         return 0;
 }
@@ -1158,31 +1169,45 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
         __iscsi_put_ctask(ctask);
 }
 
+static void iscsi_suspend_tx(struct iscsi_conn *conn)
+{
+        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
+        scsi_flush_work(conn->session->host);
+}
+
+static void iscsi_start_tx(struct iscsi_conn *conn)
+{
+        clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
+        scsi_queue_work(conn->session->host, &conn->xmitwork);
+}
+
 int iscsi_eh_abort(struct scsi_cmnd *sc)
 {
+        struct Scsi_Host *host = sc->device->host;
+        struct iscsi_session *session = iscsi_hostdata(host->hostdata);
         struct iscsi_cmd_task *ctask;
         struct iscsi_conn *conn;
-        struct iscsi_session *session;
         int rc;
 
+        mutex_lock(&session->eh_mutex);
+        spin_lock_bh(&session->lock);
         /*
          * if session was ISCSI_STATE_IN_RECOVERY then we may not have
          * got the command.
          */
         if (!sc->SCp.ptr) {
                 debug_scsi("sc never reached iscsi layer or it completed.\n");
+                spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
                 return SUCCESS;
         }
 
         ctask = (struct iscsi_cmd_task *)sc->SCp.ptr;
         conn = ctask->conn;
-        session = conn->session;
 
         conn->eh_abort_cnt++;
         debug_scsi("aborting [sc %p itt 0x%x]\n", sc, ctask->itt);
 
-        spin_lock_bh(&session->lock);
-
         /*
          * If we are not logged in or we have started a new session
          * then let the host reset code handle this
@@ -1219,6 +1244,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
         switch (conn->tmabort_state) {
         case TMABORT_SUCCESS:
                 spin_unlock_bh(&session->lock);
+                iscsi_suspend_tx(conn);
                 /*
                  * clean up task if aborted. grab the recv lock as a writer
                  */
@@ -1227,11 +1253,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
                 fail_command(conn, ctask, DID_ABORT << 16);
                 spin_unlock(&session->lock);
                 write_unlock_bh(conn->recv_lock);
-                /*
-                 * make sure xmit thread is not still touching the
-                 * ctask/scsi_cmnd
-                 */
-                scsi_flush_work(session->host);
+                iscsi_start_tx(conn);
                 goto success_unlocked;
         case TMABORT_NOT_FOUND:
                 if (!ctask->sc) {
@@ -1251,12 +1273,14 @@ success:
         spin_unlock_bh(&session->lock);
 success_unlocked:
         debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask->itt);
+        mutex_unlock(&session->eh_mutex);
         return SUCCESS;
 
 failed:
         spin_unlock_bh(&session->lock);
 failed_unlocked:
         debug_scsi("abort failed [sc %lx itt 0x%x]\n", (long)sc, ctask->itt);
+        mutex_unlock(&session->eh_mutex);
         return FAILED;
 }
 EXPORT_SYMBOL_GPL(iscsi_eh_abort);
@@ -1403,6 +1427,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
         session->max_cmdsn = initial_cmdsn + 1;
         session->max_r2t = 1;
         session->tt = iscsit;
+        mutex_init(&session->eh_mutex);
 
         /* initialize SCSI PDU commands pool */
         if (iscsi_pool_init(&session->cmdpool, session->cmds_max,
@@ -1736,9 +1761,22 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
 {
         int old_stop_stage;
 
+        mutex_lock(&session->eh_mutex);
         spin_lock_bh(&session->lock);
         if (conn->stop_stage == STOP_CONN_TERM) {
                 spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
+                return;
+        }
+
+        /*
+         * The LLD either freed/unset the lock on us, or userspace called
+         * stop but did not create a proper connection (connection was never
+         * bound or it was unbound then stop was called).
+         */
+        if (!conn->recv_lock) {
+                spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
                 return;
         }
 
@@ -1755,9 +1793,9 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
         old_stop_stage = conn->stop_stage;
         conn->stop_stage = flag;
         conn->c_stage = ISCSI_CONN_STOPPED;
-        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
         spin_unlock_bh(&session->lock);
-        scsi_flush_work(session->host);
+
+        iscsi_suspend_tx(conn);
 
         write_lock_bh(conn->recv_lock);
         set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
@@ -1786,6 +1824,7 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
         fail_all_commands(conn);
         flush_control_queues(session, conn);
         spin_unlock_bh(&session->lock);
+        mutex_unlock(&session->eh_mutex);
 }
 
 void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 3907f6718e..da56163c30 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1753,6 +1753,14 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
 
         *len = 0;
 
+        if (scsi_sg_count(cmd) == 1 && !adapter->has_64bit_addr) {
+                sg = scsi_sglist(cmd);
+                scb->dma_h_bulkdata = sg_dma_address(sg);
+                *buf = (u32)scb->dma_h_bulkdata;
+                *len = sg_dma_len(sg);
+                return 0;
+        }
+
         scsi_for_each_sg(cmd, sg, sgcnt, idx) {
                 if (adapter->has_64bit_addr) {
                         scb->sgl64[idx].address = sg_dma_address(sg);
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 563d18f4ff..c6680348b6 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -2050,21 +2050,18 @@ qla25xx_fw_dump_failed:
 void
 qla2x00_dump_regs(scsi_qla_host_t *ha)
 {
+        int i;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+        struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;
+        uint16_t __iomem *mbx_reg;
+
+        mbx_reg = IS_FWI2_CAPABLE(ha) ? &reg24->mailbox0:
+            MAILBOX_REG(ha, reg, 0);
 
         printk("Mailbox registers:\n");
-        printk("scsi(%ld): mbox 0 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 0));
-        printk("scsi(%ld): mbox 1 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 1));
-        printk("scsi(%ld): mbox 2 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 2));
-        printk("scsi(%ld): mbox 3 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 3));
-        printk("scsi(%ld): mbox 4 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 4));
-        printk("scsi(%ld): mbox 5 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 5));
+        for (i = 0; i < 6; i++)
+                printk("scsi(%ld): mbox %d 0x%04x \n", ha->host_no, i,
+                    RD_REG_WORD(mbx_reg++));
 }
 
 
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 27ae3a532a..c1964866a4 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1502,7 +1502,6 @@ typedef struct {
         uint8_t node_name[WWN_SIZE];
         uint8_t port_name[WWN_SIZE];
         uint8_t fabric_port_name[WWN_SIZE];
-        uint16_t fp_speeds;
         uint16_t fp_speed;
 } sw_info_t;
 
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index b06cbb8580..a7e23583f8 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -295,6 +295,8 @@ qla2x00_gid_pt(scsi_qla_host_t *ha, sw_info_t *list)
                         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];
+                        memset(list[i].fabric_port_name, 0, WWN_SIZE);
+                        list[i].fp_speed = PORT_SPEED_UNKNOWN;
 
                         /* Last one exit. */
                         if (gid_data->control_byte & BIT_7) {
@@ -1707,8 +1709,6 @@ qla2x00_gfpn_id(scsi_qla_host_t *ha, sw_info_t *list)
 
         for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GFPN_ID */
-                memset(list[i].fabric_port_name, 0, WWN_SIZE);
-
                 /* Prepare common MS IOCB */
                 ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GFPN_ID_REQ_SIZE,
                     GFPN_ID_RSP_SIZE);
@@ -1821,8 +1821,6 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
 
         for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GFPN_ID */
-                list[i].fp_speeds = list[i].fp_speed = 0;
-
                 /* Prepare common MS IOCB */
                 ms_pkt = qla24xx_prep_ms_fm_iocb(ha, GPSC_REQ_SIZE,
                     GPSC_RSP_SIZE);
@@ -1858,9 +1856,21 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                         }
                         rval = QLA_FUNCTION_FAILED;
                 } else {
-                        /* Save portname */
-                        list[i].fp_speeds = ct_rsp->rsp.gpsc.speeds;
-                        list[i].fp_speed = ct_rsp->rsp.gpsc.speed;
+                        /* Save port-speed */
+                        switch (be16_to_cpu(ct_rsp->rsp.gpsc.speed)) {
+                        case BIT_15:
+                                list[i].fp_speed = PORT_SPEED_1GB;
+                                break;
+                        case BIT_14:
+                                list[i].fp_speed = PORT_SPEED_2GB;
+                                break;
+                        case BIT_13:
+                                list[i].fp_speed = PORT_SPEED_4GB;
+                                break;
+                        case BIT_11:
+                                list[i].fp_speed = PORT_SPEED_8GB;
+                                break;
+                        }
 
                         DEBUG2_3(printk("scsi(%ld): GPSC ext entry - "
                             "fpn %02x%02x%02x%02x%02x%02x%02x%02x speeds=%04x "
@@ -1873,8 +1883,8 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                             list[i].fabric_port_name[5],
                             list[i].fabric_port_name[6],
                             list[i].fabric_port_name[7],
-                            be16_to_cpu(list[i].fp_speeds),
-                            be16_to_cpu(list[i].fp_speed)));
+                            be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
+                            be16_to_cpu(ct_rsp->rsp.gpsc.speed)));
                 }
 
                 /* Last device exit. */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 374abe19b5..1a058ec9bd 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2079,17 +2079,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
                 }
 
                 /* Base iIDMA settings on HBA port speed. */
-                switch (ha->link_data_rate) {
-                case PORT_SPEED_1GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_15);
-                        break;
-                case PORT_SPEED_2GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_14);
-                        break;
-                case PORT_SPEED_4GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_13);
-                        break;
-                }
+                fcport->fp_speed = ha->link_data_rate;
 
                 qla2x00_update_fcport(ha, fcport);
 
@@ -2130,38 +2120,25 @@ static void
 qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
 #define LS_UNKNOWN      2
-        static char *link_speeds[5] = { "1", "2", "?", "4" };
+        static char *link_speeds[5] = { "1", "2", "?", "4", "8" };
         int rval;
-        uint16_t port_speed, mb[6];
+        uint16_t mb[6];
 
         if (!IS_IIDMA_CAPABLE(ha))
                 return;
 
-        switch (be16_to_cpu(fcport->fp_speed)) {
-        case BIT_15:
-                port_speed = PORT_SPEED_1GB;
-                break;
-        case BIT_14:
-                port_speed = PORT_SPEED_2GB;
-                break;
-        case BIT_13:
-                port_speed = PORT_SPEED_4GB;
-                break;
-        default:
+        if (fcport->fp_speed == PORT_SPEED_UNKNOWN) {
                 DEBUG2(printk("scsi(%ld): %02x%02x%02x%02x%02x%02x%02x%02x -- "
-                    "unsupported FM port operating speed (%04x).\n",
+                    "unsupported FM port operating speed.\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],
-                    be16_to_cpu(fcport->fp_speed)));
-                port_speed = PORT_SPEED_UNKNOWN;
-                break;
-        }
-        if (port_speed == PORT_SPEED_UNKNOWN)
+                    fcport->port_name[6], fcport->port_name[7]));
                 return;
+        }
 
-        rval = qla2x00_set_idma_speed(ha, fcport->loop_id, port_speed, mb);
+        rval = qla2x00_set_idma_speed(ha, fcport->loop_id, fcport->fp_speed,
+            mb);
         if (rval != QLA_SUCCESS) {
                 DEBUG2(printk("scsi(%ld): Unable to adjust iIDMA "
                     "%02x%02x%02x%02x%02x%02x%02x%02x -- %04x %x %04x %04x.\n",
@@ -2169,12 +2146,12 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
                     fcport->port_name[2], fcport->port_name[3],
                     fcport->port_name[4], fcport->port_name[5],
                     fcport->port_name[6], fcport->port_name[7], rval,
-                    port_speed, mb[0], mb[1]));
+                    fcport->fp_speed, mb[0], mb[1]));
         } else {
                 DEBUG2(qla_printk(KERN_INFO, ha,
                     "iIDMA adjusted to %s GB/s on "
                     "%02x%02x%02x%02x%02x%02x%02x%02x.\n",
-                    link_speeds[port_speed], fcport->port_name[0],
+                    link_speeds[fcport->fp_speed], 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],
@@ -3354,7 +3331,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
 
                         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+                            !IS_QLA25XX(ha)) {
                                 /*
                                  * Disable SRAM, Instruction RAM and GP RAM
                                  * parity.
@@ -3370,7 +3348,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
 
                         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+                            !IS_QLA25XX(ha)) {
                                 /* Enable proper parity */
                                 if (IS_QLA2300(ha))
                                         /* SRAM parity */
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 50539da467..eecae9905e 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -490,6 +490,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
 
                 ha->flags.gpsc_supported = 1;
+                ha->flags.management_server_logged_in = 0;
                 break;
 
         case MBA_CHG_IN_CONNECTION:     /* Change in connection mode */
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 93c0c7e4f0..acca898ce0 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1564,7 +1564,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         struct Scsi_Host *host;
         scsi_qla_host_t *ha;
         unsigned long   flags = 0;
-        char pci_info[20];
+        char pci_info[30];
         char fw_str[30];
         struct scsi_host_template *sht;
 
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index dd1f8ceb79..18095b9b76 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.02.00-k2"
+#define QLA2XXX_VERSION      "8.02.00-k3"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    2
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 6f56f87506..4df21c92ff 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -787,10 +787,12 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
         struct scsi_target *starget = sdev->sdev_target;
         struct Scsi_Host *shost = sdev->host;
         int len = sdev->inquiry_len;
+        int min_period = spi_min_period(starget);
+        int max_width = spi_max_width(starget);
         /* first set us up for narrow async */
         DV_SET(offset, 0);
         DV_SET(width, 0);
-        
+
         if (spi_dv_device_compare_inquiry(sdev, buffer, buffer, DV_LOOPS)
             != SPI_COMPARE_SUCCESS) {
                 starget_printk(KERN_ERR, starget, "Domain Validation Initial Inquiry Failed\n");
@@ -798,9 +800,13 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
                 return;
         }
 
+        if (!scsi_device_wide(sdev)) {
+                spi_max_width(starget) = 0;
+                max_width = 0;
+        }
+
         /* test width */
-        if (i->f->set_width && spi_max_width(starget) &&
-            scsi_device_wide(sdev)) {
+        if (i->f->set_width && max_width) {
                 i->f->set_width(starget, 1);
 
                 if (spi_dv_device_compare_inquiry(sdev, buffer,
@@ -809,6 +815,11 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
                     != SPI_COMPARE_SUCCESS) {
                         starget_printk(KERN_ERR, starget, "Wide Transfers Fail\n");
                         i->f->set_width(starget, 0);
+                        /* Make sure we don't force wide back on by asking
+                         * for a transfer period that requires it */
+                        max_width = 0;
+                        if (min_period < 10)
+                                min_period = 10;
                 }
         }
 
@@ -828,7 +839,8 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
 
         /* now set up to the maximum */
         DV_SET(offset, spi_max_offset(starget));
-        DV_SET(period, spi_min_period(starget));
+        DV_SET(period, min_period);
+
         /* try QAS requests; this should be harmless to set if the
          * target supports it */
         if (scsi_device_qas(sdev)) {
@@ -837,14 +849,14 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
                 DV_SET(qas, 0);
         }
 
-        if (scsi_device_ius(sdev) && spi_min_period(starget) < 9) {
+        if (scsi_device_ius(sdev) && min_period < 9) {
                 /* This u320 (or u640). Set IU transfers */
                 DV_SET(iu, 1);
                 /* Then set the optional parameters */
                 DV_SET(rd_strm, 1);
                 DV_SET(wr_flow, 1);
                 DV_SET(rti, 1);
-                if (spi_min_period(starget) == 8)
+                if (min_period == 8)
                         DV_SET(pcomp_en, 1);
         } else {
                 DV_SET(iu, 0);
@@ -862,6 +874,10 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
         } else {
                 DV_SET(dt, 1);
         }
+        /* set width last because it will pull all the other
+         * parameters down to required values */
+        DV_SET(width, max_width);
+
         /* Do the read only INQUIRY tests */
         spi_dv_retrain(sdev, buffer, buffer + sdev->inquiry_len,
                        spi_dv_device_compare_inquiry);
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index bd66339f7a..1ea1ed82c3 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -610,7 +610,7 @@ static int pci_netmos_init(struct pci_dev *dev)
 /* enable IO_Space bit */
 #define ITE_887x_POSIO_ENABLE           (1 << 31)
 
-static int __devinit pci_ite887x_init(struct pci_dev *dev)
+static int pci_ite887x_init(struct pci_dev *dev)
 {
         /* inta_addr are the configuration addresses of the ITE */
         static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0,
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 64ff6a5f6a..81b52b7cca 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -611,7 +611,7 @@ config SERIAL_BFIN
 
 config SERIAL_BFIN_CONSOLE
         bool "Console on Blackfin serial port"
-        depends on SERIAL_BFIN
+        depends on SERIAL_BFIN=y
         select SERIAL_CORE_CONSOLE
 
 choice
@@ -832,10 +832,10 @@ config SERIAL_MUX
             4. Change the kernel command console parameter to: console=ttyB0
 
 config SERIAL_MUX_CONSOLE
-        bool "Support for console on serial MUX"
-        depends on SERIAL_MUX
+        bool "Support for console on serial MUX"
+        depends on SERIAL_MUX=y
         select SERIAL_CORE_CONSOLE
-        default y
+        default y
 
 config PDC_CONSOLE
         bool "PDC software console support"
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index a99e45e2b6..2a6477834c 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -37,6 +37,6 @@ static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
         up->smc_tfcr = SMC_EB;
 }
 
-#define DPRAM_BASE      ((unsigned char *)&cpmp->cp_dpmem[0])
+#define DPRAM_BASE      ((unsigned char *)cpm_dpram_addr(0))
 
 #endif
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c
index 2012537550..2d6c08b3db 100644
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/serial/sb1250-duart.c
@@ -58,6 +58,12 @@
 #define SBD_CTRLREGS(line)      A_BCM1480_DUART_CTRLREG((line), 0)
 #define SBD_INT(line)           (K_BCM1480_INT_UART_0 + (line))
 
+#define DUART_CHANREG_SPACING   BCM1480_DUART_CHANREG_SPACING
+
+#define R_DUART_IMRREG(line)    R_BCM1480_DUART_IMRREG(line)
+#define R_DUART_INCHREG(line)   R_BCM1480_DUART_INCHREG(line)
+#define R_DUART_ISRREG(line)    R_BCM1480_DUART_ISRREG(line)
+
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
 #include <asm/sibyte/sb1250_regs.h>
 #include <asm/sibyte/sb1250_int.h>
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index a0ea435985..7c8d78fbbb 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -943,6 +943,7 @@ static struct pcmcia_device_id serial_ids[] = {
         PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
         PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
         PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+        PCMCIA_DEVICE_MANF_CARD(0x0279, 0x950b),
         /* too generic */
         /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */
         /* PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0160, 0x0002), */
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index bca57bb949..ff610c2331 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -38,7 +38,7 @@
 #include <asm/prom.h>
 #include <asm/of_device.h>
 
-#if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#if defined(CONFIG_SERIAL_SUNSAB_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
 #endif
 
@@ -58,6 +58,7 @@ struct uart_sunsab_port {
         unsigned char                   interrupt_mask1;/* ISR1 masking         */
         unsigned char                   pvr_dtr_bit;    /* Which PVR bit is DTR */
         unsigned char                   pvr_dsr_bit;    /* Which PVR bit is DSR */
+        unsigned int                    gis_shift;
         int                             type;           /* SAB82532 version     */
 
         /* Setting configuration bits while the transmitter is active
@@ -305,13 +306,15 @@ static irqreturn_t sunsab_interrupt(int irq, void *dev_id)
         struct tty_struct *tty;
         union sab82532_irq_status status;
         unsigned long flags;
+        unsigned char gis;
 
         spin_lock_irqsave(&up->port.lock, flags);
 
         status.stat = 0;
-        if (readb(&up->regs->r.gis) & SAB82532_GIS_ISA0)
+        gis = readb(&up->regs->r.gis) >> up->gis_shift;
+        if (gis & 1)
                 status.sreg.isr0 = readb(&up->regs->r.isr0);
-        if (readb(&up->regs->r.gis) & SAB82532_GIS_ISA1)
+        if (gis & 2)
                 status.sreg.isr1 = readb(&up->regs->r.isr1);
 
         tty = NULL;
@@ -327,35 +330,6 @@ static irqreturn_t sunsab_interrupt(int irq, void *dev_id)
                         transmit_chars(up, &status);
         }
 
-        spin_unlock(&up->port.lock);
-
-        if (tty)
-                tty_flip_buffer_push(tty);
-
-        up++;
-
-        spin_lock(&up->port.lock);
-
-        status.stat = 0;
-        if (readb(&up->regs->r.gis) & SAB82532_GIS_ISB0)
-                status.sreg.isr0 = readb(&up->regs->r.isr0);
-        if (readb(&up->regs->r.gis) & SAB82532_GIS_ISB1)
-                status.sreg.isr1 = readb(&up->regs->r.isr1);
-
-        tty = NULL;
-        if (status.stat) {
-                if ((status.sreg.isr0 & (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
-                                         SAB82532_ISR0_RFO | SAB82532_ISR0_RPF)) ||
-                    (status.sreg.isr1 & SAB82532_ISR1_BRK))
-
-                        tty = receive_chars(up, &status);
-                if ((status.sreg.isr0 & SAB82532_ISR0_CDSC) ||
-                    (status.sreg.isr1 & (SAB82532_ISR1_BRK | SAB82532_ISR1_CSC)))
-                        check_status(up, &status);
-                if (status.sreg.isr1 & (SAB82532_ISR1_ALLS | SAB82532_ISR1_XPR))
-                        transmit_chars(up, &status);
-        }
-
         spin_unlock_irqrestore(&up->port.lock, flags);
 
         if (tty)
@@ -539,6 +513,10 @@ static int sunsab_startup(struct uart_port *port)
         struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
         unsigned long flags;
         unsigned char tmp;
+        int err = request_irq(up->port.irq, sunsab_interrupt,
+                              IRQF_SHARED, "sab", up);
+        if (err)
+                return err;
 
         spin_lock_irqsave(&up->port.lock, flags);
 
@@ -641,6 +619,7 @@ static void sunsab_shutdown(struct uart_port *port)
 #endif
 
         spin_unlock_irqrestore(&up->port.lock, flags);
+        free_irq(up->port.irq, up);
 }
 
 /*
@@ -1008,9 +987,11 @@ static int __devinit sunsab_init_one(struct uart_sunsab_port *up,
         if ((up->port.line & 0x1) == 0) {
                 up->pvr_dsr_bit = (1 << 0);
                 up->pvr_dtr_bit = (1 << 1);
+                up->gis_shift = 2;
         } else {
                 up->pvr_dsr_bit = (1 << 3);
                 up->pvr_dtr_bit = (1 << 2);
+                up->gis_shift = 0;
         }
         up->cached_pvr = (1 << 1) | (1 << 2) | (1 << 4);
         writeb(up->cached_pvr, &up->regs->w.pvr);
@@ -1023,19 +1004,6 @@ static int __devinit sunsab_init_one(struct uart_sunsab_port *up,
         up->tec_timeout = SAB82532_MAX_TEC_TIMEOUT;
         up->cec_timeout = SAB82532_MAX_CEC_TIMEOUT;
 
-        if (!(up->port.line & 0x01)) {
-                int err;
-
-                err = request_irq(up->port.irq, sunsab_interrupt,
-                                  IRQF_SHARED, "sab", up);
-                if (err) {
-                        of_iounmap(&op->resource[0],
-                                   up->port.membase,
-                                   sizeof(union sab82532_async_regs));
-                        return err;
-                }
-        }
-
         return 0;
 }
 
@@ -1051,52 +1019,60 @@ static int __devinit sab_probe(struct of_device *op, const struct of_device_id *
                               0,
                               (inst * 2) + 0);
         if (err)
-                return err;
+                goto out;
 
         err = sunsab_init_one(&up[1], op,
                               sizeof(union sab82532_async_regs),
                               (inst * 2) + 1);
-        if (err) {
-                of_iounmap(&op->resource[0],
-                           up[0].port.membase,
-                           sizeof(union sab82532_async_regs));
-                free_irq(up[0].port.irq, &up[0]);
-                return err;
-        }
+        if (err)
+                goto out1;
 
         sunserial_console_match(SUNSAB_CONSOLE(), op->node,
                                 &sunsab_reg, up[0].port.line);
-        uart_add_one_port(&sunsab_reg, &up[0].port);
 
         sunserial_console_match(SUNSAB_CONSOLE(), op->node,
                                 &sunsab_reg, up[1].port.line);
-        uart_add_one_port(&sunsab_reg, &up[1].port);
+
+        err = uart_add_one_port(&sunsab_reg, &up[0].port);
+        if (err)
+                goto out2;
+
+        err = uart_add_one_port(&sunsab_reg, &up[1].port);
+        if (err)
+                goto out3;
 
         dev_set_drvdata(&op->dev, &up[0]);
 
         inst++;
 
         return 0;
-}
-
-static void __devexit sab_remove_one(struct uart_sunsab_port *up)
-{
-        struct of_device *op = to_of_device(up->port.dev);
 
-        uart_remove_one_port(&sunsab_reg, &up->port);
-        if (!(up->port.line & 1))
-                free_irq(up->port.irq, up);
+out3:
+        uart_remove_one_port(&sunsab_reg, &up[0].port);
+out2:
         of_iounmap(&op->resource[0],
-                   up->port.membase,
+                   up[1].port.membase,
                    sizeof(union sab82532_async_regs));
+out1:
+        of_iounmap(&op->resource[0],
+                   up[0].port.membase,
+                   sizeof(union sab82532_async_regs));
+out:
+        return err;
 }
 
 static int __devexit sab_remove(struct of_device *op)
 {
         struct uart_sunsab_port *up = dev_get_drvdata(&op->dev);
 
-        sab_remove_one(&up[0]);
-        sab_remove_one(&up[1]);
+        uart_remove_one_port(&sunsab_reg, &up[1].port);
+        uart_remove_one_port(&sunsab_reg, &up[0].port);
+        of_iounmap(&op->resource[0],
+                   up[1].port.membase,
+                   sizeof(union sab82532_async_regs));
+        of_iounmap(&op->resource[0],
+                   up[0].port.membase,
+                   sizeof(union sab82532_async_regs));
 
         dev_set_drvdata(&op->dev, NULL);
 
@@ -1143,6 +1119,7 @@ static int __init sunsab_init(void)
 
                 sunsab_reg.minor = sunserial_current_minor;
                 sunsab_reg.nr = num_channels;
+                sunsab_reg.cons = SUNSAB_CONSOLE();
 
                 err = uart_register_driver(&sunsab_reg);
                 if (err) {
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 79b13685bd..e074943fef 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1198,10 +1198,11 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)
         if (up->port.type == PORT_UNKNOWN)
                 return -ENODEV;
 
-        printk("%s: %s port at %lx, irq %u\n",
+        printk("%s: %s port at %llx, irq %u\n",
                to_of_device(up->port.dev)->node->full_name,
                (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
-               up->port.mapbase, up->port.irq);
+               (unsigned long long) up->port.mapbase,
+               up->port.irq);
 
 #ifdef CONFIG_SERIO
         serio = &up->serio;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 1d262c0c61..283bef0d24 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1431,14 +1431,16 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
                         return err;
                 }
         } else {
-                printk(KERN_INFO "%s: Keyboard at MMIO 0x%lx (irq = %d) "
+                printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
-                       op->dev.bus_id, up[0].port.mapbase, op->irqs[0],
-                       sunzilog_type (&up[0].port));
-                printk(KERN_INFO "%s: Mouse at MMIO 0x%lx (irq = %d) "
+                       op->dev.bus_id,
+                       (unsigned long long) up[0].port.mapbase,
+                       op->irqs[0], sunzilog_type(&up[0].port));
+                printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
-                       op->dev.bus_id, up[1].port.mapbase, op->irqs[0],
-                       sunzilog_type (&up[1].port));
+                       op->dev.bus_id,
+                       (unsigned long long) up[1].port.mapbase,
+                       op->irqs[0], sunzilog_type(&up[1].port));
         }
 
         dev_set_drvdata(&op->dev, &up[0]);
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index ad144054da..b046974931 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -251,7 +251,7 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)
                 xfer->rx_dma = dma_map_single(dev,
                                 xfer->rx_buf, xfer->len,
                                 DMA_FROM_DEVICE);
-                if (dma_mapping_error(xfer->tx_dma)) {
+                if (dma_mapping_error(xfer->rx_dma)) {
                         if (xfer->tx_buf)
                                 dma_unmap_single(dev,
                                                 xfer->tx_dma, xfer->len,
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 48587c2705..f540ed77a1 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -1303,8 +1303,9 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
 #define bfin5xx_spi_resume NULL
 #endif                          /* CONFIG_PM */
 
+MODULE_ALIAS("bfin-spi-master");        /* for platform bus hotplug */
 static struct platform_driver bfin5xx_spi_driver = {
-        .driver         = {
+        .driver = {
                 .name   = "bfin-spi-master",
                 .owner  = THIS_MODULE,
         },
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index aee9ad6f63..bd9177f51d 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1735,7 +1735,7 @@ static int spi_imx_resume(struct platform_device *pdev)
 
 static struct platform_driver driver = {
         .driver = {
-                .name = "imx-spi",
+                .name = "spi_imx",
                 .bus = &platform_bus_type,
                 .owner = THIS_MODULE,
         },
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 2adf856e44..32cda77b31 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -384,11 +384,8 @@ irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
 
         mpc83xx_spi->count -= 1;
         if (mpc83xx_spi->count) {
-                if (mpc83xx_spi->tx) {
-                        u32 word = mpc83xx_spi->get_tx(mpc83xx_spi);
-                        mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit,
-                                              word);
-                }
+                u32 word = mpc83xx_spi->get_tx(mpc83xx_spi);
+                mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit, word);
         } else {
                 complete(&mpc83xx_spi->done);
         }
@@ -530,6 +527,7 @@ static int __devexit mpc83xx_spi_remove(struct platform_device *dev)
         return 0;
 }
 
+MODULE_ALIAS("mpc83xx_spi");                    /* for platform bus hotplug */
 static struct platform_driver mpc83xx_spi_driver = {
         .probe = mpc83xx_spi_probe,
         .remove = __devexit_p(mpc83xx_spi_remove),
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 5cf48123e0..e9b683f7d7 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -427,6 +427,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev)
 #define s3c24xx_spi_resume  NULL
 #endif
 
+MODULE_ALIAS("s3c2410_spi");                    /* for platform bus hotplug */
 static struct platform_driver s3c24xx_spidrv = {
         .probe          = s3c24xx_spi_probe,
         .remove         = s3c24xx_spi_remove,
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index 611ac22b7c..0fa25e2e80 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -180,7 +180,7 @@ static struct platform_driver s3c2410_spigpio_drv = {
         .suspend        = s3c2410_spigpio_suspend,
         .resume         = s3c2410_spigpio_resume,
         .driver         = {
-                .name   = "s3c24xx-spi-gpio",
+                .name   = "spi_s3c24xx_gpio",
                 .owner  = THIS_MODULE,
         },
 };
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c
index 08e981c406..b7f4bb239e 100644
--- a/drivers/spi/spi_txx9.c
+++ b/drivers/spi/spi_txx9.c
@@ -453,7 +453,7 @@ static int __exit txx9spi_remove(struct platform_device *dev)
 static struct platform_driver txx9spi_driver = {
         .remove = __exit_p(txx9spi_remove),
         .driver = {
-                .name = "txx9spi",
+                .name = "spi_txx9",
                 .owner = THIS_MODULE,
         },
 };
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index f0bf9a68e9..5d04f520c1 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -21,7 +21,7 @@
 
 #include <syslib/virtex_devices.h>
 
-#define XILINX_SPI_NAME "xspi"
+#define XILINX_SPI_NAME "xilinx_spi"
 
 /* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e)
  * Product Specification", DS464
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 6343689268..7580aa5da0 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -21,6 +21,7 @@ config USB_ARCH_HAS_HCD
         default y if USB_ARCH_HAS_EHCI
         default y if PCMCIA && !M32R                    # sl811_cs
         default y if ARM                                # SL-811
+        default y if SUPERH                             # r8a66597-hcd
         default PCI
 
 # many non-PCI SOC chips embed OHCI
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 02c52f8d5d..a73e714288 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -456,7 +456,6 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
                                  int* actual_length)
 {
         struct timer_list timer;
-        int status = urb->status;
 
         init_timer(&timer);
         timer.expires = jiffies + msecs_to_jiffies(CMD_TIMEOUT);
@@ -468,7 +467,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
 
         if (actual_length)
                 *actual_length = urb->actual_length;
-        return status;
+        return urb->status; /* must read status after completion */
 }
 
 static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm,
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index a1a1c9d467..29807d048b 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -1721,9 +1721,12 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
 
         ret = uea_boot(sc);
         if (ret < 0)
-                goto error;
+                goto error_rm_grp;
 
         return 0;
+
+error_rm_grp:
+        sysfs_remove_group(&intf->dev.kobj, &attr_grp);
 error:
         kfree(sc);
         return ret;
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index fe940e0536..f51e22490e 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -921,6 +921,10 @@ skip_normal_probe:
                         return -EINVAL;
                 }
         }
+
+        /* Accept probe requests only for the control interface */
+        if (intf != control_interface)
+                return -ENODEV;
         
         if (usb_interface_claimed(data_interface)) { /* valid in this context */
                 dev_dbg(&intf->dev,"The data interface isn't available");
@@ -1109,10 +1113,12 @@ static void acm_disconnect(struct usb_interface *intf)
                 return;
         }
         if (acm->country_codes){
-                device_remove_file(&intf->dev, &dev_attr_wCountryCodes);
-                device_remove_file(&intf->dev, &dev_attr_iCountryCodeRelDate);
+                device_remove_file(&acm->control->dev,
+                                &dev_attr_wCountryCodes);
+                device_remove_file(&acm->control->dev,
+                                &dev_attr_iCountryCodeRelDate);
         }
-        device_remove_file(&intf->dev, &dev_attr_bmCapabilities);
+        device_remove_file(&acm->control->dev, &dev_attr_bmCapabilities);
         acm->dev = NULL;
         usb_set_intfdata(acm->control, NULL);
         usb_set_intfdata(acm->data, NULL);
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 654857493a..63b1243a91 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -60,7 +60,7 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
         dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE;
 
         spin_lock(&dynids->lock);
-        list_add_tail(&dynids->list, &dynid->node);
+        list_add_tail(&dynid->node, &dynids->list);
         spin_unlock(&dynids->lock);
 
         if (get_driver(driver)) {
@@ -1224,6 +1224,8 @@ static int usb_autopm_do_device(struct usb_device *udev, int inc_usage_cnt)
         udev->auto_pm = 1;
         udev->pm_usage_cnt += inc_usage_cnt;
         WARN_ON(udev->pm_usage_cnt < 0);
+        if (inc_usage_cnt)
+                udev->last_busy = jiffies;
         if (inc_usage_cnt >= 0 && udev->pm_usage_cnt > 0) {
                 if (udev->state == USB_STATE_SUSPENDED)
                         status = usb_resume_both(udev);
@@ -1232,8 +1234,6 @@ static int usb_autopm_do_device(struct usb_device *udev, int inc_usage_cnt)
                 else if (inc_usage_cnt)
                         udev->last_busy = jiffies;
         } else if (inc_usage_cnt <= 0 && udev->pm_usage_cnt <= 0) {
-                if (inc_usage_cnt)
-                        udev->last_busy = jiffies;
                 status = usb_suspend_both(udev, PMSG_SUSPEND);
         }
         usb_pm_unlock(udev);
@@ -1342,16 +1342,15 @@ static int usb_autopm_do_interface(struct usb_interface *intf,
         else {
                 udev->auto_pm = 1;
                 intf->pm_usage_cnt += inc_usage_cnt;
+                udev->last_busy = jiffies;
                 if (inc_usage_cnt >= 0 && intf->pm_usage_cnt > 0) {
                         if (udev->state == USB_STATE_SUSPENDED)
                                 status = usb_resume_both(udev);
                         if (status != 0)
                                 intf->pm_usage_cnt -= inc_usage_cnt;
-                        else if (inc_usage_cnt)
+                        else
                                 udev->last_busy = jiffies;
                 } else if (inc_usage_cnt <= 0 && intf->pm_usage_cnt <= 0) {
-                        if (inc_usage_cnt)
-                                udev->last_busy = jiffies;
                         status = usb_suspend_both(udev, PMSG_SUSPEND);
                 }
         }
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index e341a1da51..f7b337feb3 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1644,9 +1644,10 @@ static int finish_port_resume(struct usb_device *udev)
          * and device drivers will know about any resume quirks.
          */
         if (status == 0) {
+                devstatus = 0;
                 status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
                 if (status >= 0)
-                        status = (status == 2 ? 0 : -ENODEV);
+                        status = (status > 0 ? 0 : -ENODEV);
         }
 
         if (status) {
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index b6bd05e3d4..d8f7b089a8 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -637,12 +637,12 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type, unsigned char
         memset(buf,0,size);     // Make sure we parse really received data
 
         for (i = 0; i < 3; ++i) {
-                /* retry on length 0 or stall; some devices are flakey */
+                /* retry on length 0 or error; some devices are flakey */
                 result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
                                 USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
                                 (type << 8) + index, 0, buf, size,
                                 USB_CTRL_GET_TIMEOUT);
-                if (result == 0 || result == -EPIPE)
+                if (result <= 0 && result != -ETIMEDOUT)
                         continue;
                 if (result > 1 && ((u8 *)buf)[1] != type) {
                         result = -EPROTO;
@@ -1358,6 +1358,30 @@ static int usb_if_uevent(struct device *dev, char **envp, int num_envp,
         usb_dev = interface_to_usbdev(intf);
         alt = intf->cur_altsetting;
 
+#ifdef CONFIG_USB_DEVICEFS
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "DEVICE=/proc/bus/usb/%03d/%03d",
+                           usb_dev->bus->busnum, usb_dev->devnum))
+                return -ENOMEM;
+#endif
+
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "PRODUCT=%x/%x/%x",
+                           le16_to_cpu(usb_dev->descriptor.idVendor),
+                           le16_to_cpu(usb_dev->descriptor.idProduct),
+                           le16_to_cpu(usb_dev->descriptor.bcdDevice)))
+                return -ENOMEM;
+
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "TYPE=%d/%d/%d",
+                           usb_dev->descriptor.bDeviceClass,
+                           usb_dev->descriptor.bDeviceSubClass,
+                           usb_dev->descriptor.bDeviceProtocol))
+                return -ENOMEM;
+
         if (add_uevent_var(envp, num_envp, &i,
                    buffer, buffer_size, &length,
                    "INTERFACE=%d/%d/%d",
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index b7917c5a3c..ebf3dc2011 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -28,8 +28,16 @@
  * devices is broken...
  */
 static const struct usb_device_id usb_quirk_list[] = {
+        /* CBM - Flash disk */
+        { USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },
         /* HP 5300/5370C scanner */
         { USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },
+        /* Hewlett-Packard PhotoSmart 720 / PhotoSmart 935 (storage) */
+        { USB_DEVICE(0x03f0, 0x4002), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* SGS Thomson Microelectronics 4in1 card reader */
+        { USB_DEVICE(0x0483, 0x0321), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
         /* Acer Peripherals Inc. (now BenQ Corp.) Prisa 640BU */
         { USB_DEVICE(0x04a5, 0x207e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Benq S2W 3300U */
@@ -56,25 +64,54 @@ static const struct usb_device_id usb_quirk_list[] = {
         { USB_DEVICE(0x04b8, 0x0121), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Seiko Epson Corp.*/
         { USB_DEVICE(0x04b8, 0x0122), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Samsung ML-2010 printer */
+        { USB_DEVICE(0x04e8, 0x326c), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Samsung ML-2510 Series printer */
         { USB_DEVICE(0x04e8, 0x327e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Elsa MicroLink 56k (V.250) */
         { USB_DEVICE(0x05cc, 0x2267), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Ultima Electronics Corp.*/
         { USB_DEVICE(0x05d8, 0x4005), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* Genesys USB-to-IDE */
+        { USB_DEVICE(0x0503, 0x0702), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* USB Graphical LCD - EEH Datalink GmbH */
+        { USB_DEVICE(0x060c, 0x04eb), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* INTEL VALUE SSD */
+        { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
+
+        /* M-Systems Flash Disk Pioneers */
+        { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* Agfa Snapscan1212u */
         { USB_DEVICE(0x06bd, 0x2061), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Seagate RSS LLC */
+        { USB_DEVICE(0x0bc2, 0x3000), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Umax [hex] Astra 3400U */
         { USB_DEVICE(0x1606, 0x0060), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
 
         /* Philips PSC805 audio device */
         { USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* Alcor multi-card reader */
+        { USB_DEVICE(0x058f, 0x6366), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* Canon EOS 5D in PC Connection mode */
+        { USB_DEVICE(0x04a9, 0x3101), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
         /* RIM Blackberry */
         { USB_DEVICE(0x0fca, 0x0001), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         { USB_DEVICE(0x0fca, 0x0004), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         { USB_DEVICE(0x0fca, 0x0006), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
 
+        /* Apple iPhone */
+        { USB_DEVICE(0x05ac, 0x1290), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* SKYMEDI USB_DRIVE */
+        { USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME },
+
         { }  /* terminating entry must be last */
 };
 
@@ -115,4 +152,10 @@ void usb_detect_quirks(struct usb_device *udev)
         /* do any special quirk handling here if needed */
         if (udev->quirks & USB_QUIRK_NO_AUTOSUSPEND)
                 usb_autosuspend_quirk(udev);
+
+        /* By default, disable autosuspend for all non-hubs */
+#ifdef  CONFIG_USB_SUSPEND
+        if (udev->descriptor.bDeviceClass != USB_CLASS_HUB)
+                udev->autosuspend_delay = -1;
+#endif
 }
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index f2fbdc7fe3..d008d1360a 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -34,8 +34,6 @@
  * bypassing some hardware (and driver) issues.  UML could help too.
  */
 
-#define DEBUG
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index be7a1bd282..965ad7bec7 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -599,7 +599,6 @@ enum fsg_buffer_state {
 
 struct fsg_buffhd {
         void                            *buf;
-        dma_addr_t                      dma;
         enum fsg_buffer_state           state;
         struct fsg_buffhd               *next;
 
@@ -1295,6 +1294,7 @@ static int class_setup_req(struct fsg_dev *fsg,
         struct usb_request      *req = fsg->ep0req;
         int                     value = -EOPNOTSUPP;
         u16                     w_index = le16_to_cpu(ctrl->wIndex);
+        u16                     w_value = le16_to_cpu(ctrl->wValue);
         u16                     w_length = le16_to_cpu(ctrl->wLength);
 
         if (!fsg->config)
@@ -1308,7 +1308,7 @@ static int class_setup_req(struct fsg_dev *fsg,
                         if (ctrl->bRequestType != (USB_DIR_OUT |
                                         USB_TYPE_CLASS | USB_RECIP_INTERFACE))
                                 break;
-                        if (w_index != 0) {
+                        if (w_index != 0 || w_value != 0) {
                                 value = -EDOM;
                                 break;
                         }
@@ -1324,7 +1324,7 @@ static int class_setup_req(struct fsg_dev *fsg,
                         if (ctrl->bRequestType != (USB_DIR_IN |
                                         USB_TYPE_CLASS | USB_RECIP_INTERFACE))
                                 break;
-                        if (w_index != 0) {
+                        if (w_index != 0 || w_value != 0) {
                                 value = -EDOM;
                                 break;
                         }
@@ -1343,7 +1343,7 @@ static int class_setup_req(struct fsg_dev *fsg,
                         if (ctrl->bRequestType != (USB_DIR_OUT |
                                         USB_TYPE_CLASS | USB_RECIP_INTERFACE))
                                 break;
-                        if (w_index != 0) {
+                        if (w_index != 0 || w_value != 0) {
                                 value = -EDOM;
                                 break;
                         }
@@ -2611,7 +2611,6 @@ static int send_status(struct fsg_dev *fsg)
 
                 fsg->intr_buffhd = bh;          // Point to the right buffhd
                 fsg->intreq->buf = bh->inreq->buf;
-                fsg->intreq->dma = bh->inreq->dma;
                 fsg->intreq->context = bh;
                 start_transfer(fsg, fsg->intr_in, fsg->intreq,
                                 &fsg->intreq_busy, &bh->state);
@@ -3200,7 +3199,6 @@ reset:
                 if ((rc = alloc_request(fsg, fsg->bulk_out, &bh->outreq)) != 0)
                         goto reset;
                 bh->inreq->buf = bh->outreq->buf = bh->buf;
-                bh->inreq->dma = bh->outreq->dma = bh->dma;
                 bh->inreq->context = bh->outreq->context = bh;
                 bh->inreq->complete = bulk_in_complete;
                 bh->outreq->complete = bulk_out_complete;
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 10b2b33b86..d57bcfbc08 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -1277,31 +1277,32 @@ static void setup_received_irq(struct fsl_udc *udc,
 
         udc_reset_ep_queue(udc, 0);
 
+        /* We process some stardard setup requests here */
         switch (setup->bRequest) {
-                /* Request that need Data+Status phase from udc */
         case USB_REQ_GET_STATUS:
-                if ((setup->bRequestType & (USB_DIR_IN | USB_TYPE_STANDARD))
+                /* Data+Status phase from udc */
+                if ((setup->bRequestType & (USB_DIR_IN | USB_TYPE_MASK))
                                         != (USB_DIR_IN | USB_TYPE_STANDARD))
                         break;
                 ch9getstatus(udc, setup->bRequestType, wValue, wIndex, wLength);
-                break;
+                return;
 
-                /* Requests that need Status phase from udc */
         case USB_REQ_SET_ADDRESS:
+                /* Status phase from udc */
                 if (setup->bRequestType != (USB_DIR_OUT | USB_TYPE_STANDARD
                                                 | USB_RECIP_DEVICE))
                         break;
                 ch9setaddress(udc, wValue, wIndex, wLength);
-                break;
+                return;
 
-                /* Handled by udc, no data, status by udc */
         case USB_REQ_CLEAR_FEATURE:
         case USB_REQ_SET_FEATURE:
-        {       /* status transaction */
+                /* Status phase from udc */
+        {
                 int rc = -EOPNOTSUPP;
 
-                if ((setup->bRequestType & USB_RECIP_MASK)
-                                == USB_RECIP_ENDPOINT) {
+                if ((setup->bRequestType & (USB_RECIP_MASK | USB_TYPE_MASK))
+                                == (USB_RECIP_ENDPOINT | USB_TYPE_STANDARD)) {
                         int pipe = get_pipe_by_windex(wIndex);
                         struct fsl_ep *ep;
 
@@ -1315,8 +1316,9 @@ static void setup_received_irq(struct fsl_udc *udc,
                                                 ? 1 : 0);
                         spin_lock(&udc->lock);
 
-                } else if ((setup->bRequestType & USB_RECIP_MASK)
-                                == USB_RECIP_DEVICE) {
+                } else if ((setup->bRequestType & (USB_RECIP_MASK
+                                | USB_TYPE_MASK)) == (USB_RECIP_DEVICE
+                                | USB_TYPE_STANDARD)) {
                         /* Note: The driver has not include OTG support yet.
                          * This will be set when OTG support is added */
                         if (!udc->gadget.is_otg)
@@ -1329,39 +1331,42 @@ static void setup_received_irq(struct fsl_udc *udc,
                                         USB_DEVICE_A_ALT_HNP_SUPPORT)
                                 udc->gadget.a_alt_hnp_support = 1;
                         rc = 0;
-                }
+                } else
+                        break;
+
                 if (rc == 0) {
                         if (ep0_prime_status(udc, EP_DIR_IN))
                                 ep0stall(udc);
                 }
-                break;
+                return;
         }
-                /* Requests handled by gadget */
-        default:
-                if (wLength) {
-                        /* Data phase from gadget, status phase from udc */
-                        udc->ep0_dir = (setup->bRequestType & USB_DIR_IN)
-                                        ?  USB_DIR_IN : USB_DIR_OUT;
-                        spin_unlock(&udc->lock);
-                        if (udc->driver->setup(&udc->gadget,
-                                        &udc->local_setup_buff) < 0)
-                                ep0stall(udc);
-                        spin_lock(&udc->lock);
-                        udc->ep0_state = (setup->bRequestType & USB_DIR_IN)
-                                        ?  DATA_STATE_XMIT : DATA_STATE_RECV;
 
-                } else {
-                        /* No data phase, IN status from gadget */
-                        udc->ep0_dir = USB_DIR_IN;
-                        spin_unlock(&udc->lock);
-                        if (udc->driver->setup(&udc->gadget,
-                                        &udc->local_setup_buff) < 0)
-                                ep0stall(udc);
-                        spin_lock(&udc->lock);
-                        udc->ep0_state = WAIT_FOR_OUT_STATUS;
-                }
+        default:
                 break;
         }
+
+        /* Requests handled by gadget */
+        if (wLength) {
+                /* Data phase from gadget, status phase from udc */
+                udc->ep0_dir = (setup->bRequestType & USB_DIR_IN)
+                                ?  USB_DIR_IN : USB_DIR_OUT;
+                spin_unlock(&udc->lock);
+                if (udc->driver->setup(&udc->gadget,
+                                &udc->local_setup_buff) < 0)
+                        ep0stall(udc);
+                spin_lock(&udc->lock);
+                udc->ep0_state = (setup->bRequestType & USB_DIR_IN)
+                                ?  DATA_STATE_XMIT : DATA_STATE_RECV;
+        } else {
+                /* No data phase, IN status from gadget */
+                udc->ep0_dir = USB_DIR_IN;
+                spin_unlock(&udc->lock);
+                if (udc->driver->setup(&udc->gadget,
+                                &udc->local_setup_buff) < 0)
+                        ep0stall(udc);
+                spin_lock(&udc->lock);
+                udc->ep0_state = WAIT_FOR_OUT_STATUS;
+        }
 }
 
 /* Process request for Data or Status phase of ep0
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 72b4ebbf13..1407ad1c81 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -967,7 +967,7 @@ static int pxa2xx_udc_pullup(struct usb_gadget *_gadget, int is_active)
         udc = container_of(_gadget, struct pxa2xx_udc, gadget);
 
         /* not all boards support pullup control */
-        if (!udc->mach->udc_command)
+        if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
                 return -EOPNOTSUPP;
 
         is_active = (is_active != 0);
@@ -2309,7 +2309,7 @@ static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
 
-        if (!udc->mach->udc_command)
+        if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
                 WARN("USB host won't detect disconnect!\n");
         pullup(udc, 0);
 
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 9cd98e73dc..ce4d2e0963 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -1691,14 +1691,12 @@ static int gs_setup_class(struct usb_gadget *gadget,
 
         switch (ctrl->bRequest) {
         case USB_CDC_REQ_SET_LINE_CODING:
-                ret = min(wLength,
-                        (u16)sizeof(struct usb_cdc_line_coding));
-                if (port) {
-                        spin_lock(&port->port_lock);
-                        memcpy(&port->port_line_coding, req->buf, ret);
-                        spin_unlock(&port->port_lock);
-                }
-                ret = 0;
+                /* FIXME Submit req to read the data; have its completion
+                 * handler copy that data to port->port_line_coding (iff
+                 * it's valid) and maybe pass it on.  Until then, fail.
+                 */
+                printk(KERN_WARNING "gs_setup: set_line_coding "
+                                "unuspported\n");
                 break;
 
         case USB_CDC_REQ_GET_LINE_CODING:
@@ -1713,11 +1711,18 @@ static int gs_setup_class(struct usb_gadget *gadget,
                 break;
 
         case USB_CDC_REQ_SET_CONTROL_LINE_STATE:
-                ret = 0;
+                /* FIXME Submit req to read the data; have its completion
+                 * handler use that to set the state (iff it's valid) and
+                 * maybe pass it on.  Until then, fail.
+                 */
+                printk(KERN_WARNING "gs_setup: set_control_line_state "
+                                "unuspported\n");
                 break;
 
         default:
-                printk(KERN_ERR "gs_setup: unknown class request, type=%02x, request=%02x, value=%04x, index=%04x, length=%d\n",
+                printk(KERN_ERR "gs_setup: unknown class request, "
+                                "type=%02x, request=%02x, value=%04x, "
+                                "index=%04x, length=%d\n",
                         ctrl->bRequestType, ctrl->bRequest,
                         wValue, wIndex, wLength);
                 break;
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 2f529828c7..565d6ef4c4 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -237,7 +237,7 @@ config USB_SL811_CS
           module will be called "sl811_cs".
 
 config USB_R8A66597_HCD
-        tristate "R8A66597 HCD suppoort"
+        tristate "R8A66597 HCD support"
         depends on USB
         help
           The R8A66597 is a USB 2.0 host and peripheral controller.
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index 5d1b12aad7..b1d19268cb 100644
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -1,8 +1,6 @@
 /*
  * EHCI HCD (Host Controller Driver) for USB.
  *
- * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
- *
  * Bus Glue for AMD Alchemy Au1xxx
  *
  * Based on "ohci-au1xxx.c" by Matt Porter <mporter@kernel.crashing.org>
@@ -196,6 +194,9 @@ static const struct hc_driver ehci_au1xxx_hc_driver = {
 
         /*
          * basic lifecycle operations
+         *
+         * FIXME -- ehci_init() doesn't do enough here.
+         * See ehci-ppc-soc for a complete implementation.
          */
         .reset = ehci_init,
         .start = ehci_run,
diff --git a/drivers/usb/host/ehci-ppc-soc.c b/drivers/usb/host/ehci-ppc-soc.c
index c2cedb09ed..4f99b0eb27 100644
--- a/drivers/usb/host/ehci-ppc-soc.c
+++ b/drivers/usb/host/ehci-ppc-soc.c
@@ -6,7 +6,7 @@
  * Bus Glue for PPC On-Chip EHCI driver
  * Tested on AMCC 440EPx
  *
- * Based on "ehci-au12xx.c" by David Brownell <dbrownell@users.sourceforge.net>
+ * Based on "ehci-au1xxx.c" by K.Boge <karsten.boge@amd.com>
  *
  * This file is licenced under the GPL.
  */
@@ -15,6 +15,24 @@
 
 extern int usb_disabled(void);
 
+/* called during probe() after chip reset completes */
+static int ehci_ppc_soc_setup(struct usb_hcd *hcd)
+{
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+        int             retval;
+
+        retval = ehci_halt(ehci);
+        if (retval)
+                return retval;
+
+        retval = ehci_init(hcd);
+        if (retval)
+                return retval;
+
+        ehci->sbrn = 0x20;
+        return ehci_reset(ehci);
+}
+
 /**
  * usb_ehci_ppc_soc_probe - initialize PPC-SoC-based HCDs
  * Context: !in_interrupt()
@@ -120,7 +138,7 @@ static const struct hc_driver ehci_ppc_soc_hc_driver = {
         /*
          * basic lifecycle operations
          */
-        .reset = ehci_init,
+        .reset = ehci_ppc_soc_setup,
         .start = ehci_run,
         .stop = ehci_stop,
         .shutdown = ehci_shutdown,
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 6f9e43e9a6..f61c6cdd06 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -74,7 +74,7 @@ urb_print (struct urb * urb, char * str, int small)
 
 #define ohci_dbg_sw(ohci, next, size, format, arg...) \
         do { \
-        if (next) { \
+        if (next != NULL) { \
                 unsigned s_len; \
                 s_len = scnprintf (*next, *size, format, ## arg ); \
                 *size -= s_len; *next += s_len; \
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index d60f198532..40a1de4c25 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -2208,8 +2208,6 @@ static int __init r8a66597_probe(struct platform_device *pdev)
 clean_up:
         if (reg)
                 iounmap(reg);
-        if (res)
-                release_mem_region(res->start, 1);
 
         return ret;
 }
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 7f765ec038..b88eb3c62c 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -1520,12 +1520,15 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
                 }
         }
 }
+#ifdef CONFIG_PM
 
 static void port_power(struct u132 *u132, int pn, int is_on)
 {
         u132->port[pn].power = is_on;
 }
 
+#endif
+
 static void u132_power(struct u132 *u132, int is_on)
 {
         struct usb_hcd *hcd = u132_to_hcd(u132)
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 9f37ba44c1..b64ca91d9b 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3404,6 +3404,7 @@ static void sisusb_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_device_id sisusb_table [] = {
+        { USB_DEVICE(0x0711, 0x0550) },
         { USB_DEVICE(0x0711, 0x0900) },
         { USB_DEVICE(0x0711, 0x0901) },
         { USB_DEVICE(0x0711, 0x0902) },
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index cff6fd190a..77bb893bf2 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -18,7 +18,6 @@
 
 static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */
-        { USB_DEVICE(0x413c, 0x8115) }, /* Dell Wireless HSDPA 5500 */
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index e67ce25f75..86724e8857 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -383,6 +383,10 @@ static void belkin_sa_set_termios (struct usb_serial_port *port, struct ktermios
         }
 
         baud = tty_get_baud_rate(port->tty);
+        if (baud == 0) {
+                dbg("%s - tty_get_baud_rate says 0 baud", __FUNCTION__);
+                return;
+        }
         urb_value = BELKIN_SA_BAUD(baud);
         /* Clip to maximum speed */
         if (urb_value == 0)
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index c08a38402b..a47a24f882 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -138,7 +138,7 @@ static void free_dynids(struct usb_serial_driver *drv)
 static struct driver_attribute drv_attrs[] = {
         __ATTR_NULL,
 };
-static inline void free_dynids(struct usb_driver *drv)
+static inline void free_dynids(struct usb_serial_driver *drv)
 {
 }
 #endif
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 7b1673a440..2d045857b1 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -538,6 +538,8 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },
         { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
+        { USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) },
+        { USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },
@@ -566,6 +568,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) },
         { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
+        { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
         { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_olimex_quirk },
         { },                                    /* Optional parameter entry */
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index d9e49716db..b57b90ae9f 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -430,6 +430,9 @@
  */
 #define EVOLUTION_VID           0xDEEE  /* Vendor ID */
 #define EVOLUTION_ER1_PID       0x0300  /* ER1 Control Module */
+#define EVO_8U232AM_PID 0x02FF  /* Evolution robotics RCM2 (FT232AM)*/
+#define EVO_HYBRID_PID          0x0302  /* Evolution robotics RCM4 PID (FT232BM)*/
+#define EVO_RCM4_PID            0x0303  /* Evolution robotics RCM4 PID */
 
 /* Pyramid Computer GmbH */
 #define FTDI_PYRAMID_PID        0xE6C8  /* Pyramid Appliance Display */
@@ -531,6 +534,14 @@
 #define OLIMEX_VID                      0x15BA
 #define OLIMEX_ARM_USB_OCD_PID          0x0003
 
+
+/*
+ * The Mobility Lab (TML)
+ * Submitted by Pierre Castella
+ */
+#define TML_VID                 0x1B91  /* Vendor ID */
+#define TML_USB_SERIAL_PID      0x0064  /* USB - Serial Converter */
+
 /* Commands */
 #define FTDI_SIO_RESET          0 /* Reset the port */
 #define FTDI_SIO_MODEM_CTRL     1 /* Set the modem control register */
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 04bd3b7a29..f1c90cfe72 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1,7 +1,7 @@
 /*
  * Garmin GPS driver
  *
- * Copyright (C) 2006 Hermann Kneissel herkne@users.sourceforge.net
+ * Copyright (C) 2006,2007 Hermann Kneissel herkne@users.sourceforge.net
  *
  * The latest version of the driver can be found at
  * http://sourceforge.net/projects/garmin-gps/
@@ -34,6 +34,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <asm/uaccess.h>
+#include <asm/atomic.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
@@ -52,7 +53,7 @@ static int debug = 0;
  */
 
 #define VERSION_MAJOR   0
-#define VERSION_MINOR   28
+#define VERSION_MINOR   31
 
 #define _STR(s) #s
 #define _DRIVER_VERSION(a,b) "v" _STR(a) "." _STR(b)
@@ -141,6 +142,8 @@ struct garmin_data {
         __u8   inbuffer [GPS_IN_BUFSIZ];  /* tty -> usb */
         __u8   outbuffer[GPS_OUT_BUFSIZ]; /* usb -> tty */
         __u8   privpkt[4*6];
+        atomic_t req_count;
+        atomic_t resp_count;
         spinlock_t lock;
         struct list_head pktlist;
 };
@@ -171,8 +174,6 @@ struct garmin_data {
 #define CLEAR_HALT_REQUIRED       0x0001
 
 #define FLAGS_QUEUING             0x0100
-#define FLAGS_APP_RESP_SEEN       0x0200
-#define FLAGS_APP_REQ_SEEN        0x0400
 #define FLAGS_DROP_DATA           0x0800
 
 #define FLAGS_GSP_SKIP            0x1000
@@ -186,7 +187,8 @@ struct garmin_data {
 /* function prototypes */
 static void gsp_next_packet(struct garmin_data * garmin_data_p);
 static int  garmin_write_bulk(struct usb_serial_port *port,
-                             const unsigned char *buf, int count);
+                             const unsigned char *buf, int count,
+                             int dismiss_ack);
 
 /* some special packets to be send or received */
 static unsigned char const GARMIN_START_SESSION_REQ[]
@@ -233,9 +235,7 @@ static struct usb_driver garmin_driver = {
 
 static inline int noResponseFromAppLayer(struct garmin_data * garmin_data_p)
 {
-        return ((garmin_data_p->flags
-                                & (FLAGS_APP_REQ_SEEN|FLAGS_APP_RESP_SEEN))
-                == FLAGS_APP_REQ_SEEN);
+        return atomic_read(&garmin_data_p->req_count) == atomic_read(&garmin_data_p->resp_count);
 }
 
 
@@ -463,7 +463,7 @@ static int gsp_rec_packet(struct garmin_data * garmin_data_p, int count)
         usbdata[2] = __cpu_to_le32(size);
 
         garmin_write_bulk (garmin_data_p->port, garmin_data_p->inbuffer,
-                           GARMIN_PKTHDR_LENGTH+size);
+                           GARMIN_PKTHDR_LENGTH+size, 0);
 
         /* if this was an abort-transfer command, flush all
            queued data. */
@@ -818,7 +818,7 @@ static int nat_receive(struct garmin_data * garmin_data_p,
                         if (garmin_data_p->insize >= len) {
                                 garmin_write_bulk (garmin_data_p->port,
                                                    garmin_data_p->inbuffer,
-                                                   len);
+                                                   len, 0);
                                 garmin_data_p->insize = 0;
 
                                 /* if this was an abort-transfer command,
@@ -893,10 +893,11 @@ static int garmin_clear(struct garmin_data * garmin_data_p)
 
         struct usb_serial_port *port = garmin_data_p->port;
 
-        if (port != NULL && garmin_data_p->flags & FLAGS_APP_RESP_SEEN) {
+        if (port != NULL && atomic_read(&garmin_data_p->resp_count)) {
                 /* send a terminate command */
                 status = garmin_write_bulk(port, GARMIN_STOP_TRANSFER_REQ,
-                                           sizeof(GARMIN_STOP_TRANSFER_REQ));
+                                           sizeof(GARMIN_STOP_TRANSFER_REQ),
+                                           1);
         }
 
         /* flush all queued data */
@@ -939,7 +940,8 @@ static int garmin_init_session(struct usb_serial_port *port)
                 dbg("%s - starting session ...", __FUNCTION__);
                 garmin_data_p->state = STATE_ACTIVE;
                 status = garmin_write_bulk(port, GARMIN_START_SESSION_REQ,
-                                           sizeof(GARMIN_START_SESSION_REQ));
+                                           sizeof(GARMIN_START_SESSION_REQ),
+                                           0);
 
                 if (status >= 0) {
 
@@ -950,7 +952,8 @@ static int garmin_init_session(struct usb_serial_port *port)
                         /* not needed, but the win32 driver does it too ... */
                         status = garmin_write_bulk(port,
                                                    GARMIN_START_SESSION_REQ2,
-                                                   sizeof(GARMIN_START_SESSION_REQ2));
+                                                   sizeof(GARMIN_START_SESSION_REQ2),
+                                                   0);
                         if (status >= 0) {
                                 status = 0;
                                 spin_lock_irqsave(&garmin_data_p->lock, flags);
@@ -987,6 +990,8 @@ static int garmin_open (struct usb_serial_port *port, struct file *filp)
         garmin_data_p->mode  = initial_mode;
         garmin_data_p->count = 0;
         garmin_data_p->flags = 0;
+        atomic_set(&garmin_data_p->req_count, 0);
+        atomic_set(&garmin_data_p->resp_count, 0);
         spin_unlock_irqrestore(&garmin_data_p->lock, flags);
 
         /* shutdown any bulk reads that might be going on */
@@ -1035,28 +1040,39 @@ static void garmin_write_bulk_callback (struct urb *urb)
 {
         unsigned long flags;
         struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
-        struct garmin_data * garmin_data_p = usb_get_serial_port_data(port);
         int status = urb->status;
 
-        /* free up the transfer buffer, as usb_free_urb() does not do this */
-        kfree (urb->transfer_buffer);
+        if (port) {
+                struct garmin_data * garmin_data_p = usb_get_serial_port_data(port);
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+                dbg("%s - port %d", __FUNCTION__, port->number);
 
-        if (status) {
-                dbg("%s - nonzero write bulk status received: %d",
-                        __FUNCTION__, status);
-                spin_lock_irqsave(&garmin_data_p->lock, flags);
-                garmin_data_p->flags |= CLEAR_HALT_REQUIRED;
-                spin_unlock_irqrestore(&garmin_data_p->lock, flags);
+                if (GARMIN_LAYERID_APPL == getLayerId(urb->transfer_buffer)
+                    && (garmin_data_p->mode == MODE_GARMIN_SERIAL))  {
+                        gsp_send_ack(garmin_data_p, ((__u8 *)urb->transfer_buffer)[4]);
+                }
+
+                if (status) {
+                        dbg("%s - nonzero write bulk status received: %d",
+                            __FUNCTION__, urb->status);
+                        spin_lock_irqsave(&garmin_data_p->lock, flags);
+                        garmin_data_p->flags |= CLEAR_HALT_REQUIRED;
+                        spin_unlock_irqrestore(&garmin_data_p->lock, flags);
+                }
+
+                usb_serial_port_softint(port);
         }
 
-        usb_serial_port_softint(port);
+        /* Ignore errors that resulted from garmin_write_bulk with dismiss_ack=1 */
+
+        /* free up the transfer buffer, as usb_free_urb() does not do this */
+        kfree (urb->transfer_buffer);
 }
 
 
 static int garmin_write_bulk (struct usb_serial_port *port,
-                              const unsigned char *buf, int count)
+                              const unsigned char *buf, int count,
+                              int dismiss_ack)
 {
         unsigned long flags;
         struct usb_serial *serial = port->serial;
@@ -1093,13 +1109,12 @@ static int garmin_write_bulk (struct usb_serial_port *port,
                                 usb_sndbulkpipe (serial->dev,
                                 port->bulk_out_endpointAddress),
                                 buffer, count,
-                                garmin_write_bulk_callback, port);
+                                garmin_write_bulk_callback,
+                                dismiss_ack ? NULL : port);
         urb->transfer_flags |= URB_ZERO_PACKET;
 
         if (GARMIN_LAYERID_APPL == getLayerId(buffer)) {
-                spin_lock_irqsave(&garmin_data_p->lock, flags);
-                garmin_data_p->flags |= FLAGS_APP_REQ_SEEN;
-                spin_unlock_irqrestore(&garmin_data_p->lock, flags);
+                atomic_inc(&garmin_data_p->req_count);
                 if (garmin_data_p->mode == MODE_GARMIN_SERIAL)  {
                         pkt_clear(garmin_data_p);
                         garmin_data_p->state = STATE_GSP_WAIT_DATA;
@@ -1114,13 +1129,6 @@ static int garmin_write_bulk (struct usb_serial_port *port,
                         "failed with status = %d\n",
                                 __FUNCTION__, status);
                 count = status;
-        } else {
-
-                if (GARMIN_LAYERID_APPL == getLayerId(buffer)
-                    && (garmin_data_p->mode == MODE_GARMIN_SERIAL))  {
-
-                        gsp_send_ack(garmin_data_p, buffer[4]);
-                }
         }
 
         /* we are done with this urb, so let the host driver
@@ -1135,7 +1143,6 @@ static int garmin_write_bulk (struct usb_serial_port *port,
 static int garmin_write (struct usb_serial_port *port,
                          const unsigned char *buf, int count)
 {
-        unsigned long flags;
         int pktid, pktsiz, len;
         struct garmin_data * garmin_data_p = usb_get_serial_port_data(port);
         __le32 *privpkt = (__le32 *)garmin_data_p->privpkt;
@@ -1186,9 +1193,7 @@ static int garmin_write (struct usb_serial_port *port,
                                 break;
 
                         case PRIV_PKTID_RESET_REQ:
-                                spin_lock_irqsave(&garmin_data_p->lock, flags);
-                                garmin_data_p->flags |= FLAGS_APP_REQ_SEEN;
-                                spin_unlock_irqrestore(&garmin_data_p->lock, flags);
+                                atomic_inc(&garmin_data_p->req_count);
                                 break;
 
                         case PRIV_PKTID_SET_DEF_MODE:
@@ -1241,8 +1246,6 @@ static int garmin_chars_in_buffer (struct usb_serial_port *port)
 static void garmin_read_process(struct garmin_data * garmin_data_p,
                                  unsigned char *data, unsigned data_length)
 {
-        unsigned long flags;
-
         if (garmin_data_p->flags & FLAGS_DROP_DATA) {
                 /* abort-transfer cmd is actice */
                 dbg("%s - pkt dropped", __FUNCTION__);
@@ -1254,9 +1257,7 @@ static void garmin_read_process(struct garmin_data * garmin_data_p,
                    the device */
                 if (0 == memcmp(data, GARMIN_APP_LAYER_REPLY,
                                 sizeof(GARMIN_APP_LAYER_REPLY))) {
-                        spin_lock_irqsave(&garmin_data_p->lock, flags);
-                        garmin_data_p->flags |= FLAGS_APP_RESP_SEEN;
-                        spin_unlock_irqrestore(&garmin_data_p->lock, flags);
+                        atomic_inc(&garmin_data_p->resp_count);
                 }
 
                 /* if throttling is active or postprecessing is required
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 0455c1552a..6a3a704b58 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -545,6 +545,7 @@ static struct usb_device_id ipaq_id_table [] = {
         { USB_DEVICE(0x413C, 0x4009) }, /* Dell Axim USB Sync */
         { USB_DEVICE(0x4505, 0x0010) }, /* Smartphone */
         { USB_DEVICE(0x5E04, 0xCE00) }, /* SAGEM Wireless Assistant */
+        { USB_DEVICE(0x0BB4, 0x00CF) }, /* HTC smartphone modems */
         { }                             /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 84c12b5f12..a18659e070 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -108,8 +108,10 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define HUAWEI_VENDOR_ID                        0x12D1
 #define HUAWEI_PRODUCT_E600                     0x1001
 #define HUAWEI_PRODUCT_E220                     0x1003
+#define HUAWEI_PRODUCT_E220BIS                  0x1004
 
 #define NOVATELWIRELESS_VENDOR_ID               0x1410
+#define DELL_VENDOR_ID                          0x413C
 
 #define ANYDATA_VENDOR_ID                       0x16d5
 #define ANYDATA_PRODUCT_ADU_E100A               0x6501
@@ -119,8 +121,6 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define BANDRICH_PRODUCT_C100_1                 0x1002
 #define BANDRICH_PRODUCT_C100_2                 0x1003
 
-#define DELL_VENDOR_ID                          0x413C
-
 static struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -159,6 +159,7 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
+        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS) },
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1100) }, /* Novatel Merlin XS620/S640 */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1110) }, /* Novatel Merlin S620 */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1120) }, /* Novatel Merlin EX720 */
@@ -171,11 +172,17 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2110) }, /* Novatel Merlin ES620 / Merlin ES720 / Ovation U720 */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2130) }, /* Novatel Merlin ES620 SM Bus */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2410) }, /* Novatel EU740 */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8114) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8115) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8116) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8117) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8118) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8128) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8137) }, /* Dell Wireless HSDPA 5520 */
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8118) },         /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard */
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index d7db71eca5..64f3f66a7a 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -817,23 +817,6 @@ static int oti6858_ioctl(struct usb_serial_port *port, struct file *file,
                                 __FUNCTION__, port->number, cmd, arg);
 
         switch (cmd) {
-                case TCGETS:
-                        if (copy_to_user(user_arg, port->tty->termios,
-                                                sizeof(struct ktermios))) {
-                                return -EFAULT;
-                        }
-                        return 0;
-
-                case TCSETS:
-                case TCSETSW:   /* FIXME: this is not the same! */
-                case TCSETSF:   /* FIXME: this is not the same! */
-                        if (copy_from_user(port->tty->termios, user_arg,
-                                                sizeof(struct ktermios))) {
-                                return -EFAULT;
-                        }
-                        oti6858_set_termios(port, NULL);
-                        return 0;
-
                 case TCFLSH:
                         /* FIXME */
                         return 0;
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 86899d55d8..51669b7622 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -74,13 +74,13 @@
 #include <linux/usb/serial.h>
 
 
-#ifndef CONFIG_USB_SAFE_PADDED
-#define CONFIG_USB_SAFE_PADDED 0
+#ifndef CONFIG_USB_SERIAL_SAFE_PADDED
+#define CONFIG_USB_SERIAL_SAFE_PADDED 0
 #endif
 
 static int debug;
 static int safe = 1;
-static int padded = CONFIG_USB_SAFE_PADDED;
+static int padded = CONFIG_USB_SERIAL_SAFE_PADDED;
 
 #define DRIVER_VERSION "v0.0b"
 #define DRIVER_AUTHOR "sl@lineo.com, tbr@lineo.com"
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 7d84a7647e..30e08c0bcd 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -104,6 +104,8 @@ static struct usb_device_id id_table [] = {
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_TJ25_ID),
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
+        { USB_DEVICE(ACER_VENDOR_ID, ACER_S10_ID),
+                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID), 
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SPH_I500_ID), 
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h
index 4ce6f62a6f..57229cf664 100644
--- a/drivers/usb/serial/visor.h
+++ b/drivers/usb/serial/visor.h
@@ -48,6 +48,9 @@
 #define SONY_CLIE_UX50_ID               0x0144
 #define SONY_CLIE_TJ25_ID               0x0169
 
+#define ACER_VENDOR_ID                  0x0502
+#define ACER_S10_ID                     0x0001
+
 #define SAMSUNG_VENDOR_ID               0x04E8
 #define SAMSUNG_SCH_I330_ID             0x8001
 #define SAMSUNG_SPH_I500_ID             0x6601
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 47e5607992..1ba19eaa19 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -285,15 +285,10 @@ static int device_reset(struct scsi_cmnd *srb)
 
         US_DEBUGP("%s called\n", __FUNCTION__);
 
-        result = usb_autopm_get_interface(us->pusb_intf);
-        if (result == 0) {
-
-                /* lock the device pointers and do the reset */
-                mutex_lock(&(us->dev_mutex));
-                result = us->transport_reset(us);
-                mutex_unlock(&us->dev_mutex);
-                usb_autopm_put_interface(us->pusb_intf);
-        }
+        /* lock the device pointers and do the reset */
+        mutex_lock(&(us->dev_mutex));
+        result = us->transport_reset(us);
+        mutex_unlock(&us->dev_mutex);
 
         return result < 0 ? FAILED : SUCCESS;
 }
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index d8d008d429..c6b78ba815 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -342,12 +342,19 @@ UNUSUAL_DEV(  0x04b0, 0x040d, 0x0100, 0x0100,
                 US_FL_FIX_CAPACITY),
 
 /* Reported by Emil Larsson <emil@swip.net> */
-UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0100,
+UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0101,
                 "NIKON",
                 "NIKON DSC D80",
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY),
 
+/* Reported by Ortwin Glueck <odi@odi.ch> */
+UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
+                "NIKON",
+                "NIKON DSC D40",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY),
+
 /* BENQ DC5330
  * Reported by Manuel Fombuena <mfombuena@ya.com> and
  * Frank Copeland <fjc@thingy.apana.org.au> */
@@ -897,6 +904,22 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
+/* Reported by Massimiliano Ghilardi <massimiliano.ghilardi@gmail.com>
+ * This USB MP3/AVI player device fails and disconnects if more than 128
+ * sectors (64kB) are read/written in a single command, and may be present
+ * at least in the following products:
+ *   "Magnex Digital Video Panel DVP 1800"
+ *   "MP4 AIGO 4GB SLOT SD"
+ *   "Teclast TL-C260 MP3"
+ *   "i.Meizu PMP MP3/MP4"
+ *   "Speed MV8 MP4 Audio Player"
+ */
+UNUSUAL_DEV(  0x071b, 0x3203, 0x0100, 0x0100,
+                "RockChip",
+                "ROCK MP3",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64),
+
 /* Reported by Olivier Blondeau <zeitoun@gmail.com> */
 UNUSUAL_DEV(  0x0727, 0x0306, 0x0100, 0x0100,
                 "ATMEL",
@@ -1393,6 +1416,13 @@ UNUSUAL_DEV(  0x0fce, 0xe030, 0x0000, 0x0000,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ),
 
+/* Reported by Ricardo Barberis <ricardo@dattatec.com> */
+UNUSUAL_DEV(  0x0fce, 0xe092, 0x0000, 0x0000,
+                "Sony Ericsson",
+                "P1i",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE ),
+
 /* Reported by Emmanuel Vasilakis <evas@forthnet.gr> */
 UNUSUAL_DEV(  0x0fce, 0xe031, 0x0000, 0x0000,
                 "Sony Ericsson",
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 28842d208b..5918166706 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -112,13 +112,6 @@ module_param(delay_use, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device");
 
 
-/* These are used to make sure the module doesn't unload before all the
- * threads have exited.
- */
-static atomic_t total_threads = ATOMIC_INIT(0);
-static DECLARE_COMPLETION(threads_gone);
-
-
 /*
  * The entries in this table correspond, line for line,
  * with the entries of us_unusual_dev_list[].
@@ -191,14 +184,16 @@ static int storage_suspend(struct usb_interface *iface, pm_message_t message)
 {
         struct us_data *us = usb_get_intfdata(iface);
 
-        US_DEBUGP("%s\n", __FUNCTION__);
-
         /* Wait until no command is running */
         mutex_lock(&us->dev_mutex);
 
+        US_DEBUGP("%s\n", __FUNCTION__);
         if (us->suspend_resume_hook)
                 (us->suspend_resume_hook)(us, US_SUSPEND);
 
+        /* When runtime PM is working, we'll set a flag to indicate
+         * whether we should autoresume when a SCSI request arrives. */
+
         mutex_unlock(&us->dev_mutex);
         return 0;
 }
@@ -207,11 +202,13 @@ static int storage_resume(struct usb_interface *iface)
 {
         struct us_data *us = usb_get_intfdata(iface);
 
-        US_DEBUGP("%s\n", __FUNCTION__);
+        mutex_lock(&us->dev_mutex);
 
+        US_DEBUGP("%s\n", __FUNCTION__);
         if (us->suspend_resume_hook)
                 (us->suspend_resume_hook)(us, US_RESUME);
 
+        mutex_unlock(&us->dev_mutex);
         return 0;
 }
 
@@ -309,7 +306,6 @@ static int usb_stor_control_thread(void * __us)
 {
         struct us_data *us = (struct us_data *)__us;
         struct Scsi_Host *host = us_to_host(us);
-        int autopm_rc;
 
         for(;;) {
                 US_DEBUGP("*** thread sleeping.\n");
@@ -318,9 +314,6 @@ static int usb_stor_control_thread(void * __us)
                         
                 US_DEBUGP("*** thread awakened.\n");
 
-                /* Autoresume the device */
-                autopm_rc = usb_autopm_get_interface(us->pusb_intf);
-
                 /* lock the device pointers */
                 mutex_lock(&(us->dev_mutex));
 
@@ -379,12 +372,6 @@ static int usb_stor_control_thread(void * __us)
                         us->srb->result = SAM_STAT_GOOD;
                 }
 
-                /* Did the autoresume fail? */
-                else if (autopm_rc < 0) {
-                        US_DEBUGP("Could not wake device\n");
-                        us->srb->result = DID_ERROR << 16;
-                }
-
                 /* we've got a command, let's do it! */
                 else {
                         US_DEBUG(usb_stor_show_command(us->srb));
@@ -427,10 +414,6 @@ SkipForAbort:
 
                 /* unlock the device pointers */
                 mutex_unlock(&us->dev_mutex);
-
-                /* Start an autosuspend */
-                if (autopm_rc == 0)
-                        usb_autopm_put_interface(us->pusb_intf);
         } /* for (;;) */
 
         /* Wait until we are told to stop */
@@ -879,9 +862,6 @@ static void quiesce_and_remove_host(struct us_data *us)
         usb_stor_stop_transport(us);
         wake_up(&us->delay_wait);
 
-        /* It doesn't matter if the SCSI-scanning thread is still running.
-         * The thread will exit when it sees the DISCONNECTING flag. */
-
         /* queuecommand won't accept any new commands and the control
          * thread won't execute a previously-queued command.  If there
          * is such a command pending, complete it with an error. */
@@ -891,12 +871,16 @@ static void quiesce_and_remove_host(struct us_data *us)
                 scsi_lock(host);
                 us->srb->scsi_done(us->srb);
                 us->srb = NULL;
+                complete(&us->notify);          /* in case of an abort */
                 scsi_unlock(host);
         }
         mutex_unlock(&us->dev_mutex);
 
         /* Now we own no commands so it's safe to remove the SCSI host */
         scsi_remove_host(host);
+
+        /* Wait for the SCSI-scanning thread to stop */
+        wait_for_completion(&us->scanning_done);
 }
 
 /* Second stage of disconnect processing: deallocate all resources */
@@ -947,9 +931,7 @@ retry:
                 /* Should we unbind if no devices were detected? */
         }
 
-        scsi_host_put(us_to_host(us));
-        usb_autopm_put_interface(us->pusb_intf);
-        complete_and_exit(&threads_gone, 0);
+        complete_and_exit(&us->scanning_done, 0);
 }
 
 
@@ -984,6 +966,7 @@ static int storage_probe(struct usb_interface *intf,
         init_MUTEX_LOCKED(&(us->sema));
         init_completion(&(us->notify));
         init_waitqueue_head(&us->delay_wait);
+        init_completion(&us->scanning_done);
 
         /* Associate the us_data structure with the USB device */
         result = associate_dev(us, intf);
@@ -1033,12 +1016,6 @@ static int storage_probe(struct usb_interface *intf,
                 goto BadDevice;
         }
 
-        /* Take a reference to the host for the scanning thread and
-         * count it among all the threads we have launched.  Then
-         * start it up. */
-        scsi_host_get(us_to_host(us));
-        atomic_inc(&total_threads);
-        usb_autopm_get_interface(intf); /* dropped in the scanning thread */
         wake_up_process(th);
 
         return 0;
@@ -1076,7 +1053,6 @@ static struct usb_driver usb_storage_driver = {
         .pre_reset =    storage_pre_reset,
         .post_reset =   storage_post_reset,
         .id_table =     storage_usb_ids,
-        .supports_autosuspend = 1,
 };
 
 static int __init usb_stor_init(void)
@@ -1104,16 +1080,6 @@ static void __exit usb_stor_exit(void)
         US_DEBUGP("-- calling usb_deregister()\n");
         usb_deregister(&usb_storage_driver) ;
 
-        /* Don't return until all of our control and scanning threads
-         * have exited.  Since each thread signals threads_gone as its
-         * last act, we have to call wait_for_completion the right number
-         * of times.
-         */
-        while (atomic_read(&total_threads) > 0) {
-                wait_for_completion(&threads_gone);
-                atomic_dec(&total_threads);
-        }
-
         usb_usual_clear_present(USB_US_TYPE_STOR);
 }
 
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 6445665b15..8d87503e25 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -150,6 +150,7 @@ struct us_data {
         struct semaphore        sema;            /* to sleep thread on      */
         struct completion       notify;          /* thread begin/end        */
         wait_queue_head_t       delay_wait;      /* wait during scan, reset */
+        struct completion       scanning_done;   /* wait for scan thread    */
 
         /* subdriver information */
         void                    *extra;          /* Any extra data          */
diff --git a/drivers/video/aty/ati_ids.h b/drivers/video/aty/ati_ids.h
index 685a754991..dca2eb8f2d 100644
--- a/drivers/video/aty/ati_ids.h
+++ b/drivers/video/aty/ati_ids.h
@@ -192,6 +192,12 @@
 #define PCI_CHIP_RS300_5835             0x5835
 #define PCI_CHIP_RS300_5836             0x5836
 #define PCI_CHIP_RS300_5837             0x5837
+#define PCI_CHIP_RS480_5955             0x5955
+#define PCI_CHIP_RV280_5960             0x5960
+#define PCI_CHIP_RV280_5961             0x5961
+#define PCI_CHIP_RV280_5962             0x5962
+#define PCI_CHIP_RV280_5964             0x5964
+#define PCI_CHIP_RS482_5975             0x5975
 #define PCI_CHIP_RV370_5B60             0x5B60
 #define PCI_CHIP_RV370_5B61             0x5B61
 #define PCI_CHIP_RV370_5B62             0x5B62
@@ -200,14 +206,8 @@
 #define PCI_CHIP_RV370_5B65             0x5B65
 #define PCI_CHIP_RV370_5B66             0x5B66
 #define PCI_CHIP_RV370_5B67             0x5B67
-#define PCI_CHIP_RV280_5960             0x5960
-#define PCI_CHIP_RV280_5961             0x5961
-#define PCI_CHIP_RV280_5962             0x5962
-#define PCI_CHIP_RV280_5964             0x5964
-#define PCI_CHIP_RS485_5975             0x5975
 #define PCI_CHIP_RV280_5C61             0x5C61
 #define PCI_CHIP_RV280_5C63             0x5C63
 #define PCI_CHIP_R423_5D57              0x5D57
 #define PCI_CHIP_RS350_7834             0x7834
 #define PCI_CHIP_RS350_7835             0x7835
-#define PCI_CHIP_RS480_5955             0x5955
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 47ca62fe7c..4b747bdaee 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -102,6 +102,7 @@
 static struct pci_device_id radeonfb_pci_table[] = {
         /* Radeon Xpress 200m */
         CHIP_DEF(PCI_CHIP_RS480_5955,   RS480,  CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
+        CHIP_DEF(PCI_CHIP_RS482_5975,   RS480,  CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
         /* Mobility M6 */
         CHIP_DEF(PCI_CHIP_RADEON_LY,    RV100,  CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
         CHIP_DEF(PCI_CHIP_RADEON_LZ,    RV100,  CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
@@ -153,8 +154,6 @@ static struct pci_device_id radeonfb_pci_table[] = {
         /* Mobility 9200 (M9+) */
         CHIP_DEF(PCI_CHIP_RV280_5C61,   RV280,  CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
         CHIP_DEF(PCI_CHIP_RV280_5C63,   RV280,  CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
-        /*Mobility Xpress 200 */
-        CHIP_DEF(PCI_CHIP_RS485_5975,   R300,   CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
         /* 9200 */
         CHIP_DEF(PCI_CHIP_RV280_5960,   RV280,  CHIP_HAS_CRTC2),
         CHIP_DEF(PCI_CHIP_RV280_5961,   RV280,  CHIP_HAS_CRTC2),
@@ -1285,7 +1284,8 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg
         if (rinfo->family == CHIP_FAMILY_R300 ||
             rinfo->family == CHIP_FAMILY_RS300 ||
             rinfo->family == CHIP_FAMILY_R350 ||
-            rinfo->family == CHIP_FAMILY_RV350) {
+            rinfo->family == CHIP_FAMILY_RV350 ||
+            rinfo->family == CHIP_FAMILY_RV380 ) {
                 if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) {
                         /* When restoring console mode, use saved PPLL_REF_DIV
                          * setting.
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 718b9f8373..833b10c840 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -233,9 +233,9 @@ static u8 bw2regs_66hz[] __devinitdata = {
         0x10, 0x20,     0
 };
 
-static void __devinit bw2_do_default_mode(struct bw2_par *par,
-                                          struct fb_info *info,
-                                          int *linebytes)
+static int __devinit bw2_do_default_mode(struct bw2_par *par,
+                                         struct fb_info *info,
+                                         int *linebytes)
 {
         u8 status, mon;
         u8 *p;
@@ -266,17 +266,18 @@ static void __devinit bw2_do_default_mode(struct bw2_par *par,
                 break;
 
         case BWTWO_SR_ID_NOCONN:
-                return;
+                return 0;
 
         default:
-                prom_printf("bw2: can't handle SR %02x\n",
-                            status);
-                prom_halt();
+                printk(KERN_ERR "bw2: can't handle SR %02x\n",
+                       status);
+                return -EINVAL;
         }
         for ( ; *p; p += 2) {
                 u8 __iomem *regp = &((u8 __iomem *)par->regs)[p[0]];
                 sbus_writeb(p[1], regp);
         }
+        return 0;
 }
 
 static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match)
@@ -312,8 +313,11 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
         if (!par->regs)
                 goto out_release_fb;
 
-        if (!of_find_property(dp, "width", NULL))
-                bw2_do_default_mode(par, info, &linebytes);
+        if (!of_find_property(dp, "width", NULL)) {
+                err = bw2_do_default_mode(par, info, &linebytes);
+                if (err)
+                        goto out_unmap_regs;
+        }
 
         par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
 
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 5741b46ade..a5c7fb3315 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -315,7 +315,7 @@ static u_char cg3_dacvals[] __devinitdata = {
         4, 0xff,        5, 0x00,        6, 0x70,        7, 0x00,        0
 };
 
-static void __devinit cg3_do_default_mode(struct cg3_par *par)
+static int __devinit cg3_do_default_mode(struct cg3_par *par)
 {
         enum cg3_type type;
         u8 *p;
@@ -332,10 +332,9 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                         else
                                 type = CG3_AT_66HZ;
                 } else {
-                        prom_printf("cgthree: can't handle SR %02x\n",
-                                    status);
-                        prom_halt();
-                        return;
+                        printk(KERN_ERR "cgthree: can't handle SR %02x\n",
+                               status);
+                        return -EINVAL;
                 }
         }
 
@@ -351,6 +350,7 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                 regp = (u8 __iomem *)&par->regs->cmap.control;
                 sbus_writeb(p[1], regp);
         }
+        return 0;
 }
 
 static int __devinit cg3_probe(struct of_device *op,
@@ -400,8 +400,11 @@ static int __devinit cg3_probe(struct of_device *op,
 
         cg3_blank(0, info);
 
-        if (!of_find_property(dp, "width", NULL))
-                cg3_do_default_mode(par);
+        if (!of_find_property(dp, "width", NULL)) {
+                err = cg3_do_default_mode(par);
+                if (err)
+                        goto out_unmap_screen;
+        }
 
         if (fb_alloc_cmap(&info->cmap, 256, 0))
                 goto out_unmap_screen;
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 49643969f9..a22ccf9485 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -145,7 +145,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
          oriented.
 
 config STI_CONSOLE
-        tristate "STI text console" 
+        bool "STI text console"
         depends on PARISC
         default y
         help
@@ -182,7 +182,7 @@ config FONT_8x8
 
 config FONT_8x16
         bool "VGA 8x16 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 
+        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON
         default y if !SPARC && !FONTS
         help
           This is the "high resolution" font for the VGA frame buffer (the one
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 870017d449..e9ab657f0b 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -232,18 +232,14 @@ sti_bmove(struct sti_struct *sti, int src_y, int src_x,
 }
 
 
-/* FIXME: Do we have another solution for this ? */
-static void sti_flush(unsigned long from, unsigned long len)
+static void sti_flush(unsigned long start, unsigned long end)
 {
-        flush_data_cache();
-        flush_kernel_dcache_range(from, len);
-        flush_icache_range(from, from+len);
+        flush_icache_range(start, end);
 }
 
 void __devinit
 sti_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
-        unsigned long dest_len = count;
         unsigned long dest_start = (unsigned long) dest;
 
         /* this still needs to be revisited (see arch/parisc/mm/init.c:246) ! */
@@ -260,7 +256,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest)
                 dest++;
         }
 
-        sti_flush(dest_start, dest_len);
+        sti_flush(dest_start, (unsigned long)dest);
 }
 
 
@@ -663,7 +659,6 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
 static void __devinit
 sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
-        unsigned long dest_len = count;
         unsigned long dest_start = (unsigned long) dest;
 
         while (count) {
@@ -672,7 +667,8 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
                 base += 4;
                 dest++;
         }
-        sti_flush(dest_start, dest_len);
+
+        sti_flush(dest_start, (unsigned long)dest);
 }
 
 static struct sti_rom * __devinit
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 16bc8d75e3..6a47682d86 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -924,10 +924,10 @@ calc_pll_params(int index, int clock, u32 *retm1, u32 *retm2, u32 *retn, u32 *re
                         if (m > pll->max_m)
                                 m = pll->max_m - 1;
                         for (testm = m - 1; testm <= m; testm++) {
-                                f_out = calc_vclock3(index, m, n, p);
+                                f_out = calc_vclock3(index, testm, n, p);
                                 if (splitm(index, testm, &m1, &m2)) {
-                                        WRN_MSG("cannot split m = %d\n", m);
-                                        n++;
+                                        WRN_MSG("cannot split m = %d\n",
+                                                testm);
                                         continue;
                                 }
                                 if (clock > f_out)
@@ -1352,7 +1352,7 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,
 
         /* turn off PLL */
         tmp = INREG(dpll_reg);
-        dpll_reg &= ~DPLL_VCO_ENABLE;
+        tmp &= ~DPLL_VCO_ENABLE;
         OUTREG(dpll_reg, tmp);
 
         /* Set PLL parameters */
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 8d7ab74170..a593f900ef 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -431,6 +431,7 @@ static int w1_uevent(struct device *dev, char **envp, int num_envp,
         err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
                         &cur_len, "W1_SLAVE_ID=%024LX",
                         (unsigned long long)sl->reg_num.id);
+        envp[cur_index] = NULL;
         if (err)
                 return err;
 
diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index 08fa320b7e..15e05a15b5 100644
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -92,23 +92,6 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
         return fid;
 }
 
-struct p9_fid *v9fs_fid_lookup_remove(struct dentry *dentry)
-{
-        struct p9_fid *fid;
-        struct v9fs_dentry *dent;
-
-        dent = dentry->d_fsdata;
-        fid = v9fs_fid_lookup(dentry);
-        if (!IS_ERR(fid)) {
-                spin_lock(&dent->lock);
-                list_del(&fid->dlist);
-                spin_unlock(&dent->lock);
-        }
-
-        return fid;
-}
-
-
 /**
  * v9fs_fid_clone - lookup the fid for a dentry, clone a private copy and
  *      release it
diff --git a/fs/9p/fid.h b/fs/9p/fid.h
index 47a0ba7428..26e07df783 100644
--- a/fs/9p/fid.h
+++ b/fs/9p/fid.h
@@ -28,6 +28,5 @@ struct v9fs_dentry {
 };
 
 struct p9_fid *v9fs_fid_lookup(struct dentry *dentry);
-struct p9_fid *v9fs_fid_lookup_remove(struct dentry *dentry);
 struct p9_fid *v9fs_fid_clone(struct dentry *dentry);
 int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid);
diff --git a/fs/Kconfig b/fs/Kconfig
index 84fb8428c0..bb02b39380 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -441,9 +441,6 @@ config OCFS2_FS
 
           Note: Features which OCFS2 does not support yet:
                   - extended attributes
-                  - shared writeable mmap
-                  - loopback is supported, but data written will not
-                    be cluster coherent.
                   - quotas
                   - cluster aware flock
                   - Directory change notification (F_NOTIFY)
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index a3684dcc76..6f8c96fb29 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -235,8 +235,8 @@ static void *afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
         err = do_add_mount(newmnt, nd, MNT_SHRINKABLE, &afs_vfsmounts);
         switch (err) {
         case 0:
-                mntput(nd->mnt);
                 dput(nd->dentry);
+                mntput(nd->mnt);
                 nd->mnt = newmnt;
                 nd->dentry = dget(newmnt->mnt_root);
                 schedule_delayed_work(&afs_mntpt_expiry_timer,
diff --git a/fs/aio.c b/fs/aio.c
index dbe699e982..ea2e198203 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1562,6 +1562,7 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
                 fput(file);
                 return -EAGAIN;
         }
+        req->ki_filp = file;
         if (iocb->aio_flags & IOCB_FLAG_RESFD) {
                 /*
                  * If the IOCB_FLAG_RESFD flag of aio_flags is set, get an
@@ -1576,7 +1577,6 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
                 }
         }
 
-        req->ki_filp = file;
         ret = put_user(req->ki_key, &user_iocb->aio_key);
         if (unlikely(ret)) {
                 dprintk("EFAULT: aio_key\n");
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 861141b4f6..fcb3405bb1 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -742,6 +742,7 @@ static int load_flat_file(struct linux_binprm * bprm,
          * __start to address 4 so that is okay).
          */
         if (rev > OLD_FLAT_VERSION) {
+                unsigned long persistent = 0;
                 for (i=0; i < relocs; i++) {
                         unsigned long addr, relval;
 
@@ -749,6 +750,8 @@ static int load_flat_file(struct linux_binprm * bprm,
                            relocated (of course, the address has to be
                            relocated first).  */
                         relval = ntohl(reloc[i]);
+                        if (flat_set_persistent (relval, &persistent))
+                                continue;
                         addr = flat_get_relocate_addr(relval);
                         rp = (unsigned long *) calc_reloc(addr, libinfo, id, 1);
                         if (rp == (unsigned long *)RELOC_FAILED) {
@@ -757,7 +760,8 @@ static int load_flat_file(struct linux_binprm * bprm,
                         }
 
                         /* Get the pointer's value.  */
-                        addr = flat_get_addr_from_rp(rp, relval, flags);
+                        addr = flat_get_addr_from_rp(rp, relval, flags,
+                                                        &persistent);
                         if (addr != 0) {
                                 /*
                                  * Do the relocation.  PIC relocs in the data section are
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index a6c9078af1..37310b0e81 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -2311,8 +2311,10 @@ static int do_wireless_ioctl(unsigned int fd, unsigned int cmd, unsigned long ar
         struct iwreq __user *iwr_u;
         struct iw_point __user *iwp;
         struct compat_iw_point __user *iwp_u;
-        compat_caddr_t pointer;
+        compat_caddr_t pointer_u;
+        void __user *pointer;
         __u16 length, flags;
+        int ret;
 
         iwr_u = compat_ptr(arg);
         iwp_u = (struct compat_iw_point __user *) &iwr_u->u.data;
@@ -2330,17 +2332,29 @@ static int do_wireless_ioctl(unsigned int fd, unsigned int cmd, unsigned long ar
                            sizeof(iwr->ifr_ifrn.ifrn_name)))
                 return -EFAULT;
 
-        if (__get_user(pointer, &iwp_u->pointer) ||
+        if (__get_user(pointer_u, &iwp_u->pointer) ||
             __get_user(length, &iwp_u->length) ||
             __get_user(flags, &iwp_u->flags))
                 return -EFAULT;
 
-        if (__put_user(compat_ptr(pointer), &iwp->pointer) ||
+        if (__put_user(compat_ptr(pointer_u), &iwp->pointer) ||
             __put_user(length, &iwp->length) ||
             __put_user(flags, &iwp->flags))
                 return -EFAULT;
 
-        return sys_ioctl(fd, cmd, (unsigned long) iwr);
+        ret = sys_ioctl(fd, cmd, (unsigned long) iwr);
+
+        if (__get_user(pointer, &iwp->pointer) ||
+            __get_user(length, &iwp->length) ||
+            __get_user(flags, &iwp->flags))
+                return -EFAULT;
+
+        if (__put_user(ptr_to_compat(pointer), &iwp_u->pointer) ||
+            __put_user(length, &iwp_u->length) ||
+            __put_user(flags, &iwp_u->flags))
+                return -EFAULT;
+
+        return ret;
 }
 
 /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE
@@ -3176,6 +3190,8 @@ COMPATIBLE_IOCTL(SIOCSIWRETRY)
 COMPATIBLE_IOCTL(SIOCGIWRETRY)
 COMPATIBLE_IOCTL(SIOCSIWPOWER)
 COMPATIBLE_IOCTL(SIOCGIWPOWER)
+COMPATIBLE_IOCTL(SIOCSIWAUTH)
+COMPATIBLE_IOCTL(SIOCGIWAUTH)
 /* hiddev */
 COMPATIBLE_IOCTL(HIDIOCGVERSION)
 COMPATIBLE_IOCTL(HIDIOCAPPLICATION)
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 5d40ad13ab..131954b3fb 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -357,10 +357,6 @@ static struct dentry *ecryptfs_lookup(struct inode *dir, struct dentry *dentry,
                 ecryptfs_printk(KERN_DEBUG, "Is a special file; returning\n");
                 goto out;
         }
-        if (special_file(lower_inode->i_mode)) {
-                ecryptfs_printk(KERN_DEBUG, "Is a special file; returning\n");
-                goto out;
-        }
         if (!nd) {
                 ecryptfs_printk(KERN_DEBUG, "We have a NULL nd, just leave"
                                 "as we *think* we are about to unlink\n");
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index e4ab7bc14e..fd3f94d4a6 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -834,7 +834,8 @@ static void ecryptfs_sync_page(struct page *page)
                 ecryptfs_printk(KERN_DEBUG, "find_lock_page failed\n");
                 return;
         }
-        lower_page->mapping->a_ops->sync_page(lower_page);
+        if (lower_page->mapping->a_ops->sync_page)
+                lower_page->mapping->a_ops->sync_page(lower_page);
         ecryptfs_printk(KERN_DEBUG, "Unlocking page with index = [0x%.16x]\n",
                         lower_page->index);
         unlock_page(lower_page);
diff --git a/fs/exec.c b/fs/exec.c
index c21a8cc062..073b0b8c6d 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -50,7 +50,6 @@
 #include <linux/tsacct_kern.h>
 #include <linux/cn_proc.h>
 #include <linux/audit.h>
-#include <linux/signalfd.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -784,7 +783,6 @@ static int de_thread(struct task_struct *tsk)
          * and we can just re-use it all.
          */
         if (atomic_read(&oldsighand->count) <= 1) {
-                signalfd_detach(tsk);
                 exit_itimers(sig);
                 return 0;
         }
@@ -923,7 +921,6 @@ static int de_thread(struct task_struct *tsk)
         sig->flags = 0;
 
 no_thread_group:
-        signalfd_detach(tsk);
         exit_itimers(sig);
         if (leader)
                 release_task(leader);
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 1586807b81..c1fa1908db 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -140,7 +140,8 @@ struct dx_frame
 struct dx_map_entry
 {
         u32 hash;
-        u32 offs;
+        u16 offs;
+        u16 size;
 };
 
 #ifdef CONFIG_EXT3_INDEX
@@ -379,13 +380,28 @@ dx_probe(struct dentry *dentry, struct inode *dir,
 
         entries = (struct dx_entry *) (((char *)&root->info) +
                                        root->info.info_length);
-        assert(dx_get_limit(entries) == dx_root_limit(dir,
-                                                      root->info.info_length));
+
+        if (dx_get_limit(entries) != dx_root_limit(dir,
+                                                   root->info.info_length)) {
+                ext3_warning(dir->i_sb, __FUNCTION__,
+                             "dx entry: limit != root limit");
+                brelse(bh);
+                *err = ERR_BAD_DX_DIR;
+                goto fail;
+        }
+
         dxtrace (printk("Look up %x", hash));
         while (1)
         {
                 count = dx_get_count(entries);
-                assert (count && count <= dx_get_limit(entries));
+                if (!count || count > dx_get_limit(entries)) {
+                        ext3_warning(dir->i_sb, __FUNCTION__,
+                                     "dx entry: no count or count > limit");
+                        brelse(bh);
+                        *err = ERR_BAD_DX_DIR;
+                        goto fail2;
+                }
+
                 p = entries + 1;
                 q = entries + count - 1;
                 while (p <= q)
@@ -423,8 +439,15 @@ dx_probe(struct dentry *dentry, struct inode *dir,
                 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));
+                if (dx_get_limit(entries) != dx_node_limit (dir)) {
+                        ext3_warning(dir->i_sb, __FUNCTION__,
+                                     "dx entry: limit != node limit");
+                        brelse(bh);
+                        *err = ERR_BAD_DX_DIR;
+                        goto fail2;
+                }
                 frame++;
+                frame->bh = NULL;
         }
 fail2:
         while (frame >= frame_in) {
@@ -432,6 +455,10 @@ fail2:
                 frame--;
         }
 fail:
+        if (*err == ERR_BAD_DX_DIR)
+                ext3_warning(dir->i_sb, __FUNCTION__,
+                             "Corrupt dir inode %ld, running e2fsck is "
+                             "recommended.", dir->i_ino);
         return NULL;
 }
 
@@ -671,6 +698,10 @@ errout:
  * Directory block splitting, compacting
  */
 
+/*
+ * Create map of hash values, offsets, and sizes, stored at end of block.
+ * Returns number of entries mapped.
+ */
 static int dx_make_map (struct ext3_dir_entry_2 *de, int size,
                         struct dx_hash_info *hinfo, struct dx_map_entry *map_tail)
 {
@@ -684,7 +715,8 @@ static int dx_make_map (struct ext3_dir_entry_2 *de, int size,
                         ext3fs_dirhash(de->name, de->name_len, &h);
                         map_tail--;
                         map_tail->hash = h.hash;
-                        map_tail->offs = (u32) ((char *) de - base);
+                        map_tail->offs = (u16) ((char *) de - base);
+                        map_tail->size = le16_to_cpu(de->rec_len);
                         count++;
                         cond_resched();
                 }
@@ -694,6 +726,7 @@ static int dx_make_map (struct ext3_dir_entry_2 *de, int size,
         return count;
 }
 
+/* Sort map by hash value */
 static void dx_sort_map (struct dx_map_entry *map, unsigned count)
 {
         struct dx_map_entry *p, *q, *top = map + count - 1;
@@ -1091,6 +1124,10 @@ static inline void ext3_set_de_type(struct super_block *sb,
 }
 
 #ifdef CONFIG_EXT3_INDEX
+/*
+ * Move count entries from end of map between two memory locations.
+ * Returns pointer to last entry moved.
+ */
 static struct ext3_dir_entry_2 *
 dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
 {
@@ -1109,6 +1146,10 @@ dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
         return (struct ext3_dir_entry_2 *) (to - rec_len);
 }
 
+/*
+ * Compact each dir entry in the range to the minimal rec_len.
+ * Returns pointer to last entry in range.
+ */
 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;
@@ -1131,6 +1172,11 @@ static struct ext3_dir_entry_2* dx_pack_dirents(char *base, int size)
         return prev;
 }
 
+/*
+ * Split a full leaf block to make room for a new dir entry.
+ * Allocate a new block, and move entries so that they are approx. equally full.
+ * Returns pointer to de in block into which the new entry will be inserted.
+ */
 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)
@@ -1142,7 +1188,7 @@ static struct ext3_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
         u32 hash2;
         struct dx_map_entry *map;
         char *data1 = (*bh)->b_data, *data2;
-        unsigned split;
+        unsigned split, move, size, i;
         struct ext3_dir_entry_2 *de = NULL, *de2;
         int     err = 0;
 
@@ -1170,8 +1216,19 @@ static struct ext3_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
         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);
+        /* Split the existing block in the middle, size-wise */
+        size = 0;
+        move = 0;
+        for (i = count-1; i >= 0; i--) {
+                /* is more than half of this entry in 2nd half of the block? */
+                if (size + map[i].size/2 > blocksize/2)
+                        break;
+                size += map[i].size;
+                move++;
+        }
+        /* map index at which we will split */
+        split = count - move;
         hash2 = map[split].hash;
         continued = hash2 == map[split - 1].hash;
         dxtrace(printk("Split block %i at %x, %i/%i\n",
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 22cfdd61c0..9537316a07 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2578,8 +2578,11 @@ static int ext3_release_dquot(struct dquot *dquot)
 
         handle = ext3_journal_start(dquot_to_inode(dquot),
                                         EXT3_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-        if (IS_ERR(handle))
+        if (IS_ERR(handle)) {
+                /* Release dquot anyway to avoid endless cycle in dqput() */
+                dquot_release(dquot);
                 return PTR_ERR(handle);
+        }
         ret = dquot_release(dquot);
         err = ext3_journal_stop(handle);
         if (!ret)
@@ -2712,6 +2715,12 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type,
         struct buffer_head *bh;
         handle_t *handle = journal_current_handle();
 
+        if (!handle) {
+                printk(KERN_WARNING "EXT3-fs: Quota write (off=%Lu, len=%Lu)"
+                        " cancelled because transaction is not started.\n",
+                        (unsigned long long)off, (unsigned long long)len);
+                return -EIO;
+        }
         mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
         while (towrite > 0) {
                 tocopy = sb->s_blocksize - offset < towrite ?
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index da224974af..5fdb862e71 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -140,7 +140,8 @@ struct dx_frame
 struct dx_map_entry
 {
         u32 hash;
-        u32 offs;
+        u16 offs;
+        u16 size;
 };
 
 #ifdef CONFIG_EXT4_INDEX
@@ -379,13 +380,28 @@ dx_probe(struct dentry *dentry, struct inode *dir,
 
         entries = (struct dx_entry *) (((char *)&root->info) +
                                        root->info.info_length);
-        assert(dx_get_limit(entries) == dx_root_limit(dir,
-                                                      root->info.info_length));
+
+        if (dx_get_limit(entries) != dx_root_limit(dir,
+                                                   root->info.info_length)) {
+                ext4_warning(dir->i_sb, __FUNCTION__,
+                             "dx entry: limit != root limit");
+                brelse(bh);
+                *err = ERR_BAD_DX_DIR;
+                goto fail;
+        }
+
         dxtrace (printk("Look up %x", hash));
         while (1)
         {
                 count = dx_get_count(entries);
-                assert (count && count <= dx_get_limit(entries));
+                if (!count || count > dx_get_limit(entries)) {
+                        ext4_warning(dir->i_sb, __FUNCTION__,
+                                     "dx entry: no count or count > limit");
+                        brelse(bh);
+                        *err = ERR_BAD_DX_DIR;
+                        goto fail2;
+                }
+
                 p = entries + 1;
                 q = entries + count - 1;
                 while (p <= q)
@@ -423,8 +439,15 @@ dx_probe(struct dentry *dentry, struct inode *dir,
                 if (!(bh = ext4_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));
+                if (dx_get_limit(entries) != dx_node_limit (dir)) {
+                        ext4_warning(dir->i_sb, __FUNCTION__,
+                                     "dx entry: limit != node limit");
+                        brelse(bh);
+                        *err = ERR_BAD_DX_DIR;
+                        goto fail2;
+                }
                 frame++;
+                frame->bh = NULL;
         }
 fail2:
         while (frame >= frame_in) {
@@ -432,6 +455,10 @@ fail2:
                 frame--;
         }
 fail:
+        if (*err == ERR_BAD_DX_DIR)
+                ext4_warning(dir->i_sb, __FUNCTION__,
+                             "Corrupt dir inode %ld, running e2fsck is "
+                             "recommended.", dir->i_ino);
         return NULL;
 }
 
@@ -671,6 +698,10 @@ errout:
  * Directory block splitting, compacting
  */
 
+/*
+ * Create map of hash values, offsets, and sizes, stored at end of block.
+ * Returns number of entries mapped.
+ */
 static int dx_make_map (struct ext4_dir_entry_2 *de, int size,
                         struct dx_hash_info *hinfo, struct dx_map_entry *map_tail)
 {
@@ -684,7 +715,8 @@ static int dx_make_map (struct ext4_dir_entry_2 *de, int size,
                         ext4fs_dirhash(de->name, de->name_len, &h);
                         map_tail--;
                         map_tail->hash = h.hash;
-                        map_tail->offs = (u32) ((char *) de - base);
+                        map_tail->offs = (u16) ((char *) de - base);
+                        map_tail->size = le16_to_cpu(de->rec_len);
                         count++;
                         cond_resched();
                 }
@@ -694,6 +726,7 @@ static int dx_make_map (struct ext4_dir_entry_2 *de, int size,
         return count;
 }
 
+/* Sort map by hash value */
 static void dx_sort_map (struct dx_map_entry *map, unsigned count)
 {
         struct dx_map_entry *p, *q, *top = map + count - 1;
@@ -1089,6 +1122,10 @@ static inline void ext4_set_de_type(struct super_block *sb,
 }
 
 #ifdef CONFIG_EXT4_INDEX
+/*
+ * Move count entries from end of map between two memory locations.
+ * Returns pointer to last entry moved.
+ */
 static struct ext4_dir_entry_2 *
 dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
 {
@@ -1107,6 +1144,10 @@ dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
         return (struct ext4_dir_entry_2 *) (to - rec_len);
 }
 
+/*
+ * Compact each dir entry in the range to the minimal rec_len.
+ * Returns pointer to last entry in range.
+ */
 static struct ext4_dir_entry_2* dx_pack_dirents(char *base, int size)
 {
         struct ext4_dir_entry_2 *next, *to, *prev, *de = (struct ext4_dir_entry_2 *) base;
@@ -1129,6 +1170,11 @@ static struct ext4_dir_entry_2* dx_pack_dirents(char *base, int size)
         return prev;
 }
 
+/*
+ * Split a full leaf block to make room for a new dir entry.
+ * Allocate a new block, and move entries so that they are approx. equally full.
+ * Returns pointer to de in block into which the new entry will be inserted.
+ */
 static struct ext4_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)
@@ -1140,7 +1186,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
         u32 hash2;
         struct dx_map_entry *map;
         char *data1 = (*bh)->b_data, *data2;
-        unsigned split;
+        unsigned split, move, size, i;
         struct ext4_dir_entry_2 *de = NULL, *de2;
         int     err = 0;
 
@@ -1168,8 +1214,19 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
         count = dx_make_map ((struct ext4_dir_entry_2 *) data1,
                              blocksize, hinfo, map);
         map -= count;
-        split = count/2; // need to adjust to actual middle
         dx_sort_map (map, count);
+        /* Split the existing block in the middle, size-wise */
+        size = 0;
+        move = 0;
+        for (i = count-1; i >= 0; i--) {
+                /* is more than half of this entry in 2nd half of the block? */
+                if (size + map[i].size/2 > blocksize/2)
+                        break;
+                size += map[i].size;
+                move++;
+        }
+        /* map index at which we will split */
+        split = count - move;
         hash2 = map[split].hash;
         continued = hash2 == map[split - 1].hash;
         dxtrace(printk("Split block %i at %x, %i/%i\n",
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4550b83ab1..3c1397fa83 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2698,8 +2698,11 @@ static int ext4_release_dquot(struct dquot *dquot)
 
         handle = ext4_journal_start(dquot_to_inode(dquot),
                                         EXT4_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-        if (IS_ERR(handle))
+        if (IS_ERR(handle)) {
+                /* Release dquot anyway to avoid endless cycle in dqput() */
+                dquot_release(dquot);
                 return PTR_ERR(handle);
+        }
         ret = dquot_release(dquot);
         err = ext4_journal_stop(handle);
         if (!ret)
@@ -2832,6 +2835,12 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
         struct buffer_head *bh;
         handle_t *handle = journal_current_handle();
 
+        if (!handle) {
+                printk(KERN_WARNING "EXT4-fs: Quota write (off=%Lu, len=%Lu)"
+                        " cancelled because transaction is not started.\n",
+                        (unsigned long long)off, (unsigned long long)len);
+                return -EIO;
+        }
         mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
         while (towrite > 0) {
                 tocopy = sb->s_blocksize - offset < towrite ?
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index c848a19152..950c2fbb81 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -82,14 +82,19 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)
         int ret;
 
         /*
-         * vma alignment has already been checked by prepare_hugepage_range.
-         * If you add any error returns here, do so after setting VM_HUGETLB,
-         * so is_vm_hugetlb_page tests below unmap_region go the right way
-         * when do_mmap_pgoff unwinds (may be important on powerpc and ia64).
+         * vma address alignment (but not the pgoff alignment) has
+         * already been checked by prepare_hugepage_range.  If you add
+         * any error returns here, do so after setting VM_HUGETLB, so
+         * is_vm_hugetlb_page tests below unmap_region go the right
+         * way when do_mmap_pgoff unwinds (may be important on powerpc
+         * and ia64).
          */
         vma->vm_flags |= VM_HUGETLB | VM_RESERVED;
         vma->vm_ops = &hugetlb_vm_ops;
 
+        if (vma->vm_pgoff & ~(HPAGE_MASK >> PAGE_SHIFT))
+                return -EINVAL;
+
         vma_len = (loff_t)(vma->vm_end - vma->vm_start);
 
         mutex_lock(&inode->i_mutex);
@@ -132,7 +137,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
                 return -ENOMEM;
 
         if (flags & MAP_FIXED) {
-                if (prepare_hugepage_range(addr, len, pgoff))
+                if (prepare_hugepage_range(addr, len))
                         return -EINVAL;
                 return addr;
         }
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index dd64ddc11d..ed85f9afdb 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -647,7 +647,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
         struct inode *inode = OFNI_EDONI_2SFFJ(f);
         struct page *pg;
 
-        pg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT,
+        pg = read_cache_page_async(inode->i_mapping, offset >> PAGE_CACHE_SHIFT,
                              (void *)jffs2_do_readpage_unlock, inode);
         if (IS_ERR(pg))
                 return (void *)pg;
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index a21e4bc544..d120ec39bc 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -171,19 +171,14 @@ found:
  * GRANTED_RES message by cookie, without having to rely on the client's IP
  * address. --okir
  */
-static inline struct nlm_block *
-nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_file *file,
-                struct nlm_lock *lock, struct nlm_cookie *cookie)
+static struct nlm_block *
+nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_host *host,
+                    struct nlm_file *file, struct nlm_lock *lock,
+                    struct nlm_cookie *cookie)
 {
         struct nlm_block        *block;
-        struct nlm_host         *host;
         struct nlm_rqst         *call = NULL;
 
-        /* Create host handle for callback */
-        host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
-        if (host == NULL)
-                return NULL;
-
         call = nlm_alloc_call(host);
         if (call == NULL)
                 return NULL;
@@ -366,6 +361,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
                         struct nlm_lock *lock, int wait, struct nlm_cookie *cookie)
 {
         struct nlm_block        *block = NULL;
+        struct nlm_host         *host;
         int                     error;
         __be32                  ret;
 
@@ -377,6 +373,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
                                 (long long)lock->fl.fl_end,
                                 wait);
 
+        /* Create host handle for callback */
+        host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
+        if (host == NULL)
+                return nlm_lck_denied_nolocks;
 
         /* Lock file against concurrent access */
         mutex_lock(&file->f_mutex);
@@ -385,7 +385,8 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
          */
         block = nlmsvc_lookup_block(file, lock);
         if (block == NULL) {
-                block = nlmsvc_create_block(rqstp, file, lock, cookie);
+                block = nlmsvc_create_block(rqstp, nlm_get_host(host), file,
+                                lock, cookie);
                 ret = nlm_lck_denied_nolocks;
                 if (block == NULL)
                         goto out;
@@ -449,6 +450,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 out:
         mutex_unlock(&file->f_mutex);
         nlmsvc_release_block(block);
+        nlm_release_host(host);
         dprintk("lockd: nlmsvc_lock returned %u\n", ret);
         return ret;
 }
@@ -477,10 +479,17 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
 
         if (block == NULL) {
                 struct file_lock *conf = kzalloc(sizeof(*conf), GFP_KERNEL);
+                struct nlm_host *host;
 
                 if (conf == NULL)
                         return nlm_granted;
-                block = nlmsvc_create_block(rqstp, file, lock, cookie);
+                /* Create host handle for callback */
+                host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
+                if (host == NULL) {
+                        kfree(conf);
+                        return nlm_lck_denied_nolocks;
+                }
+                block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
                 if (block == NULL) {
                         kfree(conf);
                         return nlm_granted;
diff --git a/fs/locks.c b/fs/locks.c
index 50857d2d34..c795eaaf6c 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -782,7 +782,7 @@ find_conflict:
         if (request->fl_flags & FL_ACCESS)
                 goto out;
         locks_copy_lock(new_fl, request);
-        locks_insert_lock(&inode->i_flock, new_fl);
+        locks_insert_lock(before, new_fl);
         new_fl = NULL;
         error = 0;
 
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index a49f9feff7..a204484072 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -588,16 +588,6 @@ static int nfs_init_server(struct nfs_server *server, const struct nfs_mount_dat
         server->namelen  = data->namlen;
         /* Create a client RPC handle for the NFSv3 ACL management interface */
         nfs_init_server_aclclient(server);
-        if (clp->cl_nfsversion == 3) {
-                if (server->namelen == 0 || server->namelen > NFS3_MAXNAMLEN)
-                        server->namelen = NFS3_MAXNAMLEN;
-                if (!(data->flags & NFS_MOUNT_NORDIRPLUS))
-                        server->caps |= NFS_CAP_READDIRPLUS;
-        } else {
-                if (server->namelen == 0 || server->namelen > NFS2_MAXNAMLEN)
-                        server->namelen = NFS2_MAXNAMLEN;
-        }
-
         dprintk("<-- nfs_init_server() = 0 [new %p]\n", clp);
         return 0;
 
@@ -794,6 +784,16 @@ struct nfs_server *nfs_create_server(const struct nfs_mount_data *data,
         error = nfs_probe_fsinfo(server, mntfh, &fattr);
         if (error < 0)
                 goto error;
+        if (server->nfs_client->rpc_ops->version == 3) {
+                if (server->namelen == 0 || server->namelen > NFS3_MAXNAMLEN)
+                        server->namelen = NFS3_MAXNAMLEN;
+                if (!(data->flags & NFS_MOUNT_NORDIRPLUS))
+                        server->caps |= NFS_CAP_READDIRPLUS;
+        } else {
+                if (server->namelen == 0 || server->namelen > NFS2_MAXNAMLEN)
+                        server->namelen = NFS2_MAXNAMLEN;
+        }
+
         if (!(fattr.valid & NFS_ATTR_FATTR)) {
                 error = server->nfs_client->rpc_ops->getattr(server, mntfh, &fattr);
                 if (error < 0) {
@@ -984,6 +984,9 @@ struct nfs_server *nfs4_create_server(const struct nfs4_mount_data *data,
         if (error < 0)
                 goto error;
 
+        if (server->namelen == 0 || server->namelen > NFS4_MAXNAMLEN)
+                server->namelen = NFS4_MAXNAMLEN;
+
         BUG_ON(!server->nfs_client);
         BUG_ON(!server->nfs_client->rpc_ops);
         BUG_ON(!server->nfs_client->rpc_ops->file_inode_ops);
@@ -1056,6 +1059,9 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
         if (error < 0)
                 goto error;
 
+        if (server->namelen == 0 || server->namelen > NFS4_MAXNAMLEN)
+                server->namelen = NFS4_MAXNAMLEN;
+
         dprintk("Referral FSID: %llx:%llx\n",
                 (unsigned long long) server->fsid.major,
                 (unsigned long long) server->fsid.minor);
@@ -1115,6 +1121,9 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source,
         if (error < 0)
                 goto out_free_server;
 
+        if (server->namelen == 0 || server->namelen > NFS4_MAXNAMLEN)
+                server->namelen = NFS4_MAXNAMLEN;
+
         dprintk("Cloned FSID: %llx:%llx\n",
                 (unsigned long long) server->fsid.major,
                 (unsigned long long) server->fsid.minor);
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index ea97408e42..e4a04d16b8 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1162,6 +1162,8 @@ static struct dentry *nfs_readdir_lookup(nfs_readdir_descriptor_t *desc)
         }
         if (!desc->plus || !(entry->fattr->valid & NFS_ATTR_FATTR))
                 return NULL;
+        if (name.len > NFS_SERVER(dir)->namelen)
+                return NULL;
         /* Note: caller is already holding the dir->i_mutex! */
         dentry = d_alloc(parent, &name);
         if (dentry == NULL)
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index c87dc713b5..579cf8a7d4 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -316,7 +316,7 @@ static void nfs_invalidate_page(struct page *page, unsigned long offset)
         if (offset != 0)
                 return;
         /* Cancel any unstarted writes on this page */
-        nfs_wb_page_priority(page->mapping->host, page, FLUSH_INVALIDATE);
+        nfs_wb_page_cancel(page->mapping->host, page);
 }
 
 static int nfs_release_page(struct page *page, gfp_t gfp)
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index d1cbf0a0fb..522e5ad4d8 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -175,6 +175,9 @@ next_component:
                 path++;
         name.len = path - (const char *) name.name;
 
+        if (name.len > NFS4_MAXNAMLEN)
+                return -ENAMETOOLONG;
+
 eat_dot_dir:
         while (*path == '/')
                 path++;
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index aea76d0e5f..acfc56f9ed 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -176,7 +176,7 @@ static void nfs_expire_automounts(struct work_struct *work)
 void nfs_release_automount_timer(void)
 {
         if (list_empty(&nfs_automount_list))
-                cancel_delayed_work_sync(&nfs_automount_task);
+                cancel_delayed_work(&nfs_automount_task);
 }
 
 /*
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 62b3ae2803..4b90e17555 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -646,7 +646,7 @@ static int _nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state
         rcu_read_lock();
         delegation = rcu_dereference(NFS_I(state->inode)->delegation);
         if (delegation != NULL && (delegation->flags & NFS_DELEGATION_NEED_RECLAIM) != 0)
-                delegation_type = delegation->flags;
+                delegation_type = delegation->type;
         rcu_read_unlock();
         opendata->o_arg.u.delegation_type = delegation_type;
         status = nfs4_open_recover(opendata, state);
@@ -1434,7 +1434,7 @@ nfs4_atomic_open(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
         }
         res = d_add_unique(dentry, igrab(state->inode));
         if (res != NULL)
-                dentry = res;
+                path.dentry = res;
         nfs4_intent_set_file(nd, &path, state);
         return res;
 }
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index b2a851c1b8..b878528b64 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -345,8 +345,8 @@ void __exit unregister_nfs_fs(void)
         unregister_shrinker(&acl_shrinker);
 #ifdef CONFIG_NFS_V4
         unregister_filesystem(&nfs4_fs_type);
-        nfs_unregister_sysctl();
 #endif
+        nfs_unregister_sysctl();
         unregister_filesystem(&nfs_fs_type);
 }
 
@@ -911,13 +911,13 @@ static int nfs_parse_mount_options(char *raw,
                         kfree(string);
 
                         switch (token) {
-                        case Opt_udp:
+                        case Opt_xprt_udp:
                                 mnt->flags &= ~NFS_MOUNT_TCP;
                                 mnt->nfs_server.protocol = IPPROTO_UDP;
                                 mnt->timeo = 7;
                                 mnt->retrans = 5;
                                 break;
-                        case Opt_tcp:
+                        case Opt_xprt_tcp:
                                 mnt->flags |= NFS_MOUNT_TCP;
                                 mnt->nfs_server.protocol = IPPROTO_TCP;
                                 mnt->timeo = 600;
@@ -936,10 +936,10 @@ static int nfs_parse_mount_options(char *raw,
                         kfree(string);
 
                         switch (token) {
-                        case Opt_udp:
+                        case Opt_xprt_udp:
                                 mnt->mount_server.protocol = IPPROTO_UDP;
                                 break;
-                        case Opt_tcp:
+                        case Opt_xprt_tcp:
                                 mnt->mount_server.protocol = IPPROTO_TCP;
                                 break;
                         default:
@@ -1153,20 +1153,20 @@ static int nfs_validate_mount_data(struct nfs_mount_data **options,
                 c = strchr(dev_name, ':');
                 if (c == NULL)
                         return -EINVAL;
-                len = c - dev_name - 1;
+                len = c - dev_name;
                 if (len > sizeof(data->hostname))
-                        return -EINVAL;
+                        return -ENAMETOOLONG;
                 strncpy(data->hostname, dev_name, len);
                 args.nfs_server.hostname = data->hostname;
 
                 c++;
                 if (strlen(c) > NFS_MAXPATHLEN)
-                        return -EINVAL;
+                        return -ENAMETOOLONG;
                 args.nfs_server.export_path = c;
 
                 status = nfs_try_mount(&args, mntfh);
                 if (status)
-                        return -EINVAL;
+                        return status;
 
                 /*
                  * Translate to nfs_mount_data, which nfs_fill_super
@@ -1303,34 +1303,6 @@ static void nfs_clone_super(struct super_block *sb,
         nfs_initialise_sb(sb);
 }
 
-static int nfs_set_super(struct super_block *s, void *_server)
-{
-        struct nfs_server *server = _server;
-        int ret;
-
-        s->s_fs_info = server;
-        ret = set_anon_super(s, server);
-        if (ret == 0)
-                server->s_dev = s->s_dev;
-        return ret;
-}
-
-static int nfs_compare_super(struct super_block *sb, void *data)
-{
-        struct nfs_server *server = data, *old = NFS_SB(sb);
-
-        if (memcmp(&old->nfs_client->cl_addr,
-                                &server->nfs_client->cl_addr,
-                                sizeof(old->nfs_client->cl_addr)) != 0)
-                return 0;
-        /* Note: NFS_MOUNT_UNSHARED == NFS4_MOUNT_UNSHARED */
-        if (old->flags & NFS_MOUNT_UNSHARED)
-                return 0;
-        if (memcmp(&old->fsid, &server->fsid, sizeof(old->fsid)) != 0)
-                return 0;
-        return 1;
-}
-
 #define NFS_MS_MASK (MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_SYNCHRONOUS)
 
 static int nfs_compare_mount_options(const struct super_block *s, const struct nfs_server *b, int flags)
@@ -1359,9 +1331,46 @@ static int nfs_compare_mount_options(const struct super_block *s, const struct n
                 goto Ebusy;
         if (clnt_a->cl_auth->au_flavor != clnt_b->cl_auth->au_flavor)
                 goto Ebusy;
-        return 0;
+        return 1;
 Ebusy:
-        return -EBUSY;
+        return 0;
+}
+
+struct nfs_sb_mountdata {
+        struct nfs_server *server;
+        int mntflags;
+};
+
+static int nfs_set_super(struct super_block *s, void *data)
+{
+        struct nfs_sb_mountdata *sb_mntdata = data;
+        struct nfs_server *server = sb_mntdata->server;
+        int ret;
+
+        s->s_flags = sb_mntdata->mntflags;
+        s->s_fs_info = server;
+        ret = set_anon_super(s, server);
+        if (ret == 0)
+                server->s_dev = s->s_dev;
+        return ret;
+}
+
+static int nfs_compare_super(struct super_block *sb, void *data)
+{
+        struct nfs_sb_mountdata *sb_mntdata = data;
+        struct nfs_server *server = sb_mntdata->server, *old = NFS_SB(sb);
+        int mntflags = sb_mntdata->mntflags;
+
+        if (memcmp(&old->nfs_client->cl_addr,
+                                &server->nfs_client->cl_addr,
+                                sizeof(old->nfs_client->cl_addr)) != 0)
+                return 0;
+        /* Note: NFS_MOUNT_UNSHARED == NFS4_MOUNT_UNSHARED */
+        if (old->flags & NFS_MOUNT_UNSHARED)
+                return 0;
+        if (memcmp(&old->fsid, &server->fsid, sizeof(old->fsid)) != 0)
+                return 0;
+        return nfs_compare_mount_options(sb, server, mntflags);
 }
 
 static int nfs_get_sb(struct file_system_type *fs_type,
@@ -1373,6 +1382,9 @@ static int nfs_get_sb(struct file_system_type *fs_type,
         struct nfs_mount_data *data = raw_data;
         struct dentry *mntroot;
         int (*compare_super)(struct super_block *, void *) = nfs_compare_super;
+        struct nfs_sb_mountdata sb_mntdata = {
+                .mntflags = flags,
+        };
         int error;
 
         /* Validate the mount data */
@@ -1386,28 +1398,25 @@ static int nfs_get_sb(struct file_system_type *fs_type,
                 error = PTR_ERR(server);
                 goto out;
         }
+        sb_mntdata.server = server;
 
         if (server->flags & NFS_MOUNT_UNSHARED)
                 compare_super = NULL;
 
         /* Get a superblock - note that we may end up sharing one that already exists */
-        s = sget(fs_type, compare_super, nfs_set_super, server);
+        s = sget(fs_type, compare_super, nfs_set_super, &sb_mntdata);
         if (IS_ERR(s)) {
                 error = PTR_ERR(s);
                 goto out_err_nosb;
         }
 
         if (s->s_fs_info != server) {
-                error = nfs_compare_mount_options(s, server, flags);
                 nfs_free_server(server);
                 server = NULL;
-                if (error < 0)
-                        goto error_splat_super;
         }
 
         if (!s->s_root) {
                 /* initial superblock/root creation */
-                s->s_flags = flags;
                 nfs_fill_super(s, data);
         }
 
@@ -1460,6 +1469,9 @@ static int nfs_xdev_get_sb(struct file_system_type *fs_type, int flags,
         struct nfs_server *server;
         struct dentry *mntroot;
         int (*compare_super)(struct super_block *, void *) = nfs_compare_super;
+        struct nfs_sb_mountdata sb_mntdata = {
+                .mntflags = flags,
+        };
         int error;
 
         dprintk("--> nfs_xdev_get_sb()\n");
@@ -1470,28 +1482,25 @@ static int nfs_xdev_get_sb(struct file_system_type *fs_type, int flags,
                 error = PTR_ERR(server);
                 goto out_err_noserver;
         }
+        sb_mntdata.server = server;
 
         if (server->flags & NFS_MOUNT_UNSHARED)
                 compare_super = NULL;
 
         /* Get a superblock - note that we may end up sharing one that already exists */
-        s = sget(&nfs_fs_type, compare_super, nfs_set_super, server);
+        s = sget(&nfs_fs_type, compare_super, nfs_set_super, &sb_mntdata);
         if (IS_ERR(s)) {
                 error = PTR_ERR(s);
                 goto out_err_nosb;
         }
 
         if (s->s_fs_info != server) {
-                error = nfs_compare_mount_options(s, server, flags);
                 nfs_free_server(server);
                 server = NULL;
-                if (error < 0)
-                        goto error_splat_super;
         }
 
         if (!s->s_root) {
                 /* initial superblock/root creation */
-                s->s_flags = flags;
                 nfs_clone_super(s, data->sb);
         }
 
@@ -1668,7 +1677,7 @@ static int nfs4_validate_mount_data(struct nfs4_mount_data **options,
                 /* while calculating len, pretend ':' is '\0' */
                 len = c - dev_name;
                 if (len > NFS4_MAXNAMLEN)
-                        return -EINVAL;
+                        return -ENAMETOOLONG;
                 *hostname = kzalloc(len, GFP_KERNEL);
                 if (*hostname == NULL)
                         return -ENOMEM;
@@ -1677,7 +1686,7 @@ static int nfs4_validate_mount_data(struct nfs4_mount_data **options,
                 c++;                    /* step over the ':' */
                 len = strlen(c);
                 if (len > NFS4_MAXPATHLEN)
-                        return -EINVAL;
+                        return -ENAMETOOLONG;
                 *mntpath = kzalloc(len + 1, GFP_KERNEL);
                 if (*mntpath == NULL)
                         return -ENOMEM;
@@ -1729,6 +1738,9 @@ static int nfs4_get_sb(struct file_system_type *fs_type,
         struct dentry *mntroot;
         char *mntpath = NULL, *hostname = NULL, *ip_addr = NULL;
         int (*compare_super)(struct super_block *, void *) = nfs_compare_super;
+        struct nfs_sb_mountdata sb_mntdata = {
+                .mntflags = flags,
+        };
         int error;
 
         /* Validate the mount data */
@@ -1744,12 +1756,13 @@ static int nfs4_get_sb(struct file_system_type *fs_type,
                 error = PTR_ERR(server);
                 goto out;
         }
+        sb_mntdata.server = server;
 
         if (server->flags & NFS4_MOUNT_UNSHARED)
                 compare_super = NULL;
 
         /* Get a superblock - note that we may end up sharing one that already exists */
-        s = sget(fs_type, compare_super, nfs_set_super, server);
+        s = sget(fs_type, compare_super, nfs_set_super, &sb_mntdata);
         if (IS_ERR(s)) {
                 error = PTR_ERR(s);
                 goto out_free;
@@ -1762,7 +1775,6 @@ static int nfs4_get_sb(struct file_system_type *fs_type,
 
         if (!s->s_root) {
                 /* initial superblock/root creation */
-                s->s_flags = flags;
                 nfs4_fill_super(s);
         }
 
@@ -1816,6 +1828,9 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags,
         struct nfs_server *server;
         struct dentry *mntroot;
         int (*compare_super)(struct super_block *, void *) = nfs_compare_super;
+        struct nfs_sb_mountdata sb_mntdata = {
+                .mntflags = flags,
+        };
         int error;
 
         dprintk("--> nfs4_xdev_get_sb()\n");
@@ -1826,12 +1841,13 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags,
                 error = PTR_ERR(server);
                 goto out_err_noserver;
         }
+        sb_mntdata.server = server;
 
         if (server->flags & NFS4_MOUNT_UNSHARED)
                 compare_super = NULL;
 
         /* Get a superblock - note that we may end up sharing one that already exists */
-        s = sget(&nfs_fs_type, compare_super, nfs_set_super, server);
+        s = sget(&nfs_fs_type, compare_super, nfs_set_super, &sb_mntdata);
         if (IS_ERR(s)) {
                 error = PTR_ERR(s);
                 goto out_err_nosb;
@@ -1844,7 +1860,6 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags,
 
         if (!s->s_root) {
                 /* initial superblock/root creation */
-                s->s_flags = flags;
                 nfs4_clone_super(s, data->sb);
         }
 
@@ -1887,6 +1902,9 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags,
         struct dentry *mntroot;
         struct nfs_fh mntfh;
         int (*compare_super)(struct super_block *, void *) = nfs_compare_super;
+        struct nfs_sb_mountdata sb_mntdata = {
+                .mntflags = flags,
+        };
         int error;
 
         dprintk("--> nfs4_referral_get_sb()\n");
@@ -1897,12 +1915,13 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags,
                 error = PTR_ERR(server);
                 goto out_err_noserver;
         }
+        sb_mntdata.server = server;
 
         if (server->flags & NFS4_MOUNT_UNSHARED)
                 compare_super = NULL;
 
         /* Get a superblock - note that we may end up sharing one that already exists */
-        s = sget(&nfs_fs_type, compare_super, nfs_set_super, server);
+        s = sget(&nfs_fs_type, compare_super, nfs_set_super, &sb_mntdata);
         if (IS_ERR(s)) {
                 error = PTR_ERR(s);
                 goto out_err_nosb;
@@ -1915,7 +1934,6 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags,
 
         if (!s->s_root) {
                 /* initial superblock/root creation */
-                s->s_flags = flags;
                 nfs4_fill_super(s);
         }
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index ef97e0c0f5..0d7a77cc39 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1396,6 +1396,50 @@ out:
         return ret;
 }
 
+int nfs_wb_page_cancel(struct inode *inode, struct page *page)
+{
+        struct nfs_page *req;
+        loff_t range_start = page_offset(page);
+        loff_t range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1);
+        struct writeback_control wbc = {
+                .bdi = page->mapping->backing_dev_info,
+                .sync_mode = WB_SYNC_ALL,
+                .nr_to_write = LONG_MAX,
+                .range_start = range_start,
+                .range_end = range_end,
+        };
+        int ret = 0;
+
+        BUG_ON(!PageLocked(page));
+        for (;;) {
+                req = nfs_page_find_request(page);
+                if (req == NULL)
+                        goto out;
+                if (test_bit(PG_NEED_COMMIT, &req->wb_flags)) {
+                        nfs_release_request(req);
+                        break;
+                }
+                if (nfs_lock_request_dontget(req)) {
+                        nfs_inode_remove_request(req);
+                        /*
+                         * In case nfs_inode_remove_request has marked the
+                         * page as being dirty
+                         */
+                        cancel_dirty_page(page, PAGE_CACHE_SIZE);
+                        nfs_unlock_request(req);
+                        break;
+                }
+                ret = nfs_wait_on_request(req);
+                if (ret < 0)
+                        goto out;
+        }
+        if (!PagePrivate(page))
+                return 0;
+        ret = nfs_sync_mapping_wait(page->mapping, &wbc, FLUSH_INVALIDATE);
+out:
+        return ret;
+}
+
 int nfs_wb_page_priority(struct inode *inode, struct page *page, int how)
 {
         loff_t range_start = page_offset(page);
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 0eb464a39a..7011d62acf 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -566,13 +566,23 @@ enum fsid_source fsid_source(struct svc_fh *fhp)
         case FSID_DEV:
         case FSID_ENCODE_DEV:
         case FSID_MAJOR_MINOR:
-                return FSIDSOURCE_DEV;
+                if (fhp->fh_export->ex_dentry->d_inode->i_sb->s_type->fs_flags
+                    & FS_REQUIRES_DEV)
+                        return FSIDSOURCE_DEV;
+                break;
         case FSID_NUM:
-                return FSIDSOURCE_FSID;
-        default:
                 if (fhp->fh_export->ex_flags & NFSEXP_FSID)
                         return FSIDSOURCE_FSID;
-                else
-                        return FSIDSOURCE_UUID;
+                break;
+        default:
+                break;
         }
+        /* either a UUID type filehandle, or the filehandle doesn't
+         * match the export.
+         */
+        if (fhp->fh_export->ex_flags & NFSEXP_FSID)
+                return FSIDSOURCE_FSID;
+        if (fhp->fh_export->ex_uuid)
+                return FSIDSOURCE_UUID;
+        return FSIDSOURCE_DEV;
 }
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index a0c2b25381..7867151ebb 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -115,7 +115,8 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
 
         exp2 = rqst_exp_get_by_name(rqstp, mnt, mounts);
         if (IS_ERR(exp2)) {
-                err = PTR_ERR(exp2);
+                if (PTR_ERR(exp2) != -ENOENT)
+                        err = PTR_ERR(exp2);
                 dput(mounts);
                 mntput(mnt);
                 goto out;
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 4f517665c9..778a850b46 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -5602,6 +5602,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
                                       clusters_to_del;
         spin_unlock(&OCFS2_I(inode)->ip_lock);
         le32_add_cpu(&fe->i_clusters, -clusters_to_del);
+        inode->i_blocks = ocfs2_inode_sector_count(inode);
 
         status = ocfs2_trim_tree(inode, path, handle, tc,
                                  clusters_to_del, &delete_blk);
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 460d440310..f37f25c931 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -855,6 +855,7 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp,
                                   struct ocfs2_super *osb, loff_t pos,
                                   unsigned len, struct buffer_head *di_bh)
 {
+        u32 cend;
         struct ocfs2_write_ctxt *wc;
 
         wc = kzalloc(sizeof(struct ocfs2_write_ctxt), GFP_NOFS);
@@ -862,7 +863,8 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp,
                 return -ENOMEM;
 
         wc->w_cpos = pos >> osb->s_clustersize_bits;
-        wc->w_clen = ocfs2_clusters_for_bytes(osb->sb, len);
+        cend = (pos + len - 1) >> osb->s_clustersize_bits;
+        wc->w_clen = cend - wc->w_cpos + 1;
         get_bh(di_bh);
         wc->w_di_bh = di_bh;
 
@@ -928,18 +930,11 @@ static void ocfs2_write_failure(struct inode *inode,
                                 loff_t user_pos, unsigned user_len)
 {
         int i;
-        unsigned from, to;
+        unsigned from = user_pos & (PAGE_CACHE_SIZE - 1),
+                to = user_pos + user_len;
         struct page *tmppage;
 
-        ocfs2_zero_new_buffers(wc->w_target_page, user_pos, user_len);
-
-        if (wc->w_large_pages) {
-                from = wc->w_target_from;
-                to = wc->w_target_to;
-        } else {
-                from = 0;
-                to = PAGE_CACHE_SIZE;
-        }
+        ocfs2_zero_new_buffers(wc->w_target_page, from, to);
 
         for(i = 0; i < wc->w_num_pages; i++) {
                 tmppage = wc->w_pages[i];
@@ -989,9 +984,6 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,
                         map_from = cluster_start;
                         map_to = cluster_end;
                 }
-
-                wc->w_target_from = map_from;
-                wc->w_target_to = map_to;
         } else {
                 /*
                  * If we haven't allocated the new page yet, we
@@ -1209,18 +1201,33 @@ static int ocfs2_write_cluster_by_desc(struct address_space *mapping,
                                        loff_t pos, unsigned len)
 {
         int ret, i;
+        loff_t cluster_off;
+        unsigned int local_len = len;
         struct ocfs2_write_cluster_desc *desc;
+        struct ocfs2_super *osb = OCFS2_SB(mapping->host->i_sb);
 
         for (i = 0; i < wc->w_clen; i++) {
                 desc = &wc->w_desc[i];
 
+                /*
+                 * We have to make sure that the total write passed in
+                 * doesn't extend past a single cluster.
+                 */
+                local_len = len;
+                cluster_off = pos & (osb->s_clustersize - 1);
+                if ((cluster_off + local_len) > osb->s_clustersize)
+                        local_len = osb->s_clustersize - cluster_off;
+
                 ret = ocfs2_write_cluster(mapping, desc->c_phys,
                                           desc->c_unwritten, data_ac, meta_ac,
-                                          wc, desc->c_cpos, pos, len);
+                                          wc, desc->c_cpos, pos, local_len);
                 if (ret) {
                         mlog_errno(ret);
                         goto out;
                 }
+
+                len -= local_len;
+                pos += local_len;
         }
 
         ret = 0;
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 4ffa715be0..f3bc3658e7 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -314,7 +314,6 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
         }
 
         i_size_write(inode, new_i_size);
-        inode->i_blocks = ocfs2_align_bytes_to_sectors(new_i_size);
         inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 
         di = (struct ocfs2_dinode *) fe_bh->b_data;
@@ -492,8 +491,8 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb,
                 goto leave;
         }
 
-        status = ocfs2_claim_clusters(osb, handle, data_ac, 1,
-                                      &bit_off, &num_bits);
+        status = __ocfs2_claim_clusters(osb, handle, data_ac, 1,
+                                        clusters_to_add, &bit_off, &num_bits);
         if (status < 0) {
                 if (status != -ENOSPC)
                         mlog_errno(status);
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index 545f7892cd..d272847d5a 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -514,8 +514,10 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
         ac->ac_bh = osb->local_alloc_bh;
         status = 0;
 bail:
-        if (status < 0 && local_alloc_inode)
+        if (status < 0 && local_alloc_inode) {
+                mutex_unlock(&local_alloc_inode->i_mutex);
                 iput(local_alloc_inode);
+        }
 
         mlog_exit(status);
         return status;
@@ -524,13 +526,12 @@ bail:
 int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
                                  handle_t *handle,
                                  struct ocfs2_alloc_context *ac,
-                                 u32 min_bits,
+                                 u32 bits_wanted,
                                  u32 *bit_off,
                                  u32 *num_bits)
 {
         int status, start;
         struct inode *local_alloc_inode;
-        u32 bits_wanted;
         void *bitmap;
         struct ocfs2_dinode *alloc;
         struct ocfs2_local_alloc *la;
@@ -538,7 +539,6 @@ int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
         mlog_entry_void();
         BUG_ON(ac->ac_which != OCFS2_AC_USE_LOCAL);
 
-        bits_wanted = ac->ac_bits_wanted - ac->ac_bits_given;
         local_alloc_inode = ac->ac_inode;
         alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;
         la = OCFS2_LOCAL_ALLOC(alloc);
diff --git a/fs/ocfs2/localalloc.h b/fs/ocfs2/localalloc.h
index 385a10152f..3f76631e11 100644
--- a/fs/ocfs2/localalloc.h
+++ b/fs/ocfs2/localalloc.h
@@ -48,7 +48,7 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
 int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
                                  handle_t *handle,
                                  struct ocfs2_alloc_context *ac,
-                                 u32 min_bits,
+                                 u32 bits_wanted,
                                  u32 *bit_off,
                                  u32 *num_bits);
 
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index d9c5c9fcb3..8f09f5235e 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -1486,21 +1486,21 @@ static inline void ocfs2_block_to_cluster_group(struct inode *inode,
  * contig. allocation, set to '1' to indicate we can deal with extents
  * of any size.
  */
-int ocfs2_claim_clusters(struct ocfs2_super *osb,
-                         handle_t *handle,
-                         struct ocfs2_alloc_context *ac,
-                         u32 min_clusters,
-                         u32 *cluster_start,
-                         u32 *num_clusters)
+int __ocfs2_claim_clusters(struct ocfs2_super *osb,
+                           handle_t *handle,
+                           struct ocfs2_alloc_context *ac,
+                           u32 min_clusters,
+                           u32 max_clusters,
+                           u32 *cluster_start,
+                           u32 *num_clusters)
 {
         int status;
-        unsigned int bits_wanted = ac->ac_bits_wanted - ac->ac_bits_given;
+        unsigned int bits_wanted = max_clusters;
         u64 bg_blkno = 0;
         u16 bg_bit_off;
 
         mlog_entry_void();
 
-        BUG_ON(!ac);
         BUG_ON(ac->ac_bits_given >= ac->ac_bits_wanted);
 
         BUG_ON(ac->ac_which != OCFS2_AC_USE_LOCAL
@@ -1557,6 +1557,19 @@ bail:
         return status;
 }
 
+int ocfs2_claim_clusters(struct ocfs2_super *osb,
+                         handle_t *handle,
+                         struct ocfs2_alloc_context *ac,
+                         u32 min_clusters,
+                         u32 *cluster_start,
+                         u32 *num_clusters)
+{
+        unsigned int bits_wanted = ac->ac_bits_wanted - ac->ac_bits_given;
+
+        return __ocfs2_claim_clusters(osb, handle, ac, min_clusters,
+                                      bits_wanted, cluster_start, num_clusters);
+}
+
 static inline int ocfs2_block_group_clear_bits(handle_t *handle,
                                                struct inode *alloc_inode,
                                                struct ocfs2_group_desc *bg,
diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h
index f212dc01a8..cafe937030 100644
--- a/fs/ocfs2/suballoc.h
+++ b/fs/ocfs2/suballoc.h
@@ -85,6 +85,17 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb,
                          u32 min_clusters,
                          u32 *cluster_start,
                          u32 *num_clusters);
+/*
+ * Use this variant of ocfs2_claim_clusters to specify a maxiumum
+ * number of clusters smaller than the allocation reserved.
+ */
+int __ocfs2_claim_clusters(struct ocfs2_super *osb,
+                           handle_t *handle,
+                           struct ocfs2_alloc_context *ac,
+                           u32 min_clusters,
+                           u32 max_clusters,
+                           u32 *cluster_start,
+                           u32 *num_clusters);
 
 int ocfs2_free_suballoc_bits(handle_t *handle,
                              struct inode *alloc_inode,
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index f2fc9a795d..c034b5129c 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -81,8 +81,15 @@ static struct dentry *ocfs2_debugfs_root = NULL;
 MODULE_AUTHOR("Oracle");
 MODULE_LICENSE("GPL");
 
+struct mount_options
+{
+        unsigned long   mount_opt;
+        unsigned int    atime_quantum;
+        signed short    slot;
+};
+
 static int ocfs2_parse_options(struct super_block *sb, char *options,
-                               unsigned long *mount_opt, s16 *slot,
+                               struct mount_options *mopt,
                                int is_remount);
 static void ocfs2_put_super(struct super_block *sb);
 static int ocfs2_mount_volume(struct super_block *sb);
@@ -367,24 +374,23 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)
 {
         int incompat_features;
         int ret = 0;
-        unsigned long parsed_options;
-        s16 slot;
+        struct mount_options parsed_options;
         struct ocfs2_super *osb = OCFS2_SB(sb);
 
-        if (!ocfs2_parse_options(sb, data, &parsed_options, &slot, 1)) {
+        if (!ocfs2_parse_options(sb, data, &parsed_options, 1)) {
                 ret = -EINVAL;
                 goto out;
         }
 
         if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) !=
-            (parsed_options & OCFS2_MOUNT_HB_LOCAL)) {
+            (parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL)) {
                 ret = -EINVAL;
                 mlog(ML_ERROR, "Cannot change heartbeat mode on remount\n");
                 goto out;
         }
 
         if ((osb->s_mount_opt & OCFS2_MOUNT_DATA_WRITEBACK) !=
-            (parsed_options & OCFS2_MOUNT_DATA_WRITEBACK)) {
+            (parsed_options.mount_opt & OCFS2_MOUNT_DATA_WRITEBACK)) {
                 ret = -EINVAL;
                 mlog(ML_ERROR, "Cannot change data mode on remount\n");
                 goto out;
@@ -435,7 +441,9 @@ unlock_osb:
 
                 /* Only save off the new mount options in case of a successful
                  * remount. */
-                osb->s_mount_opt = parsed_options;
+                osb->s_mount_opt = parsed_options.mount_opt;
+                osb->s_atime_quantum = parsed_options.atime_quantum;
+                osb->preferred_slot = parsed_options.slot;
         }
 out:
         return ret;
@@ -547,8 +555,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct dentry *root;
         int status, sector_size;
-        unsigned long parsed_opt;
-        s16 slot;
+        struct mount_options parsed_options;
         struct inode *inode = NULL;
         struct ocfs2_super *osb = NULL;
         struct buffer_head *bh = NULL;
@@ -556,14 +563,14 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 
         mlog_entry("%p, %p, %i", sb, data, silent);
 
-        if (!ocfs2_parse_options(sb, data, &parsed_opt, &slot, 0)) {
+        if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) {
                 status = -EINVAL;
                 goto read_super_error;
         }
 
         /* for now we only have one cluster/node, make sure we see it
          * in the heartbeat universe */
-        if (parsed_opt & OCFS2_MOUNT_HB_LOCAL) {
+        if (parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL) {
                 if (!o2hb_check_local_node_heartbeating()) {
                         status = -EINVAL;
                         goto read_super_error;
@@ -585,8 +592,9 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
         }
         brelse(bh);
         bh = NULL;
-        osb->s_mount_opt = parsed_opt;
-        osb->preferred_slot = slot;
+        osb->s_mount_opt = parsed_options.mount_opt;
+        osb->s_atime_quantum = parsed_options.atime_quantum;
+        osb->preferred_slot = parsed_options.slot;
 
         sb->s_magic = OCFS2_SUPER_MAGIC;
 
@@ -728,8 +736,7 @@ static struct file_system_type ocfs2_fs_type = {
 
 static int ocfs2_parse_options(struct super_block *sb,
                                char *options,
-                               unsigned long *mount_opt,
-                               s16 *slot,
+                               struct mount_options *mopt,
                                int is_remount)
 {
         int status;
@@ -738,8 +745,9 @@ static int ocfs2_parse_options(struct super_block *sb,
         mlog_entry("remount: %d, options: \"%s\"\n", is_remount,
                    options ? options : "(none)");
 
-        *mount_opt = 0;
-        *slot = OCFS2_INVALID_SLOT;
+        mopt->mount_opt = 0;
+        mopt->atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
+        mopt->slot = OCFS2_INVALID_SLOT;
 
         if (!options) {
                 status = 1;
@@ -749,7 +757,6 @@ static int ocfs2_parse_options(struct super_block *sb,
         while ((p = strsep(&options, ",")) != NULL) {
                 int token, option;
                 substring_t args[MAX_OPT_ARGS];
-                struct ocfs2_super * osb = OCFS2_SB(sb);
 
                 if (!*p)
                         continue;
@@ -757,10 +764,10 @@ static int ocfs2_parse_options(struct super_block *sb,
                 token = match_token(p, tokens, args);
                 switch (token) {
                 case Opt_hb_local:
-                        *mount_opt |= OCFS2_MOUNT_HB_LOCAL;
+                        mopt->mount_opt |= OCFS2_MOUNT_HB_LOCAL;
                         break;
                 case Opt_hb_none:
-                        *mount_opt &= ~OCFS2_MOUNT_HB_LOCAL;
+                        mopt->mount_opt &= ~OCFS2_MOUNT_HB_LOCAL;
                         break;
                 case Opt_barrier:
                         if (match_int(&args[0], &option)) {
@@ -768,27 +775,27 @@ static int ocfs2_parse_options(struct super_block *sb,
                                 goto bail;
                         }
                         if (option)
-                                *mount_opt |= OCFS2_MOUNT_BARRIER;
+                                mopt->mount_opt |= OCFS2_MOUNT_BARRIER;
                         else
-                                *mount_opt &= ~OCFS2_MOUNT_BARRIER;
+                                mopt->mount_opt &= ~OCFS2_MOUNT_BARRIER;
                         break;
                 case Opt_intr:
-                        *mount_opt &= ~OCFS2_MOUNT_NOINTR;
+                        mopt->mount_opt &= ~OCFS2_MOUNT_NOINTR;
                         break;
                 case Opt_nointr:
-                        *mount_opt |= OCFS2_MOUNT_NOINTR;
+                        mopt->mount_opt |= OCFS2_MOUNT_NOINTR;
                         break;
                 case Opt_err_panic:
-                        *mount_opt |= OCFS2_MOUNT_ERRORS_PANIC;
+                        mopt->mount_opt |= OCFS2_MOUNT_ERRORS_PANIC;
                         break;
                 case Opt_err_ro:
-                        *mount_opt &= ~OCFS2_MOUNT_ERRORS_PANIC;
+                        mopt->mount_opt &= ~OCFS2_MOUNT_ERRORS_PANIC;
                         break;
                 case Opt_data_ordered:
-                        *mount_opt &= ~OCFS2_MOUNT_DATA_WRITEBACK;
+                        mopt->mount_opt &= ~OCFS2_MOUNT_DATA_WRITEBACK;
                         break;
                 case Opt_data_writeback:
-                        *mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;
+                        mopt->mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;
                         break;
                 case Opt_atime_quantum:
                         if (match_int(&args[0], &option)) {
@@ -796,9 +803,7 @@ static int ocfs2_parse_options(struct super_block *sb,
                                 goto bail;
                         }
                         if (option >= 0)
-                                osb->s_atime_quantum = option;
-                        else
-                                osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
+                                mopt->atime_quantum = option;
                         break;
                 case Opt_slot:
                         option = 0;
@@ -807,7 +812,7 @@ static int ocfs2_parse_options(struct super_block *sb,
                                 goto bail;
                         }
                         if (option)
-                                *slot = (s16)option;
+                                mopt->slot = (s16)option;
                         break;
                 default:
                         mlog(ML_ERROR,
diff --git a/fs/ocfs2/vote.c b/fs/ocfs2/vote.c
index 66a13ee63d..c05358538f 100644
--- a/fs/ocfs2/vote.c
+++ b/fs/ocfs2/vote.c
@@ -66,7 +66,7 @@ struct ocfs2_vote_msg
 {
         struct ocfs2_msg_hdr v_hdr;
         __be32 v_reserved1;
-};
+} __attribute__ ((packed));
 
 /* Responses are given these values to maintain backwards
  * compatibility with older ocfs2 versions */
@@ -78,7 +78,7 @@ struct ocfs2_response_msg
 {
         struct ocfs2_msg_hdr r_hdr;
         __be32 r_response;
-};
+} __attribute__ ((packed));
 
 struct ocfs2_vote_work {
         struct list_head   w_list;
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 965625a097..ee4814dd98 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -320,7 +320,21 @@ int proc_pid_status(struct task_struct *task, char *buffer)
         return buffer - orig;
 }
 
-static clock_t task_utime(struct task_struct *p)
+/*
+ * Use precise platform statistics if available:
+ */
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+static cputime_t task_utime(struct task_struct *p)
+{
+        return p->utime;
+}
+
+static cputime_t task_stime(struct task_struct *p)
+{
+        return p->stime;
+}
+#else
+static cputime_t task_utime(struct task_struct *p)
 {
         clock_t utime = cputime_to_clock_t(p->utime),
                 total = utime + cputime_to_clock_t(p->stime);
@@ -337,10 +351,10 @@ static clock_t task_utime(struct task_struct *p)
         }
         utime = (clock_t)temp;
 
-        return utime;
+        return clock_t_to_cputime(utime);
 }
 
-static clock_t task_stime(struct task_struct *p)
+static cputime_t task_stime(struct task_struct *p)
 {
         clock_t stime;
 
@@ -349,10 +363,12 @@ static clock_t task_stime(struct task_struct *p)
          * the total, to make sure the total observed by userspace
          * grows monotonically - apps rely on that):
          */
-        stime = nsec_to_clock_t(p->se.sum_exec_runtime) - task_utime(p);
+        stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
+                        cputime_to_clock_t(task_utime(p));
 
-        return stime;
+        return clock_t_to_cputime(stime);
 }
+#endif
 
 static int do_task_stat(struct task_struct *task, char *buffer, int whole)
 {
@@ -368,8 +384,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
         unsigned long long start_time;
         unsigned long cmin_flt = 0, cmaj_flt = 0;
         unsigned long  min_flt = 0,  maj_flt = 0;
-        cputime_t cutime, cstime;
-        clock_t utime, stime;
+        cputime_t cutime, cstime, utime, stime;
         unsigned long rsslim = 0;
         char tcomm[sizeof(task->comm)];
         unsigned long flags;
@@ -387,8 +402,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
 
         sigemptyset(&sigign);
         sigemptyset(&sigcatch);
-        cutime = cstime = cputime_zero;
-        utime = stime = 0;
+        cutime = cstime = utime = stime = cputime_zero;
 
         rcu_read_lock();
         if (lock_task_sighand(task, &flags)) {
@@ -414,15 +428,15 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
                         do {
                                 min_flt += t->min_flt;
                                 maj_flt += t->maj_flt;
-                                utime += task_utime(t);
-                                stime += task_stime(t);
+                                utime = cputime_add(utime, task_utime(t));
+                                stime = cputime_add(stime, task_stime(t));
                                 t = next_thread(t);
                         } while (t != task);
 
                         min_flt += sig->min_flt;
                         maj_flt += sig->maj_flt;
-                        utime += cputime_to_clock_t(sig->utime);
-                        stime += cputime_to_clock_t(sig->stime);
+                        utime = cputime_add(utime, sig->utime);
+                        stime = cputime_add(stime, sig->stime);
                 }
 
                 sid = signal_session(sig);
@@ -471,8 +485,8 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
                 cmin_flt,
                 maj_flt,
                 cmaj_flt,
-                utime,
-                stime,
+                cputime_to_clock_t(utime),
+                cputime_to_clock_t(stime),
                 cputime_to_clock_t(cutime),
                 cputime_to_clock_t(cstime),
                 priority,
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index a5b0dfd89a..0e4d37c93e 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -11,6 +11,7 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/completion.h>
+#include <linux/poll.h>
 #include <linux/file.h>
 #include <linux/limits.h>
 #include <linux/init.h>
@@ -232,7 +233,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t
 static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts)
 {
         struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
-        unsigned int rv = 0;
+        unsigned int rv = DEFAULT_POLLMASK;
         unsigned int (*poll)(struct file *, struct poll_table_struct *);
 
         spin_lock(&pde->pde_unload_lock);
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 5b68dd3f19..a005451930 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1915,8 +1915,11 @@ static int reiserfs_release_dquot(struct dquot *dquot)
         ret =
             journal_begin(&th, dquot->dq_sb,
                           REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-        if (ret)
+        if (ret) {
+                /* Release dquot anyway to avoid endless cycle in dqput() */
+                dquot_release(dquot);
                 goto out;
+        }
         ret = dquot_release(dquot);
         err =
             journal_end(&th, dquot->dq_sb,
@@ -2067,6 +2070,12 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
         size_t towrite = len;
         struct buffer_head tmp_bh, *bh;
 
+        if (!current->journal_info) {
+                printk(KERN_WARNING "reiserfs: Quota write (off=%Lu, len=%Lu)"
+                        " cancelled because transaction is not started.\n",
+                        (unsigned long long)off, (unsigned long long)len);
+                return -EIO;
+        }
         mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
         while (towrite > 0) {
                 tocopy = sb->s_blocksize - offset < towrite ?
@@ -2098,7 +2107,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
                 data += tocopy;
                 blk++;
         }
-      out:
+out:
         if (len == towrite)
                 return err;
         if (inode->i_size < off + len - towrite)
diff --git a/fs/select.c b/fs/select.c
index a974082b08..46dca31c60 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -26,8 +26,6 @@
 
 #include <asm/uaccess.h>
 
-#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-
 struct poll_table_page {
         struct poll_table_page * next;
         struct poll_table_entry * entry;
diff --git a/fs/signalfd.c b/fs/signalfd.c
index a8e293d300..aefb0be079 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -11,8 +11,10 @@
  *      Now using anonymous inode source.
  *      Thanks to Oleg Nesterov for useful code review and suggestions.
  *      More comments and suggestions from Arnd Bergmann.
- * Sat May 19, 2007: Davi E. M. Arnaut <davi@haxent.com.br>
+ *  Sat May 19, 2007: Davi E. M. Arnaut <davi@haxent.com.br>
  *      Retrieve multiple signals with one read() call
+ *  Sun Jul 15, 2007: Davide Libenzi <davidel@xmailserver.org>
+ *      Attach to the sighand only during read() and poll().
  */
 
 #include <linux/file.h>
@@ -27,102 +29,12 @@
 #include <linux/signalfd.h>
 
 struct signalfd_ctx {
-        struct list_head lnk;
-        wait_queue_head_t wqh;
         sigset_t sigmask;
-        struct task_struct *tsk;
 };
 
-struct signalfd_lockctx {
-        struct task_struct *tsk;
-        unsigned long flags;
-};
-
-/*
- * Tries to acquire the sighand lock. We do not increment the sighand
- * use count, and we do not even pin the task struct, so we need to
- * do it inside an RCU read lock, and we must be prepared for the
- * ctx->tsk going to NULL (in signalfd_deliver()), and for the sighand
- * being detached. We return 0 if the sighand has been detached, or
- * 1 if we were able to pin the sighand lock.
- */
-static int signalfd_lock(struct signalfd_ctx *ctx, struct signalfd_lockctx *lk)
-{
-        struct sighand_struct *sighand = NULL;
-
-        rcu_read_lock();
-        lk->tsk = rcu_dereference(ctx->tsk);
-        if (likely(lk->tsk != NULL))
-                sighand = lock_task_sighand(lk->tsk, &lk->flags);
-        rcu_read_unlock();
-
-        if (!sighand)
-                return 0;
-
-        if (!ctx->tsk) {
-                unlock_task_sighand(lk->tsk, &lk->flags);
-                return 0;
-        }
-
-        if (lk->tsk->tgid == current->tgid)
-                lk->tsk = current;
-
-        return 1;
-}
-
-static void signalfd_unlock(struct signalfd_lockctx *lk)
-{
-        unlock_task_sighand(lk->tsk, &lk->flags);
-}
-
-/*
- * This must be called with the sighand lock held.
- */
-void signalfd_deliver(struct task_struct *tsk, int sig)
-{
-        struct sighand_struct *sighand = tsk->sighand;
-        struct signalfd_ctx *ctx, *tmp;
-
-        BUG_ON(!sig);
-        list_for_each_entry_safe(ctx, tmp, &sighand->signalfd_list, lnk) {
-                /*
-                 * We use a negative signal value as a way to broadcast that the
-                 * sighand has been orphaned, so that we can notify all the
-                 * listeners about this. Remember the ctx->sigmask is inverted,
-                 * so if the user is interested in a signal, that corresponding
-                 * bit will be zero.
-                 */
-                if (sig < 0) {
-                        if (ctx->tsk == tsk) {
-                                ctx->tsk = NULL;
-                                list_del_init(&ctx->lnk);
-                                wake_up(&ctx->wqh);
-                        }
-                } else {
-                        if (!sigismember(&ctx->sigmask, sig))
-                                wake_up(&ctx->wqh);
-                }
-        }
-}
-
-static void signalfd_cleanup(struct signalfd_ctx *ctx)
-{
-        struct signalfd_lockctx lk;
-
-        /*
-         * This is tricky. If the sighand is gone, we do not need to remove
-         * context from the list, the list itself won't be there anymore.
-         */
-        if (signalfd_lock(ctx, &lk)) {
-                list_del(&ctx->lnk);
-                signalfd_unlock(&lk);
-        }
-        kfree(ctx);
-}
-
 static int signalfd_release(struct inode *inode, struct file *file)
 {
-        signalfd_cleanup(file->private_data);
+        kfree(file->private_data);
         return 0;
 }
 
@@ -130,23 +42,15 @@ static unsigned int signalfd_poll(struct file *file, poll_table *wait)
 {
         struct signalfd_ctx *ctx = file->private_data;
         unsigned int events = 0;
-        struct signalfd_lockctx lk;
 
-        poll_wait(file, &ctx->wqh, wait);
+        poll_wait(file, &current->sighand->signalfd_wqh, wait);
 
-        /*
-         * Let the caller get a POLLIN in this case, ala socket recv() when
-         * the peer disconnects.
-         */
-        if (signalfd_lock(ctx, &lk)) {
-                if ((lk.tsk == current &&
-                     next_signal(&lk.tsk->pending, &ctx->sigmask) > 0) ||
-                    next_signal(&lk.tsk->signal->shared_pending,
-                                &ctx->sigmask) > 0)
-                        events |= POLLIN;
-                signalfd_unlock(&lk);
-        } else
+        spin_lock_irq(&current->sighand->siglock);
+        if (next_signal(&current->pending, &ctx->sigmask) ||
+            next_signal(&current->signal->shared_pending,
+                        &ctx->sigmask))
                 events |= POLLIN;
+        spin_unlock_irq(&current->sighand->siglock);
 
         return events;
 }
@@ -219,59 +123,46 @@ static ssize_t signalfd_dequeue(struct signalfd_ctx *ctx, siginfo_t *info,
                                 int nonblock)
 {
         ssize_t ret;
-        struct signalfd_lockctx lk;
         DECLARE_WAITQUEUE(wait, current);
 
-        if (!signalfd_lock(ctx, &lk))
-                return 0;
-
-        ret = dequeue_signal(lk.tsk, &ctx->sigmask, info);
+        spin_lock_irq(&current->sighand->siglock);
+        ret = dequeue_signal(current, &ctx->sigmask, info);
         switch (ret) {
         case 0:
                 if (!nonblock)
                         break;
                 ret = -EAGAIN;
         default:
-                signalfd_unlock(&lk);
+                spin_unlock_irq(&current->sighand->siglock);
                 return ret;
         }
 
-        add_wait_queue(&ctx->wqh, &wait);
+        add_wait_queue(&current->sighand->signalfd_wqh, &wait);
         for (;;) {
                 set_current_state(TASK_INTERRUPTIBLE);
-                ret = dequeue_signal(lk.tsk, &ctx->sigmask, info);
-                signalfd_unlock(&lk);
+                ret = dequeue_signal(current, &ctx->sigmask, info);
                 if (ret != 0)
                         break;
                 if (signal_pending(current)) {
                         ret = -ERESTARTSYS;
                         break;
                 }
+                spin_unlock_irq(&current->sighand->siglock);
                 schedule();
-                ret = signalfd_lock(ctx, &lk);
-                if (unlikely(!ret)) {
-                        /*
-                         * Let the caller read zero byte, ala socket
-                         * recv() when the peer disconnect. This test
-                         * must be done before doing a dequeue_signal(),
-                         * because if the sighand has been orphaned,
-                         * the dequeue_signal() call is going to crash
-                         * because ->sighand will be long gone.
-                         */
-                         break;
-                }
+                spin_lock_irq(&current->sighand->siglock);
         }
+        spin_unlock_irq(&current->sighand->siglock);
 
-        remove_wait_queue(&ctx->wqh, &wait);
+        remove_wait_queue(&current->sighand->signalfd_wqh, &wait);
         __set_current_state(TASK_RUNNING);
 
         return ret;
 }
 
 /*
- * Returns either the size of a "struct signalfd_siginfo", or zero if the
- * sighand we are attached to, has been orphaned. The "count" parameter
- * must be at least the size of a "struct signalfd_siginfo".
+ * Returns a multiple of the size of a "struct signalfd_siginfo", or a negative
+ * error code. The "count" parameter must be at least the size of a
+ * "struct signalfd_siginfo".
  */
 static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,
                              loff_t *ppos)
@@ -287,7 +178,6 @@ static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,
                 return -EINVAL;
 
         siginfo = (struct signalfd_siginfo __user *) buf;
-
         do {
                 ret = signalfd_dequeue(ctx, &info, nonblock);
                 if (unlikely(ret <= 0))
@@ -300,7 +190,7 @@ static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,
                 nonblock = 1;
         } while (--count);
 
-        return total ? total : ret;
+        return total ? total: ret;
 }
 
 static const struct file_operations signalfd_fops = {
@@ -309,20 +199,13 @@ static const struct file_operations signalfd_fops = {
         .read           = signalfd_read,
 };
 
-/*
- * Create a file descriptor that is associated with our signal
- * state. We can pass it around to others if we want to, but
- * it will always be _our_ signal state.
- */
 asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemask)
 {
         int error;
         sigset_t sigmask;
         struct signalfd_ctx *ctx;
-        struct sighand_struct *sighand;
         struct file *file;
         struct inode *inode;
-        struct signalfd_lockctx lk;
 
         if (sizemask != sizeof(sigset_t) ||
             copy_from_user(&sigmask, user_mask, sizeof(sigmask)))
@@ -335,17 +218,7 @@ asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemas
                 if (!ctx)
                         return -ENOMEM;
 
-                init_waitqueue_head(&ctx->wqh);
                 ctx->sigmask = sigmask;
-                ctx->tsk = current->group_leader;
-
-                sighand = current->sighand;
-                /*
-                 * Add this fd to the list of signal listeners.
-                 */
-                spin_lock_irq(&sighand->siglock);
-                list_add_tail(&ctx->lnk, &sighand->signalfd_list);
-                spin_unlock_irq(&sighand->siglock);
 
                 /*
                  * When we call this, the initialization must be complete, since
@@ -364,23 +237,18 @@ asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemas
                         fput(file);
                         return -EINVAL;
                 }
-                /*
-                 * We need to be prepared of the fact that the sighand this fd
-                 * is attached to, has been detched. In that case signalfd_lock()
-                 * will return 0, and we'll just skip setting the new mask.
-                 */
-                if (signalfd_lock(ctx, &lk)) {
-                        ctx->sigmask = sigmask;
-                        signalfd_unlock(&lk);
-                }
-                wake_up(&ctx->wqh);
+                spin_lock_irq(&current->sighand->siglock);
+                ctx->sigmask = sigmask;
+                spin_unlock_irq(&current->sighand->siglock);
+
+                wake_up(&current->sighand->signalfd_wqh);
                 fput(file);
         }
 
         return ufd;
 
 err_fdalloc:
-        signalfd_cleanup(ctx);
+        kfree(ctx);
         return error;
 }
 
diff --git a/fs/splice.c b/fs/splice.c
index c010a72ca2..e95a362288 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1224,6 +1224,33 @@ static long do_splice(struct file *in, loff_t __user *off_in,
 }
 
 /*
+ * Do a copy-from-user while holding the mmap_semaphore for reading, in a
+ * manner safe from deadlocking with simultaneous mmap() (grabbing mmap_sem
+ * for writing) and page faulting on the user memory pointed to by src.
+ * This assumes that we will very rarely hit the partial != 0 path, or this
+ * will not be a win.
+ */
+static int copy_from_user_mmap_sem(void *dst, const void __user *src, size_t n)
+{
+        int partial;
+
+        pagefault_disable();
+        partial = __copy_from_user_inatomic(dst, src, n);
+        pagefault_enable();
+
+        /*
+         * Didn't copy everything, drop the mmap_sem and do a faulting copy
+         */
+        if (unlikely(partial)) {
+                up_read(&current->mm->mmap_sem);
+                partial = copy_from_user(dst, src, n);
+                down_read(&current->mm->mmap_sem);
+        }
+
+        return partial;
+}
+
+/*
  * Map an iov into an array of pages and offset/length tupples. With the
  * partial_page structure, we can map several non-contiguous ranges into
  * our ones pages[] map instead of splitting that operation into pieces.
@@ -1236,31 +1263,26 @@ static int get_iovec_page_array(const struct iovec __user *iov,
 {
         int buffers = 0, error = 0;
 
-        /*
-         * It's ok to take the mmap_sem for reading, even
-         * across a "get_user()".
-         */
         down_read(&current->mm->mmap_sem);
 
         while (nr_vecs) {
                 unsigned long off, npages;
+                struct iovec entry;
                 void __user *base;
                 size_t len;
                 int i;
 
-                /*
-                 * Get user address base and length for this iovec.
-                 */
-                error = get_user(base, &iov->iov_base);
-                if (unlikely(error))
-                        break;
-                error = get_user(len, &iov->iov_len);
-                if (unlikely(error))
+                error = -EFAULT;
+                if (copy_from_user_mmap_sem(&entry, iov, sizeof(entry)))
                         break;
 
+                base = entry.iov_base;
+                len = entry.iov_len;
+
                 /*
                  * Sanity check this iovec. 0 read succeeds.
                  */
+                error = 0;
                 if (unlikely(!len))
                         break;
                 error = -EFAULT;
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index 135353f8a2..5afe2a26f5 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -248,12 +248,7 @@ int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr)
 
 void sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr)
 {
-        if (sysfs_hash_and_remove(kobj->sd, attr->attr.name) < 0) {
-                printk(KERN_ERR "%s: "
-                        "bad dentry or inode or no such file: \"%s\"\n",
-                        __FUNCTION__, attr->attr.name);
-                dump_stack();
-        }
+        sysfs_hash_and_remove(kobj->sd, attr->attr.name);
 }
 
 EXPORT_SYMBOL_GPL(sysfs_create_bin_file);
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 048e6054c2..83e76b3813 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -762,12 +762,15 @@ static int sysfs_count_nlink(struct sysfs_dirent *sd)
 static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
                                 struct nameidata *nd)
 {
+        struct dentry *ret = NULL;
         struct sysfs_dirent * parent_sd = dentry->d_parent->d_fsdata;
         struct sysfs_dirent * sd;
         struct bin_attribute *bin_attr;
         struct inode *inode;
         int found = 0;
 
+        mutex_lock(&sysfs_mutex);
+
         for (sd = parent_sd->s_children; sd; sd = sd->s_sibling) {
                 if (sysfs_type(sd) &&
                     !strcmp(sd->s_name, dentry->d_name.name)) {
@@ -778,14 +781,14 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
 
         /* no such entry */
         if (!found)
-                return NULL;
+                goto out_unlock;
 
         /* attach dentry and inode */
         inode = sysfs_get_inode(sd);
-        if (!inode)
-                return ERR_PTR(-ENOMEM);
-
-        mutex_lock(&sysfs_mutex);
+        if (!inode) {
+                ret = ERR_PTR(-ENOMEM);
+                goto out_unlock;
+        }
 
         if (inode->i_state & I_NEW) {
                 /* initialize inode according to type */
@@ -815,9 +818,9 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
         sysfs_instantiate(dentry, inode);
         sysfs_attach_dentry(sd, dentry);
 
+ out_unlock:
         mutex_unlock(&sysfs_mutex);
-
-        return NULL;
+        return ret;
 }
 
 const struct inode_operations sysfs_dir_inode_operations = {
@@ -942,6 +945,8 @@ int sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
         if (error)
                 goto out_drop;
 
+        mutex_lock(&sysfs_mutex);
+
         dup_name = sd->s_name;
         sd->s_name = new_name;
 
@@ -949,8 +954,6 @@ int sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
         d_add(new_dentry, NULL);
         d_move(sd->s_dentry, new_dentry);
 
-        mutex_lock(&sysfs_mutex);
-
         sysfs_unlink_sibling(sd);
         sysfs_get(new_parent_sd);
         sysfs_put(sd->s_parent);
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 276f7207a5..87e87dcd3f 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -540,26 +540,24 @@ static void udf_table_free_blocks(struct super_block *sb,
                         if (epos.offset + adsize > sb->s_blocksize) {
                                 loffset = epos.offset;
                                 aed->lengthAllocDescs = cpu_to_le32(adsize);
-                                sptr = UDF_I_DATA(inode) + epos.offset -
-                                        udf_file_entry_alloc_offset(inode) +
-                                        UDF_I_LENEATTR(inode) - adsize;
+                                sptr = UDF_I_DATA(table) + epos.offset - adsize;
                                 dptr = epos.bh->b_data + sizeof(struct allocExtDesc);
                                 memcpy(dptr, sptr, adsize);
                                 epos.offset = sizeof(struct allocExtDesc) + adsize;
                         } else {
                                 loffset = epos.offset + adsize;
                                 aed->lengthAllocDescs = cpu_to_le32(0);
-                                sptr = oepos.bh->b_data + epos.offset;
-                                epos.offset = sizeof(struct allocExtDesc);
-
                                 if (oepos.bh) {
+                                        sptr = oepos.bh->b_data + epos.offset;
                                         aed = (struct allocExtDesc *)oepos.bh->b_data;
                                         aed->lengthAllocDescs =
                                                 cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) + adsize);
                                 } else {
+                                        sptr = UDF_I_DATA(table) + epos.offset;
                                         UDF_I_LENALLOC(table) += adsize;
                                         mark_inode_dirty(table);
                                 }
+                                epos.offset = sizeof(struct allocExtDesc);
                         }
                         if (UDF_SB_UDFREV(sb) >= 0x0200)
                                 udf_new_tag(epos.bh->b_data, TAG_IDENT_AED, 3, 1,
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 382be7be5a..c68a6e730b 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -89,7 +89,7 @@ static int udf_find_fileset(struct super_block *, kernel_lb_addr *,
 static void udf_load_pvoldesc(struct super_block *, struct buffer_head *);
 static void udf_load_fileset(struct super_block *, struct buffer_head *,
                              kernel_lb_addr *);
-static void udf_load_partdesc(struct super_block *, struct buffer_head *);
+static int udf_load_partdesc(struct super_block *, struct buffer_head *);
 static void udf_open_lvid(struct super_block *);
 static void udf_close_lvid(struct super_block *);
 static unsigned int udf_count_free(struct super_block *);
@@ -877,7 +877,7 @@ static void udf_load_fileset(struct super_block *sb, struct buffer_head *bh,
                   root->logicalBlockNum, root->partitionReferenceNum);
 }
 
-static void udf_load_partdesc(struct super_block *sb, struct buffer_head *bh)
+static int udf_load_partdesc(struct super_block *sb, struct buffer_head *bh)
 {
         struct partitionDesc *p;
         int i;
@@ -912,6 +912,11 @@ static void udf_load_partdesc(struct super_block *sb, struct buffer_head *bh)
 
                                         UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table =
                                                 udf_iget(sb, loc);
+                                        if (!UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table) {
+                                                udf_debug("cannot load unallocSpaceTable (part %d)\n",
+                                                        i);
+                                                return 1;
+                                        }
                                         UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_UNALLOC_TABLE;
                                         udf_debug("unallocSpaceTable (part %d) @ %ld\n",
                                                   i, UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table->i_ino);
@@ -938,6 +943,11 @@ static void udf_load_partdesc(struct super_block *sb, struct buffer_head *bh)
 
                                         UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table =
                                                 udf_iget(sb, loc);
+                                        if (!UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table) {
+                                                udf_debug("cannot load freedSpaceTable (part %d)\n",
+                                                        i);
+                                                return 1;
+                                        }
                                         UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_FREED_TABLE;
                                         udf_debug("freedSpaceTable (part %d) @ %ld\n",
                                                   i, UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table->i_ino);
@@ -966,6 +976,7 @@ static void udf_load_partdesc(struct super_block *sb, struct buffer_head *bh)
                           le16_to_cpu(p->partitionNumber), i, UDF_SB_PARTTYPE(sb,i),
                           UDF_SB_PARTROOT(sb,i), UDF_SB_PARTLEN(sb,i));
         }
+        return 0;
 }
 
 static int udf_load_logicalvol(struct super_block *sb, struct buffer_head *bh,
@@ -1177,12 +1188,19 @@ static int udf_process_sequence(struct super_block *sb, long block, long lastblo
                                 udf_load_logicalvol(sb, bh, fileset);
                         } else if (i == VDS_POS_PARTITION_DESC) {
                                 struct buffer_head *bh2 = NULL;
-                                udf_load_partdesc(sb, bh);
+                                if (udf_load_partdesc(sb, bh)) {
+                                        brelse(bh);
+                                        return 1;
+                                }
                                 for (j = vds[i].block + 1; j <  vds[VDS_POS_TERMINATING_DESC].block; j++) {
                                         bh2 = udf_read_tagged(sb, j, j, &ident);
                                         gd = (struct generic_desc *)bh2->b_data;
                                         if (ident == TAG_IDENT_PD)
-                                                udf_load_partdesc(sb, bh2);
+                                                if (udf_load_partdesc(sb, bh2)) {
+                                                        brelse(bh);
+                                                        brelse(bh2);
+                                                        return 1;
+                                                }
                                         brelse(bh2);
                                 }
                         }
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 73402c5eeb..38eb0b7a1f 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -894,7 +894,7 @@ magic_found:
                 goto again;
         }
 
-
+        sbi->s_flags = flags;/*after that line some functions use s_flags*/
         ufs_print_super_stuff(sb, usb1, usb2, usb3);
 
         /*
@@ -1025,8 +1025,6 @@ magic_found:
             UFS_MOUNT_UFSTYPE_44BSD)
                 uspi->s_maxsymlinklen =
                     fs32_to_cpu(sb, usb3->fs_un2.fs_44.fs_maxsymlinklen);
-        
-        sbi->s_flags = flags;
 
         inode = iget(sb, UFS_ROOTINO);
         if (!inode || is_bad_inode(inode))
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h
index b4acc7f3c3..e6ea293f30 100644
--- a/fs/xfs/linux-2.6/kmem.h
+++ b/fs/xfs/linux-2.6/kmem.h
@@ -103,7 +103,7 @@ extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast);
 static inline int
 kmem_shake_allow(gfp_t gfp_mask)
 {
-        return (gfp_mask & __GFP_WAIT);
+        return (gfp_mask & __GFP_WAIT) != 0;
 }
 
 #endif /* __XFS_SUPPORT_KMEM_H__ */
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index fd4105d662..5f152f60d7 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -181,6 +181,7 @@ xfs_setfilesize(
                 ip->i_d.di_size = isize;
                 ip->i_update_core = 1;
                 ip->i_update_size = 1;
+                mark_inode_dirty_sync(vn_to_inode(ioend->io_vnode));
         }
 
         xfs_iunlock(ip, XFS_ILOCK_EXCL);
@@ -652,7 +653,7 @@ xfs_probe_cluster(
 
                 for (i = 0; i < pagevec_count(&pvec); i++) {
                         struct page *page = pvec.pages[i];
-                        size_t pg_offset, len = 0;
+                        size_t pg_offset, pg_len = 0;
 
                         if (tindex == tlast) {
                                 pg_offset =
@@ -665,16 +666,16 @@ xfs_probe_cluster(
                                 pg_offset = PAGE_CACHE_SIZE;
 
                         if (page->index == tindex && !TestSetPageLocked(page)) {
-                                len = xfs_probe_page(page, pg_offset, mapped);
+                                pg_len = xfs_probe_page(page, pg_offset, mapped);
                                 unlock_page(page);
                         }
 
-                        if (!len) {
+                        if (!pg_len) {
                                 done = 1;
                                 break;
                         }
 
-                        total += len;
+                        total += pg_len;
                         tindex++;
                 }
 
diff --git a/fs/xfs/linux-2.6/xfs_globals.c b/fs/xfs/linux-2.6/xfs_globals.c
index bb72c3d414..81565dea9a 100644
--- a/fs/xfs/linux-2.6/xfs_globals.c
+++ b/fs/xfs/linux-2.6/xfs_globals.c
@@ -46,7 +46,7 @@ xfs_param_t xfs_params = {
         .inherit_nosym  = {     0,              0,              1       },
         .rotorstep      = {     1,              1,              255     },
         .inherit_nodfrg = {     0,              1,              1       },
-        .fstrm_timer    = {     1,              50,             3600*100},
+        .fstrm_timer    = {     1,              30*100,         3600*100},
 };
 
 /*
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 4528f9a3f3..491d1f4f20 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -415,8 +415,10 @@ xfs_fs_write_inode(
 
         if (vp) {
                 vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
-                if (sync)
+                if (sync) {
+                        filemap_fdatawait(inode->i_mapping);
                         flags |= FLUSH_SYNC;
+                }
                 error = bhv_vop_iflush(vp, flags);
                 if (error == EAGAIN)
                         error = sync? bhv_vop_iflush(vp, flags | FLUSH_LOG) : 0;
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index 2d274b23ad..6ff0f4de16 100644
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -120,7 +120,8 @@ xfs_Gqm_init(void)
          * Initialize the dquot hash tables.
          */
         udqhash = kmem_zalloc_greedy(&hsize,
-                                     XFS_QM_HASHSIZE_LOW, XFS_QM_HASHSIZE_HIGH,
+                                     XFS_QM_HASHSIZE_LOW * sizeof(xfs_dqhash_t),
+                                     XFS_QM_HASHSIZE_HIGH * sizeof(xfs_dqhash_t),
                                      KM_SLEEP | KM_MAYFAIL | KM_LARGE);
         gdqhash = kmem_zalloc(hsize, KM_SLEEP | KM_LARGE);
         hsize /= sizeof(xfs_dqhash_t);
diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h
index a27a7c8c05..855da04086 100644
--- a/fs/xfs/support/debug.h
+++ b/fs/xfs/support/debug.h
@@ -34,10 +34,10 @@ extern void cmn_err(int, char *, ...)
 extern void assfail(char *expr, char *f, int l);
 
 #define ASSERT_ALWAYS(expr)     \
-        (unlikely((expr) != 0) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
+        (unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
 
 #ifndef DEBUG
-# define ASSERT(expr)   ((void)0)
+#define ASSERT(expr)    ((void)0)
 
 #ifndef STATIC
 # define STATIC static noinline
@@ -49,8 +49,10 @@ extern void assfail(char *expr, char *f, int l);
 
 #else /* DEBUG */
 
-# define ASSERT(expr)   ASSERT_ALWAYS(expr)
-# include <linux/random.h>
+#include <linux/random.h>
+
+#define ASSERT(expr)    \
+        (unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
 
 #ifndef STATIC
 # define STATIC noinline
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index aea37df4aa..26d09e2e1a 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -1975,7 +1975,6 @@ xfs_da_do_buf(
                 error = mappedbno == -2 ? 0 : XFS_ERROR(EFSCORRUPTED);
                 if (unlikely(error == EFSCORRUPTED)) {
                         if (xfs_error_level >= XFS_ERRLEVEL_LOW) {
-                                int     i;
                                 cmn_err(CE_ALERT, "xfs_da_do_buf: bno %lld\n",
                                         (long long)bno);
                                 cmn_err(CE_ALERT, "dir: inode %lld\n",
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index ce2278611b..36d8f6aa11 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -350,9 +350,10 @@ _xfs_filestream_update_ag(
 /* xfs_fstrm_free_func(): callback for freeing cached stream items. */
 void
 xfs_fstrm_free_func(
-        xfs_ino_t       ino,
-        fstrm_item_t    *item)
+        unsigned long   ino,
+        void            *data)
 {
+        fstrm_item_t    *item  = (fstrm_item_t *)data;
         xfs_inode_t     *ip = item->ip;
         int ref;
 
@@ -438,7 +439,7 @@ xfs_filestream_mount(
         grp_count = 10;
 
         err = xfs_mru_cache_create(&mp->m_filestream, lifetime, grp_count,
-                             (xfs_mru_cache_free_func_t)xfs_fstrm_free_func);
+                             xfs_fstrm_free_func);
 
         return err;
 }
@@ -467,8 +468,7 @@ void
 xfs_filestream_flush(
         xfs_mount_t     *mp)
 {
-        /* point in time flush, so keep the reaper running */
-        xfs_mru_cache_flush(mp->m_filestream, 1);
+        xfs_mru_cache_flush(mp->m_filestream);
 }
 
 /*
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 9d4c4fbeb3..9bfb69e1e8 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -2185,13 +2185,13 @@ xlog_state_do_callback(
                         }
                         cb = iclog->ic_callback;
 
-                        while (cb != 0) {
+                        while (cb) {
                                 iclog->ic_callback_tail = &(iclog->ic_callback);
                                 iclog->ic_callback = NULL;
                                 LOG_UNLOCK(log, s);
 
                                 /* perform callbacks in the order given */
-                                for (; cb != 0; cb = cb_next) {
+                                for (; cb; cb = cb_next) {
                                         cb_next = cb->cb_next;
                                         cb->cb_func(cb->cb_arg, aborted);
                                 }
@@ -2202,7 +2202,7 @@ xlog_state_do_callback(
                         loopdidcallbacks++;
                         funcdidcallbacks++;
 
-                        ASSERT(iclog->ic_callback == 0);
+                        ASSERT(iclog->ic_callback == NULL);
                         if (!(iclog->ic_state & XLOG_STATE_IOERROR))
                                 iclog->ic_state = XLOG_STATE_DIRTY;
 
@@ -3242,10 +3242,10 @@ xlog_ticket_put(xlog_t		*log,
 #else
         /* When we debug, it is easier if tickets are cycled */
         ticket->t_next     = NULL;
-        if (log->l_tail != 0) {
+        if (log->l_tail) {
                 log->l_tail->t_next = ticket;
         } else {
-                ASSERT(log->l_freelist == 0);
+                ASSERT(log->l_freelist == NULL);
                 log->l_freelist = ticket;
         }
         log->l_tail         = ticket;
@@ -3463,7 +3463,7 @@ xlog_verify_iclog(xlog_t	 *log,
         s = LOG_LOCK(log);
         icptr = log->l_iclog;
         for (i=0; i < log->l_iclog_bufs; i++) {
-                if (icptr == 0)
+                if (icptr == NULL)
                         xlog_panic("xlog_verify_iclog: invalid ptr");
                 icptr = icptr->ic_next;
         }
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index fddbb091a8..8ae6e8e5f3 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1366,7 +1366,7 @@ xlog_recover_add_to_cont_trans(
         int                     old_len;
 
         item = trans->r_itemq;
-        if (item == 0) {
+        if (item == NULL) {
                 /* finish copying rest of trans header */
                 xlog_recover_add_item(&trans->r_itemq);
                 ptr = (xfs_caddr_t) &trans->r_theader +
@@ -1412,7 +1412,7 @@ xlog_recover_add_to_trans(
         if (!len)
                 return 0;
         item = trans->r_itemq;
-        if (item == 0) {
+        if (item == NULL) {
                 ASSERT(*(uint *)dp == XFS_TRANS_HEADER_MAGIC);
                 if (len == sizeof(xfs_trans_header_t))
                         xlog_recover_add_item(&trans->r_itemq);
@@ -1467,12 +1467,12 @@ xlog_recover_unlink_tid(
         xlog_recover_t          *tp;
         int                     found = 0;
 
-        ASSERT(trans != 0);
+        ASSERT(trans != NULL);
         if (trans == *q) {
                 *q = (*q)->r_next;
         } else {
                 tp = *q;
-                while (tp != 0) {
+                while (tp) {
                         if (tp->r_next == trans) {
                                 found = 1;
                                 break;
@@ -1495,7 +1495,7 @@ xlog_recover_insert_item_backq(
         xlog_recover_item_t     **q,
         xlog_recover_item_t     *item)
 {
-        if (*q == 0) {
+        if (*q == NULL) {
                 item->ri_prev = item->ri_next = item;
                 *q = item;
         } else {
@@ -1899,7 +1899,7 @@ xlog_recover_do_reg_buffer(
                         break;
                 nbits = xfs_contig_bits(data_map, map_size, bit);
                 ASSERT(nbits > 0);
-                ASSERT(item->ri_buf[i].i_addr != 0);
+                ASSERT(item->ri_buf[i].i_addr != NULL);
                 ASSERT(item->ri_buf[i].i_len % XFS_BLI_CHUNK == 0);
                 ASSERT(XFS_BUF_COUNT(bp) >=
                        ((uint)bit << XFS_BLI_SHIFT)+(nbits<<XFS_BLI_SHIFT));
diff --git a/fs/xfs/xfs_mru_cache.c b/fs/xfs/xfs_mru_cache.c
index 7deb9e3cbb..e0b358c1c5 100644
--- a/fs/xfs/xfs_mru_cache.c
+++ b/fs/xfs/xfs_mru_cache.c
@@ -206,8 +206,11 @@ _xfs_mru_cache_list_insert(
          */
         if (!_xfs_mru_cache_migrate(mru, now)) {
                 mru->time_zero = now;
-                if (!mru->next_reap)
-                        mru->next_reap = mru->grp_count * mru->grp_time;
+                if (!mru->queued) {
+                        mru->queued = 1;
+                        queue_delayed_work(xfs_mru_reap_wq, &mru->work,
+                                           mru->grp_count * mru->grp_time);
+                }
         } else {
                 grp = (now - mru->time_zero) / mru->grp_time;
                 grp = (mru->lru_grp + grp) % mru->grp_count;
@@ -271,29 +274,26 @@ _xfs_mru_cache_reap(
         struct work_struct      *work)
 {
         xfs_mru_cache_t         *mru = container_of(work, xfs_mru_cache_t, work.work);
-        unsigned long           now;
+        unsigned long           now, next;
 
         ASSERT(mru && mru->lists);
         if (!mru || !mru->lists)
                 return;
 
         mutex_spinlock(&mru->lock);
-        now = jiffies;
-        if (mru->reap_all ||
-            (mru->next_reap && time_after(now, mru->next_reap))) {
-                if (mru->reap_all)
-                        now += mru->grp_count * mru->grp_time * 2;
-                mru->next_reap = _xfs_mru_cache_migrate(mru, now);
-                _xfs_mru_cache_clear_reap_list(mru);
+        next = _xfs_mru_cache_migrate(mru, jiffies);
+        _xfs_mru_cache_clear_reap_list(mru);
+
+        mru->queued = next;
+        if ((mru->queued > 0)) {
+                now = jiffies;
+                if (next <= now)
+                        next = 0;
+                else
+                        next -= now;
+                queue_delayed_work(xfs_mru_reap_wq, &mru->work, next);
         }
 
-        /*
-         * the process that triggered the reap_all is responsible
-         * for restating the periodic reap if it is required.
-         */
-        if (!mru->reap_all)
-                queue_delayed_work(xfs_mru_reap_wq, &mru->work, mru->grp_time);
-        mru->reap_all = 0;
         mutex_spinunlock(&mru->lock, 0);
 }
 
@@ -352,7 +352,7 @@ xfs_mru_cache_create(
 
         /* An extra list is needed to avoid reaping up to a grp_time early. */
         mru->grp_count = grp_count + 1;
-        mru->lists = kmem_alloc(mru->grp_count * sizeof(*mru->lists), KM_SLEEP);
+        mru->lists = kmem_zalloc(mru->grp_count * sizeof(*mru->lists), KM_SLEEP);
 
         if (!mru->lists) {
                 err = ENOMEM;
@@ -374,11 +374,6 @@ xfs_mru_cache_create(
         mru->grp_time  = grp_time;
         mru->free_func = free_func;
 
-        /* start up the reaper event */
-        mru->next_reap = 0;
-        mru->reap_all = 0;
-        queue_delayed_work(xfs_mru_reap_wq, &mru->work, mru->grp_time);
-
         *mrup = mru;
 
 exit:
@@ -394,35 +389,25 @@ exit:
  * Call xfs_mru_cache_flush() to flush out all cached entries, calling their
  * free functions as they're deleted.  When this function returns, the caller is
  * guaranteed that all the free functions for all the elements have finished
- * executing.
- *
- * While we are flushing, we stop the periodic reaper event from triggering.
- * Normally, we want to restart this periodic event, but if we are shutting
- * down the cache we do not want it restarted. hence the restart parameter
- * where 0 = do not restart reaper and 1 = restart reaper.
+ * executing and the reaper is not running.
  */
 void
 xfs_mru_cache_flush(
-        xfs_mru_cache_t         *mru,
-        int                     restart)
+        xfs_mru_cache_t         *mru)
 {
         if (!mru || !mru->lists)
                 return;
 
-        cancel_rearming_delayed_workqueue(xfs_mru_reap_wq, &mru->work);
-
         mutex_spinlock(&mru->lock);
-        mru->reap_all = 1;
-        mutex_spinunlock(&mru->lock, 0);
+        if (mru->queued) {
+                mutex_spinunlock(&mru->lock, 0);
+                cancel_rearming_delayed_workqueue(xfs_mru_reap_wq, &mru->work);
+                mutex_spinlock(&mru->lock);
+        }
 
-        queue_work(xfs_mru_reap_wq, &mru->work.work);
-        flush_workqueue(xfs_mru_reap_wq);
+        _xfs_mru_cache_migrate(mru, jiffies + mru->grp_count * mru->grp_time);
+        _xfs_mru_cache_clear_reap_list(mru);
 
-        mutex_spinlock(&mru->lock);
-        WARN_ON_ONCE(mru->reap_all != 0);
-        mru->reap_all = 0;
-        if (restart)
-                queue_delayed_work(xfs_mru_reap_wq, &mru->work, mru->grp_time);
         mutex_spinunlock(&mru->lock, 0);
 }
 
@@ -433,8 +418,7 @@ xfs_mru_cache_destroy(
         if (!mru || !mru->lists)
                 return;
 
-        /* we don't want the reaper to restart here */
-        xfs_mru_cache_flush(mru, 0);
+        xfs_mru_cache_flush(mru);
 
         kmem_free(mru->lists, mru->grp_count * sizeof(*mru->lists));
         kmem_free(mru, sizeof(*mru));
diff --git a/fs/xfs/xfs_mru_cache.h b/fs/xfs/xfs_mru_cache.h
index 624fd10ee8..dd58ea1bbe 100644
--- a/fs/xfs/xfs_mru_cache.h
+++ b/fs/xfs/xfs_mru_cache.h
@@ -32,11 +32,9 @@ typedef struct xfs_mru_cache
         unsigned int            grp_time;  /* Time period spanned by grps.  */
         unsigned int            lru_grp;   /* Group containing time zero.   */
         unsigned long           time_zero; /* Time first element was added. */
-        unsigned long           next_reap; /* Time that the reaper should
-                                              next do something. */
-        unsigned int            reap_all;  /* if set, reap all lists */
         xfs_mru_cache_free_func_t free_func; /* Function pointer for freeing. */
         struct delayed_work     work;      /* Workqueue data for reaping.   */
+        unsigned int            queued;    /* work has been queued */
 } xfs_mru_cache_t;
 
 int xfs_mru_cache_init(void);
@@ -44,7 +42,7 @@ void xfs_mru_cache_uninit(void);
 int xfs_mru_cache_create(struct xfs_mru_cache **mrup, unsigned int lifetime_ms,
                              unsigned int grp_count,
                              xfs_mru_cache_free_func_t free_func);
-void xfs_mru_cache_flush(xfs_mru_cache_t *mru, int restart);
+void xfs_mru_cache_flush(xfs_mru_cache_t *mru);
 void xfs_mru_cache_destroy(struct xfs_mru_cache *mru);
 int xfs_mru_cache_insert(struct xfs_mru_cache *mru, unsigned long key,
                                 void *value);
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 1a5ad8cd97..6034592299 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -1082,6 +1082,9 @@ xfs_fsync(
         if (XFS_FORCED_SHUTDOWN(ip->i_mount))
                 return XFS_ERROR(EIO);
 
+        if (flag & FSYNC_DATA)
+                filemap_fdatawait(vn_to_inode(XFS_ITOV(ip))->i_mapping);
+
         /*
          * We always need to make sure that the required inode state
          * is safe on disk.  The vnode might be clean but because
@@ -3769,12 +3772,16 @@ xfs_inode_flush(
                         sync_lsn = log->l_last_sync_lsn;
                         GRANT_UNLOCK(log, s);
 
-                        if ((XFS_LSN_CMP(iip->ili_last_lsn, sync_lsn) <= 0))
-                                return 0;
+                        if ((XFS_LSN_CMP(iip->ili_last_lsn, sync_lsn) > 0)) {
+                                if (flags & FLUSH_SYNC)
+                                        log_flags |= XFS_LOG_SYNC;
+                                error = xfs_log_force(mp, iip->ili_last_lsn, log_flags);
+                                if (error)
+                                        return error;
+                        }
 
-                        if (flags & FLUSH_SYNC)
-                                log_flags |= XFS_LOG_SYNC;
-                        return xfs_log_force(mp, iip->ili_last_lsn, log_flags);
+                        if (ip->i_update_core == 0)
+                                return 0;
                 }
         }
 
@@ -3788,9 +3795,6 @@ xfs_inode_flush(
         if (flags & FLUSH_INODE) {
                 int     flush_flags;
 
-                if (xfs_ipincount(ip))
-                        return EAGAIN;
-
                 if (flags & FLUSH_SYNC) {
                         xfs_ilock(ip, XFS_ILOCK_SHARED);
                         xfs_iflock(ip);
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 3d0fea235b..86aea44ce6 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -321,8 +321,7 @@ struct acpi_bus_event {
 };
 
 extern struct kset acpi_subsys;
-extern int acpi_bus_generate_genetlink_event(struct acpi_device *device,
-                                                u8 type, int data);
+extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
 /*
  * External Functions
  */
@@ -332,8 +331,13 @@ void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context);
 int acpi_bus_get_status(struct acpi_device *device);
 int acpi_bus_get_power(acpi_handle handle, int *state);
 int acpi_bus_set_power(acpi_handle handle, int state);
-int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data);
+#ifdef CONFIG_ACPI_PROC_EVENT
+int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data);
 int acpi_bus_receive_event(struct acpi_bus_event *event);
+#else
+static inline int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
+        { return 0; }
+#endif
 int acpi_bus_register_driver(struct acpi_driver *driver);
 void acpi_bus_unregister_driver(struct acpi_driver *driver);
 int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 202acb9ff4..f85f77a538 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -147,10 +147,6 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
 /*--------------------------------------------------------------------------
                                   Suspend/Resume
   -------------------------------------------------------------------------- */
-#ifdef CONFIG_ACPI_SLEEP
 extern int acpi_sleep_init(void);
-#else
-static inline int acpi_sleep_init(void) { return 0; }
-#endif
 
 #endif /*__ACPI_DRIVERS_H__*/
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index b5cca5daa3..3d7ab9e0c9 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
                     void *context, void **return_value);
 
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
                  acpi_walk_callback user_function,
                  void *context, void **return_value);
 
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
index aeb4498e5e..8848265540 100644
--- a/include/acpi/acstruct.h
+++ b/include/acpi/acstruct.h
@@ -146,7 +146,7 @@ struct acpi_init_walk_info {
 struct acpi_get_devices_info {
         acpi_walk_callback user_function;
         void *context;
-        char *hid;
+        const char *hid;
 };
 
 union acpi_aml_operands {
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index ec3ffdadb4..99934a999e 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -320,6 +320,8 @@ int acpi_processor_power_init(struct acpi_processor *pr,
 int acpi_processor_cst_has_changed(struct acpi_processor *pr);
 int acpi_processor_power_exit(struct acpi_processor *pr,
                               struct acpi_device *device);
+int acpi_processor_suspend(struct acpi_device * device, pm_message_t state);
+int acpi_processor_resume(struct acpi_device * device);
 
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);
diff --git a/include/asm-arm/arch-at91/irqs.h b/include/asm-arm/arch-at91/irqs.h
index 1127a3b5e9..70b1216dce 100644
--- a/include/asm-arm/arch-at91/irqs.h
+++ b/include/asm-arm/arch-at91/irqs.h
@@ -42,4 +42,7 @@
  */
 #define NR_IRQS         (NR_AIC_IRQS + (5 * 32))
 
+/* FIQ is AIC source 0. */
+#define FIQ_START AT91_ID_FIQ
+
 #endif
diff --git a/include/asm-arm/arch-omap/irda.h b/include/asm-arm/arch-omap/irda.h
index 345a649ec8..96bb12fab4 100644
--- a/include/asm-arm/arch-omap/irda.h
+++ b/include/asm-arm/arch-omap/irda.h
@@ -31,6 +31,7 @@ struct omap_irda_config {
         unsigned long src_start;
         int tx_trigger;
         int rx_trigger;
+        int mode;
 };
 
 #endif
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h
index d1294a46c7..6c1c968b29 100644
--- a/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@@ -426,6 +426,13 @@ static inline void flush_anon_page(struct vm_area_struct *vma,
  */
 #define flush_icache_page(vma,page)     do { } while (0)
 
+static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt,
+        unsigned offset, size_t size)
+{
+        const void *start = (void __force *)virt + offset;
+        dmac_inv_range(start, start + size);
+}
+
 #define __cacheid_present(val)                  (val != read_cpuid(CPUID_ID))
 #define __cacheid_type_v7(val)                  ((val & (7 << 29)) == (4 << 29))
 
diff --git a/include/asm-arm/plat-s3c/map.h b/include/asm-arm/plat-s3c/map.h
index 95a82b0e84..b84289d32a 100644
--- a/include/asm-arm/plat-s3c/map.h
+++ b/include/asm-arm/plat-s3c/map.h
@@ -30,11 +30,11 @@
 #define S3C_ADDR(x)     (S3C_ADDR_BASE + (x))
 #endif
 
-#define S3C_VA_IRQ      S3C_ADDR(0x000000000)   /* irq controller(s) */
-#define S3C_VA_SYS      S3C_ADDR(0x001000000)   /* system control */
-#define S3C_VA_MEM      S3C_ADDR(0x002000000)   /* system control */
-#define S3C_VA_TIMER    S3C_ADDR(0x003000000)   /* timer block */
-#define S3C_VA_WATCHDOG S3C_ADDR(0x004000000)   /* watchdog */
-#define S3C_VA_UART     S3C_ADDR(0x010000000)   /* UART */
+#define S3C_VA_IRQ      S3C_ADDR(0x00000000)    /* irq controller(s) */
+#define S3C_VA_SYS      S3C_ADDR(0x00100000)    /* system control */
+#define S3C_VA_MEM      S3C_ADDR(0x00200000)    /* system control */
+#define S3C_VA_TIMER    S3C_ADDR(0x00300000)    /* timer block */
+#define S3C_VA_WATCHDOG S3C_ADDR(0x00400000)    /* watchdog */
+#define S3C_VA_UART     S3C_ADDR(0x01000000)    /* UART */
 
 #endif /* __ASM_PLAT_MAP_H */
diff --git a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
index e043cafa3c..69b9f8e120 100644
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
@@ -1,5 +1,6 @@
 #include <linux/serial.h>
 #include <asm/dma.h>
+#include <asm/portmux.h>
 
 #define NR_PORTS                1
 
@@ -92,18 +93,24 @@ struct bfin_serial_res bfin_serial_resource[] = {
         }
 };
 
+#define DRIVER_NAME "bfin-uart"
 
 int nr_ports = NR_PORTS;
 static void bfin_serial_hw_init(struct bfin_serial_port *uart)
 {
 
+#ifdef CONFIG_SERIAL_BFIN_UART0
+        peripheral_request(P_UART0_TX, DRIVER_NAME);
+        peripheral_request(P_UART0_RX, DRIVER_NAME);
+#endif
+
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
         if (uart->cts_pin >= 0) {
-                gpio_request(uart->cts_pin, NULL);
+                gpio_request(uart->cts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->cts_pin);
         }
         if (uart->rts_pin >= 0) {
-                gpio_request(uart->rts_pin, NULL);
+                gpio_request(uart->rts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->rts_pin);
         }
 #endif
diff --git a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
index 8f5d9c4d8d..6fb328f518 100644
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
@@ -1,5 +1,6 @@
 #include <linux/serial.h>
 #include <asm/dma.h>
+#include <asm/portmux.h>
 
 #define NR_PORTS                2
 
@@ -122,25 +123,29 @@ struct bfin_serial_res bfin_serial_resource[] = {
 
 int nr_ports = ARRAY_SIZE(bfin_serial_resource);
 
+#define DRIVER_NAME "bfin-uart"
+
 static void bfin_serial_hw_init(struct bfin_serial_port *uart)
 {
-        unsigned short val;
-        val = bfin_read16(BFIN_PORT_MUX);
-        val &= ~(PFDE | PFTE);
-        bfin_write16(BFIN_PORT_MUX, val);
 
-        val = bfin_read16(PORTF_FER);
-        val |= 0xF;
-        bfin_write16(PORTF_FER, val);
+#ifdef CONFIG_SERIAL_BFIN_UART0
+        peripheral_request(P_UART0_TX, DRIVER_NAME);
+        peripheral_request(P_UART0_RX, DRIVER_NAME);
+#endif
+
+#ifdef CONFIG_SERIAL_BFIN_UART1
+        peripheral_request(P_UART1_TX, DRIVER_NAME);
+        peripheral_request(P_UART1_RX, DRIVER_NAME);
+#endif
 
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
         if (uart->cts_pin >= 0) {
-                gpio_request(uart->cts_pin, NULL);
+                gpio_request(uart->cts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->cts_pin);
         }
 
         if (uart->rts_pin >= 0) {
-                gpio_request(uart->rts_pin, NULL);
+                gpio_request(uart->rts_pin, DRIVER_NAME);
                 gpio_direction_output(uart->rts_pin);
         }
 #endif
diff --git a/include/asm-blackfin/mach-bf537/portmux.h b/include/asm-blackfin/mach-bf537/portmux.h
index 23e13c5abc..ae6c53b284 100644
--- a/include/asm-blackfin/mach-bf537/portmux.h
+++ b/include/asm-blackfin/mach-bf537/portmux.h
@@ -106,4 +106,37 @@
 #define P_SPI0_SSEL2    (P_DEFINED | P_IDENT(PORT_PJ11) | P_FUNCT(1))
 #define P_SPI0_SSEL7    (P_DEFINED | P_IDENT(PORT_PJ5) | P_FUNCT(2))
 
-#endif /* _MACH_PORTMUX_H_ */
+#define P_MII0 {\
+        P_MII0_ETxD0, \
+        P_MII0_ETxD1, \
+        P_MII0_ETxD2, \
+        P_MII0_ETxD3, \
+        P_MII0_ETxEN, \
+        P_MII0_TxCLK, \
+        P_MII0_PHYINT, \
+        P_MII0_COL, \
+        P_MII0_ERxD0, \
+        P_MII0_ERxD1, \
+        P_MII0_ERxD2, \
+        P_MII0_ERxD3, \
+        P_MII0_ERxDV, \
+        P_MII0_ERxCLK, \
+        P_MII0_ERxER, \
+        P_MII0_CRS, \
+        P_MDC, \
+        P_MDIO, 0}
+
+
+#define P_RMII0 {\
+        P_MII0_ETxD0, \
+        P_MII0_ETxD1, \
+        P_MII0_ETxEN, \
+        P_MII0_ERxD0, \
+        P_MII0_ERxD1, \
+        P_MII0_ERxER, \
+        P_RMII0_REF_CLK, \
+        P_RMII0_MDINT, \
+        P_RMII0_CRS_DV, \
+        P_MDC, \
+        P_MDIO, 0}
+#endif                                  /* _MACH_PORTMUX_H_ */
diff --git a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
index e043cafa3c..69b9f8e120 100644
--- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
@@ -1,5 +1,6 @@
 #include <linux/serial.h>
 #include <asm/dma.h>
+#include <asm/portmux.h>
 
 #define NR_PORTS                1
 
@@ -92,18 +93,24 @@ struct bfin_serial_res bfin_serial_resource[] = {
         }
 };
 
+#define DRIVER_NAME "bfin-uart"
 
 int nr_ports = NR_PORTS;
 static void bfin_serial_hw_init(struct bfin_serial_port *uart)
 {
 
+#ifdef CONFIG_SERIAL_BFIN_UART0
+        peripheral_request(P_UART0_TX, DRIVER_NAME);
+        peripheral_request(P_UART0_RX, DRIVER_NAME);
+#endif
+
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
         if (uart->cts_pin >= 0) {
-                gpio_request(uart->cts_pin, NULL);
+                gpio_request(uart->cts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->cts_pin);
         }
         if (uart->rts_pin >= 0) {
-                gpio_request(uart->rts_pin, NULL);
+                gpio_request(uart->rts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->rts_pin);
         }
 #endif
diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/include/asm-blackfin/mach-bf561/cdefBF561.h
index 6e87ab269f..73d4d65249 100644
--- a/include/asm-blackfin/mach-bf561/cdefBF561.h
+++ b/include/asm-blackfin/mach-bf561/cdefBF561.h
@@ -83,9 +83,9 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
 
 /* For MMR's that are reserved on Core B, set up defines to better integrate with other ports */
 #define bfin_read_SWRST()                    bfin_read_SICA_SWRST()
-#define bfin_write_SWRST()                   bfin_write_SICA_SWRST()
+#define bfin_write_SWRST(val)                bfin_write_SICA_SWRST(val)
 #define bfin_read_SYSCR()                    bfin_read_SICA_SYSCR()
-#define bfin_write_SYSCR()                   bfin_write_SICA_SYSCR()
+#define bfin_write_SYSCR(val)                bfin_write_SICA_SYSCR(val)
 
 /* System Reset and Interrupt Controller registers for core A (0xFFC0 0100-0xFFC0 01FF) */
 #define bfin_read_SICA_SWRST()               bfin_read16(SICA_SWRST)
diff --git a/include/asm-blackfin/portmux.h b/include/asm-blackfin/portmux.h
index 9d3681e421..0d3f650d2d 100644
--- a/include/asm-blackfin/portmux.h
+++ b/include/asm-blackfin/portmux.h
@@ -14,6 +14,12 @@
 #define P_MAYSHARE      0x2000
 #define P_DONTCARE      0x1000
 
+
+int peripheral_request(unsigned short per, const char *label);
+void peripheral_free(unsigned short per);
+int peripheral_request_list(unsigned short per[], const char *label);
+void peripheral_free_list(unsigned short per[]);
+
 #include <asm/gpio.h>
 #include <asm/mach/portmux.h>
 
@@ -145,6 +151,22 @@
 #define P_SPI2_SSEL3 P_UNDEF
 #endif
 
+#ifndef P_SPI2_SSEL4
+#define P_SPI2_SSEL4 P_UNDEF
+#endif
+
+#ifndef P_SPI2_SSEL5
+#define P_SPI2_SSEL5 P_UNDEF
+#endif
+
+#ifndef P_SPI2_SSEL6
+#define P_SPI2_SSEL6 P_UNDEF
+#endif
+
+#ifndef P_SPI2_SSEL7
+#define P_SPI2_SSEL7 P_UNDEF
+#endif
+
 #ifndef P_SPI2_SCK
 #define P_SPI2_SCK P_UNDEF
 #endif
@@ -513,6 +535,22 @@
 #define P_SPI0_SSEL3 P_UNDEF
 #endif
 
+#ifndef P_SPI0_SSEL4
+#define P_SPI0_SSEL4 P_UNDEF
+#endif
+
+#ifndef P_SPI0_SSEL5
+#define P_SPI0_SSEL5 P_UNDEF
+#endif
+
+#ifndef P_SPI0_SSEL6
+#define P_SPI0_SSEL6 P_UNDEF
+#endif
+
+#ifndef P_SPI0_SSEL7
+#define P_SPI0_SSEL7 P_UNDEF
+#endif
+
 #ifndef P_UART0_TX
 #define P_UART0_TX P_UNDEF
 #endif
@@ -741,6 +779,23 @@
 #define P_SPI1_SSEL3 P_UNDEF
 #endif
 
+
+#ifndef P_SPI1_SSEL4
+#define P_SPI1_SSEL4 P_UNDEF
+#endif
+
+#ifndef P_SPI1_SSEL5
+#define P_SPI1_SSEL5 P_UNDEF
+#endif
+
+#ifndef P_SPI1_SSEL6
+#define P_SPI1_SSEL6 P_UNDEF
+#endif
+
+#ifndef P_SPI1_SSEL7
+#define P_SPI1_SSEL7 P_UNDEF
+#endif
+
 #ifndef P_SPI1_SCK
 #define P_SPI1_SCK P_UNDEF
 #endif
diff --git a/include/asm-blackfin/string.h b/include/asm-blackfin/string.h
index 6f1eb7d6d3..e8ada91ab0 100644
--- a/include/asm-blackfin/string.h
+++ b/include/asm-blackfin/string.h
@@ -9,13 +9,16 @@ extern inline char *strcpy(char *dest, const char *src)
         char *xdest = dest;
         char temp = 0;
 
-        __asm__ __volatile__
-            ("1:\t%2 = B [%1++] (Z);\n\t"
-             "B [%0++] = %2;\n\t"
-             "CC = %2;\n\t"
-        "if cc jump 1b (bp);\n"
-        : "+&a" (dest), "+&a" (src), "=&d" (temp)
-             ::"memory", "CC");
+        __asm__ __volatile__ (
+                "1:"
+                "%2 = B [%1++] (Z);"
+                "B [%0++] = %2;"
+                "CC = %2;"
+                "if cc jump 1b (bp);"
+                : "+&a" (dest), "+&a" (src), "=&d" (temp)
+                :
+                : "memory", "CC");
+
         return xdest;
 }
 
@@ -28,37 +31,56 @@ extern inline char *strncpy(char *dest, const char *src, size_t n)
         if (n == 0)
                 return xdest;
 
-        __asm__ __volatile__
-            ("1:\t%3 = B [%1++] (Z);\n\t"
-             "B [%0++] = %3;\n\t"
-             "CC = %3;\n\t"
-             "if ! cc jump 2f;\n\t"
-             "%2 += -1;\n\t"
-             "CC = %2 == 0;\n\t"
-             "if ! cc jump 1b (bp);\n"
-        "2:\n"
-        : "+&a" (dest), "+&a" (src), "+&da" (n), "=&d" (temp)
-             ::"memory", "CC");
+        __asm__ __volatile__ (
+                "1:"
+                "%3 = B [%1++] (Z);"
+                "B [%0++] = %3;"
+                "CC = %3;"
+                "if ! cc jump 2f;"
+                "%2 += -1;"
+                "CC = %2 == 0;"
+                "if ! cc jump 1b (bp);"
+                "jump 4f;"
+                "2:"
+                /* if src is shorter than n, we need to null pad bytes now */
+                "%3 = 0;"
+                "3:"
+                "%2 += -1;"
+                "CC = %2 == 0;"
+                "if cc jump 4f;"
+                "B [%0++] = %3;"
+                "jump 3b;"
+                "4:"
+                : "+&a" (dest), "+&a" (src), "+&da" (n), "=&d" (temp)
+                :
+                : "memory", "CC");
+
         return xdest;
 }
 
 #define __HAVE_ARCH_STRCMP
 extern inline int strcmp(const char *cs, const char *ct)
 {
-        char __res1, __res2;
-
-        __asm__
-       ("1:\t%2 = B[%0++] (Z);\n\t" /* get *cs */
-                "%3 = B[%1++] (Z);\n\t" /* get *ct */
-                "CC = %2 == %3;\n\t"    /* compare a byte */
-                "if ! cc jump 2f;\n\t"  /* not equal, break out */
-                "CC = %2;\n\t"  /* at end of cs? */
-                "if cc jump 1b (bp);\n\t"       /* no, keep going */
-                "jump.s 3f;\n"  /* strings are equal */
-                "2:\t%2 = %2 - %3;\n"   /* *cs - *ct */
-        "3:\n"
-        : "+&a" (cs), "+&a" (ct), "=&d" (__res1), "=&d" (__res2)
-      : :       "CC");
+        /* need to use int's here so the char's in the assembly don't get
+         * sign extended incorrectly when we don't want them to be
+         */
+        int __res1, __res2;
+
+        __asm__ __volatile__ (
+                "1:"
+                "%2 = B[%0++] (Z);"      /* get *cs */
+                "%3 = B[%1++] (Z);"      /* get *ct */
+                "CC = %2 == %3;"         /* compare a byte */
+                "if ! cc jump 2f;"       /* not equal, break out */
+                "CC = %2;"               /* at end of cs? */
+                "if cc jump 1b (bp);"    /* no, keep going */
+                "jump.s 3f;"             /* strings are equal */
+                "2:"
+                "%2 = %2 - %3;"          /* *cs - *ct */
+                "3:"
+                : "+&a" (cs), "+&a" (ct), "=&d" (__res1), "=&d" (__res2)
+                :
+                : "memory", "CC");
 
         return __res1;
 }
@@ -66,26 +88,35 @@ extern inline int strcmp(const char *cs, const char *ct)
 #define __HAVE_ARCH_STRNCMP
 extern inline int strncmp(const char *cs, const char *ct, size_t count)
 {
-        char __res1, __res2;
+        /* need to use int's here so the char's in the assembly don't get
+         * sign extended incorrectly when we don't want them to be
+         */
+        int __res1, __res2;
 
         if (!count)
                 return 0;
-        __asm__
-       ("1:\t%3 = B[%0++] (Z);\n\t"        /* get *cs */
-                "%4 = B[%1++] (Z);\n\t" /* get *ct */
-                "CC = %3 == %4;\n\t"    /* compare a byte */
-                "if ! cc jump 3f;\n\t"  /* not equal, break out */
-                "CC = %3;\n\t"  /* at end of cs? */
-                "if ! cc jump 4f;\n\t"  /* yes, all done */
-                "%2 += -1;\n\t" /* no, adjust count */
-        "CC = %2 == 0;\n\t"
-        "if ! cc jump 1b;\n"                 /* more to do, keep going */
-                "2:\t%3 = 0;\n\t"       /* strings are equal */
-        "jump.s    4f;\n"
-        "3:\t%3 = %3 - %4;\n"          /* *cs - *ct */
-        "4:"
-        : "+&a" (cs), "+&a" (ct), "+&da" (count), "=&d" (__res1), "=&d" (__res2)
-      : :       "CC");
+
+        __asm__ __volatile__ (
+                "1:"
+                "%3 = B[%0++] (Z);"      /* get *cs */
+                "%4 = B[%1++] (Z);"      /* get *ct */
+                "CC = %3 == %4;"         /* compare a byte */
+                "if ! cc jump 3f;"       /* not equal, break out */
+                "CC = %3;"               /* at end of cs? */
+                "if ! cc jump 4f;"       /* yes, all done */
+                "%2 += -1;"              /* no, adjust count */
+                "CC = %2 == 0;"
+                "if ! cc jump 1b;"       /* more to do, keep going */
+                "2:"
+                "%3 = 0;"                /* strings are equal */
+                "jump.s 4f;"
+                "3:"
+                "%3 = %3 - %4;"          /* *cs - *ct */
+                "4:"
+                : "+&a" (cs), "+&a" (ct), "+&da" (count), "=&d" (__res1), "=&d" (__res2)
+                :
+                : "memory", "CC");
+
         return __res1;
 }
 
diff --git a/include/asm-blackfin/unistd.h b/include/asm-blackfin/unistd.h
index 0df9f2d322..07ffe8b718 100644
--- a/include/asm-blackfin/unistd.h
+++ b/include/asm-blackfin/unistd.h
@@ -3,6 +3,7 @@
 /*
  * This file contains the system call numbers.
  */
+#define __NR_restart_syscall      0
 #define __NR_exit                 1
 #define __NR_fork                 2
 #define __NR_read                 3
@@ -165,13 +166,13 @@
 #define __NR_sched_get_priority_min     160
 #define __NR_sched_rr_get_interval      161
 #define __NR_nanosleep          162
-                                /* 163 __NR_mremap */
+#define __NR_mremap             163
 #define __NR_setresuid          164
 #define __NR_getresuid          165
                                 /* 166 __NR_vm86 */
                                 /* 167 __NR_query_module */
                                 /* 168 __NR_poll */
-                                /* 169 __NR_nfsservctl */
+#define __NR_nfsservctl         169
 #define __NR_setresgid          170
 #define __NR_getresgid          171
 #define __NR_prctl              172
@@ -227,7 +228,7 @@
                                 /* 222 reserved for TUX */
                                 /* 223 reserved for TUX */
 #define __NR_gettid             224
-                                /* 225 __NR_readahead */
+#define __NR_readahead          225
 #define __NR_setxattr           226
 #define __NR_lsetxattr          227
 #define __NR_fsetxattr          228
@@ -287,7 +288,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-                                /* 284 __NR_sys_kexec_load */
+#define __NR_kexec_load         284
 #define __NR_waitid             285
 #define __NR_add_key            286
 #define __NR_request_key        287
@@ -352,9 +353,54 @@
 #define __NR_shmdt              340
 #define __NR_shmget             341
 
-#define __NR_syscall            342
+#define __NR_splice             342
+#define __NR_sync_file_range    343
+#define __NR_tee                344
+#define __NR_vmsplice           345
+
+#define __NR_epoll_pwait        346
+#define __NR_utimensat          347
+#define __NR_signalfd           348
+#define __NR_timerfd            349
+#define __NR_eventfd            350
+#define __NR_pread64            351
+#define __NR_pwrite64           352
+#define __NR_fadvise64          353
+#define __NR_set_robust_list    354
+#define __NR_get_robust_list    355
+#define __NR_fallocate          356
+
+#define __NR_syscall            357
 #define NR_syscalls             __NR_syscall
 
+/* Old optional stuff no one actually uses */
+#define __IGNORE_sysfs
+#define __IGNORE_uselib
+
+/* Implement the newer interfaces */
+#define __IGNORE_mmap
+#define __IGNORE_poll
+#define __IGNORE_select
+#define __IGNORE_utime
+
+/* Not relevant on no-mmu */
+#define __IGNORE_swapon
+#define __IGNORE_swapoff
+#define __IGNORE_msync
+#define __IGNORE_mlock
+#define __IGNORE_munlock
+#define __IGNORE_mlockall
+#define __IGNORE_munlockall
+#define __IGNORE_mincore
+#define __IGNORE_madvise
+#define __IGNORE_remap_file_pages
+#define __IGNORE_mbind
+#define __IGNORE_get_mempolicy
+#define __IGNORE_set_mempolicy
+#define __IGNORE_migrate_pages
+#define __IGNORE_move_pages
+#define __IGNORE_getcpu
+
 #ifdef __KERNEL__
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_STAT64
diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h
index 3769e6bd63..33dca30a3c 100644
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios.h
@@ -63,6 +63,8 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio,
 
 #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
 #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
+#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
+#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
 
 #endif  /* __ARCH_TERMIO_GETPUT */
 
diff --git a/include/asm-h8300/flat.h b/include/asm-h8300/flat.h
index c20eee767d..2a873508a9 100644
--- a/include/asm-h8300/flat.h
+++ b/include/asm-h8300/flat.h
@@ -9,6 +9,7 @@
 #define flat_argvp_envp_on_stack()              1
 #define flat_old_ram_flag(flags)                1
 #define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
+#define flat_set_persistent(relval, p)          0
 
 /*
  * on the H8 a couple of the relocations have an instruction in the
@@ -18,7 +19,7 @@
  */
 
 #define flat_get_relocate_addr(rel)             (rel)
-#define flat_get_addr_from_rp(rp, relval, flags) \
+#define flat_get_addr_from_rp(rp, relval, flags, persistent) \
         (get_unaligned(rp) & ((flags & FLAT_FLAG_GOTPIC) ? 0xffffffff: 0x00ffffff))
 #define flat_put_addr_at_rp(rp, addr, rel) \
         put_unaligned (((*(char *)(rp)) << 24) | ((addr) & 0x00ffffff), rp)
diff --git a/include/asm-i386/io.h b/include/asm-i386/io.h
index 7b65b5b000..e8e0bd6411 100644
--- a/include/asm-i386/io.h
+++ b/include/asm-i386/io.h
@@ -112,6 +112,9 @@ extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsign
  * writew/writel functions and the other mmio helpers. The returned
  * address is not guaranteed to be usable directly as a virtual
  * address. 
+ *
+ * If the area you are trying to map is a PCI BAR you should have a
+ * look at pci_iomap().
  */
 
 static inline void __iomem * ioremap(unsigned long offset, unsigned long size)
diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h
index 340764076d..dbe734ddf2 100644
--- a/include/asm-i386/io_apic.h
+++ b/include/asm-i386/io_apic.h
@@ -150,7 +150,6 @@ extern int (*ioapic_renumber_irq)(int ioapic, int irq);
 
 #else  /* !CONFIG_X86_IO_APIC */
 #define io_apic_assign_pci_irqs 0
-static inline void disable_ioapic_setup(void) { }
 #endif
 
 #endif
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 609756c616..d69ba937e0 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -214,11 +214,6 @@ static inline unsigned long get_limit(unsigned long segment)
  */
  
 
-/* 
- * Actually only lfence would be needed for mb() because all stores done 
- * by the kernel should be already ordered. But keep a full barrier for now. 
- */
-
 #define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2)
 #define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2)
 
diff --git a/include/asm-ia64/hpsim.h b/include/asm-ia64/hpsim.h
new file mode 100644
index 0000000000..892ab198a9
--- /dev/null
+++ b/include/asm-ia64/hpsim.h
@@ -0,0 +1,16 @@
+#ifndef _ASMIA64_HPSIM_H
+#define _ASMIA64_HPSIM_H
+
+#ifndef CONFIG_HP_SIMSERIAL_CONSOLE
+static inline int simcons_register(void) { return 1; }
+#else
+int simcons_register(void);
+#endif
+
+struct tty_driver;
+extern struct tty_driver *hp_simserial_driver;
+
+void ia64_ssc_connect_irq(long intr, long irq);
+void ia64_ctl_trace(long on);
+
+#endif
diff --git a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h
index 16adc93d7a..7caa1f44cd 100644
--- a/include/asm-ia64/sn/arch.h
+++ b/include/asm-ia64/sn/arch.h
@@ -81,5 +81,6 @@ extern u8 sn_sharing_domain_size;
 extern u8 sn_region_size;
 
 extern void sn_flush_all_caches(long addr, long bytes);
+extern bool sn_cpu_disable_allowed(int cpu);
 
 #endif /* _ASM_IA64_SN_ARCH_H */
diff --git a/include/asm-ia64/sn/intr.h b/include/asm-ia64/sn/intr.h
index 12b54ddb06..e0487aa974 100644
--- a/include/asm-ia64/sn/intr.h
+++ b/include/asm-ia64/sn/intr.h
@@ -60,6 +60,7 @@ extern u64 sn_intr_alloc(nasid_t, int,
                               int, nasid_t, int);
 extern void sn_intr_free(nasid_t, int, struct sn_irq_info *);
 extern struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *, nasid_t, int);
+extern void sn_set_err_irq_affinity(unsigned int);
 extern struct list_head **sn_irq_lh;
 
 #define CPU_VECTOR_TO_IRQ(cpuid,vector) (vector)
diff --git a/include/asm-ia64/sn/sn_feature_sets.h b/include/asm-ia64/sn/sn_feature_sets.h
index bfdc36273e..8e83ac117a 100644
--- a/include/asm-ia64/sn/sn_feature_sets.h
+++ b/include/asm-ia64/sn/sn_feature_sets.h
@@ -31,6 +31,7 @@ extern int sn_prom_feature_available(int id);
 #define PRF_PAL_CACHE_FLUSH_SAFE        0
 #define PRF_DEVICE_FLUSH_LIST           1
 #define PRF_HOTPLUG_SUPPORT             2
+#define PRF_CPU_DISABLE_SUPPORT         3
 
 /* --------------------- OS Features -------------------------------*/
 
diff --git a/include/asm-m32r/assembler.h b/include/asm-m32r/assembler.h
index 47041d19d4..26351539b5 100644
--- a/include/asm-m32r/assembler.h
+++ b/include/asm-m32r/assembler.h
@@ -52,27 +52,27 @@
         .endm
 
 #if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
-#define STI(reg) STI_M reg
-        .macro STI_M reg
+#define ENABLE_INTERRUPTS(reg) ENABLE_INTERRUPTS reg
+        .macro ENABLE_INTERRUPTS reg
         setpsw  #0x40       ->  nop
         ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1).
         .endm
 
-#define CLI(reg) CLI_M reg
-        .macro CLI_M reg
+#define DISABLE_INTERRUPTS(reg) DISABLE_INTERRUPTS reg
+        .macro DISABLE_INTERRUPTS reg
         clrpsw  #0x40       ->  nop
         ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1).
         .endm
 #else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-#define STI(reg) STI_M reg
-        .macro STI_M reg
+#define ENABLE_INTERRUPTS(reg) ENABLE_INTERRUPTS reg
+        .macro ENABLE_INTERRUPTS reg
         mvfc    \reg, psw
         or3     \reg, \reg, #0x0040
         mvtc    \reg, psw
         .endm
 
-#define CLI(reg) CLI_M reg
-        .macro CLI_M reg
+#define DISABLE_INTERRUPTS(reg) DISABLE_INTERRUPTS reg
+        .macro DISABLE_INTERRUPTS reg
         mvfc    \reg, psw
         and3    \reg, \reg, #0xffbf
         mvtc    \reg, psw
diff --git a/include/asm-m32r/flat.h b/include/asm-m32r/flat.h
index 1b285f65ca..d851cf0c4a 100644
--- a/include/asm-m32r/flat.h
+++ b/include/asm-m32r/flat.h
@@ -15,9 +15,10 @@
 #define flat_stack_align(sp)            (*sp += (*sp & 3 ? (4 - (*sp & 3)): 0))
 #define flat_argvp_envp_on_stack()              0
 #define flat_old_ram_flag(flags)                (flags)
+#define flat_set_persistent(relval, p)          0
 #define flat_reloc_valid(reloc, size)           \
         (((reloc) - textlen_for_m32r_lo16_data) <= (size))
-#define flat_get_addr_from_rp(rp, relval, flags) \
+#define flat_get_addr_from_rp(rp, relval, flags, persistent) \
         m32r_flat_get_addr_from_rp(rp, relval, (text_len) )
 
 #define flat_put_addr_at_rp(rp, addr, relval) \
diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h
index decfc59907..214b44b407 100644
--- a/include/asm-m32r/m32r.h
+++ b/include/asm-m32r/m32r.h
@@ -22,12 +22,26 @@
 #include <asm/m32700ut/m32700ut_pld.h>
 #include <asm/m32700ut/m32700ut_lan.h>
 #include <asm/m32700ut/m32700ut_lcd.h>
+/* for ei_handler:linux/arch/m32r/kernel/entry.S */
+#define M32R_INT1ICU_ISTS       PLD_ICUISTS
+#define M32R_INT1ICU_IRQ_BASE   M32700UT_PLD_IRQ_BASE
+#define M32R_INT0ICU_ISTS       M32700UT_LAN_ICUISTS
+#define M32R_INT0ICU_IRQ_BASE   M32700UT_LAN_PLD_IRQ_BASE
+#define M32R_INT2ICU_ISTS       M32700UT_LCD_ICUISTS
+#define M32R_INT2ICU_IRQ_BASE   M32700UT_LCD_PLD_IRQ_BASE
 #endif  /* CONFIG_PLAT_M32700UT */
 
 #if defined(CONFIG_PLAT_OPSPUT)
 #include <asm/opsput/opsput_pld.h>
 #include <asm/opsput/opsput_lan.h>
 #include <asm/opsput/opsput_lcd.h>
+/* for ei_handler:linux/arch/m32r/kernel/entry.S */
+#define M32R_INT1ICU_ISTS       PLD_ICUISTS
+#define M32R_INT1ICU_IRQ_BASE   OPSPUT_PLD_IRQ_BASE
+#define M32R_INT0ICU_ISTS       OPSPUT_LAN_ICUISTS
+#define M32R_INT0ICU_IRQ_BASE   OPSPUT_LAN_PLD_IRQ_BASE
+#define M32R_INT2ICU_ISTS       OPSPUT_LCD_ICUISTS
+#define M32R_INT2ICU_IRQ_BASE   OPSPUT_LCD_PLD_IRQ_BASE
 #endif  /* CONFIG_PLAT_OPSPUT */
 
 #if defined(CONFIG_PLAT_MAPPI2)
@@ -40,10 +54,16 @@
 
 #if defined(CONFIG_PLAT_USRV)
 #include <asm/m32700ut/m32700ut_pld.h>
+/* for ei_handler:linux/arch/m32r/kernel/entry.S */
+#define M32R_INT1ICU_ISTS       PLD_ICUISTS
+#define M32R_INT1ICU_IRQ_BASE   M32700UT_PLD_IRQ_BASE
 #endif
 
 #if defined(CONFIG_PLAT_M32104UT)
 #include <asm/m32104ut/m32104ut_pld.h>
+/* for ei_handler:linux/arch/m32r/kernel/entry.S */
+#define M32R_INT1ICU_ISTS       PLD_ICUISTS
+#define M32R_INT1ICU_IRQ_BASE   M32104UT_PLD_IRQ_BASE
 #endif  /* CONFIG_PLAT_M32104 */
 
 /*
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h
index fdbb60e6a0..a30fe9c641 100644
--- a/include/asm-m68k/unistd.h
+++ b/include/asm-m68k/unistd.h
@@ -313,10 +313,20 @@
 #define __NR_tee                308
 #define __NR_vmsplice           309
 #define __NR_move_pages         310
+#define __NR_sched_setaffinity  311
+#define __NR_sched_getaffinity  312
+#define __NR_kexec_load         313
+#define __NR_getcpu             314
+#define __NR_epoll_pwait        315
+#define __NR_utimensat          316
+#define __NR_signalfd           317
+#define __NR_timerfd            318
+#define __NR_eventfd            319
+#define __NR_fallocate          320
 
 #ifdef __KERNEL__
 
-#define NR_syscalls             311
+#define NR_syscalls             321
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-m68knommu/flat.h b/include/asm-m68knommu/flat.h
index 2d836edc43..814b5174a8 100644
--- a/include/asm-m68knommu/flat.h
+++ b/include/asm-m68knommu/flat.h
@@ -9,8 +9,9 @@
 #define flat_argvp_envp_on_stack()              1
 #define flat_old_ram_flag(flags)                (flags)
 #define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
-#define flat_get_addr_from_rp(rp, relval, flags)        get_unaligned(rp)
+#define flat_get_addr_from_rp(rp, relval, flags, p)     get_unaligned(rp)
 #define flat_put_addr_at_rp(rp, val, relval)    put_unaligned(val,rp)
 #define flat_get_relocate_addr(rel)             (rel)
+#define flat_set_persistent(relval, p)          0
 
 #endif /* __M68KNOMMU_FLAT_H__ */
diff --git a/include/asm-m68knommu/pgtable.h b/include/asm-m68knommu/pgtable.h
index e1e6a1d233..46251016e8 100644
--- a/include/asm-m68knommu/pgtable.h
+++ b/include/asm-m68knommu/pgtable.h
@@ -65,4 +65,6 @@ extern unsigned int kobjsize(const void *objp);
 #define VMALLOC_START   0
 #define VMALLOC_END     0xffffffff
 
+#include <asm-generic/pgtable.h>
+
 #endif /* _M68KNOMMU_PGTABLE_H */
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h
index 82e03195f3..eb1b566793 100644
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
@@ -314,10 +314,20 @@
 #define __NR_tee                308
 #define __NR_vmsplice           309
 #define __NR_move_pages         310
+#define __NR_sched_setaffinity  311
+#define __NR_sched_getaffinity  312
+#define __NR_kexec_load         313
+#define __NR_getcpu             314
+#define __NR_epoll_pwait        315
+#define __NR_utimensat          316
+#define __NR_signalfd           317
+#define __NR_timerfd            318
+#define __NR_eventfd            319
+#define __NR_fallocate          320
 
 #ifdef __KERNEL__
 
-#define NR_syscalls             311
+#define NR_syscalls             321
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-mips/bcache.h b/include/asm-mips/bcache.h
index 3646a3f2ed..0ba9d6ef76 100644
--- a/include/asm-mips/bcache.h
+++ b/include/asm-mips/bcache.h
@@ -21,7 +21,6 @@ struct bcache_ops {
 };
 
 extern void indy_sc_init(void);
-extern void sni_pcimt_sc_init(void);
 
 #ifdef CONFIG_BOARD_SCACHE
 
diff --git a/include/asm-mips/cmpxchg.h b/include/asm-mips/cmpxchg.h
new file mode 100644
index 0000000000..c5b4708e00
--- /dev/null
+++ b/include/asm-mips/cmpxchg.h
@@ -0,0 +1,107 @@
+/*
+ * 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, 06, 07 by Ralf Baechle (ralf@linux-mips.org)
+ */
+#ifndef __ASM_CMPXCHG_H
+#define __ASM_CMPXCHG_H
+
+#include <linux/irqflags.h>
+
+#define __HAVE_ARCH_CMPXCHG 1
+
+#define __cmpxchg_asm(ld, st, m, old, new)                              \
+({                                                                      \
+        __typeof(*(m)) __ret;                                           \
+                                                                        \
+        if (cpu_has_llsc && R10000_LLSC_WAR) {                          \
+                __asm__ __volatile__(                                   \
+                "       .set    push                            \n"     \
+                "       .set    noat                            \n"     \
+                "       .set    mips3                           \n"     \
+                "1:     " ld "  %0, %2          # __cmpxchg_asm \n"     \
+                "       bne     %0, %z3, 2f                     \n"     \
+                "       .set    mips0                           \n"     \
+                "       move    $1, %z4                         \n"     \
+                "       .set    mips3                           \n"     \
+                "       " st "  $1, %1                          \n"     \
+                "       beqzl   $1, 1b                          \n"     \
+                "2:                                             \n"     \
+                "       .set    pop                             \n"     \
+                : "=&r" (__ret), "=R" (*m)                              \
+                : "R" (*m), "Jr" (old), "Jr" (new)                      \
+                : "memory");                                            \
+        } else if (cpu_has_llsc) {                                      \
+                __asm__ __volatile__(                                   \
+                "       .set    push                            \n"     \
+                "       .set    noat                            \n"     \
+                "       .set    mips3                           \n"     \
+                "1:     " ld "  %0, %2          # __cmpxchg_asm \n"     \
+                "       bne     %0, %z3, 2f                     \n"     \
+                "       .set    mips0                           \n"     \
+                "       move    $1, %z4                         \n"     \
+                "       .set    mips3                           \n"     \
+                "       " st "  $1, %1                          \n"     \
+                "       beqz    $1, 3f                          \n"     \
+                "2:                                             \n"     \
+                "       .subsection 2                           \n"     \
+                "3:     b       1b                              \n"     \
+                "       .previous                               \n"     \
+                "       .set    pop                             \n"     \
+                : "=&r" (__ret), "=R" (*m)                              \
+                : "R" (*m), "Jr" (old), "Jr" (new)                      \
+                : "memory");                                            \
+        } else {                                                        \
+                unsigned long __flags;                                  \
+                                                                        \
+                raw_local_irq_save(__flags);                            \
+                __ret = *m;                                             \
+                if (__ret == old)                                       \
+                        *m = new;                                       \
+                raw_local_irq_restore(__flags);                         \
+        }                                                               \
+                                                                        \
+        __ret;                                                          \
+})
+
+/*
+ * This function doesn't exist, so you'll get a linker error
+ * if something tries to do an invalid cmpxchg().
+ */
+extern void __cmpxchg_called_with_bad_pointer(void);
+
+#define __cmpxchg(ptr,old,new,barrier)                                  \
+({                                                                      \
+        __typeof__(ptr) __ptr = (ptr);                                  \
+        __typeof__(*(ptr)) __old = (old);                               \
+        __typeof__(*(ptr)) __new = (new);                               \
+        __typeof__(*(ptr)) __res = 0;                                   \
+                                                                        \
+        barrier;                                                        \
+                                                                        \
+        switch (sizeof(*(__ptr))) {                                     \
+        case 4:                                                         \
+                __res = __cmpxchg_asm("ll", "sc", __ptr, __old, __new); \
+                break;                                                  \
+        case 8:                                                         \
+                if (sizeof(long) == 8) {                                \
+                        __res = __cmpxchg_asm("lld", "scd", __ptr,      \
+                                           __old, __new);               \
+                        break;                                          \
+                }                                                       \
+        default:                                                        \
+                __cmpxchg_called_with_bad_pointer();                    \
+                break;                                                  \
+        }                                                               \
+                                                                        \
+        barrier;                                                        \
+                                                                        \
+        __res;                                                          \
+})
+
+#define cmpxchg(ptr, old, new)          __cmpxchg(ptr, old, new, smp_llsc_mb())
+#define cmpxchg_local(ptr, old, new)    __cmpxchg(ptr, old, new,)
+
+#endif /* __ASM_CMPXCHG_H */
diff --git a/include/asm-mips/compiler.h b/include/asm-mips/compiler.h
index 169ae26105..aa6b876bbd 100644
--- a/include/asm-mips/compiler.h
+++ b/include/asm-mips/compiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Maciej W. Rozycki
+ * Copyright (C) 2004, 2007  Maciej W. Rozycki
  *
  * 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
@@ -9,8 +9,10 @@
 #define _ASM_COMPILER_H
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#define GCC_IMM_ASM "n"
 #define GCC_REG_ACCUM "$0"
 #else
+#define GCC_IMM_ASM "rn"
 #define GCC_REG_ACCUM "accum"
 #endif
 
diff --git a/include/asm-mips/edac.h b/include/asm-mips/edac.h
index 83719eee2d..4da0c1fe30 100644
--- a/include/asm-mips/edac.h
+++ b/include/asm-mips/edac.h
@@ -9,8 +9,7 @@ static inline void atomic_scrub(void *va, u32 size)
         unsigned long temp;
         u32 i;
 
-        for (i = 0; i < size / sizeof(unsigned long); i++, virt_addr++) {
-
+        for (i = 0; i < size / sizeof(unsigned long); i++) {
                 /*
                  * Very carefully read and write to memory atomically
                  * so we are interrupt, DMA and SMP safe.
@@ -19,16 +18,16 @@ static inline void atomic_scrub(void *va, u32 size)
                  */
 
                 __asm__ __volatile__ (
-                "       .set    mips3                                   \n"
-                "1:     ll      %0, %1          # atomic_add            \n"
-                "       ll      %0, %1          # atomic_add            \n"
-                "       addu    %0, $0                                  \n"
-                "       sc      %0, %1                                  \n"
-                "       beqz    %0, 1b                                  \n"
-                "       .set    mips0                                   \n"
+                "       .set    mips2                                   \n"
+                "1:     ll      %0, %1          # atomic_scrub          \n"
+                "       addu    %0, $0                                  \n"
+                "       sc      %0, %1                                  \n"
+                "       beqz    %0, 1b                                  \n"
+                "       .set    mips0                                   \n"
                 : "=&r" (temp), "=m" (*virt_addr)
                 : "m" (*virt_addr));
 
+                virt_addr++;
         }
 }
 
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h
index 00a50ec1c1..2a52333a06 100644
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
@@ -13,6 +13,7 @@
 #define O_SYNC          0x0010
 #define O_NONBLOCK      0x0080
 #define O_CREAT         0x0100  /* not fcntl */
+#define O_TRUNC         0x0200  /* not fcntl */
 #define O_EXCL          0x0400  /* not fcntl */
 #define O_NOCTTY        0x0800  /* not fcntl */
 #define FASYNC          0x1000  /* fcntl, for BSD compatibility */
diff --git a/include/asm-mips/gt64240.h b/include/asm-mips/gt64240.h
deleted file mode 100644
index 8f9bd341ed..0000000000
--- a/include/asm-mips/gt64240.h
+++ /dev/null
@@ -1,1235 +0,0 @@
-/*
- * 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 - Galileo technology.
- * Copyright (C) 2004 by Ralf Baechle
- */
-#ifndef __ASM_MIPS_MV64240_H
-#define __ASM_MIPS_MV64240_H
-
-#include <asm/addrspace.h>
-#include <asm/marvell.h>
-
-/*
- * CPU Control Registers
- */
-
-#define CPU_CONFIGURATION                                       0x000
-#define CPU_MODE                                                0x120
-#define CPU_READ_RESPONSE_CROSSBAR_LOW                          0x170
-#define CPU_READ_RESPONSE_CROSSBAR_HIGH                         0x178
-
-/*
- * Processor Address Space
- */
-
-/* Sdram's BAR'S */
-#define SCS_0_LOW_DECODE_ADDRESS                                0x008
-#define SCS_0_HIGH_DECODE_ADDRESS                               0x010
-#define SCS_1_LOW_DECODE_ADDRESS                                0x208
-#define SCS_1_HIGH_DECODE_ADDRESS                               0x210
-#define SCS_2_LOW_DECODE_ADDRESS                                0x018
-#define SCS_2_HIGH_DECODE_ADDRESS                               0x020
-#define SCS_3_LOW_DECODE_ADDRESS                                0x218
-#define SCS_3_HIGH_DECODE_ADDRESS                               0x220
-/* Devices BAR'S */
-#define CS_0_LOW_DECODE_ADDRESS                                 0x028
-#define CS_0_HIGH_DECODE_ADDRESS                                0x030
-#define CS_1_LOW_DECODE_ADDRESS                                 0x228
-#define CS_1_HIGH_DECODE_ADDRESS                                0x230
-#define CS_2_LOW_DECODE_ADDRESS                                 0x248
-#define CS_2_HIGH_DECODE_ADDRESS                                0x250
-#define CS_3_LOW_DECODE_ADDRESS                                 0x038
-#define CS_3_HIGH_DECODE_ADDRESS                                0x040
-#define BOOTCS_LOW_DECODE_ADDRESS                               0x238
-#define BOOTCS_HIGH_DECODE_ADDRESS                              0x240
-
-#define PCI_0I_O_LOW_DECODE_ADDRESS                             0x048
-#define PCI_0I_O_HIGH_DECODE_ADDRESS                            0x050
-#define PCI_0MEMORY0_LOW_DECODE_ADDRESS                         0x058
-#define PCI_0MEMORY0_HIGH_DECODE_ADDRESS                        0x060
-#define PCI_0MEMORY1_LOW_DECODE_ADDRESS                         0x080
-#define PCI_0MEMORY1_HIGH_DECODE_ADDRESS                        0x088
-#define PCI_0MEMORY2_LOW_DECODE_ADDRESS                         0x258
-#define PCI_0MEMORY2_HIGH_DECODE_ADDRESS                        0x260
-#define PCI_0MEMORY3_LOW_DECODE_ADDRESS                         0x280
-#define PCI_0MEMORY3_HIGH_DECODE_ADDRESS                        0x288
-
-#define PCI_1I_O_LOW_DECODE_ADDRESS                             0x090
-#define PCI_1I_O_HIGH_DECODE_ADDRESS                            0x098
-#define PCI_1MEMORY0_LOW_DECODE_ADDRESS                         0x0a0
-#define PCI_1MEMORY0_HIGH_DECODE_ADDRESS                        0x0a8
-#define PCI_1MEMORY1_LOW_DECODE_ADDRESS                         0x0b0
-#define PCI_1MEMORY1_HIGH_DECODE_ADDRESS                        0x0b8
-#define PCI_1MEMORY2_LOW_DECODE_ADDRESS                         0x2a0
-#define PCI_1MEMORY2_HIGH_DECODE_ADDRESS                        0x2a8
-#define PCI_1MEMORY3_LOW_DECODE_ADDRESS                         0x2b0
-#define PCI_1MEMORY3_HIGH_DECODE_ADDRESS                        0x2b8
-
-#define INTERNAL_SPACE_DECODE                                   0x068
-
-#define CPU_0_LOW_DECODE_ADDRESS                                0x290
-#define CPU_0_HIGH_DECODE_ADDRESS                               0x298
-#define CPU_1_LOW_DECODE_ADDRESS                                0x2c0
-#define CPU_1_HIGH_DECODE_ADDRESS                               0x2c8
-
-#define PCI_0I_O_ADDRESS_REMAP                                  0x0f0
-#define PCI_0MEMORY0_ADDRESS_REMAP                              0x0f8
-#define PCI_0MEMORY0_HIGH_ADDRESS_REMAP                         0x320
-#define PCI_0MEMORY1_ADDRESS_REMAP                              0x100
-#define PCI_0MEMORY1_HIGH_ADDRESS_REMAP                         0x328
-#define PCI_0MEMORY2_ADDRESS_REMAP                              0x2f8
-#define PCI_0MEMORY2_HIGH_ADDRESS_REMAP                         0x330
-#define PCI_0MEMORY3_ADDRESS_REMAP                              0x300
-#define PCI_0MEMORY3_HIGH_ADDRESS_REMAP                         0x338
-
-#define PCI_1I_O_ADDRESS_REMAP                                  0x108
-#define PCI_1MEMORY0_ADDRESS_REMAP                              0x110
-#define PCI_1MEMORY0_HIGH_ADDRESS_REMAP                         0x340
-#define PCI_1MEMORY1_ADDRESS_REMAP                              0x118
-#define PCI_1MEMORY1_HIGH_ADDRESS_REMAP                         0x348
-#define PCI_1MEMORY2_ADDRESS_REMAP                              0x310
-#define PCI_1MEMORY2_HIGH_ADDRESS_REMAP                         0x350
-#define PCI_1MEMORY3_ADDRESS_REMAP                              0x318
-#define PCI_1MEMORY3_HIGH_ADDRESS_REMAP                         0x358
-
-/*
- * CPU Sync Barrier
- */
-
-#define PCI_0SYNC_BARIER_VIRTUAL_REGISTER                       0x0c0
-#define PCI_1SYNC_BARIER_VIRTUAL_REGISTER                       0x0c8
-
-
-/*
- * CPU Access Protect
- */
-
-#define CPU_LOW_PROTECT_ADDRESS_0                               0X180
-#define CPU_HIGH_PROTECT_ADDRESS_0                              0X188
-#define CPU_LOW_PROTECT_ADDRESS_1                               0X190
-#define CPU_HIGH_PROTECT_ADDRESS_1                              0X198
-#define CPU_LOW_PROTECT_ADDRESS_2                               0X1a0
-#define CPU_HIGH_PROTECT_ADDRESS_2                              0X1a8
-#define CPU_LOW_PROTECT_ADDRESS_3                               0X1b0
-#define CPU_HIGH_PROTECT_ADDRESS_3                              0X1b8
-#define CPU_LOW_PROTECT_ADDRESS_4                               0X1c0
-#define CPU_HIGH_PROTECT_ADDRESS_4                              0X1c8
-#define CPU_LOW_PROTECT_ADDRESS_5                               0X1d0
-#define CPU_HIGH_PROTECT_ADDRESS_5                              0X1d8
-#define CPU_LOW_PROTECT_ADDRESS_6                               0X1e0
-#define CPU_HIGH_PROTECT_ADDRESS_6                              0X1e8
-#define CPU_LOW_PROTECT_ADDRESS_7                               0X1f0
-#define CPU_HIGH_PROTECT_ADDRESS_7                              0X1f8
-
-
-/*
- * Snoop Control
- */
-
-#define SNOOP_BASE_ADDRESS_0                                    0x380
-#define SNOOP_TOP_ADDRESS_0                                     0x388
-#define SNOOP_BASE_ADDRESS_1                                    0x390
-#define SNOOP_TOP_ADDRESS_1                                     0x398
-#define SNOOP_BASE_ADDRESS_2                                    0x3a0
-#define SNOOP_TOP_ADDRESS_2                                     0x3a8
-#define SNOOP_BASE_ADDRESS_3                                    0x3b0
-#define SNOOP_TOP_ADDRESS_3                                     0x3b8
-
-/*
- * CPU Error Report
- */
-
-#define CPU_ERROR_ADDRESS_LOW                                   0x070
-#define CPU_ERROR_ADDRESS_HIGH                                  0x078
-#define CPU_ERROR_DATA_LOW                                      0x128
-#define CPU_ERROR_DATA_HIGH                                     0x130
-#define CPU_ERROR_PARITY                                        0x138
-#define CPU_ERROR_CAUSE                                         0x140
-#define CPU_ERROR_MASK                                          0x148
-
-/*
- * Pslave Debug
- */
-
-#define X_0_ADDRESS                                             0x360
-#define X_0_COMMAND_ID                                          0x368
-#define X_1_ADDRESS                                             0x370
-#define X_1_COMMAND_ID                                          0x378
-#define WRITE_DATA_LOW                                          0x3c0
-#define WRITE_DATA_HIGH                                         0x3c8
-#define WRITE_BYTE_ENABLE                                       0X3e0
-#define READ_DATA_LOW                                           0x3d0
-#define READ_DATA_HIGH                                          0x3d8
-#define READ_ID                                                 0x3e8
-
-
-/*
- * SDRAM and Device Address Space
- */
-
-
-/*
- * SDRAM Configuration
- */
-
-#define SDRAM_CONFIGURATION                                     0x448
-#define SDRAM_OPERATION_MODE                                    0x474
-#define SDRAM_ADDRESS_DECODE                                    0x47C
-#define SDRAM_TIMING_PARAMETERS                                 0x4b4
-#define SDRAM_UMA_CONTROL                                       0x4a4
-#define SDRAM_CROSS_BAR_CONTROL_LOW                             0x4a8
-#define SDRAM_CROSS_BAR_CONTROL_HIGH                            0x4ac
-#define SDRAM_CROSS_BAR_TIMEOUT                                 0x4b0
-
-
-/*
- * SDRAM Parameters
- */
-
-#define SDRAM_BANK0PARAMETERS                                   0x44C
-#define SDRAM_BANK1PARAMETERS                                   0x450
-#define SDRAM_BANK2PARAMETERS                                   0x454
-#define SDRAM_BANK3PARAMETERS                                   0x458
-
-
-/*
- * SDRAM Error Report
- */
-
-#define SDRAM_ERROR_DATA_LOW                                    0x484
-#define SDRAM_ERROR_DATA_HIGH                                   0x480
-#define SDRAM_AND_DEVICE_ERROR_ADDRESS                          0x490
-#define SDRAM_RECEIVED_ECC                                      0x488
-#define SDRAM_CALCULATED_ECC                                    0x48c
-#define SDRAM_ECC_CONTROL                                       0x494
-#define SDRAM_ECC_ERROR_COUNTER                                 0x498
-
-
-/*
- * SDunit Debug (for internal use)
- */
-
-#define X0_ADDRESS                                              0x500
-#define X0_COMMAND_AND_ID                                       0x504
-#define X0_WRITE_DATA_LOW                                       0x508
-#define X0_WRITE_DATA_HIGH                                      0x50c
-#define X0_WRITE_BYTE_ENABLE                                    0x518
-#define X0_READ_DATA_LOW                                        0x510
-#define X0_READ_DATA_HIGH                                       0x514
-#define X0_READ_ID                                              0x51c
-#define X1_ADDRESS                                              0x520
-#define X1_COMMAND_AND_ID                                       0x524
-#define X1_WRITE_DATA_LOW                                       0x528
-#define X1_WRITE_DATA_HIGH                                      0x52c
-#define X1_WRITE_BYTE_ENABLE                                    0x538
-#define X1_READ_DATA_LOW                                        0x530
-#define X1_READ_DATA_HIGH                                       0x534
-#define X1_READ_ID                                              0x53c
-#define X0_SNOOP_ADDRESS                                        0x540
-#define X0_SNOOP_COMMAND                                        0x544
-#define X1_SNOOP_ADDRESS                                        0x548
-#define X1_SNOOP_COMMAND                                        0x54c
-
-
-/*
- * Device Parameters
- */
-
-#define DEVICE_BANK0PARAMETERS                                  0x45c
-#define DEVICE_BANK1PARAMETERS                                  0x460
-#define DEVICE_BANK2PARAMETERS                                  0x464
-#define DEVICE_BANK3PARAMETERS                                  0x468
-#define DEVICE_BOOT_BANK_PARAMETERS                             0x46c
-#define DEVICE_CONTROL                                          0x4c0
-#define DEVICE_CROSS_BAR_CONTROL_LOW                            0x4c8
-#define DEVICE_CROSS_BAR_CONTROL_HIGH                           0x4cc
-#define DEVICE_CROSS_BAR_TIMEOUT                                0x4c4
-
-
-/*
- * Device Interrupt
- */
-
-#define DEVICE_INTERRUPT_CAUSE                                  0x4d0
-#define DEVICE_INTERRUPT_MASK                                   0x4d4
-#define DEVICE_ERROR_ADDRESS                                    0x4d8
-
-/*
- * DMA Record
- */
-
-#define CHANNEL0_DMA_BYTE_COUNT                                 0x800
-#define CHANNEL1_DMA_BYTE_COUNT                                 0x804
-#define CHANNEL2_DMA_BYTE_COUNT                                 0x808
-#define CHANNEL3_DMA_BYTE_COUNT                                 0x80C
-#define CHANNEL4_DMA_BYTE_COUNT                                 0x900
-#define CHANNEL5_DMA_BYTE_COUNT                                 0x904
-#define CHANNEL6_DMA_BYTE_COUNT                                 0x908
-#define CHANNEL7_DMA_BYTE_COUNT                                 0x90C
-#define CHANNEL0_DMA_SOURCE_ADDRESS                             0x810
-#define CHANNEL1_DMA_SOURCE_ADDRESS                             0x814
-#define CHANNEL2_DMA_SOURCE_ADDRESS                             0x818
-#define CHANNEL3_DMA_SOURCE_ADDRESS                             0x81C
-#define CHANNEL4_DMA_SOURCE_ADDRESS                             0x910
-#define CHANNEL5_DMA_SOURCE_ADDRESS                             0x914
-#define CHANNEL6_DMA_SOURCE_ADDRESS                             0x918
-#define CHANNEL7_DMA_SOURCE_ADDRESS                             0x91C
-#define CHANNEL0_DMA_DESTINATION_ADDRESS                        0x820
-#define CHANNEL1_DMA_DESTINATION_ADDRESS                        0x824
-#define CHANNEL2_DMA_DESTINATION_ADDRESS                        0x828
-#define CHANNEL3_DMA_DESTINATION_ADDRESS                        0x82C
-#define CHANNEL4_DMA_DESTINATION_ADDRESS                        0x920
-#define CHANNEL5_DMA_DESTINATION_ADDRESS                        0x924
-#define CHANNEL6_DMA_DESTINATION_ADDRESS                        0x928
-#define CHANNEL7_DMA_DESTINATION_ADDRESS                        0x92C
-#define CHANNEL0NEXT_RECORD_POINTER                             0x830
-#define CHANNEL1NEXT_RECORD_POINTER                             0x834
-#define CHANNEL2NEXT_RECORD_POINTER                             0x838
-#define CHANNEL3NEXT_RECORD_POINTER                             0x83C
-#define CHANNEL4NEXT_RECORD_POINTER                             0x930
-#define CHANNEL5NEXT_RECORD_POINTER                             0x934
-#define CHANNEL6NEXT_RECORD_POINTER                             0x938
-#define CHANNEL7NEXT_RECORD_POINTER                             0x93C
-#define CHANNEL0CURRENT_DESCRIPTOR_POINTER                      0x870
-#define CHANNEL1CURRENT_DESCRIPTOR_POINTER                      0x874
-#define CHANNEL2CURRENT_DESCRIPTOR_POINTER                      0x878
-#define CHANNEL3CURRENT_DESCRIPTOR_POINTER                      0x87C
-#define CHANNEL4CURRENT_DESCRIPTOR_POINTER                      0x970
-#define CHANNEL5CURRENT_DESCRIPTOR_POINTER                      0x974
-#define CHANNEL6CURRENT_DESCRIPTOR_POINTER                      0x978
-#define CHANNEL7CURRENT_DESCRIPTOR_POINTER                      0x97C
-#define CHANNEL0_DMA_SOURCE_HIGH_PCI_ADDRESS                    0x890
-#define CHANNEL1_DMA_SOURCE_HIGH_PCI_ADDRESS                    0x894
-#define CHANNEL2_DMA_SOURCE_HIGH_PCI_ADDRESS                    0x898
-#define CHANNEL3_DMA_SOURCE_HIGH_PCI_ADDRESS                    0x89c
-#define CHANNEL4_DMA_SOURCE_HIGH_PCI_ADDRESS                    0x990
-#define CHANNEL5_DMA_SOURCE_HIGH_PCI_ADDRESS                    0x994
-#define CHANNEL6_DMA_SOURCE_HIGH_PCI_ADDRESS                    0x998
-#define CHANNEL7_DMA_SOURCE_HIGH_PCI_ADDRESS                    0x99c
-#define CHANNEL0_DMA_DESTINATION_HIGH_PCI_ADDRESS               0x8a0
-#define CHANNEL1_DMA_DESTINATION_HIGH_PCI_ADDRESS               0x8a4
-#define CHANNEL2_DMA_DESTINATION_HIGH_PCI_ADDRESS               0x8a8
-#define CHANNEL3_DMA_DESTINATION_HIGH_PCI_ADDRESS               0x8ac
-#define CHANNEL4_DMA_DESTINATION_HIGH_PCI_ADDRESS               0x9a0
-#define CHANNEL5_DMA_DESTINATION_HIGH_PCI_ADDRESS               0x9a4
-#define CHANNEL6_DMA_DESTINATION_HIGH_PCI_ADDRESS               0x9a8
-#define CHANNEL7_DMA_DESTINATION_HIGH_PCI_ADDRESS               0x9ac
-#define CHANNEL0_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS       0x8b0
-#define CHANNEL1_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS       0x8b4
-#define CHANNEL2_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS       0x8b8
-#define CHANNEL3_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS       0x8bc
-#define CHANNEL4_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS       0x9b0
-#define CHANNEL5_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS       0x9b4
-#define CHANNEL6_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS       0x9b8
-#define CHANNEL7_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS       0x9bc
-
-/*
- * DMA Channel Control
- */
-
-#define CHANNEL0CONTROL                                         0x840
-#define CHANNEL0CONTROL_HIGH                                    0x880
-
-#define CHANNEL1CONTROL                                         0x844
-#define CHANNEL1CONTROL_HIGH                                    0x884
-
-#define CHANNEL2CONTROL                                         0x848
-#define CHANNEL2CONTROL_HIGH                                    0x888
-
-#define CHANNEL3CONTROL                                         0x84C
-#define CHANNEL3CONTROL_HIGH                                    0x88C
-
-#define CHANNEL4CONTROL                                         0x940
-#define CHANNEL4CONTROL_HIGH                                    0x980
-
-#define CHANNEL5CONTROL                                         0x944
-#define CHANNEL5CONTROL_HIGH                                    0x984
-
-#define CHANNEL6CONTROL                                         0x948
-#define CHANNEL6CONTROL_HIGH                                    0x988
-
-#define CHANNEL7CONTROL                                         0x94C
-#define CHANNEL7CONTROL_HIGH                                    0x98C
-
-
-/*
- * DMA Arbiter
- */
-
-#define ARBITER_CONTROL_0_3                                     0x860
-#define ARBITER_CONTROL_4_7                                     0x960
-
-
-/*
- * DMA Interrupt
- */
-
-#define CHANELS0_3_INTERRUPT_CAUSE                              0x8c0
-#define CHANELS0_3_INTERRUPT_MASK                               0x8c4
-#define CHANELS0_3_ERROR_ADDRESS                                0x8c8
-#define CHANELS0_3_ERROR_SELECT                                 0x8cc
-#define CHANELS4_7_INTERRUPT_CAUSE                              0x9c0
-#define CHANELS4_7_INTERRUPT_MASK                               0x9c4
-#define CHANELS4_7_ERROR_ADDRESS                                0x9c8
-#define CHANELS4_7_ERROR_SELECT                                 0x9cc
-
-
-/*
- * DMA Debug (for internal use)
- */
-
-#define DMA_X0_ADDRESS                                          0x8e0
-#define DMA_X0_COMMAND_AND_ID                                   0x8e4
-#define DMA_X0_WRITE_DATA_LOW                                   0x8e8
-#define DMA_X0_WRITE_DATA_HIGH                                  0x8ec
-#define DMA_X0_WRITE_BYTE_ENABLE                                0x8f8
-#define DMA_X0_READ_DATA_LOW                                    0x8f0
-#define DMA_X0_READ_DATA_HIGH                                   0x8f4
-#define DMA_X0_READ_ID                                          0x8fc
-#define DMA_X1_ADDRESS                                          0x9e0
-#define DMA_X1_COMMAND_AND_ID                                   0x9e4
-#define DMA_X1_WRITE_DATA_LOW                                   0x9e8
-#define DMA_X1_WRITE_DATA_HIGH                                  0x9ec
-#define DMA_X1_WRITE_BYTE_ENABLE                                0x9f8
-#define DMA_X1_READ_DATA_LOW                                    0x9f0
-#define DMA_X1_READ_DATA_HIGH                                   0x9f4
-#define DMA_X1_READ_ID                                          0x9fc
-
-/*
- * Timer_Counter
- */
-
-#define TIMER_COUNTER0                                          0x850
-#define TIMER_COUNTER1                                          0x854
-#define TIMER_COUNTER2                                          0x858
-#define TIMER_COUNTER3                                          0x85C
-#define TIMER_COUNTER_0_3_CONTROL                               0x864
-#define TIMER_COUNTER_0_3_INTERRUPT_CAUSE                       0x868
-#define TIMER_COUNTER_0_3_INTERRUPT_MASK                        0x86c
-#define TIMER_COUNTER4                                          0x950
-#define TIMER_COUNTER5                                          0x954
-#define TIMER_COUNTER6                                          0x958
-#define TIMER_COUNTER7                                          0x95C
-#define TIMER_COUNTER_4_7_CONTROL                               0x964
-#define TIMER_COUNTER_4_7_INTERRUPT_CAUSE                       0x968
-#define TIMER_COUNTER_4_7_INTERRUPT_MASK                        0x96c
-
-/*
- * PCI Slave Address Decoding
- */
-
-#define PCI_0SCS_0_BANK_SIZE                                    0xc08
-#define PCI_1SCS_0_BANK_SIZE                                    0xc88
-#define PCI_0SCS_1_BANK_SIZE                                    0xd08
-#define PCI_1SCS_1_BANK_SIZE                                    0xd88
-#define PCI_0SCS_2_BANK_SIZE                                    0xc0c
-#define PCI_1SCS_2_BANK_SIZE                                    0xc8c
-#define PCI_0SCS_3_BANK_SIZE                                    0xd0c
-#define PCI_1SCS_3_BANK_SIZE                                    0xd8c
-#define PCI_0CS_0_BANK_SIZE                                     0xc10
-#define PCI_1CS_0_BANK_SIZE                                     0xc90
-#define PCI_0CS_1_BANK_SIZE                                     0xd10
-#define PCI_1CS_1_BANK_SIZE                                     0xd90
-#define PCI_0CS_2_BANK_SIZE                                     0xd18
-#define PCI_1CS_2_BANK_SIZE                                     0xd98
-#define PCI_0CS_3_BANK_SIZE                                     0xc14
-#define PCI_1CS_3_BANK_SIZE                                     0xc94
-#define PCI_0CS_BOOT_BANK_SIZE                                  0xd14
-#define PCI_1CS_BOOT_BANK_SIZE                                  0xd94
-#define PCI_0P2P_MEM0_BAR_SIZE                                  0xd1c
-#define PCI_1P2P_MEM0_BAR_SIZE                                  0xd9c
-#define PCI_0P2P_MEM1_BAR_SIZE                                  0xd20
-#define PCI_1P2P_MEM1_BAR_SIZE                                  0xda0
-#define PCI_0P2P_I_O_BAR_SIZE                                   0xd24
-#define PCI_1P2P_I_O_BAR_SIZE                                   0xda4
-#define PCI_0CPU_BAR_SIZE                                       0xd28
-#define PCI_1CPU_BAR_SIZE                                       0xda8
-#define PCI_0DAC_SCS_0_BANK_SIZE                                0xe00
-#define PCI_1DAC_SCS_0_BANK_SIZE                                0xe80
-#define PCI_0DAC_SCS_1_BANK_SIZE                                0xe04
-#define PCI_1DAC_SCS_1_BANK_SIZE                                0xe84
-#define PCI_0DAC_SCS_2_BANK_SIZE                                0xe08
-#define PCI_1DAC_SCS_2_BANK_SIZE                                0xe88
-#define PCI_0DAC_SCS_3_BANK_SIZE                                0xe0c
-#define PCI_1DAC_SCS_3_BANK_SIZE                                0xe8c
-#define PCI_0DAC_CS_0_BANK_SIZE                                 0xe10
-#define PCI_1DAC_CS_0_BANK_SIZE                                 0xe90
-#define PCI_0DAC_CS_1_BANK_SIZE                                 0xe14
-#define PCI_1DAC_CS_1_BANK_SIZE                                 0xe94
-#define PCI_0DAC_CS_2_BANK_SIZE                                 0xe18
-#define PCI_1DAC_CS_2_BANK_SIZE                                 0xe98
-#define PCI_0DAC_CS_3_BANK_SIZE                                 0xe1c
-#define PCI_1DAC_CS_3_BANK_SIZE                                 0xe9c
-#define PCI_0DAC_BOOTCS_BANK_SIZE                               0xe20
-#define PCI_1DAC_BOOTCS_BANK_SIZE                               0xea0
-#define PCI_0DAC_P2P_MEM0_BAR_SIZE                              0xe24
-#define PCI_1DAC_P2P_MEM0_BAR_SIZE                              0xea4
-#define PCI_0DAC_P2P_MEM1_BAR_SIZE                              0xe28
-#define PCI_1DAC_P2P_MEM1_BAR_SIZE                              0xea8
-#define PCI_0DAC_CPU_BAR_SIZE                                   0xe2c
-#define PCI_1DAC_CPU_BAR_SIZE                                   0xeac
-#define PCI_0EXPANSION_ROM_BAR_SIZE                             0xd2c
-#define PCI_1EXPANSION_ROM_BAR_SIZE                             0xdac
-#define PCI_0BASE_ADDRESS_REGISTERS_ENABLE                      0xc3c
-#define PCI_1BASE_ADDRESS_REGISTERS_ENABLE                      0xcbc
-#define PCI_0SCS_0_BASE_ADDRESS_REMAP                           0xc48
-#define PCI_1SCS_0_BASE_ADDRESS_REMAP                           0xcc8
-#define PCI_0SCS_1_BASE_ADDRESS_REMAP                           0xd48
-#define PCI_1SCS_1_BASE_ADDRESS_REMAP                           0xdc8
-#define PCI_0SCS_2_BASE_ADDRESS_REMAP                           0xc4c
-#define PCI_1SCS_2_BASE_ADDRESS_REMAP                           0xccc
-#define PCI_0SCS_3_BASE_ADDRESS_REMAP                           0xd4c
-#define PCI_1SCS_3_BASE_ADDRESS_REMAP                           0xdcc
-#define PCI_0CS_0_BASE_ADDRESS_REMAP                            0xc50
-#define PCI_1CS_0_BASE_ADDRESS_REMAP                            0xcd0
-#define PCI_0CS_1_BASE_ADDRESS_REMAP                            0xd50
-#define PCI_1CS_1_BASE_ADDRESS_REMAP                            0xdd0
-#define PCI_0CS_2_BASE_ADDRESS_REMAP                            0xd58
-#define PCI_1CS_2_BASE_ADDRESS_REMAP                            0xdd8
-#define PCI_0CS_3_BASE_ADDRESS_REMAP                            0xc54
-#define PCI_1CS_3_BASE_ADDRESS_REMAP                            0xcd4
-#define PCI_0CS_BOOTCS_BASE_ADDRESS_REMAP                       0xd54
-#define PCI_1CS_BOOTCS_BASE_ADDRESS_REMAP                       0xdd4
-#define PCI_0P2P_MEM0_BASE_ADDRESS_REMAP_LOW                    0xd5c
-#define PCI_1P2P_MEM0_BASE_ADDRESS_REMAP_LOW                    0xddc
-#define PCI_0P2P_MEM0_BASE_ADDRESS_REMAP_HIGH                   0xd60
-#define PCI_1P2P_MEM0_BASE_ADDRESS_REMAP_HIGH                   0xde0
-#define PCI_0P2P_MEM1_BASE_ADDRESS_REMAP_LOW                    0xd64
-#define PCI_1P2P_MEM1_BASE_ADDRESS_REMAP_LOW                    0xde4
-#define PCI_0P2P_MEM1_BASE_ADDRESS_REMAP_HIGH                   0xd68
-#define PCI_1P2P_MEM1_BASE_ADDRESS_REMAP_HIGH                   0xde8
-#define PCI_0P2P_I_O_BASE_ADDRESS_REMAP                         0xd6c
-#define PCI_1P2P_I_O_BASE_ADDRESS_REMAP                         0xdec
-#define PCI_0CPU_BASE_ADDRESS_REMAP                             0xd70
-#define PCI_1CPU_BASE_ADDRESS_REMAP                             0xdf0
-#define PCI_0DAC_SCS_0_BASE_ADDRESS_REMAP                       0xf00
-#define PCI_1DAC_SCS_0_BASE_ADDRESS_REMAP                       0xff0
-#define PCI_0DAC_SCS_1_BASE_ADDRESS_REMAP                       0xf04
-#define PCI_1DAC_SCS_1_BASE_ADDRESS_REMAP                       0xf84
-#define PCI_0DAC_SCS_2_BASE_ADDRESS_REMAP                       0xf08
-#define PCI_1DAC_SCS_2_BASE_ADDRESS_REMAP                       0xf88
-#define PCI_0DAC_SCS_3_BASE_ADDRESS_REMAP                       0xf0c
-#define PCI_1DAC_SCS_3_BASE_ADDRESS_REMAP                       0xf8c
-#define PCI_0DAC_CS_0_BASE_ADDRESS_REMAP                        0xf10
-#define PCI_1DAC_CS_0_BASE_ADDRESS_REMAP                        0xf90
-#define PCI_0DAC_CS_1_BASE_ADDRESS_REMAP                        0xf14
-#define PCI_1DAC_CS_1_BASE_ADDRESS_REMAP                        0xf94
-#define PCI_0DAC_CS_2_BASE_ADDRESS_REMAP                        0xf18
-#define PCI_1DAC_CS_2_BASE_ADDRESS_REMAP                        0xf98
-#define PCI_0DAC_CS_3_BASE_ADDRESS_REMAP                        0xf1c
-#define PCI_1DAC_CS_3_BASE_ADDRESS_REMAP                        0xf9c
-#define PCI_0DAC_BOOTCS_BASE_ADDRESS_REMAP                      0xf20
-#define PCI_1DAC_BOOTCS_BASE_ADDRESS_REMAP                      0xfa0
-#define PCI_0DAC_P2P_MEM0_BASE_ADDRESS_REMAP_LOW                0xf24
-#define PCI_1DAC_P2P_MEM0_BASE_ADDRESS_REMAP_LOW                0xfa4
-#define PCI_0DAC_P2P_MEM0_BASE_ADDRESS_REMAP_HIGH               0xf28
-#define PCI_1DAC_P2P_MEM0_BASE_ADDRESS_REMAP_HIGH               0xfa8
-#define PCI_0DAC_P2P_MEM1_BASE_ADDRESS_REMAP_LOW                0xf2c
-#define PCI_1DAC_P2P_MEM1_BASE_ADDRESS_REMAP_LOW                0xfac
-#define PCI_0DAC_P2P_MEM1_BASE_ADDRESS_REMAP_HIGH               0xf30
-#define PCI_1DAC_P2P_MEM1_BASE_ADDRESS_REMAP_HIGH               0xfb0
-#define PCI_0DAC_CPU_BASE_ADDRESS_REMAP                         0xf34
-#define PCI_1DAC_CPU_BASE_ADDRESS_REMAP                         0xfb4
-#define PCI_0EXPANSION_ROM_BASE_ADDRESS_REMAP                   0xf38
-#define PCI_1EXPANSION_ROM_BASE_ADDRESS_REMAP                   0xfb8
-#define PCI_0ADDRESS_DECODE_CONTROL                             0xd3c
-#define PCI_1ADDRESS_DECODE_CONTROL                             0xdbc
-
-/*
- * PCI Control
- */
-
-#define PCI_0COMMAND                                            0xc00
-#define PCI_1COMMAND                                            0xc80
-#define PCI_0MODE                                               0xd00
-#define PCI_1MODE                                               0xd80
-#define PCI_0TIMEOUT_RETRY                                      0xc04
-#define PCI_1TIMEOUT_RETRY                                      0xc84
-#define PCI_0READ_BUFFER_DISCARD_TIMER                          0xd04
-#define PCI_1READ_BUFFER_DISCARD_TIMER                          0xd84
-#define MSI_0TRIGGER_TIMER                                      0xc38
-#define MSI_1TRIGGER_TIMER                                      0xcb8
-#define PCI_0ARBITER_CONTROL                                    0x1d00
-#define PCI_1ARBITER_CONTROL                                    0x1d80
-/* changing untill here */
-#define PCI_0CROSS_BAR_CONTROL_LOW                               0x1d08
-#define PCI_0CROSS_BAR_CONTROL_HIGH                              0x1d0c
-#define PCI_0CROSS_BAR_TIMEOUT                                   0x1d04
-#define PCI_0READ_RESPONSE_CROSS_BAR_CONTROL_LOW                 0x1d18
-#define PCI_0READ_RESPONSE_CROSS_BAR_CONTROL_HIGH                0x1d1c
-#define PCI_0SYNC_BARRIER_VIRTUAL_REGISTER                       0x1d10
-#define PCI_0P2P_CONFIGURATION                                   0x1d14
-#define PCI_0ACCESS_CONTROL_BASE_0_LOW                           0x1e00
-#define PCI_0ACCESS_CONTROL_BASE_0_HIGH                          0x1e04
-#define PCI_0ACCESS_CONTROL_TOP_0                                0x1e08
-#define PCI_0ACCESS_CONTROL_BASE_1_LOW                           0c1e10
-#define PCI_0ACCESS_CONTROL_BASE_1_HIGH                          0x1e14
-#define PCI_0ACCESS_CONTROL_TOP_1                                0x1e18
-#define PCI_0ACCESS_CONTROL_BASE_2_LOW                           0c1e20
-#define PCI_0ACCESS_CONTROL_BASE_2_HIGH                          0x1e24
-#define PCI_0ACCESS_CONTROL_TOP_2                                0x1e28
-#define PCI_0ACCESS_CONTROL_BASE_3_LOW                           0c1e30
-#define PCI_0ACCESS_CONTROL_BASE_3_HIGH                          0x1e34
-#define PCI_0ACCESS_CONTROL_TOP_3                                0x1e38
-#define PCI_0ACCESS_CONTROL_BASE_4_LOW                           0c1e40
-#define PCI_0ACCESS_CONTROL_BASE_4_HIGH                          0x1e44
-#define PCI_0ACCESS_CONTROL_TOP_4                                0x1e48
-#define PCI_0ACCESS_CONTROL_BASE_5_LOW                           0c1e50
-#define PCI_0ACCESS_CONTROL_BASE_5_HIGH                          0x1e54
-#define PCI_0ACCESS_CONTROL_TOP_5                                0x1e58
-#define PCI_0ACCESS_CONTROL_BASE_6_LOW                           0c1e60
-#define PCI_0ACCESS_CONTROL_BASE_6_HIGH                          0x1e64
-#define PCI_0ACCESS_CONTROL_TOP_6                                0x1e68
-#define PCI_0ACCESS_CONTROL_BASE_7_LOW                           0c1e70
-#define PCI_0ACCESS_CONTROL_BASE_7_HIGH                          0x1e74
-#define PCI_0ACCESS_CONTROL_TOP_7                                0x1e78
-#define PCI_1CROSS_BAR_CONTROL_LOW                               0x1d88
-#define PCI_1CROSS_BAR_CONTROL_HIGH                              0x1d8c
-#define PCI_1CROSS_BAR_TIMEOUT                                   0x1d84
-#define PCI_1READ_RESPONSE_CROSS_BAR_CONTROL_LOW                 0x1d98
-#define PCI_1READ_RESPONSE_CROSS_BAR_CONTROL_HIGH                0x1d9c
-#define PCI_1SYNC_BARRIER_VIRTUAL_REGISTER                       0x1d90
-#define PCI_1P2P_CONFIGURATION                                   0x1d94
-#define PCI_1ACCESS_CONTROL_BASE_0_LOW                           0x1e80
-#define PCI_1ACCESS_CONTROL_BASE_0_HIGH                          0x1e84
-#define PCI_1ACCESS_CONTROL_TOP_0                                0x1e88
-#define PCI_1ACCESS_CONTROL_BASE_1_LOW                           0c1e90
-#define PCI_1ACCESS_CONTROL_BASE_1_HIGH                          0x1e94
-#define PCI_1ACCESS_CONTROL_TOP_1                                0x1e98
-#define PCI_1ACCESS_CONTROL_BASE_2_LOW                           0c1ea0
-#define PCI_1ACCESS_CONTROL_BASE_2_HIGH                          0x1ea4
-#define PCI_1ACCESS_CONTROL_TOP_2                                0x1ea8
-#define PCI_1ACCESS_CONTROL_BASE_3_LOW                           0c1eb0
-#define PCI_1ACCESS_CONTROL_BASE_3_HIGH                          0x1eb4
-#define PCI_1ACCESS_CONTROL_TOP_3                                0x1eb8
-#define PCI_1ACCESS_CONTROL_BASE_4_LOW                           0c1ec0
-#define PCI_1ACCESS_CONTROL_BASE_4_HIGH                          0x1ec4
-#define PCI_1ACCESS_CONTROL_TOP_4                                0x1ec8
-#define PCI_1ACCESS_CONTROL_BASE_5_LOW                           0c1ed0
-#define PCI_1ACCESS_CONTROL_BASE_5_HIGH                          0x1ed4
-#define PCI_1ACCESS_CONTROL_TOP_5                                0x1ed8
-#define PCI_1ACCESS_CONTROL_BASE_6_LOW                           0c1ee0
-#define PCI_1ACCESS_CONTROL_BASE_6_HIGH                          0x1ee4
-#define PCI_1ACCESS_CONTROL_TOP_6                                0x1ee8
-#define PCI_1ACCESS_CONTROL_BASE_7_LOW                           0c1ef0
-#define PCI_1ACCESS_CONTROL_BASE_7_HIGH                          0x1ef4
-#define PCI_1ACCESS_CONTROL_TOP_7                                0x1ef8
-
-/*
- * PCI Snoop Control
- */
-
-#define PCI_0SNOOP_CONTROL_BASE_0_LOW                            0x1f00
-#define PCI_0SNOOP_CONTROL_BASE_0_HIGH                           0x1f04
-#define PCI_0SNOOP_CONTROL_TOP_0                                 0x1f08
-#define PCI_0SNOOP_CONTROL_BASE_1_0_LOW                          0x1f10
-#define PCI_0SNOOP_CONTROL_BASE_1_0_HIGH                         0x1f14
-#define PCI_0SNOOP_CONTROL_TOP_1                                 0x1f18
-#define PCI_0SNOOP_CONTROL_BASE_2_0_LOW                          0x1f20
-#define PCI_0SNOOP_CONTROL_BASE_2_0_HIGH                         0x1f24
-#define PCI_0SNOOP_CONTROL_TOP_2                                 0x1f28
-#define PCI_0SNOOP_CONTROL_BASE_3_0_LOW                          0x1f30
-#define PCI_0SNOOP_CONTROL_BASE_3_0_HIGH                         0x1f34
-#define PCI_0SNOOP_CONTROL_TOP_3                                 0x1f38
-#define PCI_1SNOOP_CONTROL_BASE_0_LOW                            0x1f80
-#define PCI_1SNOOP_CONTROL_BASE_0_HIGH                           0x1f84
-#define PCI_1SNOOP_CONTROL_TOP_0                                 0x1f88
-#define PCI_1SNOOP_CONTROL_BASE_1_0_LOW                          0x1f90
-#define PCI_1SNOOP_CONTROL_BASE_1_0_HIGH                         0x1f94
-#define PCI_1SNOOP_CONTROL_TOP_1                                 0x1f98
-#define PCI_1SNOOP_CONTROL_BASE_2_0_LOW                          0x1fa0
-#define PCI_1SNOOP_CONTROL_BASE_2_0_HIGH                         0x1fa4
-#define PCI_1SNOOP_CONTROL_TOP_2                                 0x1fa8
-#define PCI_1SNOOP_CONTROL_BASE_3_0_LOW                          0x1fb0
-#define PCI_1SNOOP_CONTROL_BASE_3_0_HIGH                         0x1fb4
-#define PCI_1SNOOP_CONTROL_TOP_3                                 0x1fb8
-
-/*
- * PCI Configuration Address
- */
-
-#define PCI_0CONFIGURATION_ADDRESS                              0xcf8
-#define PCI_0CONFIGURATION_DATA_VIRTUAL_REGISTER                0xcfc
-#define PCI_1CONFIGURATION_ADDRESS                              0xc78
-#define PCI_1CONFIGURATION_DATA_VIRTUAL_REGISTER                0xc7c
-#define PCI_0INTERRUPT_ACKNOWLEDGE_VIRTUAL_REGISTER             0xc34
-#define PCI_1INTERRUPT_ACKNOWLEDGE_VIRTUAL_REGISTER             0xcb4
-
-/*
- * PCI Error Report
- */
-
-#define PCI_0SERR_MASK                                           0xc28
-#define PCI_0ERROR_ADDRESS_LOW                                   0x1d40
-#define PCI_0ERROR_ADDRESS_HIGH                                  0x1d44
-#define PCI_0ERROR_DATA_LOW                                      0x1d48
-#define PCI_0ERROR_DATA_HIGH                                     0x1d4c
-#define PCI_0ERROR_COMMAND                                       0x1d50
-#define PCI_0ERROR_CAUSE                                         0x1d58
-#define PCI_0ERROR_MASK                                          0x1d5c
-
-#define PCI_1SERR_MASK                                           0xca8
-#define PCI_1ERROR_ADDRESS_LOW                                   0x1dc0
-#define PCI_1ERROR_ADDRESS_HIGH                                  0x1dc4
-#define PCI_1ERROR_DATA_LOW                                      0x1dc8
-#define PCI_1ERROR_DATA_HIGH                                     0x1dcc
-#define PCI_1ERROR_COMMAND                                       0x1dd0
-#define PCI_1ERROR_CAUSE                                         0x1dd8
-#define PCI_1ERROR_MASK                                          0x1ddc
-
-
-/*
- * Lslave Debug  (for internal use)
- */
-
-#define L_SLAVE_X0_ADDRESS                                      0x1d20
-#define L_SLAVE_X0_COMMAND_AND_ID                               0x1d24
-#define L_SLAVE_X1_ADDRESS                                      0x1d28
-#define L_SLAVE_X1_COMMAND_AND_ID                               0x1d2c
-#define L_SLAVE_WRITE_DATA_LOW                                  0x1d30
-#define L_SLAVE_WRITE_DATA_HIGH                                 0x1d34
-#define L_SLAVE_WRITE_BYTE_ENABLE                               0x1d60
-#define L_SLAVE_READ_DATA_LOW                                   0x1d38
-#define L_SLAVE_READ_DATA_HIGH                                  0x1d3c
-#define L_SLAVE_READ_ID                                         0x1d64
-
-#if 0 /* Disabled because PCI_* namespace belongs to PCI subsystem ... */
-
-/*
- * PCI Configuration Function 0
- */
-
-#define PCI_DEVICE_AND_VENDOR_ID                                0x000
-#define PCI_STATUS_AND_COMMAND                                  0x004
-#define PCI_CLASS_CODE_AND_REVISION_ID                          0x008
-#define PCI_BIST_HEADER_TYPE_LATENCY_TIMER_CACHE_LINE           0x00C
-#define PCI_SCS_0_BASE_ADDRESS                                  0x010
-#define PCI_SCS_1_BASE_ADDRESS                                  0x014
-#define PCI_SCS_2_BASE_ADDRESS                                  0x018
-#define PCI_SCS_3_BASE_ADDRESS                                  0x01C
-#define PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS       0x020
-#define PCI_INTERNAL_REGISTERS_I_OMAPPED_BASE_ADDRESS           0x024
-#define PCI_SUBSYSTEM_ID_AND_SUBSYSTEM_VENDOR_ID                0x02C
-#define PCI_EXPANSION_ROM_BASE_ADDRESS_REGISTER                 0x030
-#define PCI_CAPABILTY_LIST_POINTER                              0x034
-#define PCI_INTERRUPT_PIN_AND_LINE                              0x03C
-#define PCI_POWER_MANAGEMENT_CAPABILITY                         0x040
-#define PCI_POWER_MANAGEMENT_STATUS_AND_CONTROL                 0x044
-#define PCI_VPD_ADDRESS                                         0x048
-#define PCI_VPD_DATA                                            0X04c
-#define PCI_MSI_MESSAGE_CONTROL                                 0x050
-#define PCI_MSI_MESSAGE_ADDRESS                                 0x054
-#define PCI_MSI_MESSAGE_UPPER_ADDRESS                           0x058
-#define PCI_MSI_MESSAGE_DATA                                    0x05c
-#define PCI_COMPACT_PCI_HOT_SWAP_CAPABILITY                     0x058
-
-/*
- * PCI Configuration Function 1
- */
-
-#define PCI_CS_0_BASE_ADDRESS                                   0x110
-#define PCI_CS_1_BASE_ADDRESS                                   0x114
-#define PCI_CS_2_BASE_ADDRESS                                   0x118
-#define PCI_CS_3_BASE_ADDRESS                                   0x11c
-#define PCI_BOOTCS_BASE_ADDRESS                                 0x120
-
-/*
- * PCI Configuration Function 2
- */
-
-#define PCI_P2P_MEM0_BASE_ADDRESS                               0x210
-#define PCI_P2P_MEM1_BASE_ADDRESS                               0x214
-#define PCI_P2P_I_O_BASE_ADDRESS                                0x218
-#define PCI_CPU_BASE_ADDRESS                                    0x21c
-
-/*
- * PCI Configuration Function 4
- */
-
-#define PCI_DAC_SCS_0_BASE_ADDRESS_LOW                          0x410
-#define PCI_DAC_SCS_0_BASE_ADDRESS_HIGH                         0x414
-#define PCI_DAC_SCS_1_BASE_ADDRESS_LOW                          0x418
-#define PCI_DAC_SCS_1_BASE_ADDRESS_HIGH                         0x41c
-#define PCI_DAC_P2P_MEM0_BASE_ADDRESS_LOW                       0x420
-#define PCI_DAC_P2P_MEM0_BASE_ADDRESS_HIGH                      0x424
-
-
-/*
- * PCI Configuration Function 5
- */
-
-#define PCI_DAC_SCS_2_BASE_ADDRESS_LOW                          0x510
-#define PCI_DAC_SCS_2_BASE_ADDRESS_HIGH                         0x514
-#define PCI_DAC_SCS_3_BASE_ADDRESS_LOW                          0x518
-#define PCI_DAC_SCS_3_BASE_ADDRESS_HIGH                         0x51c
-#define PCI_DAC_P2P_MEM1_BASE_ADDRESS_LOW                       0x520
-#define PCI_DAC_P2P_MEM1_BASE_ADDRESS_HIGH                      0x524
-
-
-/*
- * PCI Configuration Function 6
- */
-
-#define PCI_DAC_CS_0_BASE_ADDRESS_LOW                           0x610
-#define PCI_DAC_CS_0_BASE_ADDRESS_HIGH                          0x614
-#define PCI_DAC_CS_1_BASE_ADDRESS_LOW                           0x618
-#define PCI_DAC_CS_1_BASE_ADDRESS_HIGH                          0x61c
-#define PCI_DAC_CS_2_BASE_ADDRESS_LOW                           0x620
-#define PCI_DAC_CS_2_BASE_ADDRESS_HIGH                          0x624
-
-/*
- * PCI Configuration Function 7
- */
-
-#define PCI_DAC_CS_3_BASE_ADDRESS_LOW                           0x710
-#define PCI_DAC_CS_3_BASE_ADDRESS_HIGH                          0x714
-#define PCI_DAC_BOOTCS_BASE_ADDRESS_LOW                         0x718
-#define PCI_DAC_BOOTCS_BASE_ADDRESS_HIGH                        0x71c
-#define PCI_DAC_CPU_BASE_ADDRESS_LOW                            0x720
-#define PCI_DAC_CPU_BASE_ADDRESS_HIGH                           0x724
-#endif
-
-/*
- * Interrupts
- */
-
-#define LOW_INTERRUPT_CAUSE_REGISTER                            0xc18
-#define HIGH_INTERRUPT_CAUSE_REGISTER                           0xc68
-#define CPU_INTERRUPT_MASK_REGISTER_LOW                         0xc1c
-#define CPU_INTERRUPT_MASK_REGISTER_HIGH                        0xc6c
-#define CPU_SELECT_CAUSE_REGISTER                               0xc70
-#define PCI_0INTERRUPT_CAUSE_MASK_REGISTER_LOW                  0xc24
-#define PCI_0INTERRUPT_CAUSE_MASK_REGISTER_HIGH                 0xc64
-#define PCI_0SELECT_CAUSE                                       0xc74
-#define PCI_1INTERRUPT_CAUSE_MASK_REGISTER_LOW                  0xca4
-#define PCI_1INTERRUPT_CAUSE_MASK_REGISTER_HIGH                 0xce4
-#define PCI_1SELECT_CAUSE                                       0xcf4
-#define CPU_INT_0_MASK                                          0xe60
-#define CPU_INT_1_MASK                                          0xe64
-#define CPU_INT_2_MASK                                          0xe68
-#define CPU_INT_3_MASK                                          0xe6c
-
-/*
- * I20 Support registers
- */
-
-#define INBOUND_MESSAGE_REGISTER0_PCI0_SIDE                     0x010
-#define INBOUND_MESSAGE_REGISTER1_PCI0_SIDE                     0x014
-#define OUTBOUND_MESSAGE_REGISTER0_PCI0_SIDE                    0x018
-#define OUTBOUND_MESSAGE_REGISTER1_PCI0_SIDE                    0x01C
-#define INBOUND_DOORBELL_REGISTER_PCI0_SIDE                     0x020
-#define INBOUND_INTERRUPT_CAUSE_REGISTER_PCI0_SIDE              0x024
-#define INBOUND_INTERRUPT_MASK_REGISTER_PCI0_SIDE               0x028
-#define OUTBOUND_DOORBELL_REGISTER_PCI0_SIDE                    0x02C
-#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_PCI0_SIDE             0x030
-#define OUTBOUND_INTERRUPT_MASK_REGISTER_PCI0_SIDE              0x034
-#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI0_SIDE           0x040
-#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI0_SIDE          0x044
-#define QUEUE_CONTROL_REGISTER_PCI0_SIDE                        0x050
-#define QUEUE_BASE_ADDRESS_REGISTER_PCI0_SIDE                   0x054
-#define INBOUND_FREE_HEAD_POINTER_REGISTER_PCI0_SIDE            0x060
-#define INBOUND_FREE_TAIL_POINTER_REGISTER_PCI0_SIDE            0x064
-#define INBOUND_POST_HEAD_POINTER_REGISTER_PCI0_SIDE            0x068
-#define INBOUND_POST_TAIL_POINTER_REGISTER_PCI0_SIDE            0x06C
-#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_PCI0_SIDE           0x070
-#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_PCI0_SIDE           0x074
-#define OUTBOUND_POST_HEAD_POINTER_REGISTER_PCI0_SIDE           0x0F8
-#define OUTBOUND_POST_TAIL_POINTER_REGISTER_PCI0_SIDE           0x0FC
-
-#define INBOUND_MESSAGE_REGISTER0_PCI1_SIDE                     0x090
-#define INBOUND_MESSAGE_REGISTER1_PCI1_SIDE                     0x094
-#define OUTBOUND_MESSAGE_REGISTER0_PCI1_SIDE                    0x098
-#define OUTBOUND_MESSAGE_REGISTER1_PCI1_SIDE                    0x09C
-#define INBOUND_DOORBELL_REGISTER_PCI1_SIDE                     0x0A0
-#define INBOUND_INTERRUPT_CAUSE_REGISTER_PCI1_SIDE              0x0A4
-#define INBOUND_INTERRUPT_MASK_REGISTER_PCI1_SIDE               0x0A8
-#define OUTBOUND_DOORBELL_REGISTER_PCI1_SIDE                    0x0AC
-#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_PCI1_SIDE             0x0B0
-#define OUTBOUND_INTERRUPT_MASK_REGISTER_PCI1_SIDE              0x0B4
-#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI1_SIDE           0x0C0
-#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI1_SIDE          0x0C4
-#define QUEUE_CONTROL_REGISTER_PCI1_SIDE                        0x0D0
-#define QUEUE_BASE_ADDRESS_REGISTER_PCI1_SIDE                   0x0D4
-#define INBOUND_FREE_HEAD_POINTER_REGISTER_PCI1_SIDE            0x0E0
-#define INBOUND_FREE_TAIL_POINTER_REGISTER_PCI1_SIDE            0x0E4
-#define INBOUND_POST_HEAD_POINTER_REGISTER_PCI1_SIDE            0x0E8
-#define INBOUND_POST_TAIL_POINTER_REGISTER_PCI1_SIDE            0x0EC
-#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_PCI1_SIDE           0x0F0
-#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_PCI1_SIDE           0x0F4
-#define OUTBOUND_POST_HEAD_POINTER_REGISTER_PCI1_SIDE           0x078
-#define OUTBOUND_POST_TAIL_POINTER_REGISTER_PCI1_SIDE           0x07C
-
-#define INBOUND_MESSAGE_REGISTER0_CPU0_SIDE                     0X1C10
-#define INBOUND_MESSAGE_REGISTER1_CPU0_SIDE                     0X1C14
-#define OUTBOUND_MESSAGE_REGISTER0_CPU0_SIDE                    0X1C18
-#define OUTBOUND_MESSAGE_REGISTER1_CPU0_SIDE                    0X1C1C
-#define INBOUND_DOORBELL_REGISTER_CPU0_SIDE                     0X1C20
-#define INBOUND_INTERRUPT_CAUSE_REGISTER_CPU0_SIDE              0X1C24
-#define INBOUND_INTERRUPT_MASK_REGISTER_CPU0_SIDE               0X1C28
-#define OUTBOUND_DOORBELL_REGISTER_CPU0_SIDE                    0X1C2C
-#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_CPU0_SIDE             0X1C30
-#define OUTBOUND_INTERRUPT_MASK_REGISTER_CPU0_SIDE              0X1C34
-#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU0_SIDE           0X1C40
-#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU0_SIDE          0X1C44
-#define QUEUE_CONTROL_REGISTER_CPU0_SIDE                        0X1C50
-#define QUEUE_BASE_ADDRESS_REGISTER_CPU0_SIDE                   0X1C54
-#define INBOUND_FREE_HEAD_POINTER_REGISTER_CPU0_SIDE            0X1C60
-#define INBOUND_FREE_TAIL_POINTER_REGISTER_CPU0_SIDE            0X1C64
-#define INBOUND_POST_HEAD_POINTER_REGISTER_CPU0_SIDE            0X1C68
-#define INBOUND_POST_TAIL_POINTER_REGISTER_CPU0_SIDE            0X1C6C
-#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_CPU0_SIDE           0X1C70
-#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_CPU0_SIDE           0X1C74
-#define OUTBOUND_POST_HEAD_POINTER_REGISTER_CPU0_SIDE           0X1CF8
-#define OUTBOUND_POST_TAIL_POINTER_REGISTER_CPU0_SIDE           0X1CFC
-
-#define INBOUND_MESSAGE_REGISTER0_CPU1_SIDE                     0X1C90
-#define INBOUND_MESSAGE_REGISTER1_CPU1_SIDE                     0X1C94
-#define OUTBOUND_MESSAGE_REGISTER0_CPU1_SIDE                    0X1C98
-#define OUTBOUND_MESSAGE_REGISTER1_CPU1_SIDE                    0X1C9C
-#define INBOUND_DOORBELL_REGISTER_CPU1_SIDE                     0X1CA0
-#define INBOUND_INTERRUPT_CAUSE_REGISTER_CPU1_SIDE              0X1CA4
-#define INBOUND_INTERRUPT_MASK_REGISTER_CPU1_SIDE               0X1CA8
-#define OUTBOUND_DOORBELL_REGISTER_CPU1_SIDE                    0X1CAC
-#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_CPU1_SIDE             0X1CB0
-#define OUTBOUND_INTERRUPT_MASK_REGISTER_CPU1_SIDE              0X1CB4
-#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU1_SIDE           0X1CC0
-#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU1_SIDE          0X1CC4
-#define QUEUE_CONTROL_REGISTER_CPU1_SIDE                        0X1CD0
-#define QUEUE_BASE_ADDRESS_REGISTER_CPU1_SIDE                   0X1CD4
-#define INBOUND_FREE_HEAD_POINTER_REGISTER_CPU1_SIDE            0X1CE0
-#define INBOUND_FREE_TAIL_POINTER_REGISTER_CPU1_SIDE            0X1CE4
-#define INBOUND_POST_HEAD_POINTER_REGISTER_CPU1_SIDE            0X1CE8
-#define INBOUND_POST_TAIL_POINTER_REGISTER_CPU1_SIDE            0X1CEC
-#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_CPU1_SIDE           0X1CF0
-#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_CPU1_SIDE           0X1CF4
-#define OUTBOUND_POST_HEAD_POINTER_REGISTER_CPU1_SIDE           0X1C78
-#define OUTBOUND_POST_TAIL_POINTER_REGISTER_CPU1_SIDE           0X1C7C
-
-/*
- * Communication Unit Registers
- */
-
-#define ETHERNET_0_ADDRESS_CONTROL_LOW
-#define ETHERNET_0_ADDRESS_CONTROL_HIGH                         0xf204
-#define ETHERNET_0_RECEIVE_BUFFER_PCI_HIGH_ADDRESS              0xf208
-#define ETHERNET_0_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS             0xf20c
-#define ETHERNET_0_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS          0xf210
-#define ETHERNET_0_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS         0xf214
-#define ETHERNET_0_HASH_TABLE_PCI_HIGH_ADDRESS                  0xf218
-#define ETHERNET_1_ADDRESS_CONTROL_LOW                          0xf220
-#define ETHERNET_1_ADDRESS_CONTROL_HIGH                         0xf224
-#define ETHERNET_1_RECEIVE_BUFFER_PCI_HIGH_ADDRESS              0xf228
-#define ETHERNET_1_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS             0xf22c
-#define ETHERNET_1_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS          0xf230
-#define ETHERNET_1_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS         0xf234
-#define ETHERNET_1_HASH_TABLE_PCI_HIGH_ADDRESS                  0xf238
-#define ETHERNET_2_ADDRESS_CONTROL_LOW                          0xf240
-#define ETHERNET_2_ADDRESS_CONTROL_HIGH                         0xf244
-#define ETHERNET_2_RECEIVE_BUFFER_PCI_HIGH_ADDRESS              0xf248
-#define ETHERNET_2_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS             0xf24c
-#define ETHERNET_2_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS          0xf250
-#define ETHERNET_2_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS         0xf254
-#define ETHERNET_2_HASH_TABLE_PCI_HIGH_ADDRESS                  0xf258
-#define MPSC_0_ADDRESS_CONTROL_LOW                              0xf280
-#define MPSC_0_ADDRESS_CONTROL_HIGH                             0xf284
-#define MPSC_0_RECEIVE_BUFFER_PCI_HIGH_ADDRESS                  0xf288
-#define MPSC_0_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS                 0xf28c
-#define MPSC_0_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS              0xf290
-#define MPSC_0_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS             0xf294
-#define MPSC_1_ADDRESS_CONTROL_LOW                              0xf2a0
-#define MPSC_1_ADDRESS_CONTROL_HIGH                             0xf2a4
-#define MPSC_1_RECEIVE_BUFFER_PCI_HIGH_ADDRESS                  0xf2a8
-#define MPSC_1_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS                 0xf2ac
-#define MPSC_1_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS              0xf2b0
-#define MPSC_1_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS             0xf2b4
-#define MPSC_2_ADDRESS_CONTROL_LOW                              0xf2c0
-#define MPSC_2_ADDRESS_CONTROL_HIGH                             0xf2c4
-#define MPSC_2_RECEIVE_BUFFER_PCI_HIGH_ADDRESS                  0xf2c8
-#define MPSC_2_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS                 0xf2cc
-#define MPSC_2_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS              0xf2d0
-#define MPSC_2_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS             0xf2d4
-#define SERIAL_INIT_PCI_HIGH_ADDRESS                            0xf320
-#define SERIAL_INIT_LAST_DATA                                   0xf324
-#define SERIAL_INIT_STATUS_AND_CONTROL                          0xf328
-#define COMM_UNIT_ARBITER_CONTROL                               0xf300
-#define COMM_UNIT_CROSS_BAR_TIMEOUT                             0xf304
-#define COMM_UNIT_INTERRUPT_CAUSE                               0xf310
-#define COMM_UNIT_INTERRUPT_MASK                                0xf314
-#define COMM_UNIT_ERROR_ADDRESS                                 0xf314
-
-/*
- * Cunit Debug  (for internal use)
- */
-
-#define CUNIT_ADDRESS                                           0xf340
-#define CUNIT_COMMAND_AND_ID                                    0xf344
-#define CUNIT_WRITE_DATA_LOW                                    0xf348
-#define CUNIT_WRITE_DATA_HIGH                                   0xf34c
-#define CUNIT_WRITE_BYTE_ENABLE                                 0xf358
-#define CUNIT_READ_DATA_LOW                                     0xf350
-#define CUNIT_READ_DATA_HIGH                                    0xf354
-#define CUNIT_READ_ID                                           0xf35c
-
-/*
- * Fast Ethernet Unit Registers
- */
-
-/* Ethernet */
-
-#define ETHERNET_PHY_ADDRESS_REGISTER                           0x2000
-#define ETHERNET_SMI_REGISTER                                   0x2010
-
-/* Ethernet 0 */
-
-#define ETHERNET0_PORT_CONFIGURATION_REGISTER                   0x2400
-#define ETHERNET0_PORT_CONFIGURATION_EXTEND_REGISTER            0x2408
-#define ETHERNET0_PORT_COMMAND_REGISTER                         0x2410
-#define ETHERNET0_PORT_STATUS_REGISTER                          0x2418
-#define ETHERNET0_SERIAL_PARAMETRS_REGISTER                     0x2420
-#define ETHERNET0_HASH_TABLE_POINTER_REGISTER                   0x2428
-#define ETHERNET0_FLOW_CONTROL_SOURCE_ADDRESS_LOW               0x2430
-#define ETHERNET0_FLOW_CONTROL_SOURCE_ADDRESS_HIGH              0x2438
-#define ETHERNET0_SDMA_CONFIGURATION_REGISTER                   0x2440
-#define ETHERNET0_SDMA_COMMAND_REGISTER                         0x2448
-#define ETHERNET0_INTERRUPT_CAUSE_REGISTER                      0x2450
-#define ETHERNET0_INTERRUPT_MASK_REGISTER                       0x2458
-#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER0                  0x2480
-#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER1                  0x2484
-#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER2                  0x2488
-#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER3                  0x248c
-#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER0                0x24a0
-#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER1                0x24a4
-#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER2                0x24a8
-#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER3                0x24ac
-#define ETHERNET0_CURRENT_TX_DESCRIPTOR_POINTER0                0x24e0
-#define ETHERNET0_CURRENT_TX_DESCRIPTOR_POINTER1                0x24e4
-#define ETHERNET0_MIB_COUNTER_BASE                              0x2500
-
-/* Ethernet 1 */
-
-#define ETHERNET1_PORT_CONFIGURATION_REGISTER                   0x2800
-#define ETHERNET1_PORT_CONFIGURATION_EXTEND_REGISTER            0x2808
-#define ETHERNET1_PORT_COMMAND_REGISTER                         0x2810
-#define ETHERNET1_PORT_STATUS_REGISTER                          0x2818
-#define ETHERNET1_SERIAL_PARAMETRS_REGISTER                     0x2820
-#define ETHERNET1_HASH_TABLE_POINTER_REGISTER                   0x2828
-#define ETHERNET1_FLOW_CONTROL_SOURCE_ADDRESS_LOW               0x2830
-#define ETHERNET1_FLOW_CONTROL_SOURCE_ADDRESS_HIGH              0x2838
-#define ETHERNET1_SDMA_CONFIGURATION_REGISTER                   0x2840
-#define ETHERNET1_SDMA_COMMAND_REGISTER                         0x2848
-#define ETHERNET1_INTERRUPT_CAUSE_REGISTER                      0x2850
-#define ETHERNET1_INTERRUPT_MASK_REGISTER                       0x2858
-#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER0                  0x2880
-#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER1                  0x2884
-#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER2                  0x2888
-#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER3                  0x288c
-#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER0                0x28a0
-#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER1                0x28a4
-#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER2                0x28a8
-#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER3                0x28ac
-#define ETHERNET1_CURRENT_TX_DESCRIPTOR_POINTER0                0x28e0
-#define ETHERNET1_CURRENT_TX_DESCRIPTOR_POINTER1                0x28e4
-#define ETHERNET1_MIB_COUNTER_BASE                              0x2900
-
-/* Ethernet 2 */
-
-#define ETHERNET2_PORT_CONFIGURATION_REGISTER                   0x2c00
-#define ETHERNET2_PORT_CONFIGURATION_EXTEND_REGISTER            0x2c08
-#define ETHERNET2_PORT_COMMAND_REGISTER                         0x2c10
-#define ETHERNET2_PORT_STATUS_REGISTER                          0x2c18
-#define ETHERNET2_SERIAL_PARAMETRS_REGISTER                     0x2c20
-#define ETHERNET2_HASH_TABLE_POINTER_REGISTER                   0x2c28
-#define ETHERNET2_FLOW_CONTROL_SOURCE_ADDRESS_LOW               0x2c30
-#define ETHERNET2_FLOW_CONTROL_SOURCE_ADDRESS_HIGH              0x2c38
-#define ETHERNET2_SDMA_CONFIGURATION_REGISTER                   0x2c40
-#define ETHERNET2_SDMA_COMMAND_REGISTER                         0x2c48
-#define ETHERNET2_INTERRUPT_CAUSE_REGISTER                      0x2c50
-#define ETHERNET2_INTERRUPT_MASK_REGISTER                       0x2c58
-#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER0                  0x2c80
-#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER1                  0x2c84
-#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER2                  0x2c88
-#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER3                  0x2c8c
-#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER0                0x2ca0
-#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER1                0x2ca4
-#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER2                0x2ca8
-#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER3                0x2cac
-#define ETHERNET2_CURRENT_TX_DESCRIPTOR_POINTER0                0x2ce0
-#define ETHERNET2_CURRENT_TX_DESCRIPTOR_POINTER1                0x2ce4
-#define ETHERNET2_MIB_COUNTER_BASE                              0x2d00
-
-/*
- * SDMA Registers
- */
-
-#define SDMA_GROUP_CONFIGURATION_REGISTER                       0xb1f0
-#define CHANNEL0_CONFIGURATION_REGISTER                         0x4000
-#define CHANNEL0_COMMAND_REGISTER                               0x4008
-#define CHANNEL0_RX_CMD_STATUS                                  0x4800
-#define CHANNEL0_RX_PACKET_AND_BUFFER_SIZES                     0x4804
-#define CHANNEL0_RX_BUFFER_POINTER                              0x4808
-#define CHANNEL0_RX_NEXT_POINTER                                0x480c
-#define CHANNEL0_CURRENT_RX_DESCRIPTOR_POINTER                  0x4810
-#define CHANNEL0_TX_CMD_STATUS                                  0x4C00
-#define CHANNEL0_TX_PACKET_SIZE                                 0x4C04
-#define CHANNEL0_TX_BUFFER_POINTER                              0x4C08
-#define CHANNEL0_TX_NEXT_POINTER                                0x4C0c
-#define CHANNEL0_CURRENT_TX_DESCRIPTOR_POINTER                  0x4c10
-#define CHANNEL0_FIRST_TX_DESCRIPTOR_POINTER                    0x4c14
-#define CHANNEL1_CONFIGURATION_REGISTER                         0x6000
-#define CHANNEL1_COMMAND_REGISTER                               0x6008
-#define CHANNEL1_RX_CMD_STATUS                                  0x6800
-#define CHANNEL1_RX_PACKET_AND_BUFFER_SIZES                     0x6804
-#define CHANNEL1_RX_BUFFER_POINTER                              0x6808
-#define CHANNEL1_RX_NEXT_POINTER                                0x680c
-#define CHANNEL1_CURRENT_RX_DESCRIPTOR_POINTER                  0x6810
-#define CHANNEL1_TX_CMD_STATUS                                  0x6C00
-#define CHANNEL1_TX_PACKET_SIZE                                 0x6C04
-#define CHANNEL1_TX_BUFFER_POINTER                              0x6C08
-#define CHANNEL1_TX_NEXT_POINTER                                0x6C0c
-#define CHANNEL1_CURRENT_RX_DESCRIPTOR_POINTER                  0x6810
-#define CHANNEL1_CURRENT_TX_DESCRIPTOR_POINTER                  0x6c10
-#define CHANNEL1_FIRST_TX_DESCRIPTOR_POINTER                    0x6c14
-
-/* SDMA Interrupt */
-
-#define SDMA_CAUSE                                              0xb820
-#define SDMA_MASK                                               0xb8a0
-
-
-/*
- * Baude Rate Generators Registers
- */
-
-/* BRG 0 */
-
-#define BRG0_CONFIGURATION_REGISTER                             0xb200
-#define BRG0_BAUDE_TUNING_REGISTER                              0xb204
-
-/* BRG 1 */
-
-#define BRG1_CONFIGURATION_REGISTER                             0xb208
-#define BRG1_BAUDE_TUNING_REGISTER                              0xb20c
-
-/* BRG 2 */
-
-#define BRG2_CONFIGURATION_REGISTER                             0xb210
-#define BRG2_BAUDE_TUNING_REGISTER                              0xb214
-
-/* BRG Interrupts */
-
-#define BRG_CAUSE_REGISTER                                      0xb834
-#define BRG_MASK_REGISTER                                       0xb8b4
-
-/* MISC */
-
-#define MAIN_ROUTING_REGISTER                                   0xb400
-#define RECEIVE_CLOCK_ROUTING_REGISTER                          0xb404
-#define TRANSMIT_CLOCK_ROUTING_REGISTER                         0xb408
-#define COMM_UNIT_ARBITER_CONFIGURATION_REGISTER                0xb40c
-#define WATCHDOG_CONFIGURATION_REGISTER                         0xb410
-#define WATCHDOG_VALUE_REGISTER                                 0xb414
-
-
-/*
- * Flex TDM Registers
- */
-
-/* FTDM Port */
-
-#define FLEXTDM_TRANSMIT_READ_POINTER                           0xa800
-#define FLEXTDM_RECEIVE_READ_POINTER                            0xa804
-#define FLEXTDM_CONFIGURATION_REGISTER                          0xa808
-#define FLEXTDM_AUX_CHANNELA_TX_REGISTER                        0xa80c
-#define FLEXTDM_AUX_CHANNELA_RX_REGISTER                        0xa810
-#define FLEXTDM_AUX_CHANNELB_TX_REGISTER                        0xa814
-#define FLEXTDM_AUX_CHANNELB_RX_REGISTER                        0xa818
-
-/* FTDM Interrupts */
-
-#define FTDM_CAUSE_REGISTER                                     0xb830
-#define FTDM_MASK_REGISTER                                      0xb8b0
-
-
-/*
- * GPP Interface Registers
- */
-
-#define GPP_IO_CONTROL                                          0xf100
-#define GPP_LEVEL_CONTROL                                       0xf110
-#define GPP_VALUE                                               0xf104
-#define GPP_INTERRUPT_CAUSE                                     0xf108
-#define GPP_INTERRUPT_MASK                                      0xf10c
-
-#define MPP_CONTROL0                                            0xf000
-#define MPP_CONTROL1                                            0xf004
-#define MPP_CONTROL2                                            0xf008
-#define MPP_CONTROL3                                            0xf00c
-#define DEBUG_PORT_MULTIPLEX                                    0xf014
-#define SERIAL_PORT_MULTIPLEX                                   0xf010
-
-/*
- * I2C Registers
- */
-
-#define I2C_SLAVE_ADDRESS                                       0xc000
-#define I2C_EXTENDED_SLAVE_ADDRESS                              0xc040
-#define I2C_DATA                                                0xc004
-#define I2C_CONTROL                                             0xc008
-#define I2C_STATUS_BAUDE_RATE                                   0xc00C
-#define I2C_SOFT_RESET                                          0xc01c
-
-/*
- * MPSC Registers
- */
-
-/*
- * MPSC0
- */
-
-#define MPSC0_MAIN_CONFIGURATION_LOW                            0x8000
-#define MPSC0_MAIN_CONFIGURATION_HIGH                           0x8004
-#define MPSC0_PROTOCOL_CONFIGURATION                            0x8008
-#define CHANNEL0_REGISTER1                                      0x800c
-#define CHANNEL0_REGISTER2                                      0x8010
-#define CHANNEL0_REGISTER3                                      0x8014
-#define CHANNEL0_REGISTER4                                      0x8018
-#define CHANNEL0_REGISTER5                                      0x801c
-#define CHANNEL0_REGISTER6                                      0x8020
-#define CHANNEL0_REGISTER7                                      0x8024
-#define CHANNEL0_REGISTER8                                      0x8028
-#define CHANNEL0_REGISTER9                                      0x802c
-#define CHANNEL0_REGISTER10                                     0x8030
-#define CHANNEL0_REGISTER11                                     0x8034
-
-/*
- * MPSC1
- */
-
-#define MPSC1_MAIN_CONFIGURATION_LOW                            0x9000
-#define MPSC1_MAIN_CONFIGURATION_HIGH                           0x9004
-#define MPSC1_PROTOCOL_CONFIGURATION                            0x9008
-#define CHANNEL1_REGISTER1                                      0x900c
-#define CHANNEL1_REGISTER2                                      0x9010
-#define CHANNEL1_REGISTER3                                      0x9014
-#define CHANNEL1_REGISTER4                                      0x9018
-#define CHANNEL1_REGISTER5                                      0x901c
-#define CHANNEL1_REGISTER6                                      0x9020
-#define CHANNEL1_REGISTER7                                      0x9024
-#define CHANNEL1_REGISTER8                                      0x9028
-#define CHANNEL1_REGISTER9                                      0x902c
-#define CHANNEL1_REGISTER10                                     0x9030
-#define CHANNEL1_REGISTER11                                     0x9034
-
-/*
- * MPSCs Interupts
- */
-
-#define MPSC0_CAUSE                                             0xb804
-#define MPSC0_MASK                                              0xb884
-#define MPSC1_CAUSE                                             0xb80c
-#define MPSC1_MASK                                              0xb88c
-
-#endif  /* __ASM_MIPS_MV64240_H */
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h
index 918a4894b5..6a5fa32f61 100644
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
@@ -172,6 +172,7 @@ ASMMACRO(tlb_probe_hazard,
          nop; nop; nop
         )
 ASMMACRO(irq_enable_hazard,
+         _ssnop; _ssnop; _ssnop;
         )
 ASMMACRO(irq_disable_hazard,
         nop; nop; nop
diff --git a/include/asm-mips/ioctls.h b/include/asm-mips/ioctls.h
index 92f6c36aac..5097cbf183 100644
--- a/include/asm-mips/ioctls.h
+++ b/include/asm-mips/ioctls.h
@@ -77,6 +77,10 @@
 #define TIOCSBRK        0x5427  /* BSD compatibility */
 #define TIOCCBRK        0x5428  /* BSD compatibility */
 #define TIOCGSID        0x7416  /* Return the session ID of FD */
+#define TCGETS2         _IOR('T',0x2A, struct termios2)
+#define TCSETS2         _IOW('T',0x2B, struct termios2)
+#define TCSETSW2        _IOW('T',0x2C, struct termios2)
+#define TCSETSF2        _IOW('T',0x2D, struct termios2)
 #define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
 
diff --git a/include/asm-mips/irq.h b/include/asm-mips/irq.h
index 97102ebc54..2cb52cf8bd 100644
--- a/include/asm-mips/irq.h
+++ b/include/asm-mips/irq.h
@@ -24,7 +24,30 @@ static inline int irq_canonicalize(int irq)
 #define irq_canonicalize(irq) (irq)     /* Sane hardware, sane code ... */
 #endif
 
+#ifdef CONFIG_MIPS_MT_SMTC
+
+struct irqaction;
+
+extern unsigned long irq_hwmask[];
+extern int setup_irq_smtc(unsigned int irq, struct irqaction * new,
+                          unsigned long hwmask);
+
+static inline void smtc_im_ack_irq(unsigned int irq)
+{
+        if (irq_hwmask[irq] & ST0_IM)
+                set_c0_status(irq_hwmask[irq] & ST0_IM);
+}
+
+#else
+
+static inline void smtc_im_ack_irq(unsigned int irq)
+{
+}
+
+#endif /* CONFIG_MIPS_MT_SMTC */
+
 #ifdef CONFIG_MIPS_MT_SMTC_IM_BACKSTOP
+
 /*
  * Clear interrupt mask handling "backstop" if irq_hwmask
  * entry so indicates. This implies that the ack() or end()
@@ -38,6 +61,7 @@ do {									\
                                    ~(irq_hwmask[irq] & 0x0000ff00));    \
 } while (0)
 #else
+
 #define __DO_IRQ_SMTC_HOOK(irq) do { } while (0)
 #endif
 
@@ -60,14 +84,6 @@ do {									\
 extern void arch_init_irq(void);
 extern void spurious_interrupt(void);
 
-#ifdef CONFIG_MIPS_MT_SMTC
-struct irqaction;
-
-extern unsigned long irq_hwmask[];
-extern int setup_irq_smtc(unsigned int irq, struct irqaction * new,
-                          unsigned long hwmask);
-#endif /* CONFIG_MIPS_MT_SMTC */
-
 extern int allocate_irqno(void);
 extern void alloc_legacy_irqno(void);
 extern void free_irqno(unsigned int irq);
diff --git a/include/asm-mips/jmr3927/jmr3927.h b/include/asm-mips/jmr3927/jmr3927.h
index 958e29706e..b2dc35f561 100644
--- a/include/asm-mips/jmr3927/jmr3927.h
+++ b/include/asm-mips/jmr3927/jmr3927.h
@@ -13,6 +13,7 @@
 #include <asm/jmr3927/tx3927.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
+#include <asm/txx9irq.h>
 
 /* CS */
 #define JMR3927_ROMCE0  0x1fc00000      /* 4M */
@@ -115,7 +116,7 @@
 #define JMR3927_NR_IRQ_IRC      16      /* On-Chip IRC */
 #define JMR3927_NR_IRQ_IOC      8       /* PCI/MODEM/INT[6:7] */
 
-#define JMR3927_IRQ_IRC 16
+#define JMR3927_IRQ_IRC TXX9_IRQ_BASE
 #define JMR3927_IRQ_IOC (JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC)
 #define JMR3927_IRQ_END (JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC)
 
diff --git a/include/asm-mips/jmr3927/tx3927.h b/include/asm-mips/jmr3927/tx3927.h
index 0b9073bfb7..4be2f25f70 100644
--- a/include/asm-mips/jmr3927/tx3927.h
+++ b/include/asm-mips/jmr3927/tx3927.h
@@ -50,21 +50,6 @@ struct tx3927_dma_reg {
         volatile unsigned long unused0;
 };
 
-struct tx3927_irc_reg {
-        volatile unsigned long cer;
-        volatile unsigned long cr[2];
-        volatile unsigned long unused0;
-        volatile unsigned long ilr[8];
-        volatile unsigned long unused1[4];
-        volatile unsigned long imr;
-        volatile unsigned long unused2[7];
-        volatile unsigned long scr;
-        volatile unsigned long unused3[7];
-        volatile unsigned long ssr;
-        volatile unsigned long unused4[7];
-        volatile unsigned long csr;
-};
-
 #include <asm/byteorder.h>
 
 #ifdef __BIG_ENDIAN
@@ -225,26 +210,6 @@ struct tx3927_ccfg_reg {
 /*
  * IRC
  */
-#define TX3927_IR_MAX_LEVEL     7
-
-/* IRCER : Int. Control Enable */
-#define TX3927_IRCER_ICE        0x00000001
-
-/* IRCR : Int. Control */
-#define TX3927_IRCR_LOW 0x00000000
-#define TX3927_IRCR_HIGH        0x00000001
-#define TX3927_IRCR_DOWN        0x00000002
-#define TX3927_IRCR_UP  0x00000003
-
-/* IRSCR : Int. Status Control */
-#define TX3927_IRSCR_EIClrE     0x00000100
-#define TX3927_IRSCR_EIClr_MASK 0x0000000f
-
-/* IRCSR : Int. Current Status */
-#define TX3927_IRCSR_IF 0x00010000
-#define TX3927_IRCSR_ILV_MASK   0x00000700
-#define TX3927_IRCSR_IVL_MASK   0x0000001f
-
 #define TX3927_IR_INT0  0
 #define TX3927_IR_INT1  1
 #define TX3927_IR_INT2  2
@@ -347,7 +312,6 @@ struct tx3927_ccfg_reg {
 #define tx3927_sdramcptr        ((struct tx3927_sdramc_reg *)TX3927_SDRAMC_REG)
 #define tx3927_romcptr          ((struct tx3927_romc_reg *)TX3927_ROMC_REG)
 #define tx3927_dmaptr           ((struct tx3927_dma_reg *)TX3927_DMA_REG)
-#define tx3927_ircptr           ((struct tx3927_irc_reg *)TX3927_IRC_REG)
 #define tx3927_pcicptr          ((struct tx3927_pcic_reg *)TX3927_PCIC_REG)
 #define tx3927_ccfgptr          ((struct tx3927_ccfg_reg *)TX3927_CCFG_REG)
 #define tx3927_tmrptr(ch)       ((struct txx927_tmr_reg *)TX3927_TMR_REG(ch))
diff --git a/include/asm-mips/local.h b/include/asm-mips/local.h
index ed882c88e0..f9a5ce5c9a 100644
--- a/include/asm-mips/local.h
+++ b/include/asm-mips/local.h
@@ -4,6 +4,7 @@
 #include <linux/percpu.h>
 #include <linux/bitops.h>
 #include <asm/atomic.h>
+#include <asm/cmpxchg.h>
 #include <asm/war.h>
 
 typedef struct
@@ -114,68 +115,6 @@ static __inline__ long local_sub_return(long i, local_t * l)
         return result;
 }
 
-/*
- * local_sub_if_positive - conditionally subtract integer from atomic variable
- * @i: integer value to subtract
- * @l: pointer of type local_t
- *
- * Atomically test @l and subtract @i if @l is greater or equal than @i.
- * The function returns the old value of @l minus @i.
- */
-static __inline__ long local_sub_if_positive(long i, local_t * l)
-{
-        unsigned long result;
-
-        if (cpu_has_llsc && R10000_LLSC_WAR) {
-                unsigned long temp;
-
-                __asm__ __volatile__(
-                "       .set    mips3                                   \n"
-                "1:"    __LL    "%1, %2         # local_sub_if_positive\n"
-                "       dsubu   %0, %1, %3                              \n"
-                "       bltz    %0, 1f                                  \n"
-                        __SC    "%0, %2                                 \n"
-                "       .set    noreorder                               \n"
-                "       beqzl   %0, 1b                                  \n"
-                "        dsubu  %0, %1, %3                              \n"
-                "       .set    reorder                                 \n"
-                "1:                                                     \n"
-                "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
-                : "Ir" (i), "m" (l->a.counter)
-                : "memory");
-        } else if (cpu_has_llsc) {
-                unsigned long temp;
-
-                __asm__ __volatile__(
-                "       .set    mips3                                   \n"
-                "1:"    __LL    "%1, %2         # local_sub_if_positive\n"
-                "       dsubu   %0, %1, %3                              \n"
-                "       bltz    %0, 1f                                  \n"
-                        __SC    "%0, %2                                 \n"
-                "       .set    noreorder                               \n"
-                "       beqz    %0, 1b                                  \n"
-                "        dsubu  %0, %1, %3                              \n"
-                "       .set    reorder                                 \n"
-                "1:                                                     \n"
-                "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
-                : "Ir" (i), "m" (l->a.counter)
-                : "memory");
-        } else {
-                unsigned long flags;
-
-                local_irq_save(flags);
-                result = l->a.counter;
-                result -= i;
-                if (result >= 0)
-                        l->a.counter = result;
-                local_irq_restore(flags);
-        }
-
-        return result;
-}
-
 #define local_cmpxchg(l, o, n) \
         ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
 #define local_xchg(l, n) (xchg_local(&((l)->a.counter),(n)))
@@ -234,12 +173,6 @@ static __inline__ long local_sub_if_positive(long i, local_t * l)
 #define local_dec_and_test(l) (local_sub_return(1, (l)) == 0)
 
 /*
- * local_dec_if_positive - decrement by 1 if old value positive
- * @l: pointer of type local_t
- */
-#define local_dec_if_positive(l)        local_sub_if_positive(1, l)
-
-/*
  * local_add_negative - add and test if negative
  * @l: pointer of type local_t
  * @i: integer value to add
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 6eba2e576a..a77128362a 100644
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -33,13 +33,24 @@ static __inline__ int ide_probe_legacy(void)
 {
 #ifdef CONFIG_PCI
         struct pci_dev *dev;
-        if ((dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL)) != NULL ||
-            (dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL)) != NULL) {
-                pci_dev_put(dev);
-
-                return 1;
-        }
+        /*
+         * This can be called on the ide_setup() path, super-early in
+         * boot.  But the down_read() will enable local interrupts,
+         * which can cause some machines to crash.  So here we detect
+         * and flag that situation and bail out early.
+         */
+        if (no_pci_devices())
+                return 0;
+        dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL);
+        if (dev)
+                goto found;
+        dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);
+        if (dev)
+                goto found;
         return 0;
+found:
+        pci_dev_put(dev);
+        return 1;
 #elif defined(CONFIG_EISA) || defined(CONFIG_ISA)
         return 1;
 #else
@@ -49,48 +60,42 @@ static __inline__ int ide_probe_legacy(void)
 
 static __inline__ int ide_default_irq(unsigned long base)
 {
-        if (ide_probe_legacy())
-                switch (base) {
-                case 0x1f0:
-                        return 14;
-                case 0x170:
-                        return 15;
-                case 0x1e8:
-                        return 11;
-                case 0x168:
-                        return 10;
-                case 0x1e0:
-                        return 8;
-                case 0x160:
-                        return 12;
+        switch (base) {
+                case 0x1f0: return 14;
+                case 0x170: return 15;
+                case 0x1e8: return 11;
+                case 0x168: return 10;
+                case 0x1e0: return 8;
+                case 0x160: return 12;
                 default:
                         return 0;
-                }
-        else
-                return 0;
+        }
 }
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-        if (ide_probe_legacy())
+        if (!ide_probe_legacy())
+                return 0;
+        /*
+         *      If PCI is present then it is not safe to poke around
+         *      the other legacy IDE ports. Only 0x1f0 and 0x170 are
+         *      defined compatibility mode ports for PCI. A user can
+         *      override this using ide= but we must default safe.
+         */
+        if (no_pci_devices()) {
                 switch (index) {
-                case 0:
-                        return 0x1f0;
-                case 1:
-                        return 0x170;
-                case 2:
-                        return 0x1e8;
-                case 3:
-                        return 0x168;
-                case 4:
-                        return 0x1e0;
-                case 5:
-                        return 0x160;
-                default:
-                        return 0;
+                case 2: return 0x1e8;
+                case 3: return 0x168;
+                case 4: return 0x1e0;
+                case 5: return 0x160;
                 }
-        else
+        }
+        switch (index) {
+        case 0: return 0x1f0;
+        case 1: return 0x170;
+        default:
                 return 0;
+        }
 }
 
 #define IDE_ARCH_OBSOLETE_INIT
diff --git a/include/asm-mips/mach-ocelot/mach-gt64120.h b/include/asm-mips/mach-ocelot/mach-gt64120.h
deleted file mode 100644
index a62ecb53c7..0000000000
--- a/include/asm-mips/mach-ocelot/mach-gt64120.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.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.
- */
-#ifndef _ASM_GT64120_MOMENCO_OCELOT_GT64120_DEP_H
-#define _ASM_GT64120_MOMENCO_OCELOT_GT64120_DEP_H
-
-/*
- * PCI address allocation
- */
-#define GT_PCI_MEM_BASE (0x22000000UL)
-#define GT_PCI_MEM_SIZE GT_DEF_PCI0_MEM0_SIZE
-#define GT_PCI_IO_BASE  (0x20000000UL)
-#define GT_PCI_IO_SIZE  GT_DEF_PCI0_IO_SIZE
-
-extern unsigned long gt64120_base;
-
-#define GT64120_BASE    (gt64120_base)
-
-/*
- * GT timer irq
- */
-#define GT_TIMER                6
-
-#endif  /* _ASM_GT64120_MOMENCO_OCELOT_GT64120_DEP_H */
diff --git a/include/asm-mips/marvell.h b/include/asm-mips/marvell.h
deleted file mode 100644
index b6144bafc5..0000000000
--- a/include/asm-mips/marvell.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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) 2004 by Ralf Baechle
- */
-#ifndef __ASM_MIPS_MARVELL_H
-#define __ASM_MIPS_MARVELL_H
-
-#include <linux/pci.h>
-
-#include <asm/byteorder.h>
-
-extern unsigned long marvell_base;
-
-/*
- * Because of an error/peculiarity in the Galileo chip, we need to swap the
- * bytes when running bigendian.
- */
-#define __MV_READ(ofs)                                                  \
-        (*(volatile u32 *)(marvell_base+(ofs)))
-#define __MV_WRITE(ofs, data)                                           \
-        do { *(volatile u32 *)(marvell_base+(ofs)) = (data); } while (0)
-
-#define MV_READ(ofs)            le32_to_cpu(__MV_READ(ofs))
-#define MV_WRITE(ofs, data)     __MV_WRITE(ofs, cpu_to_le32(data))
-
-#define MV_READ_16(ofs)                                                 \
-        le16_to_cpu(*(volatile u16 *)(marvell_base+(ofs)))
-#define MV_WRITE_16(ofs, data)  \
-        *(volatile u16 *)(marvell_base+(ofs)) = cpu_to_le16(data)
-
-#define MV_READ_8(ofs)                                                  \
-        *(volatile u8 *)(marvell_base+(ofs))
-#define MV_WRITE_8(ofs, data)                                           \
-        *(volatile u8 *)(marvell_base+(ofs)) = data
-
-#define MV_SET_REG_BITS(ofs, bits)                                      \
-        (*((volatile u32 *)(marvell_base + (ofs)))) |= ((u32)cpu_to_le32(bits))
-#define MV_RESET_REG_BITS(ofs, bits)                                    \
-        (*((volatile u32 *)(marvell_base + (ofs)))) &= ~((u32)cpu_to_le32(bits))
-
-extern struct pci_ops mv_pci_ops;
-
-struct mv_pci_controller {
-        struct pci_controller   pcic;
-
-        /*
-         * GT-64240/MV-64340 specific, per host bus information
-         */
-        unsigned long   config_addr;
-        unsigned long   config_vreg;
-};
-
-extern void ll_mv64340_irq(void);
-extern void mv64340_irq_init(unsigned int base);
-
-#endif  /* __ASM_MIPS_MARVELL_H */
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index b92dd8c760..e3301e54d5 100644
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 /*
  * __pa()/__va() should be used only during mem init.
  */
-#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
+#ifdef CONFIG_64BIT
 #define __pa(x)                                                         \
 ({                                                                      \
     unsigned long __x = (unsigned long)(x);                             \
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h
index 2fbd47eba3..59c865deb0 100644
--- a/include/asm-mips/pgtable-32.h
+++ b/include/asm-mips/pgtable-32.h
@@ -43,11 +43,7 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
  */
 
 /* PGDIR_SHIFT determines what a third-level page table entry can map */
-#ifdef CONFIG_64BIT_PHYS_ADDR
-#define PGDIR_SHIFT     21
-#else
-#define PGDIR_SHIFT     22
-#endif
+#define PGDIR_SHIFT     (2 * PAGE_SHIFT + PTE_ORDER - PTE_T_LOG2)
 #define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
 #define PGDIR_MASK      (~(PGDIR_SIZE-1))
 
@@ -55,17 +51,11 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
  * Entries per page directory level: we use two-level, so
  * we don't really have any PUD/PMD directory physically.
  */
-#ifdef CONFIG_64BIT_PHYS_ADDR
-#define PGD_ORDER       1
+#define __PGD_ORDER     (32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2)
+#define PGD_ORDER       (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
 #define PUD_ORDER       aieeee_attempt_to_allocate_pud
 #define PMD_ORDER       1
 #define PTE_ORDER       0
-#else
-#define PGD_ORDER       0
-#define PUD_ORDER       aieeee_attempt_to_allocate_pud
-#define PMD_ORDER       1
-#define PTE_ORDER       0
-#endif
 
 #define PTRS_PER_PGD    ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))
 #define PTRS_PER_PTE    ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t))
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h
index 2e2d70d13f..d2ee281567 100644
--- a/include/asm-mips/pgtable.h
+++ b/include/asm-mips/pgtable.h
@@ -168,11 +168,15 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt
 #define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0)
 #endif
 
-#define PGD_T_LOG2      ffz(~sizeof(pgd_t))
-#define PMD_T_LOG2      ffz(~sizeof(pmd_t))
-#define PTE_T_LOG2      ffz(~sizeof(pte_t))
+#define PGD_T_LOG2      (__builtin_ffs(sizeof(pgd_t)) - 1)
+#define PMD_T_LOG2      (__builtin_ffs(sizeof(pmd_t)) - 1)
+#define PTE_T_LOG2      (__builtin_ffs(sizeof(pte_t)) - 1)
 
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
+/*
+ * We used to declare this array with size but gcc 3.3 and older are not able
+ * to find that this expression is a constant, so the size is dropped.
+ */
+extern pgd_t swapper_pg_dir[];
 
 /*
  * The following only work if pte_present() is true.
diff --git a/include/asm-mips/sibyte/bcm1480_regs.h b/include/asm-mips/sibyte/bcm1480_regs.h
index 2738c1366f..c34d36b6b8 100644
--- a/include/asm-mips/sibyte/bcm1480_regs.h
+++ b/include/asm-mips/sibyte/bcm1480_regs.h
@@ -227,10 +227,15 @@
         (A_BCM1480_DUART(chan) +                                        \
          BCM1480_DUART_CHANREG_SPACING * 3 + (reg))
 
+#define DUART_IMRISR_SPACING        0x20
+#define DUART_INCHNG_SPACING        0x10
+
 #define R_BCM1480_DUART_IMRREG(chan)                                    \
         (R_DUART_IMR_A + ((chan) & 1) * DUART_IMRISR_SPACING)
 #define R_BCM1480_DUART_ISRREG(chan)                                    \
         (R_DUART_ISR_A + ((chan) & 1) * DUART_IMRISR_SPACING)
+#define R_BCM1480_DUART_INCHREG(chan)                                   \
+        (R_DUART_IN_CHNG_A + ((chan) & 1) * DUART_INCHNG_SPACING)
 
 #define A_BCM1480_DUART_IMRREG(chan)                                    \
         (A_BCM1480_DUART_CTRLREG((chan), R_BCM1480_DUART_IMRREG(chan)))
diff --git a/include/asm-mips/smtc.h b/include/asm-mips/smtc.h
index 44dfa4adec..ff3e8936b4 100644
--- a/include/asm-mips/smtc.h
+++ b/include/asm-mips/smtc.h
@@ -55,4 +55,14 @@ extern void smtc_boot_secondary(int cpu, struct task_struct *t);
 
 #define PARKED_INDEX    ((unsigned int)0x80000000)
 
+/*
+ * Define low-level interrupt mask for IPIs, if necessary.
+ * By default, use SW interrupt 1, which requires no external
+ * hardware support, but which works only for single-core
+ * MIPS MT systems.
+ */
+#ifndef MIPS_CPU_IPI_IRQ
+#define MIPS_CPU_IPI_IRQ 1
+#endif
+
 #endif /*  _ASM_SMTC_MT_H */
diff --git a/include/asm-mips/stacktrace.h b/include/asm-mips/stacktrace.h
index 07f873351a..0bf82818aa 100644
--- a/include/asm-mips/stacktrace.h
+++ b/include/asm-mips/stacktrace.h
@@ -9,7 +9,11 @@ extern unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
                                   unsigned long pc, unsigned long *ra);
 #else
 #define raw_show_trace 1
-#define unwind_stack(task, sp, pc, ra)  0
+static inline unsigned long unwind_stack(struct task_struct *task,
+        unsigned long *sp, unsigned long pc, unsigned long *ra)
+{
+        return 0;
+}
 #endif
 
 static __always_inline void prepare_frametrace(struct pt_regs *regs)
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 357251f425..480b574e24 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -17,6 +17,7 @@
 
 #include <asm/addrspace.h>
 #include <asm/barrier.h>
+#include <asm/cmpxchg.h>
 #include <asm/cpu-features.h>
 #include <asm/dsp.h>
 #include <asm/war.h>
@@ -194,266 +195,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 
-#define __HAVE_ARCH_CMPXCHG 1
-
-static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
-        unsigned long new)
-{
-        __u32 retval;
-
-        if (cpu_has_llsc && R10000_LLSC_WAR) {
-                __asm__ __volatile__(
-                "       .set    push                                    \n"
-                "       .set    noat                                    \n"
-                "       .set    mips3                                   \n"
-                "1:     ll      %0, %2                  # __cmpxchg_u32 \n"
-                "       bne     %0, %z3, 2f                             \n"
-                "       .set    mips0                                   \n"
-                "       move    $1, %z4                                 \n"
-                "       .set    mips3                                   \n"
-                "       sc      $1, %1                                  \n"
-                "       beqzl   $1, 1b                                  \n"
-                "2:                                                     \n"
-                "       .set    pop                                     \n"
-                : "=&r" (retval), "=R" (*m)
-                : "R" (*m), "Jr" (old), "Jr" (new)
-                : "memory");
-        } else if (cpu_has_llsc) {
-                __asm__ __volatile__(
-                "       .set    push                                    \n"
-                "       .set    noat                                    \n"
-                "       .set    mips3                                   \n"
-                "1:     ll      %0, %2                  # __cmpxchg_u32 \n"
-                "       bne     %0, %z3, 2f                             \n"
-                "       .set    mips0                                   \n"
-                "       move    $1, %z4                                 \n"
-                "       .set    mips3                                   \n"
-                "       sc      $1, %1                                  \n"
-                "       beqz    $1, 3f                                  \n"
-                "2:                                                     \n"
-                "       .subsection 2                                   \n"
-                "3:     b       1b                                      \n"
-                "       .previous                                       \n"
-                "       .set    pop                                     \n"
-                : "=&r" (retval), "=R" (*m)
-                : "R" (*m), "Jr" (old), "Jr" (new)
-                : "memory");
-        } else {
-                unsigned long flags;
-
-                raw_local_irq_save(flags);
-                retval = *m;
-                if (retval == old)
-                        *m = new;
-                raw_local_irq_restore(flags);   /* implies memory barrier  */
-        }
-
-        smp_llsc_mb();
-
-        return retval;
-}
-
-static inline unsigned long __cmpxchg_u32_local(volatile int * m,
-        unsigned long old, unsigned long new)
-{
-        __u32 retval;
-
-        if (cpu_has_llsc && R10000_LLSC_WAR) {
-                __asm__ __volatile__(
-                "       .set    push                                    \n"
-                "       .set    noat                                    \n"
-                "       .set    mips3                                   \n"
-                "1:     ll      %0, %2                  # __cmpxchg_u32 \n"
-                "       bne     %0, %z3, 2f                             \n"
-                "       .set    mips0                                   \n"
-                "       move    $1, %z4                                 \n"
-                "       .set    mips3                                   \n"
-                "       sc      $1, %1                                  \n"
-                "       beqzl   $1, 1b                                  \n"
-                "2:                                                     \n"
-                "       .set    pop                                     \n"
-                : "=&r" (retval), "=R" (*m)
-                : "R" (*m), "Jr" (old), "Jr" (new)
-                : "memory");
-        } else if (cpu_has_llsc) {
-                __asm__ __volatile__(
-                "       .set    push                                    \n"
-                "       .set    noat                                    \n"
-                "       .set    mips3                                   \n"
-                "1:     ll      %0, %2                  # __cmpxchg_u32 \n"
-                "       bne     %0, %z3, 2f                             \n"
-                "       .set    mips0                                   \n"
-                "       move    $1, %z4                                 \n"
-                "       .set    mips3                                   \n"
-                "       sc      $1, %1                                  \n"
-                "       beqz    $1, 1b                                  \n"
-                "2:                                                     \n"
-                "       .set    pop                                     \n"
-                : "=&r" (retval), "=R" (*m)
-                : "R" (*m), "Jr" (old), "Jr" (new)
-                : "memory");
-        } else {
-                unsigned long flags;
-
-                local_irq_save(flags);
-                retval = *m;
-                if (retval == old)
-                        *m = new;
-                local_irq_restore(flags);       /* implies memory barrier  */
-        }
-
-        return retval;
-}
-
-#ifdef CONFIG_64BIT
-static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
-        unsigned long new)
-{
-        __u64 retval;
-
-        if (cpu_has_llsc && R10000_LLSC_WAR) {
-                __asm__ __volatile__(
-                "       .set    push                                    \n"
-                "       .set    noat                                    \n"
-                "       .set    mips3                                   \n"
-                "1:     lld     %0, %2                  # __cmpxchg_u64 \n"
-                "       bne     %0, %z3, 2f                             \n"
-                "       move    $1, %z4                                 \n"
-                "       scd     $1, %1                                  \n"
-                "       beqzl   $1, 1b                                  \n"
-                "2:                                                     \n"
-                "       .set    pop                                     \n"
-                : "=&r" (retval), "=R" (*m)
-                : "R" (*m), "Jr" (old), "Jr" (new)
-                : "memory");
-        } else if (cpu_has_llsc) {
-                __asm__ __volatile__(
-                "       .set    push                                    \n"
-                "       .set    noat                                    \n"
-                "       .set    mips3                                   \n"
-                "1:     lld     %0, %2                  # __cmpxchg_u64 \n"
-                "       bne     %0, %z3, 2f                             \n"
-                "       move    $1, %z4                                 \n"
-                "       scd     $1, %1                                  \n"
-                "       beqz    $1, 3f                                  \n"
-                "2:                                                     \n"
-                "       .subsection 2                                   \n"
-                "3:     b       1b                                      \n"
-                "       .previous                                       \n"
-                "       .set    pop                                     \n"
-                : "=&r" (retval), "=R" (*m)
-                : "R" (*m), "Jr" (old), "Jr" (new)
-                : "memory");
-        } else {
-                unsigned long flags;
-
-                raw_local_irq_save(flags);
-                retval = *m;
-                if (retval == old)
-                        *m = new;
-                raw_local_irq_restore(flags);   /* implies memory barrier  */
-        }
-
-        smp_llsc_mb();
-
-        return retval;
-}
-
-static inline unsigned long __cmpxchg_u64_local(volatile int * m,
-        unsigned long old, unsigned long new)
-{
-        __u64 retval;
-
-        if (cpu_has_llsc && R10000_LLSC_WAR) {
-                __asm__ __volatile__(
-                "       .set    push                                    \n"
-                "       .set    noat                                    \n"
-                "       .set    mips3                                   \n"
-                "1:     lld     %0, %2                  # __cmpxchg_u64 \n"
-                "       bne     %0, %z3, 2f                             \n"
-                "       move    $1, %z4                                 \n"
-                "       scd     $1, %1                                  \n"
-                "       beqzl   $1, 1b                                  \n"
-                "2:                                                     \n"
-                "       .set    pop                                     \n"
-                : "=&r" (retval), "=R" (*m)
-                : "R" (*m), "Jr" (old), "Jr" (new)
-                : "memory");
-        } else if (cpu_has_llsc) {
-                __asm__ __volatile__(
-                "       .set    push                                    \n"
-                "       .set    noat                                    \n"
-                "       .set    mips3                                   \n"
-                "1:     lld     %0, %2                  # __cmpxchg_u64 \n"
-                "       bne     %0, %z3, 2f                             \n"
-                "       move    $1, %z4                                 \n"
-                "       scd     $1, %1                                  \n"
-                "       beqz    $1, 1b                                  \n"
-                "2:                                                     \n"
-                "       .set    pop                                     \n"
-                : "=&r" (retval), "=R" (*m)
-                : "R" (*m), "Jr" (old), "Jr" (new)
-                : "memory");
-        } else {
-                unsigned long flags;
-
-                local_irq_save(flags);
-                retval = *m;
-                if (retval == old)
-                        *m = new;
-                local_irq_restore(flags);       /* implies memory barrier  */
-        }
-
-        return retval;
-}
-
-#else
-extern unsigned long __cmpxchg_u64_unsupported_on_32bit_kernels(
-        volatile int * m, unsigned long old, unsigned long new);
-#define __cmpxchg_u64 __cmpxchg_u64_unsupported_on_32bit_kernels
-extern unsigned long __cmpxchg_u64_local_unsupported_on_32bit_kernels(
-        volatile int * m, unsigned long old, unsigned long new);
-#define __cmpxchg_u64_local __cmpxchg_u64_local_unsupported_on_32bit_kernels
-#endif
-
-/* This function doesn't exist, so you'll get a linker error
-   if something tries to do an invalid cmpxchg().  */
-extern void __cmpxchg_called_with_bad_pointer(void);
-
-static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old,
-        unsigned long new, int size)
-{
-        switch (size) {
-        case 4:
-                return __cmpxchg_u32(ptr, old, new);
-        case 8:
-                return __cmpxchg_u64(ptr, old, new);
-        }
-        __cmpxchg_called_with_bad_pointer();
-        return old;
-}
-
-static inline unsigned long __cmpxchg_local(volatile void * ptr,
-        unsigned long old, unsigned long new, int size)
-{
-        switch (size) {
-        case 4:
-                return __cmpxchg_u32_local(ptr, old, new);
-        case 8:
-                return __cmpxchg_u64_local(ptr, old, new);
-        }
-        __cmpxchg_called_with_bad_pointer();
-        return old;
-}
-
-#define cmpxchg(ptr,old,new) \
-        ((__typeof__(*(ptr)))__cmpxchg((ptr), \
-                (unsigned long)(old), (unsigned long)(new),sizeof(*(ptr))))
-
-#define cmpxchg_local(ptr,old,new) \
-        ((__typeof__(*(ptr)))__cmpxchg_local((ptr), \
-                (unsigned long)(old), (unsigned long)(new),sizeof(*(ptr))))
-
 extern void set_handler (unsigned long offset, void *addr, unsigned long len);
 extern void set_uncached_handler (unsigned long offset, void *addr, unsigned long len);
 
diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h
index 5bfdc3b645..c83c68444e 100644
--- a/include/asm-mips/termbits.h
+++ b/include/asm-mips/termbits.h
@@ -164,6 +164,7 @@ struct ktermios {
 #define HUPCL   0002000         /* Hang up on last close.  */
 #define CLOCAL  0004000         /* Ignore modem status lines.  */
 #define CBAUDEX 0010000
+#define    BOTHER 0010000
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
@@ -179,9 +180,11 @@ struct ktermios {
 #define  B3000000 0010015
 #define  B3500000 0010016
 #define  B4000000 0010017
-#define CIBAUD    002003600000  /* input baud rate (not used) */
+#define CIBAUD    002003600000  /* input baud rate */
 #define CMSPAR    010000000000  /* mark or space (stick) parity */
-#define CRTSCTS   020000000000          /* flow control */
+#define CRTSCTS   020000000000  /* flow control */
+
+#define IBSHIFT 16              /* Shift from CBAUD to CIBAUD */
 
 /* c_lflag bits */
 #define ISIG    0000001         /* Enable signals.  */
diff --git a/include/asm-mips/termios.h b/include/asm-mips/termios.h
index 2ce07f4be3..a275661fa7 100644
--- a/include/asm-mips/termios.h
+++ b/include/asm-mips/termios.h
@@ -122,8 +122,10 @@ struct termio {
         copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
 })
 
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
+#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
+#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
+#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
+#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
 
 #endif /* defined(__KERNEL__) */
 
diff --git a/include/asm-mips/tx4927/toshiba_rbtx4927.h b/include/asm-mips/tx4927/toshiba_rbtx4927.h
index 5dc40a8677..a60649569c 100644
--- a/include/asm-mips/tx4927/toshiba_rbtx4927.h
+++ b/include/asm-mips/tx4927/toshiba_rbtx4927.h
@@ -50,7 +50,7 @@
 
 
 #define RBTX4927_RTL_8019_BASE (0x1c020280-TBTX4927_ISA_IO_OFFSET)
-#define RBTX4927_RTL_8019_IRQ  (29)
+#define RBTX4927_RTL_8019_IRQ  (TX4927_IRQ_PIC_BEG + 5)
 
 int toshiba_rbtx4927_irq_nested(int sw_irq);
 
diff --git a/include/asm-mips/tx4927/tx4927.h b/include/asm-mips/tx4927/tx4927.h
index de85bd2245..4bd4368e18 100644
--- a/include/asm-mips/tx4927/tx4927.h
+++ b/include/asm-mips/tx4927/tx4927.h
@@ -28,6 +28,7 @@
 #define __ASM_TX4927_TX4927_H
 
 #include <asm/tx4927/tx4927_mips.h>
+#include <asm/txx9irq.h>
 
 /*
  This register naming came from the integrated CPU/controller name TX4927
@@ -421,32 +422,6 @@
 #define TX4927_PIO_LIMIT                0xf50f
 
 
-/* TX4927 Interrupt Controller (32-bit registers) */
-#define TX4927_IRC_BASE                 0xf510
-#define TX4927_IRC_IRFLAG0              0xf510
-#define TX4927_IRC_IRFLAG1              0xf514
-#define TX4927_IRC_IRPOL                0xf518
-#define TX4927_IRC_IRRCNT               0xf51c
-#define TX4927_IRC_IRMASKINT            0xf520
-#define TX4927_IRC_IRMASKEXT            0xf524
-#define TX4927_IRC_IRDEN                0xf600
-#define TX4927_IRC_IRDM0                0xf604
-#define TX4927_IRC_IRDM1                0xf608
-#define TX4927_IRC_IRLVL0               0xf610
-#define TX4927_IRC_IRLVL1               0xf614
-#define TX4927_IRC_IRLVL2               0xf618
-#define TX4927_IRC_IRLVL3               0xf61c
-#define TX4927_IRC_IRLVL4               0xf620
-#define TX4927_IRC_IRLVL5               0xf624
-#define TX4927_IRC_IRLVL6               0xf628
-#define TX4927_IRC_IRLVL7               0xf62c
-#define TX4927_IRC_IRMSK                0xf640
-#define TX4927_IRC_IREDC                0xf660
-#define TX4927_IRC_IRPND                0xf680
-#define TX4927_IRC_IRCS                 0xf6a0
-#define TX4927_IRC_LIMIT                0xf6ff
-
-
 /* TX4927 AC-link controller (32-bit registers) */
 #define TX4927_ACLC_BASE                0xf700
 #define TX4927_ACLC_ACCTLEN             0xf700
@@ -493,25 +468,11 @@
 #define TX4927_WR( reg, val ) TX4927_WR32( reg, val )
 
 
+#define TX4927_IRQ_CP0_BEG  MIPS_CPU_IRQ_BASE
+#define TX4927_IRQ_CP0_END  (MIPS_CPU_IRQ_BASE + 8 - 1)
 
-
-
-#define MI8259_IRQ_ISA_RAW_BEG   0    /* optional backplane i8259 */
-#define MI8259_IRQ_ISA_RAW_END  15
-#define TX4927_IRQ_CP0_RAW_BEG   0    /* tx4927 cpu built-in cp0 */
-#define TX4927_IRQ_CP0_RAW_END   7
-#define TX4927_IRQ_PIC_RAW_BEG   0    /* tx4927 cpu build-in pic */
-#define TX4927_IRQ_PIC_RAW_END  31
-
-
-#define MI8259_IRQ_ISA_BEG                          MI8259_IRQ_ISA_RAW_BEG   /*  0 */
-#define MI8259_IRQ_ISA_END                          MI8259_IRQ_ISA_RAW_END   /* 15 */
-
-#define TX4927_IRQ_CP0_BEG  ((MI8259_IRQ_ISA_END+1)+TX4927_IRQ_CP0_RAW_BEG)  /* 16 */
-#define TX4927_IRQ_CP0_END  ((MI8259_IRQ_ISA_END+1)+TX4927_IRQ_CP0_RAW_END)  /* 23 */
-
-#define TX4927_IRQ_PIC_BEG  ((TX4927_IRQ_CP0_END+1)+TX4927_IRQ_PIC_RAW_BEG)  /* 24 */
-#define TX4927_IRQ_PIC_END  ((TX4927_IRQ_CP0_END+1)+TX4927_IRQ_PIC_RAW_END)  /* 55 */
+#define TX4927_IRQ_PIC_BEG  TXX9_IRQ_BASE
+#define TX4927_IRQ_PIC_END  (TXX9_IRQ_BASE + TXx9_MAX_IR - 1)
 
 
 #define TX4927_IRQ_USER0            (TX4927_IRQ_CP0_BEG+0)
diff --git a/include/asm-mips/tx4927/tx4927_pci.h b/include/asm-mips/tx4927/tx4927_pci.h
index 66c064690f..f98b2bb719 100644
--- a/include/asm-mips/tx4927/tx4927_pci.h
+++ b/include/asm-mips/tx4927/tx4927_pci.h
@@ -48,7 +48,7 @@
 #define TX4927_PCI_CLK_ACK      0x04
 #define TX4927_PCI_CLK_ACE      0x02
 #define TX4927_PCI_CLK_ENDIAN   0x01
-#define TX4927_NR_IRQ_LOCAL     (8+16)
+#define TX4927_NR_IRQ_LOCAL     TX4927_IRQ_PIC_BEG
 #define TX4927_NR_IRQ_IRC       32      /* On-Chip IRC */
 
 #define TX4927_IR_PCIC          16
@@ -99,21 +99,6 @@ struct tx4927_ccfg_reg {
         volatile unsigned long long ramp;
 };
 
-struct tx4927_irc_reg {
-        volatile unsigned long cer;
-        volatile unsigned long cr[2];
-        volatile unsigned long unused0;
-        volatile unsigned long ilr[8];
-        volatile unsigned long unused1[4];
-        volatile unsigned long imr;
-        volatile unsigned long unused2[7];
-        volatile unsigned long scr;
-        volatile unsigned long unused3[7];
-        volatile unsigned long ssr;
-        volatile unsigned long unused4[7];
-        volatile unsigned long csr;
-};
-
 struct tx4927_pcic_reg {
         volatile unsigned long pciid;
         volatile unsigned long pcistatus;
@@ -182,11 +167,6 @@ struct tx4927_pcic_reg {
 
 #endif /* _LANGUAGE_ASSEMBLY */
 
-/* IRCSR : Int. Current Status */
-#define TX4927_IRCSR_IF         0x00010000
-#define TX4927_IRCSR_ILV_MASK   0x00000700
-#define TX4927_IRCSR_IVL_MASK   0x0000001f
-
 /*
  * PCIC
  */
@@ -278,7 +258,6 @@ struct tx4927_pcic_reg {
 #define tx4927_pcicptr          ((struct tx4927_pcic_reg *)TX4927_PCIC_REG)
 #define tx4927_ccfgptr          ((struct tx4927_ccfg_reg *)TX4927_CCFG_REG)
 #define tx4927_ebuscptr         ((struct tx4927_ebusc_reg *)TX4927_EBUSC_REG)
-#define tx4927_ircptr           ((struct tx4927_irc_reg *)TX4927_IRC_REG)
 
 #endif /* _LANGUAGE_ASSEMBLY */
 
diff --git a/include/asm-mips/tx4938/rbtx4938.h b/include/asm-mips/tx4938/rbtx4938.h
index 74e7d8061e..b14acb575b 100644
--- a/include/asm-mips/tx4938/rbtx4938.h
+++ b/include/asm-mips/tx4938/rbtx4938.h
@@ -14,6 +14,7 @@
 
 #include <asm/addrspace.h>
 #include <asm/tx4938/tx4938.h>
+#include <asm/txx9irq.h>
 
 /* CS */
 #define RBTX4938_CE0    0x1c000000      /* 64M */
@@ -123,21 +124,11 @@
 #define RBTX4938_NR_IRQ_IRC     32      /* On-Chip IRC */
 #define RBTX4938_NR_IRQ_IOC     8
 
-#define MI8259_IRQ_ISA_RAW_BEG   0      /* optional backplane i8259 */
-#define MI8259_IRQ_ISA_RAW_END  15
-#define TX4938_IRQ_CP0_RAW_BEG   0      /* tx4938 cpu built-in cp0 */
-#define TX4938_IRQ_CP0_RAW_END   7
-#define TX4938_IRQ_PIC_RAW_BEG   0      /* tx4938 cpu build-in pic */
-#define TX4938_IRQ_PIC_RAW_END  31
+#define TX4938_IRQ_CP0_BEG  MIPS_CPU_IRQ_BASE
+#define TX4938_IRQ_CP0_END  (MIPS_CPU_IRQ_BASE + 8 - 1)
 
-#define MI8259_IRQ_ISA_BEG                          MI8259_IRQ_ISA_RAW_BEG      /*  0 */
-#define MI8259_IRQ_ISA_END                          MI8259_IRQ_ISA_RAW_END      /* 15 */
-
-#define TX4938_IRQ_CP0_BEG  ((MI8259_IRQ_ISA_END+1)+TX4938_IRQ_CP0_RAW_BEG)     /* 16 */
-#define TX4938_IRQ_CP0_END  ((MI8259_IRQ_ISA_END+1)+TX4938_IRQ_CP0_RAW_END)     /* 23 */
-
-#define TX4938_IRQ_PIC_BEG  ((TX4938_IRQ_CP0_END+1)+TX4938_IRQ_PIC_RAW_BEG)     /* 24 */
-#define TX4938_IRQ_PIC_END  ((TX4938_IRQ_CP0_END+1)+TX4938_IRQ_PIC_RAW_END)     /* 55 */
+#define TX4938_IRQ_PIC_BEG  TXX9_IRQ_BASE
+#define TX4938_IRQ_PIC_END  (TXX9_IRQ_BASE + TXx9_MAX_IR - 1)
 #define TX4938_IRQ_NEST_EXT_ON_PIC  (TX4938_IRQ_PIC_BEG+2)
 #define TX4938_IRQ_NEST_PIC_ON_CP0  (TX4938_IRQ_CP0_BEG+2)
 #define TX4938_IRQ_USER0            (TX4938_IRQ_CP0_BEG+0)
@@ -192,10 +183,4 @@
 #define RBTX4938_RTL_8019_BASE (RBTX4938_ETHER_ADDR - mips_io_port_base)
 #define RBTX4938_RTL_8019_IRQ  (RBTX4938_IRQ_ETHER)
 
-/* IRCR : Int. Control */
-#define TX4938_IRCR_LOW  0x00000000
-#define TX4938_IRCR_HIGH 0x00000001
-#define TX4938_IRCR_DOWN 0x00000002
-#define TX4938_IRCR_UP   0x00000003
-
 #endif /* __ASM_TX_BOARDS_RBTX4938_H */
diff --git a/include/asm-mips/tx4938/tx4938.h b/include/asm-mips/tx4938/tx4938.h
index e25b1a0975..afdb19813c 100644
--- a/include/asm-mips/tx4938/tx4938.h
+++ b/include/asm-mips/tx4938/tx4938.h
@@ -272,20 +272,6 @@ struct tx4938_pio_reg {
         volatile unsigned long maskcpu;
         volatile unsigned long maskext;
 };
-struct tx4938_irc_reg {
-        volatile unsigned long cer;
-        volatile unsigned long cr[2];
-        volatile unsigned long unused0;
-        volatile unsigned long ilr[8];
-        volatile unsigned long unused1[4];
-        volatile unsigned long imr;
-        volatile unsigned long unused2[7];
-        volatile unsigned long scr;
-        volatile unsigned long unused3[7];
-        volatile unsigned long ssr;
-        volatile unsigned long unused4[7];
-        volatile unsigned long csr;
-};
 
 struct tx4938_ndfmc_reg {
         endian_def_l2(unused0, dtr);
@@ -646,39 +632,12 @@ struct tx4938_ccfg_reg {
 #define TX4938_DMA_CSR_DESERR   0x00000002
 #define TX4938_DMA_CSR_SORERR   0x00000001
 
-/* TX4938 Interrupt Controller (32-bit registers) */
-#define TX4938_IRC_BASE                 0xf510
-#define TX4938_IRC_IRFLAG0              0xf510
-#define TX4938_IRC_IRFLAG1              0xf514
-#define TX4938_IRC_IRPOL                0xf518
-#define TX4938_IRC_IRRCNT               0xf51c
-#define TX4938_IRC_IRMASKINT            0xf520
-#define TX4938_IRC_IRMASKEXT            0xf524
-#define TX4938_IRC_IRDEN                0xf600
-#define TX4938_IRC_IRDM0                0xf604
-#define TX4938_IRC_IRDM1                0xf608
-#define TX4938_IRC_IRLVL0               0xf610
-#define TX4938_IRC_IRLVL1               0xf614
-#define TX4938_IRC_IRLVL2               0xf618
-#define TX4938_IRC_IRLVL3               0xf61c
-#define TX4938_IRC_IRLVL4               0xf620
-#define TX4938_IRC_IRLVL5               0xf624
-#define TX4938_IRC_IRLVL6               0xf628
-#define TX4938_IRC_IRLVL7               0xf62c
-#define TX4938_IRC_IRMSK                0xf640
-#define TX4938_IRC_IREDC                0xf660
-#define TX4938_IRC_IRPND                0xf680
-#define TX4938_IRC_IRCS                 0xf6a0
-#define TX4938_IRC_LIMIT                0xf6ff
-
-
 #ifndef __ASSEMBLY__
 
 #define tx4938_sdramcptr        ((struct tx4938_sdramc_reg *)TX4938_SDRAMC_REG)
 #define tx4938_ebuscptr         ((struct tx4938_ebusc_reg *)TX4938_EBUSC_REG)
 #define tx4938_dmaptr(ch)       ((struct tx4938_dma_reg *)TX4938_DMA_REG(ch))
 #define tx4938_ndfmcptr         ((struct tx4938_ndfmc_reg *)TX4938_NDFMC_REG)
-#define tx4938_ircptr           ((struct tx4938_irc_reg *)TX4938_IRC_REG)
 #define tx4938_pcicptr          ((struct tx4938_pcic_reg *)TX4938_PCIC_REG)
 #define tx4938_pcic1ptr         ((struct tx4938_pcic_reg *)TX4938_PCIC1_REG)
 #define tx4938_ccfgptr          ((struct tx4938_ccfg_reg *)TX4938_CCFG_REG)
diff --git a/include/asm-mips/txx9irq.h b/include/asm-mips/txx9irq.h
new file mode 100644
index 0000000000..1c439e51b8
--- /dev/null
+++ b/include/asm-mips/txx9irq.h
@@ -0,0 +1,30 @@
+/*
+ * include/asm-mips/txx9irq.h
+ * TX39/TX49 interrupt controller definitions.
+ *
+ * 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.
+ */
+#ifndef __ASM_TXX9IRQ_H
+#define __ASM_TXX9IRQ_H
+
+#include <irq.h>
+
+#ifdef CONFIG_IRQ_CPU
+#define TXX9_IRQ_BASE   (MIPS_CPU_IRQ_BASE + 8)
+#else
+#define TXX9_IRQ_BASE   0
+#endif
+
+#ifdef CONFIG_CPU_TX39XX
+#define TXx9_MAX_IR 16
+#else
+#define TXx9_MAX_IR 32
+#endif
+
+void txx9_irq_init(unsigned long baseaddr);
+int txx9_irq(void);
+int txx9_irq_set_pri(int irc_irq, int new_pri);
+
+#endif /* __ASM_TXX9IRQ_H */
diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h
index c0fed91da3..4cc9bcec05 100644
--- a/include/asm-parisc/io.h
+++ b/include/asm-parisc/io.h
@@ -15,6 +15,16 @@ extern unsigned long parisc_vmerge_max_size;
 #define virt_to_bus virt_to_phys
 #define bus_to_virt phys_to_virt
 
+static inline unsigned long isa_bus_to_virt(unsigned long addr) {
+        BUG();
+        return 0;
+}
+
+static inline unsigned long isa_virt_to_bus(void *addr) {
+        BUG();
+        return 0;
+}
+
 /*
  * Memory mapped I/O
  *
diff --git a/include/asm-parisc/vga.h b/include/asm-parisc/vga.h
new file mode 100644
index 0000000000..154a84c843
--- /dev/null
+++ b/include/asm-parisc/vga.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_PARISC_VGA_H__
+#define __ASM_PARISC_VGA_H__
+
+/* nothing */
+
+#endif __ASM_PARISC_VGA_H__
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index 8836c0f1f2..5bde3980bf 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -130,6 +130,7 @@ struct spu {
         u64 flags;
         u64 dar;
         u64 dsisr;
+        u64 class_0_pending;
         size_t ls_size;
         unsigned int slb_replace;
         struct mm_struct *mm;
@@ -138,7 +139,6 @@ struct spu {
         unsigned long long timestamp;
         pid_t pid;
         pid_t tgid;
-        int class_0_pending;
         spinlock_t register_lock;
 
         void (* wbox_callback)(struct spu *spu);
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index d7f5ddfbaa..c104c15c66 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -149,6 +149,11 @@ static inline u64 get_tb(void)
 }
 #endif /* !CONFIG_PPC64 */
 
+static inline u64 get_tb_or_rtc(void)
+{
+        return __USE_RTC() ? get_rtc() : get_tb();
+}
+
 static inline void set_tb(unsigned int upper, unsigned int lower)
 {
         mtspr(SPRN_TBWL, 0);
diff --git a/include/asm-sh/flat.h b/include/asm-sh/flat.h
index 0d5cc04ab0..dc4f5950da 100644
--- a/include/asm-sh/flat.h
+++ b/include/asm-sh/flat.h
@@ -16,8 +16,9 @@
 #define flat_argvp_envp_on_stack()              0
 #define flat_old_ram_flag(flags)                (flags)
 #define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
-#define flat_get_addr_from_rp(rp, relval, flags)        get_unaligned(rp)
+#define flat_get_addr_from_rp(rp, relval, flags, p)     get_unaligned(rp)
 #define flat_put_addr_at_rp(rp, val, relval)    put_unaligned(val,rp)
 #define flat_get_relocate_addr(rel)             (rel)
+#define flat_set_persistent(relval, p)          0
 
 #endif /* __ASM_SH_FLAT_H */
diff --git a/include/asm-sparc/tlbflush.h b/include/asm-sparc/tlbflush.h
index 4a3b66618e..a619da5cfa 100644
--- a/include/asm-sparc/tlbflush.h
+++ b/include/asm-sparc/tlbflush.h
@@ -57,6 +57,10 @@ BTFIXUPDEF_CALL(void, flush_tlb_page, struct vm_area_struct *, unsigned long)
 /*
  * This is a kludge, until I know better. --zaitcev XXX
  */
-#define flush_tlb_kernel_range(start, end) flush_tlb_all()
+static inline void flush_tlb_kernel_range(unsigned long start,
+                                          unsigned long end)
+{
+        flush_tlb_all();
+}
 
 #endif /* _SPARC_TLBFLUSH_H */
diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h
index d5a4559b95..5111e8717b 100644
--- a/include/asm-sparc64/device.h
+++ b/include/asm-sparc64/device.h
@@ -16,8 +16,6 @@ struct dev_archdata {
 
         struct device_node      *prom_node;
         struct of_device        *op;
-
-        unsigned int            msi_num;
 };
 
 #endif /* _ASM_SPARC64_DEVICE_H */
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
index e6c436ef93..c00ad15277 100644
--- a/include/asm-sparc64/irq.h
+++ b/include/asm-sparc64/irq.h
@@ -16,21 +16,21 @@
 #include <asm/ptrace.h>
 
 /* IMAP/ICLR register defines */
-#define IMAP_VALID              0x80000000      /* IRQ Enabled          */
-#define IMAP_TID_UPA            0x7c000000      /* UPA TargetID         */
-#define IMAP_TID_JBUS           0x7c000000      /* JBUS TargetID        */
+#define IMAP_VALID              0x80000000UL    /* IRQ Enabled          */
+#define IMAP_TID_UPA            0x7c000000UL    /* UPA TargetID         */
+#define IMAP_TID_JBUS           0x7c000000UL    /* JBUS TargetID        */
 #define IMAP_TID_SHIFT          26
-#define IMAP_AID_SAFARI         0x7c000000      /* Safari AgentID       */
+#define IMAP_AID_SAFARI         0x7c000000UL    /* Safari AgentID       */
 #define IMAP_AID_SHIFT          26
-#define IMAP_NID_SAFARI         0x03e00000      /* Safari NodeID        */
+#define IMAP_NID_SAFARI         0x03e00000UL    /* Safari NodeID        */
 #define IMAP_NID_SHIFT          21
-#define IMAP_IGN                0x000007c0      /* IRQ Group Number     */
-#define IMAP_INO                0x0000003f      /* IRQ Number           */
-#define IMAP_INR                0x000007ff      /* Full interrupt number*/
+#define IMAP_IGN                0x000007c0UL    /* IRQ Group Number     */
+#define IMAP_INO                0x0000003fUL    /* IRQ Number           */
+#define IMAP_INR                0x000007ffUL    /* Full interrupt number*/
 
-#define ICLR_IDLE               0x00000000      /* Idle state           */
-#define ICLR_TRANSMIT           0x00000001      /* Transmit state       */
-#define ICLR_PENDING            0x00000003      /* Pending state        */
+#define ICLR_IDLE               0x00000000UL    /* Idle state           */
+#define ICLR_TRANSMIT           0x00000001UL    /* Transmit state       */
+#define ICLR_PENDING            0x00000003UL    /* Pending state        */
 
 /* The largest number of unique interrupt sources we support.
  * If this needs to ever be larger than 255, you need to change
@@ -53,6 +53,9 @@ extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
 extern void sun4v_destroy_msi(unsigned int virt_irq);
 extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);
 
+extern void sparc64_set_msi(unsigned int virt_irq, u32 msi);
+extern u32 sparc64_get_msi(unsigned int virt_irq);
+
 extern void fixup_irqs(void);
 
 static __inline__ void set_softint(unsigned long bits)
diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h
index 86dc5c018a..55c5bb27e4 100644
--- a/include/asm-sparc64/oplib.h
+++ b/include/asm-sparc64/oplib.h
@@ -297,11 +297,7 @@ extern void prom_sun4v_guest_soft_state(void);
 extern int prom_ihandle2path(int handle, char *buffer, int bufsize);
 
 /* Client interface level routines. */
-extern void prom_set_trap_table(unsigned long tba);
-extern void prom_set_trap_table_sun4v(unsigned long tba, unsigned long mmfsa);
-
 extern long p1275_cmd(const char *, long, ...);
-                                   
 
 #if 0
 #define P1275_SIZE(x) ((((long)((x) / 32)) << 32) | (x))
diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
index e3f010bd12..cb0248616d 100644
--- a/include/asm-um/common.lds.S
+++ b/include/asm-um/common.lds.S
@@ -16,82 +16,112 @@
 
   . = ALIGN(4096);
   .note : { *(.note.*) }
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
+  __ex_table : {
+        __start___ex_table = .;
+        *(__ex_table)
+        __stop___ex_table = .;
+  }
 
   BUG_TABLE
 
-  __uml_setup_start = .;
-  .uml.setup.init : { *(.uml.setup.init) }
-  __uml_setup_end = .;
+  .uml.setup.init : {
+        __uml_setup_start = .;
+        *(.uml.setup.init)
+        __uml_setup_end = .;
+  }
         
-  __uml_help_start = .;
-  .uml.help.init : { *(.uml.help.init) }
-  __uml_help_end = .;
+  .uml.help.init : {
+        __uml_help_start = .;
+        *(.uml.help.init)
+        __uml_help_end = .;
+  }
         
-  __uml_postsetup_start = .;
-  .uml.postsetup.init : { *(.uml.postsetup.init) }
-  __uml_postsetup_end = .;
+  .uml.postsetup.init : {
+        __uml_postsetup_start = .;
+        *(.uml.postsetup.init)
+        __uml_postsetup_end = .;
+  }
         
-  __setup_start = .;
-  .init.setup : { *(.init.setup) }
-  __setup_end = .;
+  .init.setup : {
+        __setup_start = .;
+        *(.init.setup)
+        __setup_end = .;
+  }
 
   . = ALIGN(32);
-  __per_cpu_start = . ; 
-  .data.percpu : { *(.data.percpu) }
-  __per_cpu_end = . ;
+  .data.percpu : {
+        __per_cpu_start = . ;
+        *(.data.percpu)
+        __per_cpu_end = . ;
+  }
         
-  __initcall_start = .;
   .initcall.init : {
+        __initcall_start = .;
         INITCALLS
+        __initcall_end = .;
   }
-  __initcall_end = .;
 
-  __con_initcall_start = .;
-  .con_initcall.init : { *(.con_initcall.init) }
-  __con_initcall_end = .;
+  .con_initcall.init : {
+        __con_initcall_start = .;
+        *(.con_initcall.init)
+        __con_initcall_end = .;
+  }
 
-  __uml_initcall_start = .;
-  .uml.initcall.init : { *(.uml.initcall.init) }
-  __uml_initcall_end = .;
+  .uml.initcall.init : {
+        __uml_initcall_start = .;
+        *(.uml.initcall.init)
+        __uml_initcall_end = .;
+  }
   __init_end = .;
 
   SECURITY_INIT
 
-  __exitcall_begin = .;
-  .exitcall : { *(.exitcall.exit) }
-  __exitcall_end = .;
+  .exitcall : {
+        __exitcall_begin = .;
+        *(.exitcall.exit)
+        __exitcall_end = .;
+  }
 
-  __uml_exitcall_begin = .;
-  .uml.exitcall : { *(.uml.exitcall.exit) }
-  __uml_exitcall_end = .;
+  .uml.exitcall : {
+        __uml_exitcall_begin = .;
+        *(.uml.exitcall.exit)
+        __uml_exitcall_end = .;
+  }
 
   . = ALIGN(4);
-  __alt_instructions = .;
-  .altinstructions : { *(.altinstructions) }
-  __alt_instructions_end = .;
+  .altinstructions : {
+        __alt_instructions = .;
+        *(.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 = .;
+  .preinit_array : {
+        __preinit_array_start = .;
+        *(.preinit_array)
+        __preinit_array_end = .;
+  }
+  .init_array : {
+        __init_array_start = .;
+        *(.init_array)
+        __init_array_end = .;
+  }
+  .fini_array : {
+        __fini_array_start = .;
+        *(.fini_array)
+        __fini_array_end = .;
+  }
 
    . = ALIGN(4096);
-  __initramfs_start = .;
-  .init.ramfs : { *(.init.ramfs) }
-  __initramfs_end = .;
+  .init.ramfs : {
+        __initramfs_start = .;
+        *(.init.ramfs)
+        __initramfs_end = .;
+  }
 
   /* Sections to be discarded */
   /DISCARD/ : {
diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h
index 8a8246d039..857471c49d 100644
--- a/include/asm-um/elf-x86_64.h
+++ b/include/asm-um/elf-x86_64.h
@@ -6,7 +6,9 @@
 #ifndef __UM_ELF_X86_64_H
 #define __UM_ELF_X86_64_H
 
+#include <linux/sched.h>
 #include <asm/user.h>
+#include "skas.h"
 
 /* x86-64 relocation types, taken from asm-x86_64/elf.h */
 #define R_X86_64_NONE           0       /* No reloc */
@@ -64,6 +66,44 @@ typedef struct { } elf_fpregset_t;
         PT_REGS_R15(regs) = 0; \
 } while (0)
 
+#define ELF_CORE_COPY_REGS(pr_reg, regs)                \
+        (pr_reg)[0] = (regs)->regs.skas.regs[0];                        \
+        (pr_reg)[1] = (regs)->regs.skas.regs[1];                        \
+        (pr_reg)[2] = (regs)->regs.skas.regs[2];                        \
+        (pr_reg)[3] = (regs)->regs.skas.regs[3];                        \
+        (pr_reg)[4] = (regs)->regs.skas.regs[4];                        \
+        (pr_reg)[5] = (regs)->regs.skas.regs[5];                        \
+        (pr_reg)[6] = (regs)->regs.skas.regs[6];                        \
+        (pr_reg)[7] = (regs)->regs.skas.regs[7];                        \
+        (pr_reg)[8] = (regs)->regs.skas.regs[8];                        \
+        (pr_reg)[9] = (regs)->regs.skas.regs[9];                        \
+        (pr_reg)[10] = (regs)->regs.skas.regs[10];                      \
+        (pr_reg)[11] = (regs)->regs.skas.regs[11];                      \
+        (pr_reg)[12] = (regs)->regs.skas.regs[12];                      \
+        (pr_reg)[13] = (regs)->regs.skas.regs[13];                      \
+        (pr_reg)[14] = (regs)->regs.skas.regs[14];                      \
+        (pr_reg)[15] = (regs)->regs.skas.regs[15];                      \
+        (pr_reg)[16] = (regs)->regs.skas.regs[16];                      \
+        (pr_reg)[17] = (regs)->regs.skas.regs[17];                      \
+        (pr_reg)[18] = (regs)->regs.skas.regs[18];                      \
+        (pr_reg)[19] = (regs)->regs.skas.regs[19];                      \
+        (pr_reg)[20] = (regs)->regs.skas.regs[20];                      \
+        (pr_reg)[21] = current->thread.arch.fs;                 \
+        (pr_reg)[22] = 0;                                       \
+        (pr_reg)[23] = 0;                                       \
+        (pr_reg)[24] = 0;                                       \
+        (pr_reg)[25] = 0;                                       \
+        (pr_reg)[26] = 0;
+
+static inline int elf_core_copy_fpregs(struct task_struct *t,
+                                       elf_fpregset_t *fpu)
+{
+        int cpu = current_thread->cpu;
+        return save_fp_registers(userspace_pid[cpu], (unsigned long *) fpu);
+}
+
+#define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu)
+
 #ifdef TIF_IA32 /* XXX */
 #error XXX, indeed
         clear_thread_flag(TIF_IA32);
diff --git a/include/asm-v850/flat.h b/include/asm-v850/flat.h
index 3888f59d68..17f0ea5666 100644
--- a/include/asm-v850/flat.h
+++ b/include/asm-v850/flat.h
@@ -25,6 +25,7 @@
 #define flat_stack_align(sp)            /* nothing needed */
 #define flat_argvp_envp_on_stack()      0
 #define flat_old_ram_flag(flags)        (flags)
+#define flat_set_persistent(relval, p)  0
 
 /* We store the type of relocation in the top 4 bits of the `relval.' */
 
@@ -46,7 +47,8 @@ flat_get_relocate_addr (unsigned long relval)
    For the v850, RP should always be half-word aligned.  */
 static inline unsigned long flat_get_addr_from_rp (unsigned long *rp,
                                                    unsigned long relval,
-                                                   unsigned long flags)
+                                                   unsigned long flags,
+                                                   unsigned long *persistent)
 {
         short *srp = (short *)rp;
 
diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h
index 969d225a93..d9f2e54324 100644
--- a/include/asm-x86_64/io_apic.h
+++ b/include/asm-x86_64/io_apic.h
@@ -109,6 +109,12 @@ extern int mpc_default_type;
 /* 1 if "noapic" boot option passed */
 extern int skip_ioapic_setup;
 
+static inline void disable_ioapic_setup(void)
+{
+        skip_ioapic_setup = 1;
+}
+
+
 /*
  * If we use the IO-APIC for IRQ routing, disable automatic
  * assignment of PCI IRQ's.
diff --git a/include/asm-x86_64/pgalloc.h b/include/asm-x86_64/pgalloc.h
index b467be6d36..8bb5646878 100644
--- a/include/asm-x86_64/pgalloc.h
+++ b/include/asm-x86_64/pgalloc.h
@@ -4,10 +4,6 @@
 #include <asm/pda.h>
 #include <linux/threads.h>
 #include <linux/mm.h>
-#include <linux/quicklist.h>
-
-#define QUICK_PGD 0     /* We preserve special mappings over free */
-#define QUICK_PT 1      /* Other page table pages that are zero on free */
 
 #define pmd_populate_kernel(mm, pmd, pte) \
                 set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)))
@@ -24,23 +20,23 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p
 static inline void pmd_free(pmd_t *pmd)
 {
         BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));
-        quicklist_free(QUICK_PT, NULL, pmd);
+        free_page((unsigned long)pmd);
 }
 
 static inline pmd_t *pmd_alloc_one (struct mm_struct *mm, unsigned long addr)
 {
-        return (pmd_t *)quicklist_alloc(QUICK_PT, GFP_KERNEL|__GFP_REPEAT, NULL);
+        return (pmd_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
 }
 
 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return (pud_t *)quicklist_alloc(QUICK_PT, GFP_KERNEL|__GFP_REPEAT, NULL);
+        return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
 }
 
 static inline void pud_free (pud_t *pud)
 {
         BUG_ON((unsigned long)pud & (PAGE_SIZE-1));
-        quicklist_free(QUICK_PT, NULL, pud);
+        free_page((unsigned long)pud);
 }
 
 static inline void pgd_list_add(pgd_t *pgd)
@@ -61,57 +57,41 @@ static inline void pgd_list_del(pgd_t *pgd)
         spin_unlock(&pgd_lock);
 }
 
-static inline void pgd_ctor(void *x)
+static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
         unsigned boundary;
-        pgd_t *pgd = x;
-        struct page *page = virt_to_page(pgd);
-
+        pgd_t *pgd = (pgd_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+        if (!pgd)
+                return NULL;
+        pgd_list_add(pgd);
         /*
          * Copy kernel pointers in from init.
+         * Could keep a freelist or slab cache of those because the kernel
+         * part never changes.
          */
         boundary = pgd_index(__PAGE_OFFSET);
+        memset(pgd, 0, boundary * sizeof(pgd_t));
         memcpy(pgd + boundary,
-                init_level4_pgt + boundary,
-                (PTRS_PER_PGD - boundary) * sizeof(pgd_t));
-
-        spin_lock(&pgd_lock);
-        list_add(&page->lru, &pgd_list);
-        spin_unlock(&pgd_lock);
-}
-
-static inline void pgd_dtor(void *x)
-{
-        pgd_t *pgd = x;
-        struct page *page = virt_to_page(pgd);
-
-        spin_lock(&pgd_lock);
-        list_del(&page->lru);
-        spin_unlock(&pgd_lock);
-}
-
-static inline pgd_t *pgd_alloc(struct mm_struct *mm)
-{
-        pgd_t *pgd = (pgd_t *)quicklist_alloc(QUICK_PGD,
-                GFP_KERNEL|__GFP_REPEAT, pgd_ctor);
+               init_level4_pgt + boundary,
+               (PTRS_PER_PGD - boundary) * sizeof(pgd_t));
         return pgd;
 }
 
 static inline void pgd_free(pgd_t *pgd)
 {
         BUG_ON((unsigned long)pgd & (PAGE_SIZE-1));
-        quicklist_free(QUICK_PGD, pgd_dtor, pgd);
+        pgd_list_del(pgd);
+        free_page((unsigned long)pgd);
 }
 
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 {
-        return (pte_t *)quicklist_alloc(QUICK_PT, GFP_KERNEL|__GFP_REPEAT, NULL);
+        return (pte_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
 }
 
 static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-        void *p = (void *)quicklist_alloc(QUICK_PT, GFP_KERNEL|__GFP_REPEAT, NULL);
-
+        void *p = (void *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
         if (!p)
                 return NULL;
         return virt_to_page(p);
@@ -123,22 +103,17 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add
 static inline void pte_free_kernel(pte_t *pte)
 {
         BUG_ON((unsigned long)pte & (PAGE_SIZE-1));
-        quicklist_free(QUICK_PT, NULL, pte);
+        free_page((unsigned long)pte); 
 }
 
 static inline void pte_free(struct page *pte)
 {
-        quicklist_free_page(QUICK_PT, NULL, pte);
-}
+        __free_page(pte);
+} 
 
-#define __pte_free_tlb(tlb,pte) quicklist_free_page(QUICK_PT, NULL,(pte))
+#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
 
-#define __pmd_free_tlb(tlb,x)   quicklist_free(QUICK_PT, NULL, (x))
-#define __pud_free_tlb(tlb,x)   quicklist_free(QUICK_PT, NULL, (x))
+#define __pmd_free_tlb(tlb,x)   tlb_remove_page((tlb),virt_to_page(x))
+#define __pud_free_tlb(tlb,x)   tlb_remove_page((tlb),virt_to_page(x))
 
-static inline void check_pgt_cache(void)
-{
-        quicklist_trim(QUICK_PGD, pgd_dtor, 25, 16);
-        quicklist_trim(QUICK_PT, NULL, 25, 16);
-}
 #endif /* _X86_64_PGALLOC_H */
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h
index c9d8764c89..57dd6b3107 100644
--- a/include/asm-x86_64/pgtable.h
+++ b/include/asm-x86_64/pgtable.h
@@ -411,6 +411,7 @@ pte_t *lookup_address(unsigned long addr);
 #define HAVE_ARCH_UNMAPPED_AREA
 
 #define pgtable_cache_init()   do { } while (0)
+#define check_pgt_cache()      do { } while (0)
 
 #define PAGE_AGP    PAGE_KERNEL_NOCACHE
 #define HAVE_PAGE_AGP 1
diff --git a/include/asm-x86_64/processor.h b/include/asm-x86_64/processor.h
index 19525175b9..31f579b828 100644
--- a/include/asm-x86_64/processor.h
+++ b/include/asm-x86_64/processor.h
@@ -371,7 +371,7 @@ static inline void sync_core(void)
 #define ARCH_HAS_PREFETCH
 static inline void prefetch(void *x) 
 { 
-        asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
+        asm volatile("prefetcht0 (%0)" :: "r" (x));
 } 
 
 #define ARCH_HAS_PREFETCHW 1
diff --git a/include/asm-xtensa/bugs.h b/include/asm-xtensa/bugs.h
index c422853201..69b29d1982 100644
--- a/include/asm-xtensa/bugs.h
+++ b/include/asm-xtensa/bugs.h
@@ -13,10 +13,6 @@
 #ifndef _XTENSA_BUGS_H
 #define _XTENSA_BUGS_H
 
-#include <asm/processor.h>
-
-static void __init check_bugs(void)
-{
-}
+static void check_bugs(void) { }
 
 #endif /* _XTENSA_BUGS_H */
diff --git a/include/asm-xtensa/cache.h b/include/asm-xtensa/cache.h
index 1c4a78f29a..3bba2a540c 100644
--- a/include/asm-xtensa/cache.h
+++ b/include/asm-xtensa/cache.h
@@ -19,6 +19,15 @@
 
 #define DCACHE_WAY_SIZE (XCHAL_DCACHE_SIZE/XCHAL_DCACHE_WAYS)
 #define ICACHE_WAY_SIZE (XCHAL_ICACHE_SIZE/XCHAL_ICACHE_WAYS)
+#define DCACHE_WAY_SHIFT (XCHAL_DCACHE_SETWIDTH + XCHAL_DCACHE_LINEWIDTH)
+#define ICACHE_WAY_SHIFT (XCHAL_ICACHE_SETWIDTH + XCHAL_ICACHE_LINEWIDTH)
+
+/* Maximum cache size per way. */
+#if DCACHE_WAY_SIZE >= ICACHE_WAY_SIZE
+# define CACHE_WAY_SIZE DCACHE_WAY_SIZE
+#else
+# define CACHE_WAY_SIZE ICACHE_WAY_SIZE
+#endif
 
 
 #endif  /* _XTENSA_CACHE_H */
diff --git a/include/asm-xtensa/cacheflush.h b/include/asm-xtensa/cacheflush.h
index 22ef901b78..b773c57e75 100644
--- a/include/asm-xtensa/cacheflush.h
+++ b/include/asm-xtensa/cacheflush.h
@@ -5,7 +5,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * (C) 2001 - 2006 Tensilica Inc.
+ * (C) 2001 - 2007 Tensilica Inc.
  */
 
 #ifndef _XTENSA_CACHEFLUSH_H
@@ -18,10 +18,7 @@
 #include <asm/page.h>
 
 /*
- * flush and invalidate data cache, invalidate instruction cache:
- *
- * __flush_invalidate_cache_all()
- * __flush_invalidate_cache_range(from,sze)
+ * Lo-level routines for cache flushing.
  *
  * invalidate data or instruction cache:
  *
@@ -40,26 +37,39 @@
  * __flush_invalidate_dcache_all()
  * __flush_invalidate_dcache_page(adr)
  * __flush_invalidate_dcache_range(from,size)
+ *
+ * specials for cache aliasing:
+ *
+ * __flush_invalidate_dcache_page_alias(vaddr,paddr)
+ * __invalidate_icache_page_alias(vaddr,paddr)
  */
 
-extern void __flush_invalidate_cache_all(void);
-extern void __flush_invalidate_cache_range(unsigned long, unsigned long);
-extern void __flush_invalidate_dcache_all(void);
+extern void __invalidate_dcache_all(void);
 extern void __invalidate_icache_all(void);
-
 extern void __invalidate_dcache_page(unsigned long);
 extern void __invalidate_icache_page(unsigned long);
 extern void __invalidate_icache_range(unsigned long, unsigned long);
 extern void __invalidate_dcache_range(unsigned long, unsigned long);
 
+
 #if XCHAL_DCACHE_IS_WRITEBACK
+extern void __flush_invalidate_dcache_all(void);
 extern void __flush_dcache_page(unsigned long);
+extern void __flush_dcache_range(unsigned long, unsigned long);
 extern void __flush_invalidate_dcache_page(unsigned long);
 extern void __flush_invalidate_dcache_range(unsigned long, unsigned long);
 #else
-# define __flush_dcache_page(p)                         do { } while(0)
-# define __flush_invalidate_dcache_page(p)              do { } while(0)
-# define __flush_invalidate_dcache_range(p,s)           do { } while(0)
+# define __flush_dcache_range(p,s)              do { } while(0)
+# define __flush_dcache_page(p)                 do { } while(0)
+# define __flush_invalidate_dcache_page(p)      __invalidate_dcache_page(p)
+# define __flush_invalidate_dcache_range(p,s)   __invalidate_dcache_range(p,s)
+#endif
+
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
+extern void __flush_invalidate_dcache_page_alias(unsigned long, unsigned long);
+#endif
+#if (ICACHE_WAY_SIZE > PAGE_SIZE)
+extern void __invalidate_icache_page_alias(unsigned long, unsigned long);
 #endif
 
 /*
@@ -71,17 +81,21 @@ extern void __flush_invalidate_dcache_range(unsigned long, unsigned long);
  * (see also Documentation/cachetlb.txt)
  */
 
-#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
 
-#define flush_cache_all()               __flush_invalidate_cache_all();
-#define flush_cache_mm(mm)              __flush_invalidate_cache_all();
-#define flush_cache_dup_mm(mm)          __flush_invalidate_cache_all();
+#define flush_cache_all()                                               \
+        do {                                                            \
+                __flush_invalidate_dcache_all();                        \
+                __invalidate_icache_all();                              \
+        } while (0)
 
-#define flush_cache_vmap(start,end)     __flush_invalidate_cache_all();
-#define flush_cache_vunmap(start,end)   __flush_invalidate_cache_all();
+#define flush_cache_mm(mm)              flush_cache_all()
+#define flush_cache_dup_mm(mm)          flush_cache_mm(mm)
 
-extern void flush_dcache_page(struct page*);
+#define flush_cache_vmap(start,end)     flush_cache_all()
+#define flush_cache_vunmap(start,end)   flush_cache_all()
 
+extern void flush_dcache_page(struct page*);
 extern void flush_cache_range(struct vm_area_struct*, ulong, ulong);
 extern void flush_cache_page(struct vm_area_struct*, unsigned long, unsigned long);
 
@@ -101,24 +115,39 @@ extern void flush_cache_page(struct vm_area_struct*, unsigned long, unsigned lon
 
 #endif
 
+/* Ensure consistency between data and instruction cache. */
 #define flush_icache_range(start,end)                                   \
-        __invalidate_icache_range(start,(end)-(start))
+        do {                                                            \
+                __flush_dcache_range(start, (end) - (start));           \
+                __invalidate_icache_range(start,(end) - (start));       \
+        } while (0)
 
 /* This is not required, see Documentation/cachetlb.txt */
-
-#define flush_icache_page(vma,page)                     do { } while(0)
+#define flush_icache_page(vma,page)                     do { } while (0)
 
 #define flush_dcache_mmap_lock(mapping)                 do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)               do { } while (0)
 
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
 
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-        memcpy(dst, src, len)
+extern void copy_to_user_page(struct vm_area_struct*, struct page*,
+                unsigned long, void*, const void*, unsigned long);
+extern void copy_from_user_page(struct vm_area_struct*, struct page*,
+                unsigned long, void*, const void*, unsigned long);
+
+#else
+
+#define copy_to_user_page(vma, page, vaddr, dst, src, len)              \
+        do {                                                            \
+                memcpy(dst, src, len);                                  \
+                __flush_dcache_range((unsigned long) dst, len);         \
+                __invalidate_icache_range((unsigned long) dst, len);    \
+        } while (0)
 
 #define copy_from_user_page(vma, page, vaddr, dst, src, len) \
         memcpy(dst, src, len)
 
-#endif /* __KERNEL__ */
+#endif
 
+#endif /* __KERNEL__ */
 #endif /* _XTENSA_CACHEFLUSH_H */
-
diff --git a/include/asm-xtensa/elf.h b/include/asm-xtensa/elf.h
index 1569b53cec..7083d46766 100644
--- a/include/asm-xtensa/elf.h
+++ b/include/asm-xtensa/elf.h
@@ -20,6 +20,56 @@
 #define EM_XTENSA       94
 #define EM_XTENSA_OLD   0xABC7
 
+/* Xtensa relocations defined by the ABIs */
+
+#define R_XTENSA_NONE           0
+#define R_XTENSA_32             1
+#define R_XTENSA_RTLD           2
+#define R_XTENSA_GLOB_DAT       3
+#define R_XTENSA_JMP_SLOT       4
+#define R_XTENSA_RELATIVE       5
+#define R_XTENSA_PLT            6
+#define R_XTENSA_OP0            8
+#define R_XTENSA_OP1            9
+#define R_XTENSA_OP2            10
+#define R_XTENSA_ASM_EXPAND     11
+#define R_XTENSA_ASM_SIMPLIFY   12
+#define R_XTENSA_GNU_VTINHERIT  15
+#define R_XTENSA_GNU_VTENTRY    16
+#define R_XTENSA_DIFF8          17
+#define R_XTENSA_DIFF16         18
+#define R_XTENSA_DIFF32         19
+#define R_XTENSA_SLOT0_OP       20
+#define R_XTENSA_SLOT1_OP       21
+#define R_XTENSA_SLOT2_OP       22
+#define R_XTENSA_SLOT3_OP       23
+#define R_XTENSA_SLOT4_OP       24
+#define R_XTENSA_SLOT5_OP       25
+#define R_XTENSA_SLOT6_OP       26
+#define R_XTENSA_SLOT7_OP       27
+#define R_XTENSA_SLOT8_OP       28
+#define R_XTENSA_SLOT9_OP       29
+#define R_XTENSA_SLOT10_OP      30
+#define R_XTENSA_SLOT11_OP      31
+#define R_XTENSA_SLOT12_OP      32
+#define R_XTENSA_SLOT13_OP      33
+#define R_XTENSA_SLOT14_OP      34
+#define R_XTENSA_SLOT0_ALT      35
+#define R_XTENSA_SLOT1_ALT      36
+#define R_XTENSA_SLOT2_ALT      37
+#define R_XTENSA_SLOT3_ALT      38
+#define R_XTENSA_SLOT4_ALT      39
+#define R_XTENSA_SLOT5_ALT      40
+#define R_XTENSA_SLOT6_ALT      41
+#define R_XTENSA_SLOT7_ALT      42
+#define R_XTENSA_SLOT8_ALT      43
+#define R_XTENSA_SLOT9_ALT      44
+#define R_XTENSA_SLOT10_ALT     45
+#define R_XTENSA_SLOT11_ALT     46
+#define R_XTENSA_SLOT12_ALT     47
+#define R_XTENSA_SLOT13_ALT     48
+#define R_XTENSA_SLOT14_ALT     49
+
 /* ELF register definitions. This is needed for core dump support.  */
 
 /*
diff --git a/include/asm-xtensa/io.h b/include/asm-xtensa/io.h
index 0faa614d96..47c3616ea9 100644
--- a/include/asm-xtensa/io.h
+++ b/include/asm-xtensa/io.h
@@ -14,6 +14,7 @@
 #ifdef __KERNEL__
 #include <asm/byteorder.h>
 #include <asm/page.h>
+#include <linux/kernel.h>
 
 #include <linux/types.h>
 
diff --git a/include/asm-xtensa/ioctls.h b/include/asm-xtensa/ioctls.h
index 39e6f23921..0ffa942954 100644
--- a/include/asm-xtensa/ioctls.h
+++ b/include/asm-xtensa/ioctls.h
@@ -91,6 +91,10 @@
 #define TIOCSBRK        _IO('T', 39)         /* BSD compatibility */
 #define TIOCCBRK        _IO('T', 40)         /* BSD compatibility */
 #define TIOCGSID        _IOR('T', 41, pid_t) /* Return the session ID of FD*/
+#define TCGETS2         _IOR('T', 42, struct termios2)
+#define TCSETS2         _IOW('T', 43, struct termios2)
+#define TCSETSW2        _IOW('T', 44, struct termios2)
+#define TCSETSF2        _IOW('T', 45, struct termios2)
 #define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
 
diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h
index 1213cde754..55ce2c9749 100644
--- a/include/asm-xtensa/page.h
+++ b/include/asm-xtensa/page.h
@@ -1,11 +1,11 @@
 /*
- * linux/include/asm-xtensa/page.h
+ * include/asm-xtensa/page.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version2 as
  * published by the Free Software Foundation.
  *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2007 Tensilica Inc.
  */
 
 #ifndef _XTENSA_PAGE_H
@@ -14,6 +14,12 @@
 #ifdef __KERNEL__
 
 #include <asm/processor.h>
+#include <asm/types.h>
+#include <asm/cache.h>
+
+/*
+ * Fixed TLB translations in the processor.
+ */
 
 #define XCHAL_KSEG_CACHED_VADDR 0xd0000000
 #define XCHAL_KSEG_BYPASS_VADDR 0xd8000000
@@ -26,13 +32,60 @@
  */
 
 #define PAGE_SHIFT              12
-#define PAGE_SIZE               (1 << PAGE_SHIFT)
+#define PAGE_SIZE               (__XTENSA_UL_CONST(1) << PAGE_SHIFT)
 #define PAGE_MASK               (~(PAGE_SIZE-1))
 #define PAGE_ALIGN(addr)        (((addr)+PAGE_SIZE - 1) & PAGE_MASK)
 
 #define PAGE_OFFSET             XCHAL_KSEG_CACHED_VADDR
-#define MAX_MEM_PFN             XCHAL_KSEG_SIZE
-#define PGTABLE_START           0x80000000
+#define MAX_MEM_PFN             XCHAL_KSEG_SIZE
+#define PGTABLE_START           0x80000000
+
+/*
+ * Cache aliasing:
+ *
+ * If the cache size for one way is greater than the page size, we have to
+ * deal with cache aliasing. The cache index is wider than the page size:
+ *
+ * |    |cache| cache index
+ * | pfn  |off| virtual address
+ * |xxxx:X|zzz|
+ * |    : |   |
+ * | \  / |   |
+ * |trans.|   |
+ * | /  \ |   |
+ * |yyyy:Y|zzz| physical address
+ *
+ * When the page number is translated to the physical page address, the lowest
+ * bit(s) (X) that are part of the cache index are also translated (Y).
+ * If this translation changes bit(s) (X), the cache index is also afected,
+ * thus resulting in a different cache line than before.
+ * The kernel does not provide a mechanism to ensure that the page color
+ * (represented by this bit) remains the same when allocated or when pages
+ * are remapped. When user pages are mapped into kernel space, the color of
+ * the page might also change.
+ *
+ * We use the address space VMALLOC_END ... VMALLOC_END + DCACHE_WAY_SIZE * 2
+ * to temporarily map a patch so we can match the color.
+ */
+
+#if DCACHE_WAY_SIZE > PAGE_SIZE
+# define DCACHE_ALIAS_ORDER     (DCACHE_WAY_SHIFT - PAGE_SHIFT)
+# define DCACHE_ALIAS_MASK      (PAGE_MASK & (DCACHE_WAY_SIZE - 1))
+# define DCACHE_ALIAS(a)        (((a) & DCACHE_ALIAS_MASK) >> PAGE_SHIFT)
+# define DCACHE_ALIAS_EQ(a,b)   ((((a) ^ (b)) & DCACHE_ALIAS_MASK) == 0)
+#else
+# define DCACHE_ALIAS_ORDER     0
+#endif
+
+#if ICACHE_WAY_SIZE > PAGE_SIZE
+# define ICACHE_ALIAS_ORDER     (ICACHE_WAY_SHIFT - PAGE_SHIFT)
+# define ICACHE_ALIAS_MASK      (PAGE_MASK & (ICACHE_WAY_SIZE - 1))
+# define ICACHE_ALIAS(a)        (((a) & ICACHE_ALIAS_MASK) >> PAGE_SHIFT)
+# define ICACHE_ALIAS_EQ(a,b)   ((((a) ^ (b)) & ICACHE_ALIAS_MASK) == 0)
+#else
+# define ICACHE_ALIAS_ORDER     0
+#endif
+
 
 #ifdef __ASSEMBLY__
 
@@ -58,34 +111,23 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 /*
  * Pure 2^n version of get_order
+ * Use 'nsau' instructions if supported by the processor or the generic version.
  */
 
-static inline int get_order(unsigned long size)
+#if XCHAL_HAVE_NSA
+
+static inline __attribute_const__ int get_order(unsigned long size)
 {
-        int order;
-#ifndef XCHAL_HAVE_NSU
-        unsigned long x1, x2, x4, x8, x16;
-
-        size = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        x1  = size & 0xAAAAAAAA;
-        x2  = size & 0xCCCCCCCC;
-        x4  = size & 0xF0F0F0F0;
-        x8  = size & 0xFF00FF00;
-        x16 = size & 0xFFFF0000;
-        order = x2 ? 2 : 0;
-        order += (x16 != 0) * 16;
-        order += (x8 != 0) * 8;
-        order += (x4 != 0) * 4;
-        order += (x1 != 0);
-
-        return order;
-#else
-        size = (size - 1) >> PAGE_SHIFT;
-        asm ("nsau %0, %1" : "=r" (order) : "r" (size));
-        return 32 - order;
-#endif
+        int lz;
+        asm ("nsau %0, %1" : "=r" (lz) : "r" ((size - 1) >> PAGE_SHIFT));
+        return 32 - lz;
 }
 
+#else
+
+# include <asm-generic/page.h>
+
+#endif
 
 struct page;
 extern void clear_page(void *page);
@@ -96,11 +138,11 @@ extern void copy_page(void *to, void *from);
  * some extra work
  */
 
-#if (DCACHE_WAY_SIZE > PAGE_SIZE)
-void clear_user_page(void *addr, unsigned long vaddr, struct page* page);
-void copy_user_page(void *to,void* from,unsigned long vaddr,struct page* page);
+#if DCACHE_WAY_SIZE > PAGE_SIZE
+extern void clear_user_page(void*, unsigned long, struct page*);
+extern void copy_user_page(void*, void*, unsigned long, struct page*);
 #else
-# define clear_user_page(page,vaddr,pg)         clear_page(page)
+# define clear_user_page(page, vaddr, pg)       clear_page(page)
 # define copy_user_page(to, from, vaddr, pg)    copy_page(to, from)
 #endif
 
diff --git a/include/asm-xtensa/pgalloc.h b/include/asm-xtensa/pgalloc.h
index d56ddf2055..3e5b565251 100644
--- a/include/asm-xtensa/pgalloc.h
+++ b/include/asm-xtensa/pgalloc.h
@@ -1,11 +1,11 @@
 /*
- * linux/include/asm-xtensa/pgalloc.h
+ * include/asm-xtensa/pgalloc.h
  *
  * 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.
  *
- * Copyright (C) 2001-2005 Tensilica Inc.
+ * Copyright (C) 2001-2007 Tensilica Inc.
  */
 
 #ifndef _XTENSA_PGALLOC_H
@@ -13,103 +13,54 @@
 
 #ifdef __KERNEL__
 
-#include <linux/threads.h>
 #include <linux/highmem.h>
-#include <asm/processor.h>
-#include <asm/cacheflush.h>
-
-
-/* Cache aliasing:
- *
- * If the cache size for one way is greater than the page size, we have to
- * deal with cache aliasing. The cache index is wider than the page size:
- *
- *      |cache |
- * |pgnum |page|        virtual address
- * |xxxxxX|zzzz|
- * |      |    |
- *   \  / |    |
- *  trans.|    |
- *   /  \ |    |
- * |yyyyyY|zzzz|        physical address
- *
- * When the page number is translated to the physical page address, the lowest
- * bit(s) (X) that are also part of the cache index are also translated (Y).
- * If this translation changes this bit (X), the cache index is also afected,
- * thus resulting in a different cache line than before.
- * The kernel does not provide a mechanism to ensure that the page color
- * (represented by this bit) remains the same when allocated or when pages
- * are remapped. When user pages are mapped into kernel space, the color of
- * the page might also change.
- *
- * We use the address space VMALLOC_END ... VMALLOC_END + DCACHE_WAY_SIZE * 2
- * to temporarily map a patch so we can match the color.
- */
-
-#if (DCACHE_WAY_SIZE > PAGE_SIZE)
-# define PAGE_COLOR_MASK        (PAGE_MASK & (DCACHE_WAY_SIZE-1))
-# define PAGE_COLOR(a)          \
-        (((unsigned long)(a)&PAGE_COLOR_MASK) >> PAGE_SHIFT)
-# define PAGE_COLOR_EQ(a,b)     \
-        ((((unsigned long)(a) ^ (unsigned long)(b)) & PAGE_COLOR_MASK) == 0)
-# define PAGE_COLOR_MAP0(v)     \
-        (VMALLOC_END + ((unsigned long)(v) & PAGE_COLOR_MASK))
-# define PAGE_COLOR_MAP1(v)     \
-        (VMALLOC_END + ((unsigned long)(v) & PAGE_COLOR_MASK) + DCACHE_WAY_SIZE)
-#endif
 
 /*
  * Allocating and freeing a pmd is trivial: the 1-entry pmd is
  * inside the pgd, so has no extra memory associated with it.
  */
 
-#define pgd_free(pgd)   free_page((unsigned long)(pgd))
-
-#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
+#define pmd_populate_kernel(mm, pmdp, ptep)                                  \
+        (pmd_val(*(pmdp)) = ((unsigned long)ptep))
+#define pmd_populate(mm, pmdp, page)                                         \
+        (pmd_val(*(pmdp)) = ((unsigned long)page_to_virt(page)))
 
-static inline void
-pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *pte)
+static inline pgd_t*
+pgd_alloc(struct mm_struct *mm)
 {
-        pmd_val(*(pmdp)) = (unsigned long)(pte);
-        __asm__ __volatile__ ("memw; dhwb %0, 0; dsync" :: "a" (pmdp));
+        return (pgd_t*) __get_free_pages(GFP_KERNEL | __GFP_ZERO, PGD_ORDER);
 }
 
-static inline void
-pmd_populate(struct mm_struct *mm, pmd_t *pmdp, struct page *page)
+static inline void pgd_free(pgd_t *pgd)
 {
-        pmd_val(*(pmdp)) = (unsigned long)page_to_virt(page);
-        __asm__ __volatile__ ("memw; dhwb %0, 0; dsync" :: "a" (pmdp));
+        free_page((unsigned long)pgd);
 }
 
+/* Use a slab cache for the pte pages (see also sparc64 implementation) */
 
+extern struct kmem_cache *pgtable_cache;
 
-#else
-
-# define pmd_populate_kernel(mm, pmdp, pte)                                  \
-        (pmd_val(*(pmdp)) = (unsigned long)(pte))
-# define pmd_populate(mm, pmdp, page)                                        \
-        (pmd_val(*(pmdp)) = (unsigned long)page_to_virt(page))
-
-#endif
-
-static inline pgd_t*
-pgd_alloc(struct mm_struct *mm)
+static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, 
+                                         unsigned long address)
 {
-        pgd_t *pgd;
-
-        pgd = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, PGD_ORDER);
-
-        if (likely(pgd != NULL))
-                __flush_dcache_page((unsigned long)pgd);
+        return kmem_cache_alloc(pgtable_cache, GFP_KERNEL|__GFP_REPEAT);
+}
 
-        return pgd;
+static inline struct page *pte_alloc_one(struct mm_struct *mm, 
+                                         unsigned long addr)
+{
+        return virt_to_page(pte_alloc_one_kernel(mm, addr));
 }
 
-extern pte_t* pte_alloc_one_kernel(struct mm_struct* mm, unsigned long addr);
-extern struct page* pte_alloc_one(struct mm_struct* mm, unsigned long addr);
+static inline void pte_free_kernel(pte_t *pte)
+{
+        kmem_cache_free(pgtable_cache, pte);
+}
 
-#define pte_free_kernel(pte) free_page((unsigned long)pte)
-#define pte_free(pte) __free_page(pte)
+static inline void pte_free(struct page *page)
+{
+        kmem_cache_free(pgtable_cache, page_address(page));
+}
 
 #endif /* __KERNEL__ */
 #endif /* _XTENSA_PGALLOC_H */
diff --git a/include/asm-xtensa/pgtable.h b/include/asm-xtensa/pgtable.h
index 06850f3b26..c0fcc1c966 100644
--- a/include/asm-xtensa/pgtable.h
+++ b/include/asm-xtensa/pgtable.h
@@ -1,11 +1,11 @@
 /*
- * linux/include/asm-xtensa/pgtable.h
+ * include/asm-xtensa/pgtable.h
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version2 as
+ * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2007 Tensilica Inc.
  */
 
 #ifndef _XTENSA_PGTABLE_H
@@ -23,7 +23,7 @@
 
 /*
  * The Xtensa architecture port of Linux has a two-level page table system,
- * i.e. the logical three-level Linux page table layout are folded.
+ * i.e. the logical three-level Linux page table layout is folded.
  * Each task has the following memory page tables:
  *
  *   PGD table (page directory), ie. 3rd-level page table:
@@ -43,6 +43,7 @@
  *
  * The individual pages are 4 kB big with special pages for the empty_zero_page.
  */
+
 #define PGDIR_SHIFT     22
 #define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
 #define PGDIR_MASK      (~(PGDIR_SIZE-1))
@@ -53,24 +54,26 @@
  */
 #define PTRS_PER_PTE            1024
 #define PTRS_PER_PTE_SHIFT      10
-#define PTRS_PER_PMD            1
 #define PTRS_PER_PGD            1024
 #define PGD_ORDER               0
-#define PMD_ORDER               0
 #define USER_PTRS_PER_PGD       (TASK_SIZE/PGDIR_SIZE)
-#define FIRST_USER_ADDRESS      0
+#define FIRST_USER_ADDRESS      0
 #define FIRST_USER_PGD_NR       (FIRST_USER_ADDRESS >> PGDIR_SHIFT)
 
-/* virtual memory area. We keep a distance to other memory regions to be
+/*
+ * Virtual memory area. We keep a distance to other memory regions to be
  * on the safe side. We also use this area for cache aliasing.
  */
 
-// FIXME: virtual memory area must be configuration-dependent
-
 #define VMALLOC_START           0xC0000000
-#define VMALLOC_END             0xC7FF0000
+#define VMALLOC_END             0xC6FEFFFF
+#define TLBTEMP_BASE_1          0xC6FF0000
+#define TLBTEMP_BASE_2          0xC6FF8000
+#define MODULE_START            0xC7000000
+#define MODULE_END              0xC7FFFFFF
 
-/* Xtensa Linux config PTE layout (when present):
+/*
+ * Xtensa Linux config PTE layout (when present):
  *      31-12:  PPN
  *      11-6:   Software
  *      5-4:    RING
@@ -86,47 +89,55 @@
  * See further below for PTE layout for swapped-out pages.
  */
 
-#define _PAGE_VALID             (1<<0)  /* hardware: page is accessible */
-#define _PAGE_WRENABLE          (1<<1)  /* hardware: page is writable */
+#define _PAGE_HW_EXEC           (1<<0)  /* hardware: page is executable */
+#define _PAGE_HW_WRITE          (1<<1)  /* hardware: page is writable */
+
+#define _PAGE_FILE              (1<<1)  /* non-linear mapping, if !present */
+#define _PAGE_PROTNONE          (3<<0)  /* special case for VM_PROT_NONE */
 
 /* None of these cache modes include MP coherency:  */
-#define _PAGE_NO_CACHE          (0<<2)  /* bypass, non-speculative */
-#if XCHAL_DCACHE_IS_WRITEBACK
-# define _PAGE_WRITEBACK        (1<<2)  /* write back */
-# define _PAGE_WRITETHRU        (2<<2)  /* write through */
-#else
-# define _PAGE_WRITEBACK        (1<<2)  /* assume write through */
-# define _PAGE_WRITETHRU        (1<<2)
-#endif
-#define _PAGE_NOALLOC           (3<<2)  /* don't allocate cache,if not cached */
-#define _CACHE_MASK             (3<<2)
+#define _PAGE_CA_BYPASS         (0<<2)  /* bypass, non-speculative */
+#define _PAGE_CA_WB             (1<<2)  /* write-back */
+#define _PAGE_CA_WT             (2<<2)  /* write-through */
+#define _PAGE_CA_MASK           (3<<2)
+#define _PAGE_INVALID           (3<<2)
 
 #define _PAGE_USER              (1<<4)  /* user access (ring=1) */
-#define _PAGE_KERNEL            (0<<4)  /* kernel access (ring=0) */
 
 /* Software */
-#define _PAGE_RW                (1<<6)  /* software: page writable */
+#define _PAGE_WRITABLE_BIT      6
+#define _PAGE_WRITABLE          (1<<6)  /* software: page writable */
 #define _PAGE_DIRTY             (1<<7)  /* software: page dirty */
 #define _PAGE_ACCESSED          (1<<8)  /* software: page accessed (read) */
-#define _PAGE_FILE              (1<<9)  /* nonlinear file mapping*/
 
-#define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_ACCESSED | _CACHE_MASK | _PAGE_DIRTY)
-#define _PAGE_PRESENT   ( _PAGE_VALID | _PAGE_WRITEBACK | _PAGE_ACCESSED)
+/* On older HW revisions, we always have to set bit 0 */
+#if XCHAL_HW_VERSION_MAJOR < 2000
+# define _PAGE_VALID            (1<<0)
+#else
+# define _PAGE_VALID            0
+#endif
 
-#ifdef CONFIG_MMU
+#define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
+#define _PAGE_PRESENT   (_PAGE_VALID | _PAGE_CA_WB | _PAGE_ACCESSED)
 
-# define PAGE_NONE      __pgprot(_PAGE_PRESENT)
-# define PAGE_SHARED    __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_RW)
-# define PAGE_COPY      __pgprot(_PAGE_PRESENT | _PAGE_USER)
-# define PAGE_READONLY  __pgprot(_PAGE_PRESENT | _PAGE_USER)
-# define PAGE_KERNEL    __pgprot(_PAGE_PRESENT | _PAGE_KERNEL | _PAGE_WRENABLE)
-# define PAGE_INVALID   __pgprot(_PAGE_USER)
+#ifdef CONFIG_MMU
 
-# if (DCACHE_WAY_SIZE > PAGE_SIZE)
-#  define PAGE_DIRECTORY  __pgprot(_PAGE_VALID | _PAGE_ACCESSED | _PAGE_KERNEL)
-# else
-#  define PAGE_DIRECTORY  __pgprot(_PAGE_PRESENT | _PAGE_KERNEL)
-# endif
+#define PAGE_NONE          __pgprot(_PAGE_INVALID | _PAGE_USER | _PAGE_PROTNONE)
+#define PAGE_COPY          __pgprot(_PAGE_PRESENT | _PAGE_USER)
+#define PAGE_COPY_EXEC     __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_HW_EXEC)
+#define PAGE_READONLY      __pgprot(_PAGE_PRESENT | _PAGE_USER)
+#define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_HW_EXEC)
+#define PAGE_SHARED        __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_WRITABLE)
+#define PAGE_SHARED_EXEC \
+        __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_WRITABLE | _PAGE_HW_EXEC)
+#define PAGE_KERNEL        __pgprot(_PAGE_PRESENT | _PAGE_HW_WRITE)
+#define PAGE_KERNEL_EXEC   __pgprot(_PAGE_PRESENT|_PAGE_HW_WRITE|_PAGE_HW_EXEC)
+
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
+# define _PAGE_DIRECTORY (_PAGE_VALID | _PAGE_ACCESSED)
+#else
+# define _PAGE_DIRECTORY (_PAGE_VALID | _PAGE_ACCESSED | _PAGE_CA_WB)
+#endif
 
 #else /* no mmu */
 
@@ -145,23 +156,23 @@
  * What follows is the closest we can get by reasonable means..
  * See linux/mm/mmap.c for protection_map[] array that uses these definitions.
  */
-#define __P000  PAGE_NONE       /* private --- */
-#define __P001  PAGE_READONLY   /* private --r */
-#define __P010  PAGE_COPY       /* private -w- */
-#define __P011  PAGE_COPY       /* private -wr */
-#define __P100  PAGE_READONLY   /* private x-- */
-#define __P101  PAGE_READONLY   /* private x-r */
-#define __P110  PAGE_COPY       /* private xw- */
-#define __P111  PAGE_COPY       /* private xwr */
-
-#define __S000  PAGE_NONE       /* shared  --- */
-#define __S001  PAGE_READONLY   /* shared  --r */
-#define __S010  PAGE_SHARED     /* shared  -w- */
-#define __S011  PAGE_SHARED     /* shared  -wr */
-#define __S100  PAGE_READONLY   /* shared  x-- */
-#define __S101  PAGE_READONLY   /* shared  x-r */
-#define __S110  PAGE_SHARED     /* shared  xw- */
-#define __S111  PAGE_SHARED     /* shared  xwr */
+#define __P000  PAGE_NONE               /* private --- */
+#define __P001  PAGE_READONLY           /* private --r */
+#define __P010  PAGE_COPY               /* private -w- */
+#define __P011  PAGE_COPY               /* private -wr */
+#define __P100  PAGE_READONLY_EXEC      /* private x-- */
+#define __P101  PAGE_READONLY_EXEC      /* private x-r */
+#define __P110  PAGE_COPY_EXEC          /* private xw- */
+#define __P111  PAGE_COPY_EXEC          /* private xwr */
+
+#define __S000  PAGE_NONE               /* shared  --- */
+#define __S001  PAGE_READONLY           /* shared  --r */
+#define __S010  PAGE_SHARED             /* shared  -w- */
+#define __S011  PAGE_SHARED             /* shared  -wr */
+#define __S100  PAGE_READONLY_EXEC      /* shared  x-- */
+#define __S101  PAGE_READONLY_EXEC      /* shared  x-r */
+#define __S110  PAGE_SHARED_EXEC        /* shared  xw- */
+#define __S111  PAGE_SHARED_EXEC        /* shared  xwr */
 
 #ifndef __ASSEMBLY__
 
@@ -183,35 +194,42 @@ extern pgd_t swapper_pg_dir[PAGE_SIZE/sizeof(pgd_t)];
 #define pmd_page(pmd) virt_to_page(pmd_val(pmd))
 
 /*
- * The following only work if pte_present() is true.
+ * pte status.
  */
-#define pte_none(pte)    (!(pte_val(pte) ^ _PAGE_USER))
-#define pte_present(pte) (pte_val(pte) & _PAGE_VALID)
+#define pte_none(pte)    (pte_val(pte) == _PAGE_INVALID)
+#define pte_present(pte)                                                \
+        (((pte_val(pte) & _PAGE_CA_MASK) != _PAGE_INVALID)              \
+         || ((pte_val(pte) & _PAGE_PROTNONE) == _PAGE_PROTNONE))
 #define pte_clear(mm,addr,ptep)                                         \
-        do { update_pte(ptep, __pte(_PAGE_USER)); } while(0)
+        do { update_pte(ptep, __pte(_PAGE_INVALID)); } while(0)
 
 #define pmd_none(pmd)    (!pmd_val(pmd))
 #define pmd_present(pmd) (pmd_val(pmd) & PAGE_MASK)
-#define pmd_clear(pmdp)  do { set_pmd(pmdp, __pmd(0)); } while (0)
 #define pmd_bad(pmd)     (pmd_val(pmd) & ~PAGE_MASK)
+#define pmd_clear(pmdp)  do { set_pmd(pmdp, __pmd(0)); } while (0)
 
-/* Note: We use the _PAGE_USER bit to indicate write-protect kernel memory */
-
-static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW; }
+static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITABLE; }
 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_file(pte_t pte)  { return pte_val(pte) & _PAGE_FILE; }
-static inline pte_t pte_wrprotect(pte_t pte)    { pte_val(pte) &= ~(_PAGE_RW | _PAGE_WRENABLE); return pte; }
-static inline pte_t pte_mkclean(pte_t pte)      { pte_val(pte) &= ~_PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkold(pte_t pte)        { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }
-static inline pte_t pte_mkdirty(pte_t pte)      { pte_val(pte) |= _PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkyoung(pte_t pte)      { pte_val(pte) |= _PAGE_ACCESSED; return pte; }
-static inline pte_t pte_mkwrite(pte_t pte)      { pte_val(pte) |= _PAGE_RW; return pte; }
+static inline pte_t pte_wrprotect(pte_t pte)    
+        { pte_val(pte) &= ~(_PAGE_WRITABLE | _PAGE_HW_WRITE); return pte; }
+static inline pte_t pte_mkclean(pte_t pte)
+        { pte_val(pte) &= ~(_PAGE_DIRTY | _PAGE_HW_WRITE); return pte; }
+static inline pte_t pte_mkold(pte_t pte)
+        { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }
+static inline pte_t pte_mkdirty(pte_t pte)
+        { pte_val(pte) |= _PAGE_DIRTY; return pte; }
+static inline pte_t pte_mkyoung(pte_t pte)
+        { pte_val(pte) |= _PAGE_ACCESSED; return pte; }
+static inline pte_t pte_mkwrite(pte_t pte)
+        { pte_val(pte) |= _PAGE_WRITABLE; return pte; }
 
 /*
  * Conversion functions: convert a page and protection to a page entry,
  * and a page entry and page directory to the page they refer to.
  */
+
 #define pte_pfn(pte)            (pte_val(pte) >> PAGE_SHIFT)
 #define pte_same(a,b)           (pte_val(a) == pte_val(b))
 #define pte_page(x)             pfn_to_page(pte_pfn(x))
@@ -232,8 +250,9 @@ static inline void update_pte(pte_t *ptep, pte_t pteval)
 {
         *ptep = pteval;
 #if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
-        __asm__ __volatile__ ("memw; dhwb %0, 0; dsync" :: "a" (ptep));
+        __asm__ __volatile__ ("dhwb %0, 0" :: "a" (ptep));
 #endif
+
 }
 
 struct mm_struct;
@@ -249,9 +268,6 @@ static inline void
 set_pmd(pmd_t *pmdp, pmd_t pmdval)
 {
         *pmdp = pmdval;
-#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
-        __asm__ __volatile__ ("memw; dhwb %0, 0; dsync" :: "a" (pmdp));
-#endif
 }
 
 struct vm_area_struct;
@@ -306,52 +322,34 @@ ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 
 /*
  * Encode and decode a swap entry.
- * Each PTE in a process VM's page table is either:
- *   "present" -- valid and not swapped out, protection bits are meaningful;
- *   "not present" -- which further subdivides in these two cases:
- *      "none" -- no mapping at all; identified by pte_none(), set by pte_clear(
- *      "swapped out" -- the page is swapped out, and the SWP macros below
- *                      are used to store swap file info in the PTE itself.
  *
- * In the Xtensa processor MMU, any PTE entries in user space (or anywhere
- * in virtual memory that can map differently across address spaces)
- * must have a correct ring value that represents the RASID field that
- * is changed when switching address spaces.  Eg. such PTE entries cannot
- * be set to ring zero, because that can cause a (global) kernel ASID
- * entry to be created in the TLBs (even with invalid cache attribute),
- * potentially causing a multihit exception when going back to another
- * address space that mapped the same virtual address at another ring.
- *
- * SO: we avoid using ring bits (_PAGE_RING_MASK) in "not present" PTEs.
- * We also avoid using the _PAGE_VALID bit which must be zero for non-present
- * pages.
- *
- * We end up with the following available bits:  1..3 and 7..31.
- * We don't bother with 1..3 for now (we can use them later if needed),
- * and chose to allocate 6 bits for SWP_TYPE and the remaining 19 bits
- * for SWP_OFFSET.  At least 5 bits are needed for SWP_TYPE, because it
- * is currently implemented as an index into swap_info[MAX_SWAPFILES]
- * and MAX_SWAPFILES is currently defined as 32 in <linux/swap.h>.
- * However, for some reason all other architectures in the 2.4 kernel
- * reserve either 6, 7, or 8 bits so I'll not detract from that for now.  :)
- * SWP_OFFSET is an offset into the swap file in page-size units, so
- * with 4 kB pages, 19 bits supports a maximum swap file size of 2 GB.
- *
- * FIXME:  2 GB isn't very big.  Other bits can be used to allow
- * larger swap sizes.  In the meantime, it appears relatively easy to get
- * around the 2 GB limitation by simply using multiple swap files.
+ * Format of swap pte:
+ *  bit    0       MBZ
+ *  bit    1       page-file (must be zero)
+ *  bits   2 -  3  page hw access mode (must be 11: _PAGE_INVALID)
+ *  bits   4 -  5  ring protection (must be 01: _PAGE_USER)
+ *  bits   6 - 10  swap type (5 bits -> 32 types)
+ *  bits  11 - 31  swap offset / PAGE_SIZE (21 bits -> 8GB)
+ 
+ * Format of file pte:
+ *  bit    0       MBZ
+ *  bit    1       page-file (must be one: _PAGE_FILE)
+ *  bits   2 -  3  page hw access mode (must be 11: _PAGE_INVALID)
+ *  bits   4 -  5  ring protection (must be 01: _PAGE_USER)
+ *  bits   6 - 31  file offset / PAGE_SIZE
  */
 
-#define __swp_type(entry)       (((entry).val >> 7) & 0x3f)
-#define __swp_offset(entry)     ((entry).val >> 13)
-#define __swp_entry(type,offs)  ((swp_entry_t) {((type) << 7) | ((offs) << 13)})
+#define __swp_type(entry)       (((entry).val >> 6) & 0x1f)
+#define __swp_offset(entry)     ((entry).val >> 11)
+#define __swp_entry(type,offs)  \
+        ((swp_entry_t) {((type) << 6) | ((offs) << 11) | _PAGE_INVALID})
 #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
 #define __swp_entry_to_pte(x)   ((pte_t) { (x).val })
 
-#define PTE_FILE_MAX_BITS       29
-#define pte_to_pgoff(pte)       (pte_val(pte) >> 3)
-#define pgoff_to_pte(off)       ((pte_t) { ((off) << 3) | _PAGE_FILE })
-
+#define PTE_FILE_MAX_BITS       28
+#define pte_to_pgoff(pte)       (pte_val(pte) >> 4)
+#define pgoff_to_pte(off)       \
+        ((pte_t) { ((off) << 4) | _PAGE_INVALID | _PAGE_FILE })
 
 #endif /*  !defined (__ASSEMBLY__) */
 
@@ -394,13 +392,12 @@ extern  void update_mmu_cache(struct vm_area_struct * vma,
  * remap a physical page `pfn' of size `size' with page protection `prot'
  * into virtual address `from'
  */
+
 #define io_remap_pfn_range(vma,from,pfn,size,prot) \
                 remap_pfn_range(vma, from, pfn, size, prot)
 
 
-/* No page table caches to init */
-
-#define pgtable_cache_init()    do { } while (0)
+extern void pgtable_cache_init(void);
 
 typedef pte_t *pte_addr_t;
 
diff --git a/include/asm-xtensa/processor.h b/include/asm-xtensa/processor.h
index 4feb9f7f35..35145bcd96 100644
--- a/include/asm-xtensa/processor.h
+++ b/include/asm-xtensa/processor.h
@@ -33,7 +33,7 @@
  * the 1 GB requirement applies to the stack as well.
  */
 
-#define TASK_SIZE       0x40000000
+#define TASK_SIZE       __XTENSA_UL_CONST(0x40000000)
 
 /*
  * General exception cause assigned to debug exceptions. Debug exceptions go
diff --git a/include/asm-xtensa/syscall.h b/include/asm-xtensa/syscall.h
index 6cb0d42f11..05cebf8f62 100644
--- a/include/asm-xtensa/syscall.h
+++ b/include/asm-xtensa/syscall.h
@@ -1,3 +1,13 @@
+/*
+ * include/asm-xtensa/syscall.h
+ *
+ * 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) 2001 - 2007 Tensilica Inc.
+ */
+
 struct pt_regs;
 struct sigaction;
 asmlinkage long xtensa_execve(char*, char**, char**, struct pt_regs*);
@@ -17,4 +27,16 @@ asmlinkage long sys_rt_sigaction(int,
                                  const struct sigaction __user *,
                                  struct sigaction __user *,
                                  size_t);
-asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg);
+asmlinkage long xtensa_shmat(int, char __user *, int);
+asmlinkage long xtensa_fadvise64_64(int, int,
+                                    unsigned long long, unsigned long long);
+
+/* Should probably move to linux/syscalls.h */
+struct pollfd;
+asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp,
+        fd_set __user *exp, struct timespec __user *tsp, void __user *sig);
+asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
+        struct timespec __user *tsp, const sigset_t __user *sigmask,
+        size_t sigsetsize);
+
+
diff --git a/include/asm-xtensa/termbits.h b/include/asm-xtensa/termbits.h
index 9972c25ec8..85aa6a3c0b 100644
--- a/include/asm-xtensa/termbits.h
+++ b/include/asm-xtensa/termbits.h
@@ -157,6 +157,7 @@ struct ktermios {
 #define HUPCL   0002000
 #define CLOCAL  0004000
 #define CBAUDEX 0010000
+#define    BOTHER 0010000
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
@@ -172,10 +173,12 @@ struct ktermios {
 #define  B3000000 0010015
 #define  B3500000 0010016
 #define  B4000000 0010017
-#define CIBAUD    002003600000  /* input baud rate (not used) */
+#define CIBAUD    002003600000          /* input baud rate */
 #define CMSPAR    010000000000          /* mark or space (stick) parity */
 #define CRTSCTS   020000000000          /* flow control */
 
+#define IBSHIFT 16              /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 
 #define ISIG    0000001
diff --git a/include/asm-xtensa/termios.h b/include/asm-xtensa/termios.h
index f14b42c8da..4673f42f88 100644
--- a/include/asm-xtensa/termios.h
+++ b/include/asm-xtensa/termios.h
@@ -95,8 +95,10 @@ struct termio {
         copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
 })
 
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
+#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
+#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
+#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
+#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
 
 #endif  /* __KERNEL__ */
 
diff --git a/include/asm-xtensa/timex.h b/include/asm-xtensa/timex.h
index 28c7985a40..a5fca59fba 100644
--- a/include/asm-xtensa/timex.h
+++ b/include/asm-xtensa/timex.h
@@ -41,10 +41,10 @@
 extern unsigned long ccount_per_jiffy;
 extern unsigned long ccount_nsec;
 #define CCOUNT_PER_JIFFY ccount_per_jiffy
-#define CCOUNT_NSEC ccount_nsec
+#define NSEC_PER_CCOUNT  ccount_nsec
 #else
 #define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))
-#define CCOUNT_NSEC (1000000000UL / CONFIG_XTENSA_CPU_CLOCK)
+#define NSEC_PER_CCOUNT (1000UL / CONFIG_XTENSA_CPU_CLOCK)
 #endif
 
 
diff --git a/include/asm-xtensa/tlb.h b/include/asm-xtensa/tlb.h
index 4562b2dcfb..4830232017 100644
--- a/include/asm-xtensa/tlb.h
+++ b/include/asm-xtensa/tlb.h
@@ -11,14 +11,36 @@
 #ifndef _XTENSA_TLB_H
 #define _XTENSA_TLB_H
 
-#define tlb_start_vma(tlb,vma)                  do { } while (0)
-#define tlb_end_vma(tlb,vma)                    do { } while (0)
-#define __tlb_remove_tlb_entry(tlb,pte,addr)    do { } while (0)
+#include <asm/cache.h>
+#include <asm/page.h>
+
+#if (DCACHE_WAY_SIZE <= PAGE_SIZE)
+
+/* Note, read http://lkml.org/lkml/2004/1/15/6 */
+
+# define tlb_start_vma(tlb,vma)                 do { } while (0)
+# define tlb_end_vma(tlb,vma)                   do { } while (0)
+
+#else
 
+# define tlb_start_vma(tlb, vma)                                              \
+        do {                                                                  \
+                if (!tlb->fullmm)                                             \
+                        flush_cache_range(vma, vma->vm_start, vma->vm_end);   \
+        } while(0)
+
+# define tlb_end_vma(tlb, vma)                                                \
+        do {                                                                  \
+                if (!tlb->fullmm)                                             \
+                        flush_tlb_range(vma, vma->vm_start, vma->vm_end);     \
+        } while(0)
+
+#endif
+
+#define __tlb_remove_tlb_entry(tlb,pte,addr)    do { } while (0)
 #define tlb_flush(tlb)                          flush_tlb_mm((tlb)->mm)
 
 #include <asm-generic/tlb.h>
-#include <asm/page.h>
 
 #define __pte_free_tlb(tlb,pte)                 pte_free(pte)
 
diff --git a/include/asm-xtensa/types.h b/include/asm-xtensa/types.h
index 9d99a8e9e3..f1e84526f9 100644
--- a/include/asm-xtensa/types.h
+++ b/include/asm-xtensa/types.h
@@ -11,6 +11,15 @@
 #ifndef _XTENSA_TYPES_H
 #define _XTENSA_TYPES_H
 
+
+#ifdef __ASSEMBLY__
+# define __XTENSA_UL(x)         (x)
+# define __XTENSA_UL_CONST(x)   x
+#else
+# define __XTENSA_UL(x)         ((unsigned long)(x))
+# define __XTENSA_UL_CONST(x)   x##UL
+#endif
+
 #ifndef __ASSEMBLY__
 
 typedef unsigned short umode_t;
diff --git a/include/asm-xtensa/unistd.h b/include/asm-xtensa/unistd.h
index 9bd3402443..92968aabe3 100644
--- a/include/asm-xtensa/unistd.h
+++ b/include/asm-xtensa/unistd.h
@@ -151,7 +151,7 @@ __SYSCALL( 61, sys_fcntl64, 3)
 #define __NR_available62                         62
 __SYSCALL( 62, sys_ni_syscall, 0)
 #define __NR_fadvise64_64                        63
-__SYSCALL( 63, sys_fadvise64_64, 6)
+__SYSCALL( 63, xtensa_fadvise64_64, 6)
 #define __NR_utime                               64     /* glibc 2.3.3 ?? */
 __SYSCALL( 64, sys_utime, 2)
 #define __NR_utimes                              65
@@ -339,8 +339,8 @@ __SYSCALL(148, sys_setpgid, 2)
 __SYSCALL(149, sys_getpgid, 1)
 #define __NR_getppid                            150
 __SYSCALL(150, sys_getppid, 0)
-#define __NR_available151                       151
-__SYSCALL(151, sys_ni_syscall, 0)
+#define __NR_getpgrp                            151
+__SYSCALL(151, sys_getpgrp, 0)
 
 #define __NR_reserved152                        152     /* set_thread_area */
 __SYSCALL(152, sys_ni_syscall, 0)
@@ -577,7 +577,112 @@ __SYSCALL(258, sys_keyctl, 5)
 #define __NR_available259                       259
 __SYSCALL(259, sys_ni_syscall, 0)
 
-#define __NR_syscall_count                      261
+
+#define __NR_readahead                          260
+__SYSCALL(260, sys_readahead, 5)
+#define __NR_remap_file_pages                   261
+__SYSCALL(261, sys_remap_file_pages, 5)
+#define __NR_migrate_pages                      262
+__SYSCALL(262, sys_migrate_pages, 0)
+#define __NR_mbind                              263
+__SYSCALL(263, sys_mbind, 6)
+#define __NR_get_mempolicy                      264
+__SYSCALL(264, sys_get_mempolicy, 5)
+#define __NR_set_mempolicy                      265
+__SYSCALL(265, sys_set_mempolicy, 3)
+#define __NR_unshare                            266
+__SYSCALL(266, sys_unshare, 1)
+#define __NR_move_pages                         267
+__SYSCALL(267, sys_move_pages, 0)
+#define __NR_splice                             268
+__SYSCALL(268, sys_splice, 0)
+#define __NR_tee                                269
+__SYSCALL(269, sys_tee, 0)
+#define __NR_vmsplice                           270
+__SYSCALL(270, sys_vmsplice, 0)
+#define __NR_available271                       271
+__SYSCALL(271, sys_ni_syscall, 0)
+
+#define __NR_pselect6                           272
+__SYSCALL(272, sys_pselect6, 0)
+#define __NR_ppoll                              273
+__SYSCALL(273, sys_ppoll, 0)
+#define __NR_epoll_pwait                        274
+__SYSCALL(274, sys_epoll_pwait, 0)
+#define __NR_available275                       275
+__SYSCALL(275, sys_ni_syscall, 0)
+
+#define __NR_inotify_init                       276
+__SYSCALL(276, sys_inotify_init, 0)
+#define __NR_inotify_add_watch                  277
+__SYSCALL(277, sys_inotify_add_watch, 3)
+#define __NR_inotify_rm_watch                   278
+__SYSCALL(278, sys_inotify_rm_watch, 2)
+#define __NR_available279                       279
+__SYSCALL(279, sys_ni_syscall, 0)
+
+#define __NR_getcpu                             280
+__SYSCALL(280, sys_getcpu, 0)
+#define __NR_kexec_load                         281
+__SYSCALL(281, sys_ni_syscall, 0)
+
+#define __NR_ioprio_set                         282
+__SYSCALL(282, sys_ioprio_set, 2)
+#define __NR_ioprio_get                         283
+__SYSCALL(283, sys_ioprio_get, 3)
+
+#define __NR_set_robust_list                    284
+__SYSCALL(284, sys_set_robust_list, 3)
+#define __NR_get_robust_list                    285
+__SYSCALL(285, sys_get_robust_list, 3)
+#define __NR_reserved286                        286     /* sync_file_rangeX */
+__SYSCALL(286, sys_ni_syscall, 3)
+#define __NR_available287                       287
+__SYSCALL(287, sys_faccessat, 0)
+
+/* Relative File Operations */
+
+#define __NR_openat                             288
+__SYSCALL(288, sys_openat, 4)
+#define __NR_mkdirat                            289
+__SYSCALL(289, sys_mkdirat, 3)
+#define __NR_mknodat                            290
+__SYSCALL(290, sys_mknodat, 4)
+#define __NR_unlinkat                           291
+__SYSCALL(291, sys_unlinkat, 3)
+#define __NR_renameat                           292
+__SYSCALL(292, sys_renameat, 4)
+#define __NR_linkat                             293
+__SYSCALL(293, sys_linkat, 5)
+#define __NR_symlinkat                          294
+__SYSCALL(294, sys_symlinkat, 3)
+#define __NR_readlinkat                         295
+__SYSCALL(295, sys_readlinkat, 4)
+#define __NR_utimensat                          296
+__SYSCALL(296, sys_utimensat, 0)
+#define __NR_fchownat                           297
+__SYSCALL(297, sys_fchownat, 5)
+#define __NR_futimesat                          298
+__SYSCALL(298, sys_futimesat, 4)
+#define __NR_fstatat64                          299
+__SYSCALL(299, sys_fstatat64, 0)
+#define __NR_fchmodat                           300
+__SYSCALL(300, sys_fchmodat, 4)
+#define __NR_faccessat                          301
+__SYSCALL(301, sys_faccessat, 4)
+#define __NR_available302                       302
+__SYSCALL(302, sys_ni_syscall, 0)
+#define __NR_available303                       303
+__SYSCALL(303, sys_ni_syscall, 0)
+
+#define __NR_signalfd                           304
+__SYSCALL(304, sys_signalfd, 3)
+#define __NR_timerfd                            305
+__SYSCALL(305, sys_timerfd, 4)
+#define __NR_eventfd                            306
+__SYSCALL(306, sys_eventfd, 1)
+
+#define __NR_syscall_count                      307
 
 /*
  * sysxtensa syscall handler
@@ -612,8 +717,19 @@ __SYSCALL(259, sys_ni_syscall, 0)
 #define __ARCH_WANT_SYS_LLSEEK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_SYS_GETPGRP
 
-#endif  /* __KERNEL__ */
+/* 
+ * Ignore legacy system calls in the checksyscalls.sh script
+ */
 
-#endif  /* _XTENSA_UNISTD_H */
+#define __IGNORE_fork                           /* use clone */
+#define __IGNORE_time
+#define __IGNORE_alarm                          /* use setitimer */
+#define __IGNORE_pause
+#define __IGNORE_mmap                           /* use mmap2 */
+#define __IGNORE_vfork                          /* use clone */
+#define __IGNORE_fadvise64                      /* use fadvise64_64 */
 
+#endif  /* __KERNEL__ */
+#endif  /* _XTENSA_UNISTD_H */
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index ad7f71a81b..818cc3a50e 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -7,6 +7,7 @@ header-y += raid/
 header-y += spi/
 header-y += sunrpc/
 header-y += tc_act/
+header-y += tc_ematch/
 header-y += netfilter/
 header-y += netfilter_arp/
 header-y += netfilter_bridge/
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 509656286e..bcf236d825 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -15,11 +15,26 @@ extern int pci_disable_pcie_error_reporting(struct pci_dev *dev);
 extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
 extern int pci_cleanup_aer_correct_error_status(struct pci_dev *dev);
 #else
-#define pci_enable_pcie_error_reporting(dev)            (-EINVAL)
-#define pci_find_aer_capability(dev)                    (0)
-#define pci_disable_pcie_error_reporting(dev)           (-EINVAL)
-#define pci_cleanup_aer_uncorrect_error_status(dev)     (-EINVAL)
-#define pci_cleanup_aer_correct_error_status(dev)       (-EINVAL)
+static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)
+{
+        return -EINVAL;
+}
+static inline int pci_find_aer_capability(struct pci_dev *dev)
+{
+        return 0;
+}
+static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev)
+{
+        return -EINVAL;
+}
+static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
+{
+        return -EINVAL;
+}
+static inline int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
+{
+        return -EINVAL;
+}
 #endif
 
 #endif //_AER_H_
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 23a22df039..c043c1ccf1 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -73,6 +73,19 @@ enum {
         ATA_PIO5                = ATA_PIO4 | (1 << 5),
         ATA_PIO6                = ATA_PIO5 | (1 << 6),
 
+        ATA_SWDMA0              = (1 << 0),
+        ATA_SWDMA1              = ATA_SWDMA0 | (1 << 1),
+        ATA_SWDMA2              = ATA_SWDMA1 | (1 << 2),
+
+        ATA_SWDMA2_ONLY         = (1 << 2),
+
+        ATA_MWDMA0              = (1 << 0),
+        ATA_MWDMA1              = ATA_MWDMA0 | (1 << 1),
+        ATA_MWDMA2              = ATA_MWDMA1 | (1 << 2),
+
+        ATA_MWDMA12_ONLY        = (1 << 1) | (1 << 2),
+        ATA_MWDMA2_ONLY         = (1 << 2),
+
         ATA_UDMA0               = (1 << 0),
         ATA_UDMA1               = ATA_UDMA0 | (1 << 1),
         ATA_UDMA2               = ATA_UDMA1 | (1 << 2),
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 4bbd8601b8..d6579df8da 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -63,8 +63,8 @@
 #define AUDIT_ADD_RULE          1011    /* Add syscall filtering rule */
 #define AUDIT_DEL_RULE          1012    /* Delete syscall filtering rule */
 #define AUDIT_LIST_RULES        1013    /* List syscall filtering rules */
-#define AUDIT_TTY_GET           1014    /* Get TTY auditing status */
-#define AUDIT_TTY_SET           1015    /* Set TTY auditing status */
+#define AUDIT_TTY_GET           1016    /* Get TTY auditing status */
+#define AUDIT_TTY_SET           1017    /* Set TTY auditing status */
 
 #define AUDIT_FIRST_USER_MSG    1100    /* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC          1107    /* We filter this differently */
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 1d5ded0836..0ad72c4cf3 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -126,16 +126,16 @@ static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
 static inline int cpu_is_offline(int cpu) { return 0; }
 #endif          /* CONFIG_HOTPLUG_CPU */
 
-#ifdef CONFIG_SUSPEND_SMP
+#ifdef CONFIG_PM_SLEEP_SMP
 extern int suspend_cpu_hotplug;
 
 extern int disable_nonboot_cpus(void);
 extern void enable_nonboot_cpus(void);
-#else
+#else /* !CONFIG_PM_SLEEP_SMP */
 #define suspend_cpu_hotplug     0
 
 static inline int disable_nonboot_cpus(void) { return 0; }
 static inline void enable_nonboot_cpus(void) {}
-#endif
+#endif /* !CONFIG_PM_SLEEP_SMP */
 
 #endif /* _LINUX_CPU_H_ */
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 963051a967..3ec6e7ff5f 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -32,15 +32,7 @@
  *                     CPUFREQ NOTIFIER INTERFACE                    *
  *********************************************************************/
 
-#ifdef CONFIG_CPU_FREQ
 int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);
-#else
-static inline int cpufreq_register_notifier(struct notifier_block *nb,
-                                                unsigned int list)
-{
-        return 0;
-}
-#endif
 int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);
 
 #define CPUFREQ_TRANSITION_NOTIFIER     (0)
@@ -268,22 +260,17 @@ struct freq_attr {
 int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
 int cpufreq_update_policy(unsigned int cpu);
 
+/* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */
+unsigned int cpufreq_get(unsigned int cpu);
 
-/*
- * query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it
- */
+/* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */
 #ifdef CONFIG_CPU_FREQ
 unsigned int cpufreq_quick_get(unsigned int cpu);
-unsigned int cpufreq_get(unsigned int cpu);
 #else
 static inline unsigned int cpufreq_quick_get(unsigned int cpu)
 {
         return 0;
 }
-static inline unsigned int cpufreq_get(unsigned int cpu)
-{
-        return 0;
-}
 #endif
 
 
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index e6a71c82d2..3a19b032c0 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -66,11 +66,8 @@ void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr,
  * If the arch doesn't supply something else, assume that hugepage
  * size aligned regions are ok without further preparation.
  */
-static inline int prepare_hugepage_range(unsigned long addr, unsigned long len,
-                                                pgoff_t pgoff)
+static inline int prepare_hugepage_range(unsigned long addr, unsigned long len)
 {
-        if (pgoff & (~HPAGE_MASK >> PAGE_SHIFT))
-                return -EINVAL;
         if (len & ~HPAGE_MASK)
                 return -EINVAL;
         if (addr & ~HPAGE_MASK)
@@ -78,8 +75,7 @@ static inline int prepare_hugepage_range(unsigned long addr, unsigned long len,
         return 0;
 }
 #else
-int prepare_hugepage_range(unsigned long addr, unsigned long len,
-                                                pgoff_t pgoff);
+int prepare_hugepage_range(unsigned long addr, unsigned long len);
 #endif
 
 #ifndef ARCH_HAS_SETCLEAR_HUGE_PTE
@@ -117,7 +113,7 @@ static inline unsigned long hugetlb_total_pages(void)
 #define hugetlb_report_meminfo(buf)             0
 #define hugetlb_report_node_meminfo(n, buf)     0
 #define follow_huge_pmd(mm, addr, pmd, write)   NULL
-#define prepare_hugepage_range(addr,len,pgoff)  (-EINVAL)
+#define prepare_hugepage_range(addr,len)        (-EINVAL)
 #define pmd_huge(x)     0
 #define is_hugepage_only_range(mm, addr, len)   0
 #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; })
diff --git a/include/linux/ide.h b/include/linux/ide.h
index c792b4fd15..b9f66c10ca 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1378,6 +1378,19 @@ static inline int ide_dev_has_iordy(struct hd_driveid *id)
         return ((id->field_valid & 2) && (id->capability & 8)) ? 1 : 0;
 }
 
+static inline int ide_dev_is_sata(struct hd_driveid *id)
+{
+        /*
+         * See if word 93 is 0 AND drive is at least ATA-5 compatible
+         * verifying that word 80 by casting it to a signed type --
+         * this trick allows us to filter out the reserved values of
+         * 0x0000 and 0xffff along with the earlier ATA revisions...
+         */
+        if (id->hw_config == 0 && (short)id->major_rev_num >= 0x0020)
+                return 1;
+        return 0;
+}
+
 u8 ide_dump_status(ide_drive_t *, const char *, u8);
 
 typedef struct ide_pio_timings_s {
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index 516203b6fd..a7d6a2234b 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -32,8 +32,8 @@ struct pppol2tp_addr
 
         struct sockaddr_in addr;        /* IP address and port to send to */
 
-        __be16 s_tunnel, s_session;     /* For matching incoming packets */
-        __be16 d_tunnel, d_session;     /* For sending outgoing packets */
+        __u16 s_tunnel, s_session;      /* For matching incoming packets */
+        __u16 d_tunnel, d_session;      /* For sending outgoing packets */
 };
 
 /* Socket options:
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index cab741c2d6..f8abfa349e 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -86,7 +86,7 @@ extern struct nsproxy init_nsproxy;
         .count          = ATOMIC_INIT(1),                               \
         .action         = { { { .sa_handler = NULL, } }, },             \
         .siglock        = __SPIN_LOCK_UNLOCKED(sighand.siglock),        \
-        .signalfd_list  = LIST_HEAD_INIT(sighand.signalfd_list),        \
+        .signalfd_wqh   = __WAIT_QUEUE_HEAD_INITIALIZER(sighand.signalfd_wqh),  \
 }
 
 extern struct group_info init_groups;
diff --git a/include/linux/input.h b/include/linux/input.h
index e02c6a66b2..36e00aa6f0 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -363,6 +363,12 @@ struct input_absinfo {
 
 #define KEY_UNKNOWN             240
 
+#define KEY_VIDEO_NEXT          241     /* drive next video source */
+#define KEY_VIDEO_PREV          242     /* drive previous video source */
+#define KEY_BRIGHTNESS_CYCLE    243     /* brightness up, after max is min */
+#define KEY_BRIGHTNESS_ZERO     244     /* brightness off, use ambient */
+#define KEY_DISPLAY_OFF         245     /* display device to off state */
+
 #define BTN_MISC                0x100
 #define BTN_0                   0x100
 #define BTN_1                   0x101
@@ -552,6 +558,8 @@ struct input_absinfo {
 #define KEY_BRL_DOT6            0x1f6
 #define KEY_BRL_DOT7            0x1f7
 #define KEY_BRL_DOT8            0x1f8
+#define KEY_BRL_DOT9            0x1f9
+#define KEY_BRL_DOT10           0x1fa
 
 /* We avoid low common keys in module aliases so they don't get huge. */
 #define KEY_MIN_INTERESTING     KEY_MUTE
diff --git a/include/linux/isa.h b/include/linux/isa.h
index 1b855335cb..b0270e3814 100644
--- a/include/linux/isa.h
+++ b/include/linux/isa.h
@@ -22,7 +22,18 @@ struct isa_driver {
 
 #define to_isa_driver(x) container_of((x), struct isa_driver, driver)
 
+#ifdef CONFIG_ISA
 int isa_register_driver(struct isa_driver *, unsigned int);
 void isa_unregister_driver(struct isa_driver *);
+#else
+static inline int isa_register_driver(struct isa_driver *d, unsigned int i)
+{
+        return 0;
+}
+
+static inline void isa_unregister_driver(struct isa_driver *d)
+{
+}
+#endif
 
 #endif /* __LINUX_ISA_H */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index f592df74b3..47160fe378 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -34,6 +34,7 @@ extern const char linux_proc_banner[];
 
 #define ALIGN(x,a)              __ALIGN_MASK(x,(typeof(x))(a)-1)
 #define __ALIGN_MASK(x,mask)    (((x)+(mask))&~(mask))
+#define PTR_ALIGN(p, a)         ((typeof(p))ALIGN((unsigned long)(p), (a)))
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
 
diff --git a/include/linux/keyboard.h b/include/linux/keyboard.h
index de76843bbe..7ddbc30aa8 100644
--- a/include/linux/keyboard.h
+++ b/include/linux/keyboard.h
@@ -437,8 +437,10 @@ extern unsigned short plain_map[NR_KEYS];
 #define K_BRL_DOT6      K(KT_BRL, 6)
 #define K_BRL_DOT7      K(KT_BRL, 7)
 #define K_BRL_DOT8      K(KT_BRL, 8)
+#define K_BRL_DOT9      K(KT_BRL, 9)
+#define K_BRL_DOT10     K(KT_BRL, 10)
 
-#define NR_BRL          9
+#define NR_BRL          11
 
 #define MAX_DIACR       256
 #endif
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 421175092e..dc1178f618 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -13,6 +13,7 @@
 #define __LINUX_LEDS_H_INCLUDED
 
 #include <linux/list.h>
+#include <linux/spinlock.h>
 
 struct device;
 /*
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 41978a5573..a67bb9075e 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -303,6 +303,7 @@ enum {
         ATA_HORKAGE_NODMA       = (1 << 1),     /* DMA problems */
         ATA_HORKAGE_NONCQ       = (1 << 2),     /* Don't use NCQ */
         ATA_HORKAGE_MAX_SEC_128 = (1 << 3),     /* Limit max sects to 128 */
+        ATA_HORKAGE_BROKEN_HPA  = (1 << 4),     /* Broken HPA */
 };
 
 enum hsm_task_states {
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 5bdd656e88..a020eb2d4e 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -159,7 +159,7 @@ extern void mpol_fix_fork_child_flag(struct task_struct *p);
 
 extern struct mempolicy default_policy;
 extern struct zonelist *huge_zonelist(struct vm_area_struct *vma,
-                unsigned long addr, gfp_t gfp_flags);
+                unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol);
 extern unsigned slab_node(struct mempolicy *policy);
 
 extern enum zone_type policy_zone;
@@ -256,7 +256,7 @@ static inline void mpol_fix_fork_child_flag(struct task_struct *p)
 #define set_cpuset_being_rebound(x) do {} while (0)
 
 static inline struct zonelist *huge_zonelist(struct vm_area_struct *vma,
-                unsigned long addr, gfp_t gfp_flags)
+                unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol)
 {
         return NODE_DATA(0)->node_zonelists + gfp_zone(gfp_flags);
 }
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 0eed0b7ab2..1dd075eda5 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -88,9 +88,8 @@ struct nf_sockopt_ops
         int (*compat_get)(struct sock *sk, int optval,
                         void __user *user, int *len);
 
-        /* Number of users inside set() or get(). */
-        unsigned int use;
-        struct task_struct *cleanup_task;
+        /* Use the module struct to lock set/get code in place */
+        struct module *owner;
 };
 
 /* Each queued (to userspace) skbuff has one of these. */
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 157dcb055b..7250eeadd7 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -431,6 +431,7 @@ extern int nfs_sync_mapping_range(struct address_space *, loff_t, loff_t, int);
 extern int nfs_wb_all(struct inode *inode);
 extern int nfs_wb_page(struct inode *inode, struct page* page);
 extern int nfs_wb_page_priority(struct inode *inode, struct page* page, int how);
+extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
 #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 extern int  nfs_commit_inode(struct inode *, int);
 extern struct nfs_write_data *nfs_commit_alloc(void);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e7d8d4e19a..038a0dc727 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -557,6 +557,7 @@ int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
 int pcix_get_max_mmrbc(struct pci_dev *dev);
 int pcix_get_mmrbc(struct pci_dev *dev);
 int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc);
+int pcie_get_readrq(struct pci_dev *dev);
 int pcie_set_readrq(struct pci_dev *dev, int rq);
 void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
 int __must_check pci_assign_resource(struct pci_dev *dev, int i);
@@ -578,6 +579,9 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state);
 pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);
 int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);
 
+/* Functions for PCI Hotplug drivers to use */
+int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);
+
 /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */
 void pci_bus_assign_resources(struct pci_bus *bus);
 void pci_bus_size_bridges(struct pci_bus *bus);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 8938d59013..55f307ffbf 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -360,6 +360,9 @@
 #define PCI_DEVICE_ID_ATI_RS400_166     0x5a32
 #define PCI_DEVICE_ID_ATI_RS400_200     0x5a33
 #define PCI_DEVICE_ID_ATI_RS480         0x5950
+#define PCI_DEVICE_ID_ATI_RD580         0x5952
+#define PCI_DEVICE_ID_ATI_RX790         0x5957
+#define PCI_DEVICE_ID_ATI_RS690         0x7910
 /* ATI IXP Chipset */
 #define PCI_DEVICE_ID_ATI_IXP200_IDE    0x4349
 #define PCI_DEVICE_ID_ATI_IXP200_SMBUS  0x4353
@@ -371,10 +374,9 @@
 #define PCI_DEVICE_ID_ATI_IXP400_SATA   0x4379
 #define PCI_DEVICE_ID_ATI_IXP400_SATA2  0x437a
 #define PCI_DEVICE_ID_ATI_IXP600_SATA   0x4380
-#define PCI_DEVICE_ID_ATI_IXP600_SMBUS  0x4385
+#define PCI_DEVICE_ID_ATI_SBX00_SMBUS   0x4385
 #define PCI_DEVICE_ID_ATI_IXP600_IDE    0x438c
 #define PCI_DEVICE_ID_ATI_IXP700_SATA   0x4390
-#define PCI_DEVICE_ID_ATI_IXP700_SMBUS  0x4395
 #define PCI_DEVICE_ID_ATI_IXP700_IDE    0x439c
 
 #define PCI_VENDOR_ID_VLSI              0x1004
@@ -1287,6 +1289,7 @@
 #define PCI_DEVICE_ID_VIA_VT3324        0x0324
 #define PCI_DEVICE_ID_VIA_VT3336        0x0336
 #define PCI_DEVICE_ID_VIA_VT3351        0x0351
+#define PCI_DEVICE_ID_VIA_VT3364        0x0364
 #define PCI_DEVICE_ID_VIA_8371_0        0x0391
 #define PCI_DEVICE_ID_VIA_8501_0        0x0501
 #define PCI_DEVICE_ID_VIA_82C561        0x0561
@@ -1340,6 +1343,7 @@
 #define PCI_DEVICE_ID_VIA_8231_4        0x8235
 #define PCI_DEVICE_ID_VIA_8365_1        0x8305
 #define PCI_DEVICE_ID_VIA_CX700         0x8324
+#define PCI_DEVICE_ID_VIA_VX800         0x8353
 #define PCI_DEVICE_ID_VIA_8371_1        0x8391
 #define PCI_DEVICE_ID_VIA_82C598_1      0x8598
 #define PCI_DEVICE_ID_VIA_838X_1        0xB188
@@ -2289,6 +2293,8 @@
 #define PCI_DEVICE_ID_INTEL_MCH_PC      0x3599
 #define PCI_DEVICE_ID_INTEL_MCH_PC1     0x359a
 #define PCI_DEVICE_ID_INTEL_E7525_MCH   0x359e
+#define PCI_DEVICE_ID_INTEL_TOLAPAI_0   0x5031
+#define PCI_DEVICE_ID_INTEL_TOLAPAI_1   0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0   0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1   0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2   0x7020
diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index 5ad913ff02..b7824c2153 100644
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
@@ -226,7 +226,7 @@ extern unsigned int pmu_power_flags;
 extern void pmu_backlight_init(void);
 
 /* some code needs to know if the PMU was suspended for hibernation */
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 extern int pmu_sys_suspended;
 #else
 /* if power management is not configured it can't be suspended */
diff --git a/include/linux/poll.h b/include/linux/poll.h
index 2769079862..16d813b364 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -21,6 +21,8 @@
 #define WQUEUES_STACK_ALLOC     (MAX_STACK_ALLOC - FRONTEND_STACK_ALLOC)
 #define N_INLINE_POLL_ENTRIES   (WQUEUES_STACK_ALLOC / sizeof(struct poll_table_entry))
 
+#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
+
 struct poll_table_struct;
 
 /* 
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index c91476ce31..dff3192374 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -351,6 +351,8 @@ enum
 #define RTAX_INITCWND RTAX_INITCWND
         RTAX_FEATURES,
 #define RTAX_FEATURES RTAX_FEATURES
+        RTAX_RTO_MIN,
+#define RTAX_RTO_MIN RTAX_RTO_MIN
         __RTAX_MAX
 };
 
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 682ef87da6..313c6b6e77 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -113,7 +113,7 @@ extern unsigned long avenrun[];		/* Load averages */
 
 #define FSHIFT          11              /* nr of bits of precision */
 #define FIXED_1         (1<<FSHIFT)     /* 1.0 as fixed-point */
-#define LOAD_FREQ       (5*HZ)          /* 5 sec intervals */
+#define LOAD_FREQ       (5*HZ+1)        /* 5 sec intervals */
 #define EXP_1           1884            /* 1/exp(5sec/1min) as fixed-point */
 #define EXP_5           2014            /* 1/exp(5sec/5min) */
 #define EXP_15          2037            /* 1/exp(5sec/15min) */
@@ -438,7 +438,7 @@ struct sighand_struct {
         atomic_t                count;
         struct k_sigaction      action[_NSIG];
         spinlock_t              siglock;
-        struct list_head        signalfd_list;
+        wait_queue_head_t       signalfd_wqh;
 };
 
 struct pacct_struct {
@@ -593,7 +593,7 @@ struct user_struct {
 #endif
 
         /* Hash table maintenance information */
-        struct list_head uidhash_list;
+        struct hlist_node uidhash_node;
         uid_t uid;
 };
 
@@ -681,7 +681,7 @@ enum cpu_idle_type {
 #define SCHED_LOAD_SHIFT        10
 #define SCHED_LOAD_SCALE        (1L << SCHED_LOAD_SHIFT)
 
-#define SCHED_LOAD_SCALE_FUZZ   (SCHED_LOAD_SCALE >> 1)
+#define SCHED_LOAD_SCALE_FUZZ   SCHED_LOAD_SCALE
 
 #ifdef CONFIG_SMP
 #define SD_LOAD_BALANCE         1       /* Do load balancing on this domain. */
@@ -904,6 +904,7 @@ struct sched_entity {
 
         u64                     exec_start;
         u64                     sum_exec_runtime;
+        u64                     prev_sum_exec_runtime;
         u64                     wait_start_fair;
         u64                     sleep_start_fair;
 
@@ -1388,7 +1389,8 @@ extern void sched_exec(void);
 #define sched_exec()   {}
 #endif
 
-extern void sched_clock_unstable_event(void);
+extern void sched_clock_idle_sleep_event(void);
+extern void sched_clock_idle_wakeup_event(u64 delta_ns);
 
 #ifdef CONFIG_HOTPLUG_CPU
 extern void idle_task_exit(void);
@@ -1398,11 +1400,13 @@ static inline void idle_task_exit(void) {}
 
 extern void sched_idle_next(void);
 
-extern unsigned int sysctl_sched_granularity;
+extern unsigned int sysctl_sched_latency;
+extern unsigned int sysctl_sched_min_granularity;
 extern unsigned int sysctl_sched_wakeup_granularity;
 extern unsigned int sysctl_sched_batch_wakeup_granularity;
 extern unsigned int sysctl_sched_stat_granularity;
 extern unsigned int sysctl_sched_runtime_limit;
+extern unsigned int sysctl_sched_compat_yield;
 extern unsigned int sysctl_sched_child_runs_first;
 extern unsigned int sysctl_sched_features;
 
@@ -1469,6 +1473,7 @@ static inline struct user_struct *get_uid(struct user_struct *u)
 }
 extern void free_uid(struct user_struct *);
 extern void switch_uid(struct user_struct *);
+extern void release_uids(struct user_namespace *ns);
 
 #include <asm/current.h>
 
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
index 5104294956..4c9ff0910a 100644
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -45,49 +45,17 @@ struct signalfd_siginfo {
 #ifdef CONFIG_SIGNALFD
 
 /*
- * Deliver the signal to listening signalfd. This must be called
- * with the sighand lock held. Same are the following that end up
- * calling signalfd_deliver().
- */
-void signalfd_deliver(struct task_struct *tsk, int sig);
-
-/*
- * No need to fall inside signalfd_deliver() if no signal listeners
- * are available.
+ * Deliver the signal to listening signalfd.
  */
 static inline void signalfd_notify(struct task_struct *tsk, int sig)
 {
-        if (unlikely(!list_empty(&tsk->sighand->signalfd_list)))
-                signalfd_deliver(tsk, sig);
-}
-
-/*
- * The signal -1 is used to notify the signalfd that the sighand
- * is on its way to be detached.
- */
-static inline void signalfd_detach_locked(struct task_struct *tsk)
-{
-        if (unlikely(!list_empty(&tsk->sighand->signalfd_list)))
-                signalfd_deliver(tsk, -1);
-}
-
-static inline void signalfd_detach(struct task_struct *tsk)
-{
-        struct sighand_struct *sighand = tsk->sighand;
-
-        if (unlikely(!list_empty(&sighand->signalfd_list))) {
-                spin_lock_irq(&sighand->siglock);
-                signalfd_deliver(tsk, -1);
-                spin_unlock_irq(&sighand->siglock);
-        }
+        if (unlikely(waitqueue_active(&tsk->sighand->signalfd_wqh)))
+                wake_up(&tsk->sighand->signalfd_wqh);
 }
 
 #else /* CONFIG_SIGNALFD */
 
-#define signalfd_deliver(t, s) do { } while (0)
-#define signalfd_notify(t, s) do { } while (0)
-#define signalfd_detach_locked(t) do { } while (0)
-#define signalfd_detach(t) do { } while (0)
+static inline void signalfd_notify(struct task_struct *tsk, int sig) { }
 
 #endif /* CONFIG_SIGNALFD */
 
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 93c27f7112..a656cecd37 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1352,6 +1352,22 @@ static inline int skb_clone_writable(struct sk_buff *skb, int len)
                skb_headroom(skb) + len <= skb->hdr_len;
 }
 
+static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
+                            int cloned)
+{
+        int delta = 0;
+
+        if (headroom < NET_SKB_PAD)
+                headroom = NET_SKB_PAD;
+        if (headroom > skb_headroom(skb))
+                delta = headroom - skb_headroom(skb);
+
+        if (delta || cloned)
+                return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
+                                        GFP_ATOMIC);
+        return 0;
+}
+
 /**
  *      skb_cow - copy header of skb when it is required
  *      @skb: buffer to cow
@@ -1366,16 +1382,22 @@ static inline int skb_clone_writable(struct sk_buff *skb, int len)
  */
 static inline int skb_cow(struct sk_buff *skb, unsigned int headroom)
 {
-        int delta = (headroom > NET_SKB_PAD ? headroom : NET_SKB_PAD) -
-                        skb_headroom(skb);
-
-        if (delta < 0)
-                delta = 0;
+        return __skb_cow(skb, headroom, skb_cloned(skb));
+}
 
-        if (delta || skb_cloned(skb))
-                return pskb_expand_head(skb, (delta + (NET_SKB_PAD-1)) &
-                                ~(NET_SKB_PAD-1), 0, GFP_ATOMIC);
-        return 0;
+/**
+ *      skb_cow_head - skb_cow but only making the head writable
+ *      @skb: buffer to cow
+ *      @headroom: needed headroom
+ *
+ *      This function is identical to skb_cow except that we replace the
+ *      skb_cloned check by skb_header_cloned.  It should be used when
+ *      you only need to push on some header and do not need to modify
+ *      the data.
+ */
+static inline int skb_cow_head(struct sk_buff *skb, unsigned int headroom)
+{
+        return __skb_cow(skb, headroom, skb_header_cloned(skb));
 }
 
 /**
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 124270df87..74962077f6 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -78,7 +78,7 @@ extern struct kmem_cache kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
  * Sorry that the following has to be that ugly but some versions of GCC
  * have trouble with constant propagation and loops.
  */
-static inline int kmalloc_index(size_t size)
+static __always_inline int kmalloc_index(size_t size)
 {
         if (!size)
                 return 0;
@@ -133,7 +133,7 @@ static inline int kmalloc_index(size_t size)
  * This ought to end up with a global pointer to the right cache
  * in kmalloc_caches.
  */
-static inline struct kmem_cache *kmalloc_slab(size_t size)
+static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
 {
         int index = kmalloc_index(size);
 
@@ -166,7 +166,7 @@ static inline struct kmem_cache *kmalloc_slab(size_t size)
 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
 void *__kmalloc(size_t size, gfp_t flags);
 
-static inline void *kmalloc(size_t size, gfp_t flags)
+static __always_inline void *kmalloc(size_t size, gfp_t flags)
 {
         if (__builtin_constant_p(size) && !(flags & SLUB_DMA)) {
                 struct kmem_cache *s = kmalloc_slab(size);
@@ -183,7 +183,7 @@ static inline void *kmalloc(size_t size, gfp_t flags)
 void *__kmalloc_node(size_t size, gfp_t flags, int node);
 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 
-static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
         if (__builtin_constant_p(size) && !(flags & SLUB_DMA)) {
                 struct kmem_cache *s = kmalloc_slab(size);
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index 1101b0ce87..b5f41d4c2e 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -11,7 +11,7 @@
 
 struct user_namespace {
         struct kref             kref;
-        struct list_head        uidhash_table[UIDHASH_SZ];
+        struct hlist_head       uidhash_table[UIDHASH_SZ];
         struct user_struct      *root_user;
 };
 
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 4ef4d22e5e..b4af6bcb7b 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -127,7 +127,7 @@ int sync_page_range(struct inode *inode, struct address_space *mapping,
                         loff_t pos, loff_t count);
 int sync_page_range_nolock(struct inode *inode, struct address_space *mapping,
                            loff_t pos, loff_t count);
-void set_page_dirty_balance(struct page *page);
+void set_page_dirty_balance(struct page *page, int page_mkwrite);
 void writeback_set_ratelimit(void);
 
 /* pdflush.c */
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index d62847f846..17f8f3a2f0 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -337,6 +337,9 @@ void *priv;
         struct class_device class_dev; /* sysfs */
 };
 
+/* Class-dev to video-device */
+#define to_video_device(cd) container_of(cd, struct video_device, class_dev)
+
 /* Version 2 functions */
 extern int video_register_device(struct video_device *vfd, int type, int nr);
 void video_unregister_device(struct video_device *);
@@ -354,11 +357,9 @@ extern int video_usercopy(struct inode *inode, struct file *file,
                           int (*func)(struct inode *inode, struct file *file,
                                       unsigned int cmd, void *arg));
 
-
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 #include <linux/mm.h>
 
-#define to_video_device(cd) container_of(cd, struct video_device, class_dev)
 static inline int __must_check
 video_device_create_file(struct video_device *vfd,
                          struct class_device_attribute *attr)
diff --git a/include/net/rose.h b/include/net/rose.h
index a4047d3cf5..e5bb084d87 100644
--- a/include/net/rose.h
+++ b/include/net/rose.h
@@ -188,7 +188,7 @@ extern void rose_kick(struct sock *);
 extern void rose_enquiry_response(struct sock *);
 
 /* rose_route.c */
-extern struct rose_neigh rose_loopback_neigh;
+extern struct rose_neigh *rose_loopback_neigh;
 extern const struct file_operations rose_neigh_fops;
 extern const struct file_operations rose_nodes_fops;
 extern const struct file_operations rose_routes_fops;
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index d529045c16..c9cc00c857 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -123,6 +123,7 @@
  * sctp/protocol.c
  */
 extern struct sock *sctp_get_ctl_sock(void);
+extern void sctp_local_addr_free(struct rcu_head *head);
 extern int sctp_copy_local_addr_list(struct sctp_bind_addr *,
                                      sctp_scope_t, gfp_t gfp,
                                      int flags);
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index 73cb9943c8..e8e3a64eb3 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -114,7 +114,6 @@ sctp_state_fn_t sctp_sf_do_4_C;
 sctp_state_fn_t sctp_sf_eat_data_6_2;
 sctp_state_fn_t sctp_sf_eat_data_fast_4_4;
 sctp_state_fn_t sctp_sf_eat_sack_6_2;
-sctp_state_fn_t sctp_sf_tabort_8_4_8;
 sctp_state_fn_t sctp_sf_operr_notify;
 sctp_state_fn_t sctp_sf_t1_init_timer_expire;
 sctp_state_fn_t sctp_sf_t1_cookie_timer_expire;
@@ -214,7 +213,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc,
                                           const struct sctp_chunk *);
 struct sctp_chunk *sctp_make_shutdown_complete(const struct sctp_association *,
                                           const struct sctp_chunk *);
-void sctp_init_cause(struct sctp_chunk *, __be16 cause, const void *, size_t);
+void sctp_init_cause(struct sctp_chunk *, __be16 cause, size_t);
 struct sctp_chunk *sctp_make_abort(const struct sctp_association *,
                               const struct sctp_chunk *,
                               const size_t hint);
@@ -247,6 +246,9 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *,
                                               int, __be16);
 struct sctp_chunk *sctp_make_asconf_set_prim(struct sctp_association *asoc,
                                              union sctp_addr *addr);
+int sctp_verify_asconf(const struct sctp_association *asoc,
+                       struct sctp_paramhdr *param_hdr, void *chunk_end,
+                       struct sctp_paramhdr **errp);
 struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
                                        struct sctp_chunk *asconf);
 int sctp_process_asconf_ack(struct sctp_association *asoc,
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index ee4559b113..baff49dfcd 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -207,6 +207,9 @@ extern struct sctp_globals {
          * It is a list of sctp_sockaddr_entry.
          */
         struct list_head local_addr_list;
+
+        /* Lock that protects the local_addr_list writers */
+        spinlock_t addr_list_lock;
         
         /* Flag to indicate if addip is enabled. */
         int addip_enable;
@@ -242,6 +245,7 @@ extern struct sctp_globals {
 #define sctp_port_alloc_lock            (sctp_globals.port_alloc_lock)
 #define sctp_port_hashtable             (sctp_globals.port_hashtable)
 #define sctp_local_addr_list            (sctp_globals.local_addr_list)
+#define sctp_local_addr_lock            (sctp_globals.addr_list_lock)
 #define sctp_addip_enable               (sctp_globals.addip_enable)
 #define sctp_prsctp_enable              (sctp_globals.prsctp_enable)
 
@@ -417,6 +421,7 @@ struct sctp_signed_cookie {
  * internally.
  */
 union sctp_addr_param {
+        struct sctp_paramhdr p;
         struct sctp_ipv4addr_param v4;
         struct sctp_ipv6addr_param v6;
 };
@@ -726,6 +731,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len,
                           struct iovec *data);
 void sctp_chunk_free(struct sctp_chunk *);
 void  *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data);
+void  *sctp_addto_param(struct sctp_chunk *, int len, const void *data);
 struct sctp_chunk *sctp_chunkify(struct sk_buff *,
                                  const struct sctp_association *,
                                  struct sock *);
@@ -736,8 +742,10 @@ const union sctp_addr *sctp_source(const struct sctp_chunk *chunk);
 /* This is a structure for holding either an IPv6 or an IPv4 address.  */
 struct sctp_sockaddr_entry {
         struct list_head list;
+        struct rcu_head rcu;
         union sctp_addr a;
         __u8 use_as_src;
+        __u8 valid;
 };
 
 typedef struct sctp_chunk *(sctp_packet_phandler_t)(struct sctp_association *);
@@ -1148,7 +1156,9 @@ int sctp_bind_addr_copy(struct sctp_bind_addr *dest,
                         int flags);
 int sctp_add_bind_addr(struct sctp_bind_addr *, union sctp_addr *,
                        __u8 use_as_src, gfp_t gfp);
-int sctp_del_bind_addr(struct sctp_bind_addr *, union sctp_addr *);
+int sctp_del_bind_addr(struct sctp_bind_addr *, union sctp_addr *,
+                        void fastcall (*rcu_call)(struct rcu_head *,
+                                          void (*func)(struct rcu_head *)));
 int sctp_bind_addr_match(struct sctp_bind_addr *, const union sctp_addr *,
                          struct sctp_sock *);
 union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr   *bp,
@@ -1219,9 +1229,6 @@ struct sctp_ep_common {
          * bind_addr.address_list is our set of local IP addresses.
          */
         struct sctp_bind_addr bind_addr;
-
-        /* Protection during address list comparisons. */
-        rwlock_t   addr_lock;
 };
 
 
diff --git a/include/net/sctp/ulpqueue.h b/include/net/sctp/ulpqueue.h
index 39ea3f442b..cd33270e86 100644
--- a/include/net/sctp/ulpqueue.h
+++ b/include/net/sctp/ulpqueue.h
@@ -83,6 +83,7 @@ int sctp_clear_pd(struct sock *sk, struct sctp_association *asoc);
 /* Skip over an SSN. */
 void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn);
 
+void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *, __u32);
 #endif /* __sctp_ulpqueue_h__ */
 
 
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 185c7ecce4..54053de0bd 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1059,14 +1059,12 @@ struct tcp_md5sig_key {
 };
 
 struct tcp4_md5sig_key {
-        u8                      *key;
-        u16                     keylen;
+        struct tcp_md5sig_key   base;
         __be32                  addr;
 };
 
 struct tcp6_md5sig_key {
-        u8                      *key;
-        u16                     keylen;
+        struct tcp_md5sig_key   base;
 #if 0
         u32                     scope_id;       /* XXX */
 #endif
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 007d442412..b4b3113261 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -205,6 +205,13 @@ struct iscsi_queue {
 };
 
 struct iscsi_session {
+        /*
+         * Syncs up the scsi eh thread with the iscsi eh thread when sending
+         * task management functions. This must be taken before the session
+         * and recv lock.
+         */
+        struct mutex            eh_mutex;
+
         /* iSCSI session-wide sequencing */
         uint32_t                cmdsn;
         uint32_t                exp_cmdsn;
diff --git a/init/Kconfig b/init/Kconfig
index 96b54595f1..d54d0cadcc 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -488,6 +488,7 @@ config SIGNALFD
 config TIMERFD
         bool "Enable timerfd() system call" if EMBEDDED
         select ANON_INODES
+        depends on BROKEN
         default y
         help
           Enable the timerfd() system call that allows to receive timer
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index a6b4c0c08e..fd4fc12d26 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -57,8 +57,10 @@ static void __init handle_initrd(void)
 
         pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
         if (pid > 0)
-                while (pid != sys_wait4(-1, NULL, 0, NULL))
+                while (pid != sys_wait4(-1, NULL, 0, NULL)) {
+                        try_to_freeze();
                         yield();
+                }
 
         /* move initrd to rootfs' /old */
         sys_fchdir(old_fd);
diff --git a/init/main.c b/init/main.c
index d3bcb3b116..9def935ab1 100644
--- a/init/main.c
+++ b/init/main.c
@@ -146,9 +146,14 @@ static unsigned int __initdata max_cpus = NR_CPUS;
  * greater than 0, limits the maximum number of CPUs activated in
  * SMP mode to <NUM>.
  */
+#ifndef CONFIG_X86_IO_APIC
+static inline void disable_ioapic_setup(void) {};
+#endif
+
 static int __init nosmp(char *str)
 {
         max_cpus = 0;
+        disable_ioapic_setup();
         return 0;
 }
 
@@ -157,10 +162,13 @@ early_param("nosmp", nosmp);
 static int __init maxcpus(char *str)
 {
         get_option(&str, &max_cpus);
-        return 1;
+        if (max_cpus == 0)
+                disable_ioapic_setup();
+
+        return 0;
 }
 
-__setup("maxcpus=", maxcpus);
+early_param("maxcpus", maxcpus);
 #else
 #define max_cpus NR_CPUS
 #endif
@@ -389,10 +397,6 @@ static void __init smp_init(void)
 {
         unsigned int cpu;
 
-#ifndef CONFIG_HOTPLUG_CPU
-        cpu_possible_map = cpu_present_map;
-#endif
-
         /* FIXME: This should be done in userspace --RR */
         for_each_present_cpu(cpu) {
                 if (num_online_cpus() >= max_cpus)
@@ -537,10 +541,6 @@ asmlinkage void __init start_kernel(void)
         setup_arch(&command_line);
         setup_command_line(command_line);
         unwind_setup();
-#ifndef CONFIG_HOTPLUG_CPU
-        if (max_cpus < 2)
-                cpu_possible_map = cpu_online_map;
-#endif
         setup_per_cpu_areas();
         smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
 
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 181ae70860..38033db8d8 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -273,7 +273,7 @@ int __cpuinit cpu_up(unsigned int cpu)
         return err;
 }
 
-#ifdef CONFIG_SUSPEND_SMP
+#ifdef CONFIG_PM_SLEEP_SMP
 static cpumask_t frozen_cpus;
 
 int disable_nonboot_cpus(void)
@@ -334,4 +334,4 @@ void enable_nonboot_cpus(void)
 out:
         mutex_unlock(&cpu_add_remove_lock);
 }
-#endif
+#endif /* CONFIG_PM_SLEEP_SMP */
diff --git a/kernel/exit.c b/kernel/exit.c
index 9578c1ae19..993369ee94 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -24,7 +24,6 @@
 #include <linux/pid_namespace.h>
 #include <linux/ptrace.h>
 #include <linux/profile.h>
-#include <linux/signalfd.h>
 #include <linux/mount.h>
 #include <linux/proc_fs.h>
 #include <linux/kthread.h>
@@ -86,14 +85,6 @@ static void __exit_signal(struct task_struct *tsk)
         sighand = rcu_dereference(tsk->sighand);
         spin_lock(&sighand->siglock);
 
-        /*
-         * Notify that this sighand has been detached. This must
-         * be called with the tsk->sighand lock held. Also, this
-         * access tsk->sighand internally, so it must be called
-         * before tsk->sighand is reset.
-         */
-        signalfd_detach_locked(tsk);
-
         posix_cpu_timers_exit(tsk);
         if (atomic_dec_and_test(&sig->count))
                 posix_cpu_timers_exit_group(tsk);
@@ -975,6 +966,7 @@ fastcall NORET_TYPE void do_exit(long code)
         if (unlikely(tsk->audit_context))
                 audit_free(tsk);
 
+        tsk->exit_code = code;
         taskstats_exit(tsk, group_dead);
 
         exit_mm(tsk);
@@ -996,7 +988,6 @@ fastcall NORET_TYPE void do_exit(long code)
         if (tsk->binfmt)
                 module_put(tsk->binfmt->module);
 
-        tsk->exit_code = code;
         proc_exit_connector(tsk);
         exit_task_namespaces(tsk);
         exit_notify(tsk);
diff --git a/kernel/fork.c b/kernel/fork.c
index 7332e236d3..33f12f4868 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1438,7 +1438,7 @@ static void sighand_ctor(void *data, struct kmem_cache *cachep,
         struct sighand_struct *sighand = data;
 
         spin_lock_init(&sighand->siglock);
-        INIT_LIST_HEAD(&sighand->signalfd_list);
+        init_waitqueue_head(&sighand->signalfd_wqh);
 }
 
 void __init proc_caches_init(void)
diff --git a/kernel/futex.c b/kernel/futex.c
index e8935b195e..fcc94e7b40 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1943,9 +1943,10 @@ static inline int fetch_robust_entry(struct robust_list __user **entry,
 void exit_robust_list(struct task_struct *curr)
 {
         struct robust_list_head __user *head = curr->robust_list;
-        struct robust_list __user *entry, *pending;
-        unsigned int limit = ROBUST_LIST_LIMIT, pi, pip;
+        struct robust_list __user *entry, *next_entry, *pending;
+        unsigned int limit = ROBUST_LIST_LIMIT, pi, next_pi, pip;
         unsigned long futex_offset;
+        int rc;
 
         /*
          * Fetch the list head (which was registered earlier, via
@@ -1965,12 +1966,14 @@ void exit_robust_list(struct task_struct *curr)
         if (fetch_robust_entry(&pending, &head->list_op_pending, &pip))
                 return;
 
-        if (pending)
-                handle_futex_death((void __user *)pending + futex_offset,
-                                   curr, pip);
-
+        next_entry = NULL;      /* avoid warning with gcc */
         while (entry != &head->list) {
                 /*
+                 * Fetch the next entry in the list before calling
+                 * handle_futex_death:
+                 */
+                rc = fetch_robust_entry(&next_entry, &entry->next, &next_pi);
+                /*
                  * A pending lock might already be on the list, so
                  * don't process it twice:
                  */
@@ -1978,11 +1981,10 @@ void exit_robust_list(struct task_struct *curr)
                         if (handle_futex_death((void __user *)entry + futex_offset,
                                                 curr, pi))
                                 return;
-                /*
-                 * Fetch the next entry in the list:
-                 */
-                if (fetch_robust_entry(&entry, &entry->next, &pi))
+                if (rc)
                         return;
+                entry = next_entry;
+                pi = next_pi;
                 /*
                  * Avoid excessively long or circular lists:
                  */
@@ -1991,6 +1993,10 @@ void exit_robust_list(struct task_struct *curr)
 
                 cond_resched();
         }
+
+        if (pending)
+                handle_futex_death((void __user *)pending + futex_offset,
+                                   curr, pip);
 }
 
 long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index f7921360ef..2c2e2954b7 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -38,10 +38,11 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
 void compat_exit_robust_list(struct task_struct *curr)
 {
         struct compat_robust_list_head __user *head = curr->compat_robust_list;
-        struct robust_list __user *entry, *pending;
-        unsigned int limit = ROBUST_LIST_LIMIT, pi, pip;
-        compat_uptr_t uentry, upending;
+        struct robust_list __user *entry, *next_entry, *pending;
+        unsigned int limit = ROBUST_LIST_LIMIT, pi, next_pi, pip;
+        compat_uptr_t uentry, next_uentry, upending;
         compat_long_t futex_offset;
+        int rc;
 
         /*
          * Fetch the list head (which was registered earlier, via
@@ -61,10 +62,15 @@ void compat_exit_robust_list(struct task_struct *curr)
         if (fetch_robust_entry(&upending, &pending,
                                &head->list_op_pending, &pip))
                 return;
-        if (upending)
-                handle_futex_death((void __user *)pending + futex_offset, curr, pip);
 
-        while (compat_ptr(uentry) != &head->list) {
+        next_entry = NULL;      /* avoid warning with gcc */
+        while (entry != (struct robust_list __user *) &head->list) {
+                /*
+                 * Fetch the next entry in the list before calling
+                 * handle_futex_death:
+                 */
+                rc = fetch_robust_entry(&next_uentry, &next_entry,
+                        (compat_uptr_t __user *)&entry->next, &next_pi);
                 /*
                  * A pending lock might already be on the list, so
                  * dont process it twice:
@@ -74,12 +80,11 @@ void compat_exit_robust_list(struct task_struct *curr)
                                                 curr, pi))
                                 return;
 
-                /*
-                 * Fetch the next entry in the list:
-                 */
-                if (fetch_robust_entry(&uentry, &entry,
-                                       (compat_uptr_t __user *)&entry->next, &pi))
+                if (rc)
                         return;
+                uentry = next_uentry;
+                entry = next_entry;
+                pi = next_pi;
                 /*
                  * Avoid excessively long or circular lists:
                  */
@@ -88,6 +93,9 @@ void compat_exit_robust_list(struct task_struct *curr)
 
                 cond_resched();
         }
+        if (pending)
+                handle_futex_death((void __user *)pending + futex_offset,
+                                   curr, pip);
 }
 
 asmlinkage long
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 853aefbd18..7230d914ea 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -547,14 +547,11 @@ int request_irq(unsigned int irq, irq_handler_t handler,
                  * We do this before actually registering it, to make sure that
                  * a 'real' IRQ doesn't run in parallel with our fake
                  */
-                if (irqflags & IRQF_DISABLED) {
-                        unsigned long flags;
+                unsigned long flags;
 
-                        local_irq_save(flags);
-                        handler(irq, dev_id);
-                        local_irq_restore(flags);
-                } else
-                        handler(irq, dev_id);
+                local_irq_save(flags);
+                handler(irq, dev_id);
+                local_irq_restore(flags);
         }
 #endif
 
diff --git a/kernel/kmod.c b/kernel/kmod.c
index 9809cc1f33..c6a4f8aebe 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -505,7 +505,7 @@ int call_usermodehelper_pipe(char *path, char **argv, char **envp,
         if (ret < 0)
                 goto out;
 
-        return call_usermodehelper_exec(sub_info, 1);
+        return call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC);
 
   out:
         call_usermodehelper_freeinfo(sub_info);
diff --git a/kernel/module.c b/kernel/module.c
index 33c04ad511..db0ead0363 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -784,8 +784,7 @@ EXPORT_SYMBOL_GPL(symbol_put_addr);
 static ssize_t show_refcnt(struct module_attribute *mattr,
                            struct module *mod, char *buffer)
 {
-        /* sysfs holds a reference */
-        return sprintf(buffer, "%u\n", module_refcount(mod)-1);
+        return sprintf(buffer, "%u\n", module_refcount(mod));
 }
 
 static struct module_attribute refcnt = {
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 412859f8d9..14b0e10dc9 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -72,15 +72,10 @@ config PM_TRACE
         CAUTION: this option will cause your machine's real-time clock to be
         set to an invalid time after a resume.
 
-config SUSPEND_SMP_POSSIBLE
-        bool
-        depends on (X86 && !X86_VOYAGER) || (PPC64 && (PPC_PSERIES || PPC_PMAC))
-        depends on SMP
-        default y
-
-config SUSPEND_SMP
+config PM_SLEEP_SMP
         bool
-        depends on SUSPEND_SMP_POSSIBLE && PM_SLEEP
+        depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
+        depends on PM_SLEEP
         select HOTPLUG_CPU
         default y
 
@@ -89,20 +84,46 @@ config PM_SLEEP
         depends on SUSPEND || HIBERNATION
         default y
 
+config SUSPEND_UP_POSSIBLE
+        bool
+        depends on (X86 && !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \
+                   || SUPERH || FRV
+        depends on !SMP
+        default y
+
+config SUSPEND_SMP_POSSIBLE
+        bool
+        depends on (X86 && !X86_VOYAGER) \
+                   || (PPC && (PPC_PSERIES || PPC_PMAC)) || ARM
+        depends on SMP
+        default y
+
 config SUSPEND
         bool "Suspend to RAM and standby"
         depends on PM
-        depends on !SMP || SUSPEND_SMP_POSSIBLE
+        depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE
         default y
         ---help---
           Allow the system to enter sleep states in which main memory is
           powered and thus its contents are preserved, such as the
           suspend-to-RAM state (i.e. the ACPI S3 state).
 
+config HIBERNATION_UP_POSSIBLE
+        bool
+        depends on X86 || PPC64_SWSUSP || PPC32
+        depends on !SMP
+        default y
+
+config HIBERNATION_SMP_POSSIBLE
+        bool
+        depends on (X86 && !X86_VOYAGER) || PPC64_SWSUSP
+        depends on SMP
+        default y
+
 config HIBERNATION
         bool "Hibernation (aka 'suspend to disk')"
         depends on PM && SWAP
-        depends on ((X86 || PPC64_SWSUSP || FRV || PPC32) && !SMP) || SUSPEND_SMP_POSSIBLE
+        depends on HIBERNATION_UP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
         ---help---
           Enable the suspend to disk (STD) functionality, which is usually
           called "hibernation" in user interfaces.  STD checkpoints the
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 82a558b655..3eca7a55f2 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -233,6 +233,7 @@ int ptrace_detach(struct task_struct *child, unsigned int data)
 
         /* Architecture-specific hardware disable .. */
         ptrace_disable(child);
+        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 
         write_lock_irq(&tasklist_lock);
         /* protect against de_thread()->release_task() */
diff --git a/kernel/sched.c b/kernel/sched.c
index 45e17b83b7..6107a0cd63 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -262,7 +262,8 @@ struct rq {
         s64 clock_max_delta;
 
         unsigned int clock_warps, clock_overflows;
-        unsigned int clock_unstable_events;
+        u64 idle_clock;
+        unsigned int clock_deep_idle_events;
         u64 tick_timestamp;
 
         atomic_t nr_iowait;
@@ -556,18 +557,40 @@ static inline struct rq *this_rq_lock(void)
 }
 
 /*
- * CPU frequency is/was unstable - start new by setting prev_clock_raw:
+ * We are going deep-idle (irqs are disabled):
  */
-void sched_clock_unstable_event(void)
+void sched_clock_idle_sleep_event(void)
 {
-        unsigned long flags;
-        struct rq *rq;
+        struct rq *rq = cpu_rq(smp_processor_id());
 
-        rq = task_rq_lock(current, &flags);
-        rq->prev_clock_raw = sched_clock();
-        rq->clock_unstable_events++;
-        task_rq_unlock(rq, &flags);
+        spin_lock(&rq->lock);
+        __update_rq_clock(rq);
+        spin_unlock(&rq->lock);
+        rq->clock_deep_idle_events++;
+}
+EXPORT_SYMBOL_GPL(sched_clock_idle_sleep_event);
+
+/*
+ * We just idled delta nanoseconds (called with irqs disabled):
+ */
+void sched_clock_idle_wakeup_event(u64 delta_ns)
+{
+        struct rq *rq = cpu_rq(smp_processor_id());
+        u64 now = sched_clock();
+
+        rq->idle_clock += delta_ns;
+        /*
+         * Override the previous timestamp and ignore all
+         * sched_clock() deltas that occured while we idled,
+         * and use the PM-provided delta_ns to advance the
+         * rq clock:
+         */
+        spin_lock(&rq->lock);
+        rq->prev_clock_raw = now;
+        rq->clock += delta_ns;
+        spin_unlock(&rq->lock);
 }
+EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event);
 
 /*
  * resched_task - mark a task 'to be rescheduled now'.
@@ -645,7 +668,7 @@ static u64 div64_likely32(u64 divident, unsigned long divisor)
 /*
  * Shift right and round:
  */
-#define RSR(x, y) (((x) + (1UL << ((y) - 1))) >> (y))
+#define SRR(x, y) (((x) + (1UL << ((y) - 1))) >> (y))
 
 static unsigned long
 calc_delta_mine(unsigned long delta_exec, unsigned long weight,
@@ -661,10 +684,10 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight,
          * Check whether we'd overflow the 64-bit multiplication:
          */
         if (unlikely(tmp > WMULT_CONST))
-                tmp = RSR(RSR(tmp, WMULT_SHIFT/2) * lw->inv_weight,
+                tmp = SRR(SRR(tmp, WMULT_SHIFT/2) * lw->inv_weight,
                         WMULT_SHIFT/2);
         else
-                tmp = RSR(tmp * lw->inv_weight, WMULT_SHIFT);
+                tmp = SRR(tmp * lw->inv_weight, WMULT_SHIFT);
 
         return (unsigned long)min(tmp, (u64)(unsigned long)LONG_MAX);
 }
@@ -835,7 +858,6 @@ static void dec_nr_running(struct task_struct *p, struct rq *rq)
 
 static void set_load_weight(struct task_struct *p)
 {
-        task_rq(p)->cfs.wait_runtime -= p->se.wait_runtime;
         p->se.wait_runtime = 0;
 
         if (task_has_rt_policy(p)) {
@@ -1564,6 +1586,7 @@ static void __sched_fork(struct task_struct *p)
         p->se.wait_start_fair           = 0;
         p->se.exec_start                = 0;
         p->se.sum_exec_runtime          = 0;
+        p->se.prev_sum_exec_runtime     = 0;
         p->se.delta_exec                = 0;
         p->se.delta_fair_run            = 0;
         p->se.delta_fair_sleep          = 0;
@@ -1659,6 +1682,11 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
 
         p->prio = effective_prio(p);
 
+        if (rt_prio(p->prio))
+                p->sched_class = &rt_sched_class;
+        else
+                p->sched_class = &fair_sched_class;
+
         if (!p->sched_class->task_new || !sysctl_sched_child_runs_first ||
                         (clone_flags & CLONE_VM) || task_cpu(p) != this_cpu ||
                         !current->se.on_rq) {
@@ -2157,12 +2185,6 @@ int can_migrate_task(struct task_struct *p, struct rq *rq, int this_cpu,
         if (task_running(rq, p))
                 return 0;
 
-        /*
-         * Aggressive migration if too many balance attempts have failed:
-         */
-        if (sd->nr_balance_failed > sd->cache_nice_tries)
-                return 1;
-
         return 1;
 }
 
@@ -2494,7 +2516,7 @@ group_next:
          * a think about bumping its value to force at least one task to be
          * moved
          */
-        if (*imbalance + SCHED_LOAD_SCALE_FUZZ < busiest_load_per_task/2) {
+        if (*imbalance < busiest_load_per_task) {
                 unsigned long tmp, pwr_now, pwr_move;
                 unsigned int imbn;
 
@@ -2546,10 +2568,8 @@ small_imbalance:
                 pwr_move /= SCHED_LOAD_SCALE;
 
                 /* Move if we gain throughput */
-                if (pwr_move <= pwr_now)
-                        goto out_balanced;
-
-                *imbalance = busiest_load_per_task;
+                if (pwr_move > pwr_now)
+                        *imbalance = busiest_load_per_task;
         }
 
         return busiest;
@@ -3020,6 +3040,7 @@ static inline void rebalance_domains(int cpu, enum cpu_idle_type idle)
         struct sched_domain *sd;
         /* Earliest time when we have to do rebalance again */
         unsigned long next_balance = jiffies + 60*HZ;
+        int update_next_balance = 0;
 
         for_each_domain(cpu, sd) {
                 if (!(sd->flags & SD_LOAD_BALANCE))
@@ -3056,8 +3077,10 @@ static inline void rebalance_domains(int cpu, enum cpu_idle_type idle)
                 if (sd->flags & SD_SERIALIZE)
                         spin_unlock(&balancing);
 out:
-                if (time_after(next_balance, sd->last_balance + interval))
+                if (time_after(next_balance, sd->last_balance + interval)) {
                         next_balance = sd->last_balance + interval;
+                        update_next_balance = 1;
+                }
 
                 /*
                  * Stop the load balance at this level. There is another
@@ -3067,7 +3090,14 @@ out:
                 if (!balance)
                         break;
         }
-        rq->next_balance = next_balance;
+
+        /*
+         * next_balance will be updated only when there is a need.
+         * When the cpu is attached to null domain for ex, it will not be
+         * updated.
+         */
+        if (likely(update_next_balance))
+                rq->next_balance = next_balance;
 }
 
 /*
@@ -4525,10 +4555,7 @@ asmlinkage long sys_sched_yield(void)
         struct rq *rq = this_rq_lock();
 
         schedstat_inc(rq, yld_cnt);
-        if (unlikely(rq->nr_running == 1))
-                schedstat_inc(rq, yld_act_empty);
-        else
-                current->sched_class->yield_task(rq, current);
+        current->sched_class->yield_task(rq, current);
 
         /*
          * Since we are going to call schedule() anyway, there's
@@ -4884,14 +4911,18 @@ cpumask_t nohz_cpu_mask = CPU_MASK_NONE;
 static inline void sched_init_granularity(void)
 {
         unsigned int factor = 1 + ilog2(num_online_cpus());
-        const unsigned long gran_limit = 100000000;
+        const unsigned long limit = 100000000;
+
+        sysctl_sched_min_granularity *= factor;
+        if (sysctl_sched_min_granularity > limit)
+                sysctl_sched_min_granularity = limit;
 
-        sysctl_sched_granularity *= factor;
-        if (sysctl_sched_granularity > gran_limit)
-                sysctl_sched_granularity = gran_limit;
+        sysctl_sched_latency *= factor;
+        if (sysctl_sched_latency > limit)
+                sysctl_sched_latency = limit;
 
-        sysctl_sched_runtime_limit = sysctl_sched_granularity * 4;
-        sysctl_sched_wakeup_granularity = sysctl_sched_granularity / 2;
+        sysctl_sched_runtime_limit = sysctl_sched_latency;
+        sysctl_sched_wakeup_granularity = sysctl_sched_min_granularity / 2;
 }
 
 #ifdef CONFIG_SMP
@@ -5234,15 +5265,16 @@ static void migrate_dead_tasks(unsigned int dead_cpu)
 static struct ctl_table sd_ctl_dir[] = {
         {
                 .procname       = "sched_domain",
-                .mode           = 0755,
+                .mode           = 0555,
         },
         {0,},
 };
 
 static struct ctl_table sd_ctl_root[] = {
         {
+                .ctl_name       = CTL_KERN,
                 .procname       = "kernel",
-                .mode           = 0755,
+                .mode           = 0555,
                 .child          = sd_ctl_dir,
         },
         {0,},
@@ -5318,7 +5350,7 @@ static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
         for_each_domain(cpu, sd) {
                 snprintf(buf, 32, "domain%d", i);
                 entry->procname = kstrdup(buf, GFP_KERNEL);
-                entry->mode = 0755;
+                entry->mode = 0555;
                 entry->child = sd_alloc_ctl_domain_table(sd);
                 entry++;
                 i++;
@@ -5338,7 +5370,7 @@ static void init_sched_domain_sysctl(void)
         for (i = 0; i < cpu_num; i++, entry++) {
                 snprintf(buf, 32, "cpu%d", i);
                 entry->procname = kstrdup(buf, GFP_KERNEL);
-                entry->mode = 0755;
+                entry->mode = 0555;
                 entry->child = sd_alloc_ctl_cpu_table(i);
         }
         sd_sysctl_header = register_sysctl_table(sd_ctl_root);
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 87e524762b..c3ee38bd34 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -154,10 +154,11 @@ static void print_cpu(struct seq_file *m, int cpu)
         P(next_balance);
         P(curr->pid);
         P(clock);
+        P(idle_clock);
         P(prev_clock_raw);
         P(clock_warps);
         P(clock_overflows);
-        P(clock_unstable_events);
+        P(clock_deep_idle_events);
         P(clock_max_delta);
         P(cpu_load[0]);
         P(cpu_load[1]);
@@ -282,4 +283,5 @@ void proc_sched_set_task(struct task_struct *p)
         p->se.wait_runtime_overruns = p->se.wait_runtime_underruns = 0;
 #endif
         p->se.sum_exec_runtime = 0;
+        p->se.prev_sum_exec_runtime     = 0;
 }
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index fedbb51bba..67c67a8714 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -15,34 +15,50 @@
  *
  *  Scaled math optimizations by Thomas Gleixner
  *  Copyright (C) 2007, Thomas Gleixner <tglx@linutronix.de>
+ *
+ *  Adaptive scheduling granularity, math enhancements by Peter Zijlstra
+ *  Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
  */
 
 /*
- * Preemption granularity:
- * (default: 2 msec, units: nanoseconds)
+ * Targeted preemption latency for CPU-bound tasks:
+ * (default: 20ms, units: nanoseconds)
  *
- * NOTE: this granularity value is not the same as the concept of
- * 'timeslice length' - timeslices in CFS will typically be somewhat
- * larger than this value. (to see the precise effective timeslice
- * length of your workload, run vmstat and monitor the context-switches
- * field)
+ * NOTE: this latency value is not the same as the concept of
+ * 'timeslice length' - timeslices in CFS are of variable length.
+ * (to see the precise effective timeslice length of your workload,
+ *  run vmstat and monitor the context-switches field)
  *
  * On SMP systems the value of this is multiplied by the log2 of the
  * number of CPUs. (i.e. factor 2x on 2-way systems, 3x on 4-way
  * systems, 4x on 8-way systems, 5x on 16-way systems, etc.)
+ * Targeted preemption latency for CPU-bound tasks:
+ */
+unsigned int sysctl_sched_latency __read_mostly = 20000000ULL;
+
+/*
+ * Minimal preemption granularity for CPU-bound tasks:
+ * (default: 2 msec, units: nanoseconds)
  */
-unsigned int sysctl_sched_granularity __read_mostly = 2000000000ULL/HZ;
+unsigned int sysctl_sched_min_granularity __read_mostly = 2000000ULL;
+
+/*
+ * sys_sched_yield() compat mode
+ *
+ * This option switches the agressive yield implementation of the
+ * old scheduler back on.
+ */
+unsigned int __read_mostly sysctl_sched_compat_yield;
 
 /*
  * SCHED_BATCH wake-up granularity.
- * (default: 10 msec, units: nanoseconds)
+ * (default: 25 msec, units: nanoseconds)
  *
  * This option delays the preemption effects of decoupled workloads
  * and reduces their over-scheduling. Synchronous workloads will still
  * have immediate wakeup/sleep latencies.
  */
-unsigned int sysctl_sched_batch_wakeup_granularity __read_mostly =
-                                                        10000000000ULL/HZ;
+unsigned int sysctl_sched_batch_wakeup_granularity __read_mostly = 25000000UL;
 
 /*
  * SCHED_OTHER wake-up granularity.
@@ -52,12 +68,12 @@ unsigned int sysctl_sched_batch_wakeup_granularity __read_mostly =
  * and reduces their over-scheduling. Synchronous workloads will still
  * have immediate wakeup/sleep latencies.
  */
-unsigned int sysctl_sched_wakeup_granularity __read_mostly = 1000000000ULL/HZ;
+unsigned int sysctl_sched_wakeup_granularity __read_mostly = 1000000UL;
 
 unsigned int sysctl_sched_stat_granularity __read_mostly;
 
 /*
- * Initialized in sched_init_granularity():
+ * Initialized in sched_init_granularity() [to 5 times the base granularity]:
  */
 unsigned int sysctl_sched_runtime_limit __read_mostly;
 
@@ -186,6 +202,8 @@ __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
         update_load_add(&cfs_rq->load, se->load.weight);
         cfs_rq->nr_running++;
         se->on_rq = 1;
+
+        schedstat_add(cfs_rq, wait_runtime, se->wait_runtime);
 }
 
 static inline void
@@ -197,6 +215,8 @@ __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
         update_load_sub(&cfs_rq->load, se->load.weight);
         cfs_rq->nr_running--;
         se->on_rq = 0;
+
+        schedstat_add(cfs_rq, wait_runtime, -se->wait_runtime);
 }
 
 static inline struct rb_node *first_fair(struct cfs_rq *cfs_rq)
@@ -214,6 +234,49 @@ static struct sched_entity *__pick_next_entity(struct cfs_rq *cfs_rq)
  */
 
 /*
+ * Calculate the preemption granularity needed to schedule every
+ * runnable task once per sysctl_sched_latency amount of time.
+ * (down to a sensible low limit on granularity)
+ *
+ * For example, if there are 2 tasks running and latency is 10 msecs,
+ * we switch tasks every 5 msecs. If we have 3 tasks running, we have
+ * to switch tasks every 3.33 msecs to get a 10 msecs observed latency
+ * for each task. We do finer and finer scheduling up to until we
+ * reach the minimum granularity value.
+ *
+ * To achieve this we use the following dynamic-granularity rule:
+ *
+ *    gran = lat/nr - lat/nr/nr
+ *
+ * This comes out of the following equations:
+ *
+ *    kA1 + gran = kB1
+ *    kB2 + gran = kA2
+ *    kA2 = kA1
+ *    kB2 = kB1 - d + d/nr
+ *    lat = d * nr
+ *
+ * Where 'k' is key, 'A' is task A (waiting), 'B' is task B (running),
+ * '1' is start of time, '2' is end of time, 'd' is delay between
+ * 1 and 2 (during which task B was running), 'nr' is number of tasks
+ * running, 'lat' is the the period of each task. ('lat' is the
+ * sched_latency that we aim for.)
+ */
+static long
+sched_granularity(struct cfs_rq *cfs_rq)
+{
+        unsigned int gran = sysctl_sched_latency;
+        unsigned int nr = cfs_rq->nr_running;
+
+        if (nr > 1) {
+                gran = gran/nr - gran/nr/nr;
+                gran = max(gran, sysctl_sched_min_granularity);
+        }
+
+        return gran;
+}
+
+/*
  * We rescale the rescheduling granularity of tasks according to their
  * nice level, but only linearly, not exponentially:
  */
@@ -240,7 +303,7 @@ niced_granularity(struct sched_entity *curr, unsigned long granularity)
         /*
          * It will always fit into 'long':
          */
-        return (long) (tmp >> WMULT_SHIFT);
+        return (long) (tmp >> (WMULT_SHIFT-NICE_0_SHIFT));
 }
 
 static inline void
@@ -303,10 +366,10 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr)
         delta_fair = calc_delta_fair(delta_exec, lw);
         delta_mine = calc_delta_mine(delta_exec, curr->load.weight, lw);
 
-        if (cfs_rq->sleeper_bonus > sysctl_sched_granularity) {
-                delta = min(cfs_rq->sleeper_bonus, (u64)delta_exec);
-                delta = calc_delta_mine(delta, curr->load.weight, lw);
-                delta = min((u64)delta, cfs_rq->sleeper_bonus);
+        if (cfs_rq->sleeper_bonus > sysctl_sched_min_granularity) {
+                delta = min((u64)delta_mine, cfs_rq->sleeper_bonus);
+                delta = min(delta, (unsigned long)(
+                        (long)sysctl_sched_runtime_limit - curr->wait_runtime));
                 cfs_rq->sleeper_bonus -= delta;
                 delta_mine -= delta;
         }
@@ -438,6 +501,9 @@ update_stats_wait_end(struct cfs_rq *cfs_rq, struct sched_entity *se)
 {
         unsigned long delta_fair;
 
+        if (unlikely(!se->wait_start_fair))
+                return;
+
         delta_fair = (unsigned long)min((u64)(2*sysctl_sched_runtime_limit),
                         (u64)(cfs_rq->fair_clock - se->wait_start_fair));
 
@@ -494,6 +560,13 @@ static void __enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se)
         unsigned long load = cfs_rq->load.weight, delta_fair;
         long prev_runtime;
 
+        /*
+         * Do not boost sleepers if there's too much bonus 'in flight'
+         * already:
+         */
+        if (unlikely(cfs_rq->sleeper_bonus > sysctl_sched_runtime_limit))
+                return;
+
         if (sysctl_sched_features & SCHED_FEAT_SLEEPER_LOAD_AVG)
                 load = rq_of(cfs_rq)->cpu_load[2];
 
@@ -519,10 +592,6 @@ static void __enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se)
          * Track the amount of bonus we've given to sleepers:
          */
         cfs_rq->sleeper_bonus += delta_fair;
-        if (unlikely(cfs_rq->sleeper_bonus > sysctl_sched_runtime_limit))
-                cfs_rq->sleeper_bonus = sysctl_sched_runtime_limit;
-
-        schedstat_add(cfs_rq, wait_runtime, se->wait_runtime);
 }
 
 static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -570,6 +639,16 @@ static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se)
 
                 se->block_start = 0;
                 se->sum_sleep_runtime += delta;
+
+                /*
+                 * Blocking time is in units of nanosecs, so shift by 20 to
+                 * get a milliseconds-range estimation of the amount of
+                 * time that the task spent sleeping:
+                 */
+                if (unlikely(prof_on == SLEEP_PROFILING)) {
+                        profile_hits(SLEEP_PROFILING, (void *)get_wchan(tsk),
+                                     delta >> 20);
+                }
         }
 #endif
 }
@@ -604,7 +683,6 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
                         if (tsk->state & TASK_UNINTERRUPTIBLE)
                                 se->block_start = rq_of(cfs_rq)->clock;
                 }
-                cfs_rq->wait_runtime -= se->wait_runtime;
 #endif
         }
         __dequeue_entity(cfs_rq, se);
@@ -618,11 +696,31 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
                           struct sched_entity *curr, unsigned long granularity)
 {
         s64 __delta = curr->fair_key - se->fair_key;
+        unsigned long ideal_runtime, delta_exec;
+
+        /*
+         * ideal_runtime is compared against sum_exec_runtime, which is
+         * walltime, hence do not scale.
+         */
+        ideal_runtime = max(sysctl_sched_latency / cfs_rq->nr_running,
+                        (unsigned long)sysctl_sched_min_granularity);
+
+        /*
+         * If we executed more than what the latency constraint suggests,
+         * reduce the rescheduling granularity. This way the total latency
+         * of how much a task is not scheduled converges to
+         * sysctl_sched_latency:
+         */
+        delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
+        if (delta_exec > ideal_runtime)
+                granularity = 0;
 
         /*
          * Take scheduling granularity into account - do not
          * preempt the current task unless the best task has
          * a larger than sched_granularity fairness advantage:
+         *
+         * scale granularity as key space is in fair_clock.
          */
         if (__delta > niced_granularity(curr, granularity))
                 resched_task(rq_of(cfs_rq)->curr);
@@ -641,6 +739,7 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
         update_stats_wait_end(cfs_rq, se);
         update_stats_curr_start(cfs_rq, se);
         set_cfs_rq_curr(cfs_rq, se);
+        se->prev_sum_exec_runtime = se->sum_exec_runtime;
 }
 
 static struct sched_entity *pick_next_entity(struct cfs_rq *cfs_rq)
@@ -686,7 +785,8 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
         if (next == curr)
                 return;
 
-        __check_preempt_curr_fair(cfs_rq, next, curr, sysctl_sched_granularity);
+        __check_preempt_curr_fair(cfs_rq, next, curr,
+                        sched_granularity(cfs_rq));
 }
 
 /**************************************************
@@ -815,19 +915,62 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int sleep)
 }
 
 /*
- * sched_yield() support is very simple - we dequeue and enqueue
+ * sched_yield() support is very simple - we dequeue and enqueue.
+ *
+ * If compat_yield is turned on then we requeue to the end of the tree.
  */
 static void yield_task_fair(struct rq *rq, struct task_struct *p)
 {
         struct cfs_rq *cfs_rq = task_cfs_rq(p);
+        struct rb_node **link = &cfs_rq->tasks_timeline.rb_node;
+        struct sched_entity *rightmost, *se = &p->se;
+        struct rb_node *parent;
 
-        __update_rq_clock(rq);
         /*
-         * Dequeue and enqueue the task to update its
-         * position within the tree:
+         * Are we the only task in the tree?
+         */
+        if (unlikely(cfs_rq->nr_running == 1))
+                return;
+
+        if (likely(!sysctl_sched_compat_yield)) {
+                __update_rq_clock(rq);
+                /*
+                 * Dequeue and enqueue the task to update its
+                 * position within the tree:
+                 */
+                dequeue_entity(cfs_rq, &p->se, 0);
+                enqueue_entity(cfs_rq, &p->se, 0);
+
+                return;
+        }
+        /*
+         * Find the rightmost entry in the rbtree:
+         */
+        do {
+                parent = *link;
+                link = &parent->rb_right;
+        } while (*link);
+
+        rightmost = rb_entry(parent, struct sched_entity, run_node);
+        /*
+         * Already in the rightmost position?
+         */
+        if (unlikely(rightmost == se))
+                return;
+
+        /*
+         * Minimally necessary key value to be last in the tree:
          */
-        dequeue_entity(cfs_rq, &p->se, 0);
-        enqueue_entity(cfs_rq, &p->se, 0);
+        se->fair_key = rightmost->fair_key + 1;
+
+        if (cfs_rq->rb_leftmost == &se->run_node)
+                cfs_rq->rb_leftmost = rb_next(&se->run_node);
+        /*
+         * Relink the task to the rightmost position:
+         */
+        rb_erase(&se->run_node, &cfs_rq->tasks_timeline);
+        rb_link_node(&se->run_node, parent, link);
+        rb_insert_color(&se->run_node, &cfs_rq->tasks_timeline);
 }
 
 /*
@@ -1020,31 +1163,32 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr)
 static void task_new_fair(struct rq *rq, struct task_struct *p)
 {
         struct cfs_rq *cfs_rq = task_cfs_rq(p);
-        struct sched_entity *se = &p->se;
+        struct sched_entity *se = &p->se, *curr = cfs_rq_curr(cfs_rq);
 
         sched_info_queued(p);
 
+        update_curr(cfs_rq);
         update_stats_enqueue(cfs_rq, se);
         /*
          * Child runs first: we let it run before the parent
          * until it reschedules once. We set up the key so that
          * it will preempt the parent:
          */
-        p->se.fair_key = current->se.fair_key -
-                niced_granularity(&rq->curr->se, sysctl_sched_granularity) - 1;
+        se->fair_key = curr->fair_key -
+                niced_granularity(curr, sched_granularity(cfs_rq)) - 1;
         /*
          * The first wait is dominated by the child-runs-first logic,
          * so do not credit it with that waiting time yet:
          */
         if (sysctl_sched_features & SCHED_FEAT_SKIP_INITIAL)
-                p->se.wait_start_fair = 0;
+                se->wait_start_fair = 0;
 
         /*
          * The statistical average of wait_runtime is about
          * -granularity/2, so initialize the task with that:
          */
         if (sysctl_sched_features & SCHED_FEAT_START_DEBIT)
-                p->se.wait_runtime = -(sysctl_sched_granularity / 2);
+                se->wait_runtime = -(sched_granularity(cfs_rq) / 2);
 
         __enqueue_entity(cfs_rq, se);
 }
@@ -1057,7 +1201,7 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
  */
 static void set_curr_task_fair(struct rq *rq)
 {
-        struct sched_entity *se = &rq->curr.se;
+        struct sched_entity *se = &rq->curr->se;
 
         for_each_sched_entity(se)
                 set_next_entity(cfs_rq_of(se), se);
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index dcdcad632f..4b87476a02 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -207,10 +207,15 @@ static void task_tick_rt(struct rq *rq, struct task_struct *p)
                 return;
 
         p->time_slice = static_prio_timeslice(p->static_prio);
-        set_tsk_need_resched(p);
 
-        /* put it at the end of the queue: */
-        requeue_task_rt(rq, p);
+        /*
+         * Requeue to the end of queue if we are not the only element
+         * on the queue:
+         */
+        if (p->run_list.prev != p->run_list.next) {
+                requeue_task_rt(rq, p);
+                set_tsk_need_resched(p);
+        }
 }
 
 static struct sched_class rt_sched_class __read_mostly = {
diff --git a/kernel/signal.c b/kernel/signal.c
index ad63109e41..7929523810 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -378,8 +378,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
         /* We only dequeue private signals from ourselves, we don't let
          * signalfd steal them
          */
-        if (likely(tsk == current))
-                signr = __dequeue_signal(&tsk->pending, mask, info);
+        signr = __dequeue_signal(&tsk->pending, mask, info);
         if (!signr) {
                 signr = __dequeue_signal(&tsk->signal->shared_pending,
                                          mask, info);
@@ -407,8 +406,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
                         }
                 }
         }
-        if (likely(tsk == current))
-                recalc_sigpending();
+        recalc_sigpending();
         if (signr && unlikely(sig_kernel_stop(signr))) {
                 /*
                  * Set a marker that we have dequeued a stop signal.  Our
@@ -425,7 +423,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
                 if (!(tsk->signal->flags & SIGNAL_GROUP_EXIT))
                         tsk->signal->flags |= SIGNAL_STOP_DEQUEUED;
         }
-        if (signr && likely(tsk == current) &&
+        if (signr &&
              ((info->si_code & __SI_MASK) == __SI_TIMER) &&
              info->si_sys_private){
                 /*
@@ -533,18 +531,18 @@ static int check_kill_permission(int sig, struct siginfo *info,
         if (!valid_signal(sig))
                 return error;
 
-        error = audit_signal_info(sig, t); /* Let audit system see the signal */
-        if (error)
-                return error;
-
-        error = -EPERM;
-        if ((info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info)))
-            && ((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))
+        if (info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info))) {
+                error = audit_signal_info(sig, t); /* Let audit system see the signal */
+                if (error)
+                        return error;
+                error = -EPERM;
+                if (((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))
                 return error;
+        }
 
         return security_task_kill(t, info, sig, 0);
 }
@@ -1300,20 +1298,19 @@ struct sigqueue *sigqueue_alloc(void)
 void sigqueue_free(struct sigqueue *q)
 {
         unsigned long flags;
+        spinlock_t *lock = &current->sighand->siglock;
+
         BUG_ON(!(q->flags & SIGQUEUE_PREALLOC));
         /*
          * If the signal is still pending remove it from the
-         * pending queue.
+         * pending queue. We must hold ->siglock while testing
+         * q->list to serialize with collect_signal().
          */
-        if (unlikely(!list_empty(&q->list))) {
-                spinlock_t *lock = &current->sighand->siglock;
-                read_lock(&tasklist_lock);
-                spin_lock_irqsave(lock, flags);
-                if (!list_empty(&q->list))
-                        list_del_init(&q->list);
-                spin_unlock_irqrestore(lock, flags);
-                read_unlock(&tasklist_lock);
-        }
+        spin_lock_irqsave(lock, flags);
+        if (!list_empty(&q->list))
+                list_del_init(&q->list);
+        spin_unlock_irqrestore(lock, flags);
+
         q->flags &= ~SIGQUEUE_PREALLOC;
         __sigqueue_free(q);
 }
diff --git a/kernel/sys.c b/kernel/sys.c
index 449b81b98b..8ae2e636eb 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -32,6 +32,7 @@
 #include <linux/getcpu.h>
 #include <linux/task_io_accounting_ops.h>
 #include <linux/seccomp.h>
+#include <linux/cpu.h>
 
 #include <linux/compat.h>
 #include <linux/syscalls.h>
@@ -878,6 +879,7 @@ void kernel_power_off(void)
         kernel_shutdown_prepare(SYSTEM_POWER_OFF);
         if (pm_power_off_prepare)
                 pm_power_off_prepare();
+        disable_nonboot_cpus();
         sysdev_shutdown();
         printk(KERN_EMERG "Power down.\n");
         machine_power_off();
@@ -1442,7 +1444,6 @@ asmlinkage long sys_times(struct tms __user * tbuf)
  * Auch. Had to add the 'did_exec' flag to conform completely to POSIX.
  * LBT 04.03.94
  */
-
 asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
 {
         struct task_struct *p;
@@ -1470,7 +1471,7 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
         if (!thread_group_leader(p))
                 goto out;
 
-        if (p->real_parent == group_leader) {
+        if (p->real_parent->tgid == group_leader->tgid) {
                 err = -EPERM;
                 if (task_session(p) != task_session(group_leader))
                         goto out;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9029690f4f..53a456ebf6 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -222,8 +222,19 @@ static ctl_table kern_table[] = {
 #ifdef CONFIG_SCHED_DEBUG
         {
                 .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "sched_granularity_ns",
-                .data           = &sysctl_sched_granularity,
+                .procname       = "sched_min_granularity_ns",
+                .data           = &sysctl_sched_min_granularity,
+                .maxlen         = sizeof(unsigned int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &min_sched_granularity_ns,
+                .extra2         = &max_sched_granularity_ns,
+        },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "sched_latency_ns",
+                .data           = &sysctl_sched_latency,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec_minmax,
@@ -283,6 +294,23 @@ static ctl_table kern_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
         },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "sched_features",
+                .data           = &sysctl_sched_features,
+                .maxlen         = sizeof(unsigned int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+        },
+#endif
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "sched_compat_yield",
+                .data           = &sysctl_sched_compat_yield,
+                .maxlen         = sizeof(unsigned int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+        },
 #ifdef CONFIG_PROVE_LOCKING
         {
                 .ctl_name       = CTL_UNNUMBERED,
@@ -304,15 +332,6 @@ static ctl_table kern_table[] = {
         },
 #endif
         {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "sched_features",
-                .data           = &sysctl_sched_features,
-                .maxlen         = sizeof(unsigned int),
-                .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-        },
-#endif
-        {
                 .ctl_name       = KERN_PANIC,
                 .procname       = "panic",
                 .data           = &panic_timeout,
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index cd91237dbf..de6a2d6b3e 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -226,7 +226,7 @@ static void sync_cmos_clock(unsigned long dummy)
 
 static void notify_cmos_timer(void)
 {
-        if (no_sync_cmos_clock)
+        if (!no_sync_cmos_clock)
                 mod_timer(&sync_cmos_timer, jiffies + 1);
 }
 
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index db8e0f3d40..0962e05776 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -383,11 +383,7 @@ static int tick_broadcast_set_event(ktime_t expires, int force)
 int tick_resume_broadcast_oneshot(struct clock_event_device *bc)
 {
         clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
-
-        if(!cpus_empty(tick_broadcast_oneshot_mask))
-                tick_broadcast_set_event(ktime_get(), 1);
-
-        return cpu_isset(smp_processor_id(), tick_broadcast_oneshot_mask);
+        return 0;
 }
 
 /*
@@ -549,20 +545,17 @@ void tick_broadcast_switch_to_oneshot(void)
  */
 void tick_shutdown_broadcast_oneshot(unsigned int *cpup)
 {
-        struct clock_event_device *bc;
         unsigned long flags;
         unsigned int cpu = *cpup;
 
         spin_lock_irqsave(&tick_broadcast_lock, flags);
 
-        bc = tick_broadcast_device.evtdev;
+        /*
+         * Clear the broadcast mask flag for the dead cpu, but do not
+         * stop the broadcast device!
+         */
         cpu_clear(cpu, tick_broadcast_oneshot_mask);
 
-        if (tick_broadcast_device.mode == TICKDEV_MODE_ONESHOT) {
-                if (bc && cpus_empty(tick_broadcast_oneshot_mask))
-                        clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN);
-        }
-
         spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index b416995b97..8c3fef1db0 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -160,6 +160,18 @@ void tick_nohz_stop_sched_tick(void)
         cpu = smp_processor_id();
         ts = &per_cpu(tick_cpu_sched, cpu);
 
+        /*
+         * If this cpu is offline and it is the one which updates
+         * jiffies, then give up the assignment and let it be taken by
+         * the cpu which runs the tick timer next. If we don't drop
+         * this here the jiffies might be stale and do_timer() never
+         * invoked.
+         */
+        if (unlikely(!cpu_online(cpu))) {
+                if (cpu == tick_do_timer_cpu)
+                        tick_do_timer_cpu = -1;
+        }
+
         if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE))
                 goto end;
 
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index acc417b5a9..4ad79f6bde 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -217,6 +217,7 @@ static void change_clocksource(void)
 }
 #else
 static inline void change_clocksource(void) { }
+static inline s64 __get_nsec_offset(void) { return 0; }
 #endif
 
 /**
@@ -280,6 +281,8 @@ void __init timekeeping_init(void)
 static int timekeeping_suspended;
 /* time in seconds when suspend began */
 static unsigned long timekeeping_suspend_time;
+/* xtime offset when we went into suspend */
+static s64 timekeeping_suspend_nsecs;
 
 /**
  * timekeeping_resume - Resumes the generic timekeeping subsystem.
@@ -305,6 +308,8 @@ static int timekeeping_resume(struct sys_device *dev)
                 wall_to_monotonic.tv_sec -= sleep_length;
                 total_sleep_time += sleep_length;
         }
+        /* Make sure that we have the correct xtime reference */
+        timespec_add_ns(&xtime, timekeeping_suspend_nsecs);
         /* re-base the last cycle value */
         clock->cycle_last = clocksource_read(clock);
         clock->error = 0;
@@ -325,9 +330,12 @@ static int timekeeping_suspend(struct sys_device *dev, pm_message_t state)
 {
         unsigned long flags;
 
+        timekeeping_suspend_time = read_persistent_clock();
+
         write_seqlock_irqsave(&xtime_lock, flags);
+        /* Get the current xtime offset */
+        timekeeping_suspend_nsecs = __get_nsec_offset();
         timekeeping_suspended = 1;
-        timekeeping_suspend_time = read_persistent_clock();
         write_sequnlock_irqrestore(&xtime_lock, flags);
 
         clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL);
diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
index 3c38fb5eae..c36bb7ed03 100644
--- a/kernel/time/timer_stats.c
+++ b/kernel/time/timer_stats.c
@@ -327,8 +327,9 @@ static int tstats_show(struct seq_file *m, void *v)
                 ms = 1;
 
         if (events && period.tv_sec)
-                seq_printf(m, "%ld total events, %ld.%ld events/sec\n", events,
-                           events / period.tv_sec, events * 1000 / ms);
+                seq_printf(m, "%ld total events, %ld.%03ld events/sec\n",
+                           events, events * 1000 / ms,
+                           (events * 1000000 / ms) % 1000);
         else
                 seq_printf(m, "%ld total events\n", events);
 
diff --git a/kernel/user.c b/kernel/user.c
index e7d11cef69..9ca2848fc3 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -55,25 +55,22 @@ struct user_struct root_user = {
 /*
  * These routines must be called with the uidhash spinlock held!
  */
-static inline void uid_hash_insert(struct user_struct *up, struct list_head *hashent)
+static inline void uid_hash_insert(struct user_struct *up, struct hlist_head *hashent)
 {
-        list_add(&up->uidhash_list, hashent);
+        hlist_add_head(&up->uidhash_node, hashent);
 }
 
 static inline void uid_hash_remove(struct user_struct *up)
 {
-        list_del(&up->uidhash_list);
+        hlist_del_init(&up->uidhash_node);
 }
 
-static inline struct user_struct *uid_hash_find(uid_t uid, struct list_head *hashent)
+static inline struct user_struct *uid_hash_find(uid_t uid, struct hlist_head *hashent)
 {
-        struct list_head *up;
-
-        list_for_each(up, hashent) {
-                struct user_struct *user;
-
-                user = list_entry(up, struct user_struct, uidhash_list);
+        struct user_struct *user;
+        struct hlist_node *h;
 
+        hlist_for_each_entry(user, h, hashent, uidhash_node) {
                 if(user->uid == uid) {
                         atomic_inc(&user->__count);
                         return user;
@@ -122,7 +119,7 @@ void free_uid(struct user_struct *up)
 
 struct user_struct * alloc_uid(struct user_namespace *ns, uid_t uid)
 {
-        struct list_head *hashent = uidhashentry(ns, uid);
+        struct hlist_head *hashent = uidhashentry(ns, uid);
         struct user_struct *up;
 
         spin_lock_irq(&uidhash_lock);
@@ -202,6 +199,30 @@ void switch_uid(struct user_struct *new_user)
         suid_keys(current);
 }
 
+void release_uids(struct user_namespace *ns)
+{
+        int i;
+        unsigned long flags;
+        struct hlist_head *head;
+        struct hlist_node *nd;
+
+        spin_lock_irqsave(&uidhash_lock, flags);
+        /*
+         * collapse the chains so that the user_struct-s will
+         * be still alive, but not in hashes. subsequent free_uid()
+         * will free them.
+         */
+        for (i = 0; i < UIDHASH_SZ; i++) {
+                head = ns->uidhash_table + i;
+                while (!hlist_empty(head)) {
+                        nd = head->first;
+                        hlist_del_init(nd);
+                }
+        }
+        spin_unlock_irqrestore(&uidhash_lock, flags);
+
+        free_uid(ns->root_user);
+}
 
 static int __init uid_cache_init(void)
 {
@@ -211,7 +232,7 @@ static int __init uid_cache_init(void)
                         0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
         for(n = 0; n < UIDHASH_SZ; ++n)
-                INIT_LIST_HEAD(init_user_ns.uidhash_table + n);
+                INIT_HLIST_HEAD(init_user_ns.uidhash_table + n);
 
         /* Insert the root user immediately (init already runs as root) */
         spin_lock_irq(&uidhash_lock);
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index d055d98785..7af90fc4f0 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -39,7 +39,7 @@ static struct user_namespace *clone_user_ns(struct user_namespace *old_ns)
         kref_init(&ns->kref);
 
         for (n = 0; n < UIDHASH_SZ; ++n)
-                INIT_LIST_HEAD(ns->uidhash_table + n);
+                INIT_HLIST_HEAD(ns->uidhash_table + n);
 
         /* Insert new root user.  */
         ns->root_user = alloc_uid(ns, 0);
@@ -81,6 +81,7 @@ void free_user_ns(struct kref *kref)
         struct user_namespace *ns;
 
         ns = container_of(kref, struct user_namespace, kref);
+        release_uids(ns);
         kfree(ns);
 }
 
diff --git a/kernel/utsname.c b/kernel/utsname.c
index 9d8180a0f0..816d7b24fa 100644
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -28,7 +28,9 @@ static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns)
         if (!ns)
                 return ERR_PTR(-ENOMEM);
 
+        down_read(&uts_sem);
         memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
+        up_read(&uts_sem);
         kref_init(&ns->kref);
         return ns;
 }
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 58e5c152a6..e080d1d744 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -635,7 +635,7 @@ int keventd_up(void)
 int current_is_keventd(void)
 {
         struct cpu_workqueue_struct *cwq;
-        int cpu = smp_processor_id();   /* preempt-safe: keventd is per-cpu */
+        int cpu = raw_smp_processor_id(); /* preempt-safe: keventd is per-cpu */
         int ret = 0;
 
         BUG_ON(!keventd_wq);
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 50a94eee4d..cdc9b099e6 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -284,7 +284,7 @@ config LOCKDEP
         select KALLSYMS_ALL
 
 config LOCK_STAT
-        bool "Lock usage statisitics"
+        bool "Lock usage statistics"
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
         select LOCKDEP
         select DEBUG_SPINLOCK
@@ -294,6 +294,8 @@ config LOCK_STAT
         help
          This feature enables tracking lock contention points
 
+         For more details, see Documentation/lockstat.txt
+
 config DEBUG_LOCKDEP
         bool "Lock dependency engine debugging"
         depends on DEBUG_KERNEL && LOCKDEP
diff --git a/lib/Makefile b/lib/Makefile
index 6b0ba8cf4e..4f3f3e2565 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,7 +2,7 @@
 # Makefile for some libs needed in the kernel.
 #
 
-lib-y := ctype.o string.o vsprintf.o kasprintf.o cmdline.o \
+lib-y := ctype.o string.o vsprintf.o cmdline.o \
          rbtree.o radix-tree.o dump_stack.o \
          idr.o int_sqrt.o bitmap.o extable.o prio_tree.o \
          sha1.o irq_regs.o reciprocal_div.o argv_split.o
@@ -13,7 +13,7 @@ lib-$(CONFIG_SMP) += cpumask.o
 lib-y   += kobject.o kref.o kobject_uevent.o klist.o
 
 obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
-         bust_spinlocks.o hexdump.o
+         bust_spinlocks.o hexdump.o kasprintf.o
 
 ifeq ($(CONFIG_DEBUG_KOBJECT),y)
 CFLAGS_kobject.o += -DDEBUG
diff --git a/lib/iomap.c b/lib/iomap.c
index a57d262a5e..864f2ec196 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -240,7 +240,20 @@ void ioport_unmap(void __iomem *addr)
 EXPORT_SYMBOL(ioport_map);
 EXPORT_SYMBOL(ioport_unmap);
 
-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
+/**
+ * pci_iomap - create a virtual mapping cookie for a PCI BAR
+ * @dev: PCI device that owns the BAR
+ * @bar: BAR number
+ * @maxlen: length of the memory to map
+ *
+ * Using this function you will get a __iomem address to your device BAR.
+ * You can access it using ioread*() and iowrite*(). These functions hide
+ * the details if this is a MMIO or PIO address space and will just do what
+ * you expect from them in the correct way.
+ *
+ * @maxlen specifies the maximum length to map. If you want to get access to
+ * the complete BAR without checking for its length first, pass %0 here.
+ * */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
         unsigned long start = pci_resource_start(dev, bar);
diff --git a/mm/Kconfig b/mm/Kconfig
index e24d348083..a7609cbcb0 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -137,6 +137,7 @@ config SPLIT_PTLOCK_CPUS
         int
         default "4096" if ARM && !CPU_CACHE_VIPT
         default "4096" if PARISC && !PA20
+        default "4096" if XEN
         default "4"
 
 #
diff --git a/mm/filemap.c b/mm/filemap.c
index 90b657b50f..15c8413ee9 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1388,6 +1388,7 @@ retry_find:
         size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
         if (unlikely(vmf->pgoff >= size)) {
                 unlock_page(page);
+                page_cache_release(page);
                 goto outside_data_content;
         }
 
diff --git a/mm/fremap.c b/mm/fremap.c
index c395b1abf0..95bcb5641c 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -160,7 +160,7 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
         if (vma->vm_private_data && !(vma->vm_flags & VM_NONLINEAR))
                 goto out;
 
-        if (!vma->vm_flags & VM_CAN_NONLINEAR)
+        if (!(vma->vm_flags & VM_CAN_NONLINEAR))
                 goto out;
 
         if (end <= start || start < vma->vm_start || end > vma->vm_end)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index de4cf458d6..eab8c428cc 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -42,7 +42,7 @@ static void clear_huge_page(struct page *page, unsigned long addr)
         might_sleep();
         for (i = 0; i < (HPAGE_SIZE/PAGE_SIZE); i++) {
                 cond_resched();
-                clear_user_highpage(page + i, addr);
+                clear_user_highpage(page + i, addr + i * PAGE_SIZE);
         }
 }
 
@@ -71,8 +71,9 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
 {
         int nid;
         struct page *page = NULL;
+        struct mempolicy *mpol;
         struct zonelist *zonelist = huge_zonelist(vma, address,
-                                                htlb_alloc_mask);
+                                        htlb_alloc_mask, &mpol);
         struct zone **z;
 
         for (z = zonelist->zones; *z; z++) {
@@ -87,6 +88,7 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
                         break;
                 }
         }
+        mpol_free(mpol);        /* unref if mpol !NULL */
         return page;
 }
 
diff --git a/mm/memory.c b/mm/memory.c
index ca8cac11bd..f82b359b27 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1639,6 +1639,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
         struct page *old_page, *new_page;
         pte_t entry;
         int reuse = 0, ret = 0;
+        int page_mkwrite = 0;
         struct page *dirty_page = NULL;
 
         old_page = vm_normal_page(vma, address, orig_pte);
@@ -1687,6 +1688,8 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
                         page_cache_release(old_page);
                         if (!pte_same(*page_table, orig_pte))
                                 goto unlock;
+
+                        page_mkwrite = 1;
                 }
                 dirty_page = old_page;
                 get_page(dirty_page);
@@ -1774,7 +1777,7 @@ unlock:
                  * do_no_page is protected similarly.
                  */
                 wait_on_page_locked(dirty_page);
-                set_page_dirty_balance(dirty_page);
+                set_page_dirty_balance(dirty_page, page_mkwrite);
                 put_page(dirty_page);
         }
         return ret;
@@ -2307,13 +2310,14 @@ oom:
  * do not need to flush old virtual caches or the TLB.
  *
  * We enter with non-exclusive mmap_sem (to exclude vma changes,
- * but allow concurrent faults), and pte mapped but not yet locked.
+ * but allow concurrent faults), and pte neither mapped nor locked.
  * We return with mmap_sem still held, but pte unmapped and unlocked.
  */
 static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
-                unsigned long address, pte_t *page_table, pmd_t *pmd,
+                unsigned long address, pmd_t *pmd,
                 pgoff_t pgoff, unsigned int flags, pte_t orig_pte)
 {
+        pte_t *page_table;
         spinlock_t *ptl;
         struct page *page;
         pte_t entry;
@@ -2321,13 +2325,13 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
         struct page *dirty_page = NULL;
         struct vm_fault vmf;
         int ret;
+        int page_mkwrite = 0;
 
         vmf.virtual_address = (void __user *)(address & PAGE_MASK);
         vmf.pgoff = pgoff;
         vmf.flags = flags;
         vmf.page = NULL;
 
-        pte_unmap(page_table);
         BUG_ON(vma->vm_flags & VM_PFNMAP);
 
         if (likely(vma->vm_ops->fault)) {
@@ -2398,6 +2402,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                                         anon = 1; /* no anon but release vmf.page */
                                         goto out;
                                 }
+                                page_mkwrite = 1;
                         }
                 }
 
@@ -2453,7 +2458,7 @@ out_unlocked:
         if (anon)
                 page_cache_release(vmf.page);
         else if (dirty_page) {
-                set_page_dirty_balance(dirty_page);
+                set_page_dirty_balance(dirty_page, page_mkwrite);
                 put_page(dirty_page);
         }
 
@@ -2468,8 +2473,8 @@ static int do_linear_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                         - vma->vm_start) >> PAGE_CACHE_SHIFT) + vma->vm_pgoff;
         unsigned int flags = (write_access ? FAULT_FLAG_WRITE : 0);
 
-        return __do_fault(mm, vma, address, page_table, pmd, pgoff,
-                                                        flags, orig_pte);
+        pte_unmap(page_table);
+        return __do_fault(mm, vma, address, pmd, pgoff, flags, orig_pte);
 }
 
 
@@ -2552,9 +2557,7 @@ static int do_nonlinear_fault(struct mm_struct *mm, struct vm_area_struct *vma,
         }
 
         pgoff = pte_to_pgoff(orig_pte);
-
-        return __do_fault(mm, vma, address, page_table, pmd, pgoff,
-                                                        flags, orig_pte);
+        return __do_fault(mm, vma, address, pmd, pgoff, flags, orig_pte);
 }
 
 /*
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 172abffeb2..3d6ac9505d 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -955,6 +955,11 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
                 goto out;
         }
 
+        if (!nodes_subset(new, node_online_map)) {
+                err = -EINVAL;
+                goto out;
+        }
+
         err = security_task_movememory(task);
         if (err)
                 goto out;
@@ -1072,21 +1077,37 @@ asmlinkage long compat_sys_mbind(compat_ulong_t start, compat_ulong_t len,
 
 #endif
 
-/* Return effective policy for a VMA */
+/*
+ * get_vma_policy(@task, @vma, @addr)
+ * @task - task for fallback if vma policy == default
+ * @vma   - virtual memory area whose policy is sought
+ * @addr  - address in @vma for shared policy lookup
+ *
+ * Returns effective policy for a VMA at specified address.
+ * Falls back to @task or system default policy, as necessary.
+ * Returned policy has extra reference count if shared, vma,
+ * or some other task's policy [show_numa_maps() can pass
+ * @task != current].  It is the caller's responsibility to
+ * free the reference in these cases.
+ */
 static struct mempolicy * get_vma_policy(struct task_struct *task,
                 struct vm_area_struct *vma, unsigned long addr)
 {
         struct mempolicy *pol = task->mempolicy;
+        int shared_pol = 0;
 
         if (vma) {
-                if (vma->vm_ops && vma->vm_ops->get_policy)
+                if (vma->vm_ops && vma->vm_ops->get_policy) {
                         pol = vma->vm_ops->get_policy(vma, addr);
-                else if (vma->vm_policy &&
+                        shared_pol = 1; /* if pol non-NULL, add ref below */
+                } else if (vma->vm_policy &&
                                 vma->vm_policy->policy != MPOL_DEFAULT)
                         pol = vma->vm_policy;
         }
         if (!pol)
                 pol = &default_policy;
+        else if (!shared_pol && pol != current->mempolicy)
+                mpol_get(pol);  /* vma or other task's policy */
         return pol;
 }
 
@@ -1202,19 +1223,45 @@ static inline unsigned interleave_nid(struct mempolicy *pol,
 }
 
 #ifdef CONFIG_HUGETLBFS
-/* Return a zonelist suitable for a huge page allocation. */
+/*
+ * huge_zonelist(@vma, @addr, @gfp_flags, @mpol)
+ * @vma = virtual memory area whose policy is sought
+ * @addr = address in @vma for shared policy lookup and interleave policy
+ * @gfp_flags = for requested zone
+ * @mpol = pointer to mempolicy pointer for reference counted 'BIND policy
+ *
+ * Returns a zonelist suitable for a huge page allocation.
+ * If the effective policy is 'BIND, returns pointer to policy's zonelist.
+ * If it is also a policy for which get_vma_policy() returns an extra
+ * reference, we must hold that reference until after allocation.
+ * In that case, return policy via @mpol so hugetlb allocation can drop
+ * the reference.  For non-'BIND referenced policies, we can/do drop the
+ * reference here, so the caller doesn't need to know about the special case
+ * for default and current task policy.
+ */
 struct zonelist *huge_zonelist(struct vm_area_struct *vma, unsigned long addr,
-                                                        gfp_t gfp_flags)
+                                gfp_t gfp_flags, struct mempolicy **mpol)
 {
         struct mempolicy *pol = get_vma_policy(current, vma, addr);
+        struct zonelist *zl;
 
+        *mpol = NULL;           /* probably no unref needed */
         if (pol->policy == MPOL_INTERLEAVE) {
                 unsigned nid;
 
                 nid = interleave_nid(pol, vma, addr, HPAGE_SHIFT);
+                __mpol_free(pol);               /* finished with pol */
                 return NODE_DATA(nid)->node_zonelists + gfp_zone(gfp_flags);
         }
-        return zonelist_policy(GFP_HIGHUSER, pol);
+
+        zl = zonelist_policy(GFP_HIGHUSER, pol);
+        if (unlikely(pol != &default_policy && pol != current->mempolicy)) {
+                if (pol->policy != MPOL_BIND)
+                        __mpol_free(pol);       /* finished with pol */
+                else
+                        *mpol = pol;    /* unref needed after allocation */
+        }
+        return zl;
 }
 #endif
 
@@ -1259,6 +1306,7 @@ struct page *
 alloc_page_vma(gfp_t gfp, struct vm_area_struct *vma, unsigned long addr)
 {
         struct mempolicy *pol = get_vma_policy(current, vma, addr);
+        struct zonelist *zl;
 
         cpuset_update_task_memory_state();
 
@@ -1268,7 +1316,19 @@ alloc_page_vma(gfp_t gfp, struct vm_area_struct *vma, unsigned long addr)
                 nid = interleave_nid(pol, vma, addr, PAGE_SHIFT);
                 return alloc_page_interleave(gfp, 0, nid);
         }
-        return __alloc_pages(gfp, 0, zonelist_policy(gfp, pol));
+        zl = zonelist_policy(gfp, pol);
+        if (pol != &default_policy && pol != current->mempolicy) {
+                /*
+                 * slow path: ref counted policy -- shared or vma
+                 */
+                struct page *page =  __alloc_pages(gfp, 0, zl);
+                __mpol_free(pol);
+                return page;
+        }
+        /*
+         * fast path:  default or task policy
+         */
+        return __alloc_pages(gfp, 0, zl);
 }
 
 /**
@@ -1867,6 +1927,7 @@ int show_numa_map(struct seq_file *m, void *v)
         struct numa_maps *md;
         struct file *file = vma->vm_file;
         struct mm_struct *mm = vma->vm_mm;
+        struct mempolicy *pol;
         int n;
         char buffer[50];
 
@@ -1877,8 +1938,13 @@ int show_numa_map(struct seq_file *m, void *v)
         if (!md)
                 return 0;
 
-        mpol_to_str(buffer, sizeof(buffer),
-                            get_vma_policy(priv->task, vma, vma->vm_start));
+        pol = get_vma_policy(priv->task, vma, vma->vm_start);
+        mpol_to_str(buffer, sizeof(buffer), pol);
+        /*
+         * unref shared or other task's mempolicy
+         */
+        if (pol != &default_policy && pol != current->mempolicy)
+                __mpol_free(pol);
 
         seq_printf(m, "%08lx %s", vma->vm_start, buffer);
 
diff --git a/mm/migrate.c b/mm/migrate.c
index 37c73b9020..e2fdbce187 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -611,6 +611,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
         int rc = 0;
         int *result = NULL;
         struct page *newpage = get_new_page(page, private, &result);
+        int rcu_locked = 0;
 
         if (!newpage)
                 return -ENOMEM;
@@ -636,8 +637,13 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
          * we cannot notice that anon_vma is freed while we migrates a page.
          * This rcu_read_lock() delays freeing anon_vma pointer until the end
          * of migration. File cache pages are no problem because of page_lock()
+         * File Caches may use write_page() or lock_page() in migration, then,
+         * just care Anon page here.
          */
-        rcu_read_lock();
+        if (PageAnon(page)) {
+                rcu_read_lock();
+                rcu_locked = 1;
+        }
         /*
          * This is a corner case handling.
          * When a new swap-cache is read into, it is linked to LRU
@@ -656,7 +662,8 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
         if (rc)
                 remove_migration_ptes(page, page);
 rcu_unlock:
-        rcu_read_unlock();
+        if (rcu_locked)
+                rcu_read_unlock();
 
 unlock:
 
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 63512a9ed5..4472036337 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -274,9 +274,9 @@ static void balance_dirty_pages(struct address_space *mapping)
                 pdflush_operation(background_writeout, 0);
 }
 
-void set_page_dirty_balance(struct page *page)
+void set_page_dirty_balance(struct page *page, int page_mkwrite)
 {
-        if (set_page_dirty(page)) {
+        if (set_page_dirty(page) || page_mkwrite) {
                 struct address_space *mapping = page_mapping(page);
 
                 if (mapping)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6427653023..1a8c59571c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2345,6 +2345,8 @@ static int __cpuinit process_zones(int cpu)
         return 0;
 bad:
         for_each_zone(dzone) {
+                if (!populated_zone(dzone))
+                        continue;
                 if (dzone == zone)
                         break;
                 kfree(zone_pcp(dzone, cpu));
diff --git a/mm/slub.c b/mm/slub.c
index 04151da399..addb20a6d6 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -986,7 +986,9 @@ out:
 
 __setup("slub_debug", setup_slub_debug);
 
-static void kmem_cache_open_debug_check(struct kmem_cache *s)
+static unsigned long kmem_cache_flags(unsigned long objsize,
+        unsigned long flags, const char *name,
+        void (*ctor)(void *, struct kmem_cache *, unsigned long))
 {
         /*
          * The page->offset field is only 16 bit wide. This is an offset
@@ -1000,19 +1002,21 @@ static void kmem_cache_open_debug_check(struct kmem_cache *s)
          * Debugging or ctor may create a need to move the free
          * pointer. Fail if this happens.
          */
-        if (s->objsize >= 65535 * sizeof(void *)) {
-                BUG_ON(s->flags & (SLAB_RED_ZONE | SLAB_POISON |
+        if (objsize >= 65535 * sizeof(void *)) {
+                BUG_ON(flags & (SLAB_RED_ZONE | SLAB_POISON |
                                 SLAB_STORE_USER | SLAB_DESTROY_BY_RCU));
-                BUG_ON(s->ctor);
-        }
-        else
+                BUG_ON(ctor);
+        } else {
                 /*
                  * Enable debugging if selected on the kernel commandline.
                  */
                 if (slub_debug && (!slub_debug_slabs ||
-                    strncmp(slub_debug_slabs, s->name,
+                    strncmp(slub_debug_slabs, name,
                         strlen(slub_debug_slabs)) == 0))
-                                s->flags |= slub_debug;
+                                flags |= slub_debug;
+        }
+
+        return flags;
 }
 #else
 static inline void setup_object_debug(struct kmem_cache *s,
@@ -1029,7 +1033,12 @@ static inline int slab_pad_check(struct kmem_cache *s, struct page *page)
 static inline int check_object(struct kmem_cache *s, struct page *page,
                         void *object, int active) { return 1; }
 static inline void add_full(struct kmem_cache_node *n, struct page *page) {}
-static inline void kmem_cache_open_debug_check(struct kmem_cache *s) {}
+static inline unsigned long kmem_cache_flags(unsigned long objsize,
+        unsigned long flags, const char *name,
+        void (*ctor)(void *, struct kmem_cache *, unsigned long))
+{
+        return flags;
+}
 #define slub_debug 0
 #endif
 /*
@@ -2088,9 +2097,8 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags,
         s->name = name;
         s->ctor = ctor;
         s->objsize = size;
-        s->flags = flags;
         s->align = align;
-        kmem_cache_open_debug_check(s);
+        s->flags = kmem_cache_flags(size, flags, name, ctor);
 
         if (!calculate_sizes(s))
                 goto error;
@@ -2660,7 +2668,7 @@ static int slab_unmergeable(struct kmem_cache *s)
 }
 
 static struct kmem_cache *find_mergeable(size_t size,
-                size_t align, unsigned long flags,
+                size_t align, unsigned long flags, const char *name,
                 void (*ctor)(void *, struct kmem_cache *, unsigned long))
 {
         struct kmem_cache *s;
@@ -2674,6 +2682,7 @@ static struct kmem_cache *find_mergeable(size_t size,
         size = ALIGN(size, sizeof(void *));
         align = calculate_alignment(flags, align, size);
         size = ALIGN(size, align);
+        flags = kmem_cache_flags(size, flags, name, NULL);
 
         list_for_each_entry(s, &slab_caches, list) {
                 if (slab_unmergeable(s))
@@ -2682,8 +2691,7 @@ static struct kmem_cache *find_mergeable(size_t size,
                 if (size > s->size)
                         continue;
 
-                if (((flags | slub_debug) & SLUB_MERGE_SAME) !=
-                        (s->flags & SLUB_MERGE_SAME))
+                if ((flags & SLUB_MERGE_SAME) != (s->flags & SLUB_MERGE_SAME))
                                 continue;
                 /*
                  * Check if alignment is compatible.
@@ -2707,7 +2715,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
         struct kmem_cache *s;
 
         down_write(&slub_lock);
-        s = find_mergeable(size, align, flags, ctor);
+        s = find_mergeable(size, align, flags, name, ctor);
         if (s) {
                 s->refcount++;
                 /*
@@ -3813,7 +3821,9 @@ static int __init slab_sysfs_init(void)
 
         list_for_each_entry(s, &slab_caches, list) {
                 err = sysfs_slab_add(s);
-                BUG_ON(err);
+                if (err)
+                        printk(KERN_ERR "SLUB: Unable to add boot slab %s"
+                                                " to sysfs\n", s->name);
         }
 
         while (alias_list) {
@@ -3821,7 +3831,9 @@ static int __init slab_sysfs_init(void)
 
                 alias_list = alias_list->next;
                 err = sysfs_slab_alias(al->s, al->name);
-                BUG_ON(err);
+                if (err)
+                        printk(KERN_ERR "SLUB: Unable to add boot slab alias"
+                                        " %s to sysfs\n", s->name);
                 kfree(al);
         }
 
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 1583c5ef96..2a546919d6 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -562,8 +562,6 @@ static int register_vlan_device(struct net_device *real_dev,
         if (err < 0)
                 goto out_free_newdev;
 
-        /* Account for reference in struct vlan_dev_info */
-        dev_hold(real_dev);
 #ifdef VLAN_DEBUG
         printk(VLAN_DBG "Allocated new device successfully, returning.\n");
 #endif
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 4bab322c9f..328759c32d 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -116,12 +116,22 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                   struct packet_type* ptype, struct net_device *orig_dev)
 {
         unsigned char *rawp = NULL;
-        struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data);
+        struct vlan_hdr *vhdr;
         unsigned short vid;
         struct net_device_stats *stats;
         unsigned short vlan_TCI;
         __be16 proto;
 
+        if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+                return -1;
+
+        if (unlikely(!pskb_may_pull(skb, VLAN_HLEN))) {
+                kfree_skb(skb);
+                return -1;
+        }
+
+        vhdr = (struct vlan_hdr *)(skb->data);
+
         /* vlan_TCI = ntohs(get_unaligned(&vhdr->h_vlan_TCI)); */
         vlan_TCI = ntohs(vhdr->h_vlan_TCI);
 
diff --git a/net/9p/conv.c b/net/9p/conv.c
index f2a041cb50..d979d958ea 100644
--- a/net/9p/conv.c
+++ b/net/9p/conv.c
@@ -796,6 +796,7 @@ struct p9_fcall *p9_create_twrite_u(u32 fid, u64 offset, u32 count,
         if (err) {
                 kfree(fc);
                 fc = ERR_PTR(err);
+                goto error;
         }
 
         if (buf_check_overflow(bufp)) {
diff --git a/net/9p/mux.c b/net/9p/mux.c
index acb038810f..5d70558c4c 100644
--- a/net/9p/mux.c
+++ b/net/9p/mux.c
@@ -288,9 +288,10 @@ struct p9_conn *p9_conn_create(struct p9_transport *trans, int msize,
         m->extended = extended;
         m->trans = trans;
         m->tagpool = p9_idpool_create();
-        if (!m->tagpool) {
+        if (IS_ERR(m->tagpool)) {
+                mtmp = ERR_PTR(-ENOMEM);
                 kfree(m);
-                return ERR_PTR(PTR_ERR(m->tagpool));
+                return mtmp;
         }
 
         m->err = 0;
@@ -308,8 +309,10 @@ struct p9_conn *p9_conn_create(struct p9_transport *trans, int msize,
         memset(&m->poll_waddr, 0, sizeof(m->poll_waddr));
         m->poll_task = NULL;
         n = p9_mux_poll_start(m);
-        if (n)
+        if (n) {
+                kfree(m);
                 return ERR_PTR(n);
+        }
 
         n = trans->poll(trans, &m->pt);
         if (n & POLLIN) {
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 63caa41494..18e3afc964 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -183,6 +183,7 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt)
 {
         struct sk_buff *skb;
         __le16 param;
+        __u8 flt_type;
 
         BT_DBG("%s %ld", hdev->name, opt);
 
@@ -233,11 +234,8 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt)
         /* Optional initialization */
 
         /* Clear Event Filters */
-        {
-                struct hci_cp_set_event_flt cp;
-                cp.flt_type  = HCI_FLT_CLEAR_ALL;
-                hci_send_cmd(hdev, OGF_HOST_CTL, OCF_SET_EVENT_FLT, sizeof(cp), &cp);
-        }
+        flt_type = HCI_FLT_CLEAR_ALL;
+        hci_send_cmd(hdev, OGF_HOST_CTL, OCF_SET_EVENT_FLT, 1, &flt_type);
 
         /* Page timeout ~20 secs */
         param = cpu_to_le16(0x8000);
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 1dae3dfc66..5ccea5fbd2 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -37,6 +37,7 @@
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
+#include <linux/compat.h>
 #include <linux/socket.h>
 #include <linux/ioctl.h>
 #include <net/sock.h>
@@ -70,15 +71,15 @@ static struct hci_sec_filter hci_sec_filter = {
         {
                 { 0x0 },
                 /* OGF_LINK_CTL */
-                { 0xbe000006, 0x00000001, 0x000000, 0x00 },
+                { 0xbe000006, 0x00000001, 0x00000000, 0x00 },
                 /* OGF_LINK_POLICY */
-                { 0x00005200, 0x00000000, 0x000000, 0x00 },
+                { 0x00005200, 0x00000000, 0x00000000, 0x00 },
                 /* OGF_HOST_CTL */
-                { 0xaab00200, 0x2b402aaa, 0x020154, 0x00 },
+                { 0xaab00200, 0x2b402aaa, 0x05220154, 0x00 },
                 /* OGF_INFO_PARAM */
-                { 0x000002be, 0x00000000, 0x000000, 0x00 },
+                { 0x000002be, 0x00000000, 0x00000000, 0x00 },
                 /* OGF_STATUS_PARAM */
-                { 0x000000ea, 0x00000000, 0x000000, 0x00 }
+                { 0x000000ea, 0x00000000, 0x00000000, 0x00 }
         }
 };
 
@@ -342,9 +343,24 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_
 
         if (mask & HCI_CMSG_TSTAMP) {
                 struct timeval tv;
+                void *data;
+                int len;
 
                 skb_get_timestamp(skb, &tv);
-                put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, sizeof(tv), &tv);
+
+                data = &tv;
+                len = sizeof(tv);
+#ifdef CONFIG_COMPAT
+                if (msg->msg_flags & MSG_CMSG_COMPAT) {
+                        struct compat_timeval ctv;
+                        ctv.tv_sec = tv.tv_sec;
+                        ctv.tv_usec = tv.tv_usec;
+                        data = &ctv;
+                        len = sizeof(ctv);
+                }
+#endif
+
+                put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, len, data);
         }
 }
 
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 0eded176ce..99292e8e1d 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -41,11 +41,11 @@ int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
         skb_pull(skb, ETH_HLEN);
 
         if (dest[0] & 1)
-                br_flood_deliver(br, skb, 0);
+                br_flood_deliver(br, skb);
         else if ((dst = __br_fdb_get(br, dest)) != NULL)
                 br_deliver(dst->dst, skb);
         else
-                br_flood_deliver(br, skb, 0);
+                br_flood_deliver(br, skb);
 
         return 0;
 }
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 69b70977f0..eb57502bb2 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -384,6 +384,11 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
         if (hold_time(br) == 0)
                 return;
 
+        /* ignore packets unless we are using this port */
+        if (!(source->state == BR_STATE_LEARNING ||
+              source->state == BR_STATE_FORWARDING))
+                return;
+
         fdb = fdb_find(head, addr);
         if (likely(fdb)) {
                 /* attempt to update an entry for a local interface */
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index ada7f49544..bdd7c35c3c 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -100,24 +100,13 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb)
 }
 
 /* called under bridge lock */
-static void br_flood(struct net_bridge *br, struct sk_buff *skb, int clone,
+static void br_flood(struct net_bridge *br, struct sk_buff *skb,
         void (*__packet_hook)(const struct net_bridge_port *p,
                               struct sk_buff *skb))
 {
         struct net_bridge_port *p;
         struct net_bridge_port *prev;
 
-        if (clone) {
-                struct sk_buff *skb2;
-
-                if ((skb2 = skb_clone(skb, GFP_ATOMIC)) == NULL) {
-                        br->statistics.tx_dropped++;
-                        return;
-                }
-
-                skb = skb2;
-        }
-
         prev = NULL;
 
         list_for_each_entry_rcu(p, &br->port_list, list) {
@@ -148,13 +137,13 @@ static void br_flood(struct net_bridge *br, struct sk_buff *skb, int clone,
 
 
 /* called with rcu_read_lock */
-void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, int clone)
+void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
 {
-        br_flood(br, skb, clone, __br_deliver);
+        br_flood(br, skb, __br_deliver);
 }
 
 /* called under bridge lock */
-void br_flood_forward(struct net_bridge *br, struct sk_buff *skb, int clone)
+void br_flood_forward(struct net_bridge *br, struct sk_buff *skb)
 {
-        br_flood(br, skb, clone, __br_forward);
+        br_flood(br, skb, __br_forward);
 }
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 749f0e8f54..9272f12f66 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -33,17 +33,17 @@
  */
 static int port_cost(struct net_device *dev)
 {
-        if (dev->ethtool_ops->get_settings) {
-                struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-                int err = dev->ethtool_ops->get_settings(dev, &ecmd);
-                if (!err) {
+        if (dev->ethtool_ops && dev->ethtool_ops->get_settings) {
+                struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET, };
+
+                if (!dev->ethtool_ops->get_settings(dev, &ecmd)) {
                         switch(ecmd.speed) {
-                        case SPEED_100:
-                                return 19;
-                        case SPEED_1000:
-                                return 4;
                         case SPEED_10000:
                                 return 2;
+                        case SPEED_1000:
+                                return 4;
+                        case SPEED_100:
+                                return 19;
                         case SPEED_10:
                                 return 100;
                         }
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 5c18595b76..3a8a015c92 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -43,7 +43,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
         struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
         struct net_bridge *br;
         struct net_bridge_fdb_entry *dst;
-        int passedup = 0;
+        struct sk_buff *skb2;
 
         if (!p || p->state == BR_STATE_DISABLED)
                 goto drop;
@@ -55,39 +55,35 @@ int br_handle_frame_finish(struct sk_buff *skb)
         if (p->state == BR_STATE_LEARNING)
                 goto drop;
 
-        if (br->dev->flags & IFF_PROMISC) {
-                struct sk_buff *skb2;
+        /* The packet skb2 goes to the local host (NULL to skip). */
+        skb2 = NULL;
 
-                skb2 = skb_clone(skb, GFP_ATOMIC);
-                if (skb2 != NULL) {
-                        passedup = 1;
-                        br_pass_frame_up(br, skb2);
-                }
-        }
+        if (br->dev->flags & IFF_PROMISC)
+                skb2 = skb;
+
+        dst = NULL;
 
         if (is_multicast_ether_addr(dest)) {
                 br->statistics.multicast++;
-                br_flood_forward(br, skb, !passedup);
-                if (!passedup)
-                        br_pass_frame_up(br, skb);
-                goto out;
+                skb2 = skb;
+        } else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
+                skb2 = skb;
+                /* Do not forward the packet since it's local. */
+                skb = NULL;
         }
 
-        dst = __br_fdb_get(br, dest);
-        if (dst != NULL && dst->is_local) {
-                if (!passedup)
-                        br_pass_frame_up(br, skb);
-                else
-                        kfree_skb(skb);
-                goto out;
-        }
+        if (skb2 == skb)
+                skb2 = skb_clone(skb, GFP_ATOMIC);
 
-        if (dst != NULL) {
-                br_forward(dst->dst, skb);
-                goto out;
-        }
+        if (skb2)
+                br_pass_frame_up(br, skb2);
 
-        br_flood_forward(br, skb, 0);
+        if (skb) {
+                if (dst)
+                        br_forward(dst->dst, skb);
+                else
+                        br_flood_forward(br, skb);
+        }
 
 out:
         return 0;
@@ -101,9 +97,8 @@ static int br_handle_local_finish(struct sk_buff *skb)
 {
         struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
 
-        if (p && p->state != BR_STATE_DISABLED)
+        if (p)
                 br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
-
         return 0;        /* process further */
 }
 
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index fa779874b9..fc13130035 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -183,7 +183,7 @@ int nf_bridge_copy_header(struct sk_buff *skb)
         int err;
         int header_size = ETH_HLEN + nf_bridge_encap_header_len(skb);
 
-        err = skb_cow(skb, header_size);
+        err = skb_cow_head(skb, header_size);
         if (err)
                 return err;
 
@@ -509,8 +509,14 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
                                       int (*okfn)(struct sk_buff *))
 {
         struct iphdr *iph;
-        __u32 len;
         struct sk_buff *skb = *pskb;
+        __u32 len = nf_bridge_encap_header_len(skb);
+
+        if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+                return NF_STOLEN;
+
+        if (unlikely(!pskb_may_pull(skb, len)))
+                goto out;
 
         if (skb->protocol == htons(ETH_P_IPV6) || IS_VLAN_IPV6(skb) ||
             IS_PPPOE_IPV6(skb)) {
@@ -518,8 +524,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
                 if (!brnf_call_ip6tables)
                         return NF_ACCEPT;
 #endif
-                if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
-                        goto out;
                 nf_bridge_pull_encap_header_rcsum(skb);
                 return br_nf_pre_routing_ipv6(hook, skb, in, out, okfn);
         }
@@ -532,8 +536,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
             !IS_PPPOE_IP(skb))
                 return NF_ACCEPT;
 
-        if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
-                goto out;
         nf_bridge_pull_encap_header_rcsum(skb);
 
         if (!pskb_may_pull(skb, sizeof(struct iphdr)))
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 21bf3a9a03..e6dc6f5299 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -170,12 +170,8 @@ extern int br_dev_queue_push_xmit(struct sk_buff *skb);
 extern void br_forward(const struct net_bridge_port *to,
                 struct sk_buff *skb);
 extern int br_forward_finish(struct sk_buff *skb);
-extern void br_flood_deliver(struct net_bridge *br,
-                      struct sk_buff *skb,
-                      int clone);
-extern void br_flood_forward(struct net_bridge *br,
-                      struct sk_buff *skb,
-                      int clone);
+extern void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb);
+extern void br_flood_forward(struct net_bridge *br, struct sk_buff *skb);
 
 /* br_if.c */
 extern void br_port_carrier_check(struct net_bridge_port *p);
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 4169a2a89a..6018d0e519 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1513,6 +1513,7 @@ static struct nf_sockopt_ops ebt_sockopts =
         .get_optmin     = EBT_BASE_CTL,
         .get_optmax     = EBT_SO_GET_MAX + 1,
         .get            = do_ebt_get_ctl,
+        .owner          = THIS_MODULE,
 };
 
 static int __init ebtables_init(void)
diff --git a/net/core/datagram.c b/net/core/datagram.c
index cb056f4761..029b93e246 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -450,6 +450,9 @@ int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
         __wsum csum;
         int chunk = skb->len - hlen;
 
+        if (!chunk)
+                return 0;
+
         /* Skip filled elements.
          * Pretty silly, look at memcpy_toiovec, though 8)
          */
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index 99aece1aec..20330c5726 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -116,11 +116,13 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
  */
 int dev_mc_sync(struct net_device *to, struct net_device *from)
 {
-        struct dev_addr_list *da;
+        struct dev_addr_list *da, *next;
         int err = 0;
 
         netif_tx_lock_bh(to);
-        for (da = from->mc_list; da != NULL; da = da->next) {
+        da = from->mc_list;
+        while (da != NULL) {
+                next = da->next;
                 if (!da->da_synced) {
                         err = __dev_addr_add(&to->mc_list, &to->mc_count,
                                              da->da_addr, da->da_addrlen, 0);
@@ -134,6 +136,7 @@ int dev_mc_sync(struct net_device *to, struct net_device *from)
                         __dev_addr_delete(&from->mc_list, &from->mc_count,
                                           da->da_addr, da->da_addrlen, 0);
                 }
+                da = next;
         }
         if (!err)
                 __dev_set_rx_mode(to);
@@ -156,12 +159,14 @@ EXPORT_SYMBOL(dev_mc_sync);
  */
 void dev_mc_unsync(struct net_device *to, struct net_device *from)
 {
-        struct dev_addr_list *da;
+        struct dev_addr_list *da, *next;
 
         netif_tx_lock_bh(from);
         netif_tx_lock_bh(to);
 
-        for (da = from->mc_list; da != NULL; da = da->next) {
+        da = from->mc_list;
+        while (da != NULL) {
+                next = da->next;
                 if (!da->da_synced)
                         continue;
                 __dev_addr_delete(&to->mc_list, &to->mc_count,
@@ -169,6 +174,7 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from)
                 da->da_synced = 0;
                 __dev_addr_delete(&from->mc_list, &from->mc_count,
                                   da->da_addr, da->da_addrlen, 0);
+                da = next;
         }
         __dev_set_rx_mode(to);
 
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index ca2a153313..f7de8f24d8 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -33,6 +33,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/random.h>
 #include <linux/string.h>
+#include <linux/log2.h>
 
 #define NEIGH_DEBUG 1
 
@@ -311,7 +312,7 @@ static void neigh_hash_grow(struct neigh_table *tbl, unsigned long new_entries)
 
         NEIGH_CACHE_STAT_INC(tbl, hash_grows);
 
-        BUG_ON(new_entries & (new_entries - 1));
+        BUG_ON(!is_power_of_2(new_entries));
         new_hash = neigh_hash_alloc(new_entries);
         if (!new_hash)
                 return;
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 7bae576ac1..803d0c8826 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -111,6 +111,9 @@
  *
  * 802.1Q/Q-in-Q support by Francesco Fondelli (FF) <francesco.fondelli@gmail.com>
  *
+ * Fixed src_mac command to set source mac of packet to value specified in
+ * command by Adit Ranadive <adit.262@gmail.com>
+ *
  */
 #include <linux/sys.h>
 #include <linux/types.h>
@@ -380,7 +383,6 @@ struct pktgen_thread {
         /* Field for thread to receive "posted" events terminate, stop ifs etc. */
 
         u32 control;
-        int pid;
         int cpu;
 
         wait_queue_head_t queue;
@@ -1452,8 +1454,11 @@ static ssize_t pktgen_if_write(struct file *file,
         }
         if (!strcmp(name, "src_mac")) {
                 char *v = valstr;
+                unsigned char old_smac[ETH_ALEN];
                 unsigned char *m = pkt_dev->src_mac;
 
+                memcpy(old_smac, pkt_dev->src_mac, ETH_ALEN);
+
                 len = strn_len(&user_buffer[i], sizeof(valstr) - 1);
                 if (len < 0) {
                         return len;
@@ -1482,6 +1487,10 @@ static ssize_t pktgen_if_write(struct file *file,
                         }
                 }
 
+                /* Set up Src MAC */
+                if (compare_ether_addr(old_smac, pkt_dev->src_mac))
+                        memcpy(&(pkt_dev->hh[6]), pkt_dev->src_mac, ETH_ALEN);
+
                 sprintf(pg_result, "OK: srcmac");
                 return count;
         }
@@ -3331,8 +3340,9 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
         }
 
         if ((netif_queue_stopped(odev) ||
-             netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping)) ||
-             need_resched()) {
+             (pkt_dev->skb &&
+              netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping))) ||
+            need_resched()) {
                 idle_start = getCurUs();
 
                 if (!netif_running(odev)) {
@@ -3462,8 +3472,6 @@ static int pktgen_thread_worker(void *arg)
 
         init_waitqueue_head(&t->queue);
 
-        t->pid = current->pid;
-
         pr_debug("pktgen: starting pktgen/%d:  pid=%d\n", cpu, current->pid);
 
         max_before_softirq = t->max_before_softirq;
diff --git a/net/core/sock.c b/net/core/sock.c
index cfed7d42c4..190de61cd6 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -362,6 +362,61 @@ struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie)
 }
 EXPORT_SYMBOL(sk_dst_check);
 
+static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen)
+{
+        int ret = -ENOPROTOOPT;
+#ifdef CONFIG_NETDEVICES
+        char devname[IFNAMSIZ];
+        int index;
+
+        /* Sorry... */
+        ret = -EPERM;
+        if (!capable(CAP_NET_RAW))
+                goto out;
+
+        ret = -EINVAL;
+        if (optlen < 0)
+                goto out;
+
+        /* Bind this socket to a particular device like "eth0",
+         * as specified in the passed interface name. If the
+         * name is "" or the option length is zero the socket
+         * is not bound.
+         */
+        if (optlen > IFNAMSIZ - 1)
+                optlen = IFNAMSIZ - 1;
+        memset(devname, 0, sizeof(devname));
+
+        ret = -EFAULT;
+        if (copy_from_user(devname, optval, optlen))
+                goto out;
+
+        if (devname[0] == '\0') {
+                index = 0;
+        } else {
+                struct net_device *dev = dev_get_by_name(devname);
+
+                ret = -ENODEV;
+                if (!dev)
+                        goto out;
+
+                index = dev->ifindex;
+                dev_put(dev);
+        }
+
+        lock_sock(sk);
+        sk->sk_bound_dev_if = index;
+        sk_dst_reset(sk);
+        release_sock(sk);
+
+        ret = 0;
+
+out:
+#endif
+
+        return ret;
+}
+
 /*
  *      This is meant for all protocols to use and covers goings on
  *      at the socket level. Everything here is generic.
@@ -390,6 +445,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
         }
 #endif
 
+        if (optname == SO_BINDTODEVICE)
+                return sock_bindtodevice(sk, optval, optlen);
+
         if (optlen < sizeof(int))
                 return -EINVAL;
 
@@ -578,54 +636,6 @@ set_rcvbuf:
                 ret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen);
                 break;
 
-#ifdef CONFIG_NETDEVICES
-        case SO_BINDTODEVICE:
-        {
-                char devname[IFNAMSIZ];
-
-                /* Sorry... */
-                if (!capable(CAP_NET_RAW)) {
-                        ret = -EPERM;
-                        break;
-                }
-
-                /* Bind this socket to a particular device like "eth0",
-                 * as specified in the passed interface name. If the
-                 * name is "" or the option length is zero the socket
-                 * is not bound.
-                 */
-
-                if (!valbool) {
-                        sk->sk_bound_dev_if = 0;
-                } else {
-                        if (optlen > IFNAMSIZ - 1)
-                                optlen = IFNAMSIZ - 1;
-                        memset(devname, 0, sizeof(devname));
-                        if (copy_from_user(devname, optval, optlen)) {
-                                ret = -EFAULT;
-                                break;
-                        }
-
-                        /* Remove any cached route for this socket. */
-                        sk_dst_reset(sk);
-
-                        if (devname[0] == '\0') {
-                                sk->sk_bound_dev_if = 0;
-                        } else {
-                                struct net_device *dev = dev_get_by_name(devname);
-                                if (!dev) {
-                                        ret = -ENODEV;
-                                        break;
-                                }
-                                sk->sk_bound_dev_if = dev->ifindex;
-                                dev_put(dev);
-                        }
-                }
-                break;
-        }
-#endif
-
-
         case SO_ATTACH_FILTER:
                 ret = -EINVAL;
                 if (optlen == sizeof(struct sock_fprog)) {
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index fa6604fcf0..8def68209e 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -814,7 +814,7 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
                 for (ifa = dn_db->ifa_list, dn_idx = 0; ifa;
                      ifa = ifa->ifa_next, dn_idx++) {
                         if (dn_idx < skip_naddr)
-                                goto cont;
+                                continue;
 
                         if (dn_nl_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
                                               cb->nlh->nlmsg_seq, RTM_NEWADDR,
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index f2de2e48b0..6284c99b45 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -366,6 +366,12 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
         frag = WLAN_GET_SEQ_FRAG(sc);
         hdrlen = ieee80211_get_hdrlen(fc);
 
+        if (skb->len < hdrlen) {
+                printk(KERN_INFO "%s: invalid SKB length %d\n",
+                        dev->name, skb->len);
+                goto rx_dropped;
+        }
+
         /* Put this code here so that we avoid duplicating it in all
          * Rx paths. - Jean II */
 #ifdef CONFIG_WIRELESS_EXT
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index afb6c6698b..e475f2e1be 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -273,8 +273,6 @@ ieee80211softmac_assoc_work(struct work_struct *work)
                         ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL);
                         if (ieee80211softmac_start_scan(mac)) {
                                 dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");
-                                mac->associnfo.associating = 0;
-                                mac->associnfo.associated = 0;
                         }
                         goto out;
                 } else {
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index d054e9224b..5742dc803b 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -70,44 +70,30 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev,
                               char *extra)
 {
         struct ieee80211softmac_device *sm = ieee80211_priv(net_dev);
-        struct ieee80211softmac_network *n;
         struct ieee80211softmac_auth_queue_item *authptr;
         int length = 0;
 
 check_assoc_again:
         mutex_lock(&sm->associnfo.mutex);
-        /* Check if we're already associating to this or another network
-         * If it's another network, cancel and start over with our new network
-         * If it's our network, ignore the change, we're already doing it!
-         */
         if((sm->associnfo.associating || sm->associnfo.associated) &&
            (data->essid.flags && data->essid.length)) {
-                /* Get the associating network */
-                n = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid);
-                if(n && n->essid.len == data->essid.length &&
-                   !memcmp(n->essid.data, extra, n->essid.len)) {
-                        dprintk(KERN_INFO PFX "Already associating or associated to "MAC_FMT"\n",
-                                MAC_ARG(sm->associnfo.bssid));
-                        goto out;
-                } else {
-                        dprintk(KERN_INFO PFX "Canceling existing associate request!\n");
-                        /* Cancel assoc work */
-                        cancel_delayed_work(&sm->associnfo.work);
-                        /* We don't have to do this, but it's a little cleaner */
-                        list_for_each_entry(authptr, &sm->auth_queue, list)
-                                cancel_delayed_work(&authptr->work);
-                        sm->associnfo.bssvalid = 0;
-                        sm->associnfo.bssfixed = 0;
-                        sm->associnfo.associating = 0;
-                        sm->associnfo.associated = 0;
-                        /* We must unlock to avoid deadlocks with the assoc workqueue
-                         * on the associnfo.mutex */
-                        mutex_unlock(&sm->associnfo.mutex);
-                        flush_scheduled_work();
-                        /* Avoid race! Check assoc status again. Maybe someone started an
-                         * association while we flushed. */
-                        goto check_assoc_again;
-                }
+                dprintk(KERN_INFO PFX "Canceling existing associate request!\n");
+                /* Cancel assoc work */
+                cancel_delayed_work(&sm->associnfo.work);
+                /* We don't have to do this, but it's a little cleaner */
+                list_for_each_entry(authptr, &sm->auth_queue, list)
+                        cancel_delayed_work(&authptr->work);
+                sm->associnfo.bssvalid = 0;
+                sm->associnfo.bssfixed = 0;
+                sm->associnfo.associating = 0;
+                sm->associnfo.associated = 0;
+                /* We must unlock to avoid deadlocks with the assoc workqueue
+                 * on the associnfo.mutex */
+                mutex_unlock(&sm->associnfo.mutex);
+                flush_scheduled_work();
+                /* Avoid race! Check assoc status again. Maybe someone started an
+                 * association while we flushed. */
+                goto check_assoc_again;
         }
 
         sm->associnfo.static_essid = 0;
@@ -128,7 +114,7 @@ check_assoc_again:
         sm->associnfo.associating = 1;
         /* queue lower level code to do work (if necessary) */
         schedule_delayed_work(&sm->associnfo.work, 0);
-out:
+
         mutex_unlock(&sm->associnfo.mutex);
 
         return 0;
@@ -153,13 +139,13 @@ ieee80211softmac_wx_get_essid(struct net_device *net_dev,
                 data->essid.length = sm->associnfo.req_essid.len;
                 data->essid.flags = 1;  /* active */
                 memcpy(extra, sm->associnfo.req_essid.data, sm->associnfo.req_essid.len);
-        }
-
+                dprintk(KERN_INFO PFX "Getting essid from req_essid\n");
+        } else if (sm->associnfo.associated || sm->associnfo.associating) {
         /* If we're associating/associated, return that */
-        if (sm->associnfo.associated || sm->associnfo.associating) {
                 data->essid.length = sm->associnfo.associate_essid.len;
                 data->essid.flags = 1;  /* active */
                 memcpy(extra, sm->associnfo.associate_essid.data, sm->associnfo.associate_essid.len);
+                dprintk(KERN_INFO PFX "Getting essid from associate_essid\n");
         }
         mutex_unlock(&sm->associnfo.mutex);
 
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 7a23e59c37..39f6211f14 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -46,7 +46,7 @@ static int ip_clear_mutable_options(struct iphdr *iph, __be32 *daddr)
                         memcpy(daddr, optptr+optlen-4, 4);
                         /* Fall through */
                 default:
-                        memset(optptr+2, 0, optlen-2);
+                        memset(optptr, 0, optlen);
                 }
                 l -= optlen;
                 optptr += optlen;
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 5b77bdaa57..5dbe5803b7 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1193,7 +1193,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
                 for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
                      ifa = ifa->ifa_next, ip_idx++) {
                         if (ip_idx < s_ip_idx)
-                                goto cont;
+                                continue;
                         if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
                                              cb->nlh->nlmsg_seq,
                                              RTM_NEWADDR, NLM_F_MULTI) <= 0)
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index dbeacd8b0f..def007ec1d 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -836,12 +836,16 @@ static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
         return inet_diag_get_exact(skb, nlh);
 }
 
+static DEFINE_MUTEX(inet_diag_mutex);
+
 static void inet_diag_rcv(struct sock *sk, int len)
 {
         unsigned int qlen = 0;
 
         do {
+                mutex_lock(&inet_diag_mutex);
                 netlink_run_queue(sk, &qlen, &inet_diag_rcv_msg);
+                mutex_unlock(&inet_diag_mutex);
         } while (qlen);
 }
 
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 4d544573f4..6b420aedcd 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -625,6 +625,10 @@ static int do_ip_setsockopt(struct sock *sk, int level,
         {
                 struct ip_mreqn mreq;
 
+                err = -EPROTO;
+                if (inet_sk(sk)->is_icsk)
+                        break;
+
                 if (optlen < sizeof(struct ip_mreq))
                         goto e_inval;
                 err = -EFAULT;
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
index 902fd578aa..f656d41d8d 100644
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
@@ -2339,6 +2339,7 @@ static struct nf_sockopt_ops ip_vs_sockopts = {
         .get_optmin     = IP_VS_BASE_CTL,
         .get_optmax     = IP_VS_SO_GET_MAX+1,
         .get            = do_ip_vs_get_ctl,
+        .owner          = THIS_MODULE,
 };
 
 
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index d1149aba93..29114a9ccd 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -1161,6 +1161,7 @@ static struct nf_sockopt_ops arpt_sockopts = {
         .get_optmin     = ARPT_BASE_CTL,
         .get_optmax     = ARPT_SO_GET_MAX+1,
         .get            = do_arpt_get_ctl,
+        .owner          = THIS_MODULE,
 };
 
 static int __init arp_tables_init(void)
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index e1b402c6b8..6486894f45 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -2296,6 +2296,7 @@ static struct nf_sockopt_ops ipt_sockopts = {
 #ifdef CONFIG_COMPAT
         .compat_get     = compat_do_ipt_get_ctl,
 #endif
+        .owner          = THIS_MODULE,
 };
 
 static struct xt_match icmp_matchstruct __read_mostly = {
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index d9b5177989..f813e02aab 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -87,14 +87,10 @@ static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
         if (iph == NULL)
                 return -NF_DROP;
 
-        /* Never happen */
-        if (iph->frag_off & htons(IP_OFFSET)) {
-                if (net_ratelimit()) {
-                        printk(KERN_ERR "ipv4_get_l4proto: Frag of proto %u\n",
-                        iph->protocol);
-                }
+        /* Conntrack defragments packets, we might still see fragments
+         * inside ICMP packets though. */
+        if (iph->frag_off & htons(IP_OFFSET))
                 return -NF_DROP;
-        }
 
         *dataoff = nhoff + (iph->ihl << 2);
         *protonum = iph->protocol;
@@ -403,6 +399,7 @@ static struct nf_sockopt_ops so_getorigdst = {
         .get_optmin     = SO_ORIGINAL_DST,
         .get_optmax     = SO_ORIGINAL_DST+1,
         .get            = &getorigdst,
+        .owner          = THIS_MODULE,
 };
 
 struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index f030435e0e..f893e90061 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -555,6 +555,16 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb)
                 tcp_grow_window(sk, skb);
 }
 
+static u32 tcp_rto_min(struct sock *sk)
+{
+        struct dst_entry *dst = __sk_dst_get(sk);
+        u32 rto_min = TCP_RTO_MIN;
+
+        if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
+                rto_min = dst->metrics[RTAX_RTO_MIN-1];
+        return rto_min;
+}
+
 /* Called to compute a smoothed rtt estimate. The data fed to this
  * routine either comes from timestamps, or from segments that were
  * known _not_ to have been retransmitted [see Karn/Partridge
@@ -616,13 +626,13 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt)
                         if (tp->mdev_max < tp->rttvar)
                                 tp->rttvar -= (tp->rttvar-tp->mdev_max)>>2;
                         tp->rtt_seq = tp->snd_nxt;
-                        tp->mdev_max = TCP_RTO_MIN;
+                        tp->mdev_max = tcp_rto_min(sk);
                 }
         } else {
                 /* no previous measure. */
                 tp->srtt = m<<3;        /* take the measured time to be rtt */
                 tp->mdev = m<<1;        /* make sure rto = 3*rtt */
-                tp->mdev_max = tp->rttvar = max(tp->mdev, TCP_RTO_MIN);
+                tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk));
                 tp->rtt_seq = tp->snd_nxt;
         }
 }
@@ -755,7 +765,15 @@ void tcp_update_metrics(struct sock *sk)
         }
 }
 
-/* Numbers are taken from RFC2414.  */
+/* Numbers are taken from RFC3390.
+ *
+ * John Heffner states:
+ *
+ *      The RFC specifies a window of no more than 4380 bytes
+ *      unless 2*MSS > 4380.  Reading the pseudocode in the RFC
+ *      is a bit misleading because they use a clamp at 4380 bytes
+ *      rather than use a multiplier in the relevant range.
+ */
 __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst)
 {
         __u32 cwnd = (dst ? dst_metric(dst, RTAX_INITCWND) : 0);
@@ -2402,6 +2420,9 @@ static int tcp_tso_acked(struct sock *sk, struct sk_buff *skb,
                         __u32 dval = min(tp->fackets_out, packets_acked);
                         tp->fackets_out -= dval;
                 }
+                /* hint's skb might be NULL but we don't need to care */
+                tp->fastpath_cnt_hint -= min_t(u32, packets_acked,
+                                               tp->fastpath_cnt_hint);
                 tp->packets_out -= packets_acked;
 
                 BUG_ON(tcp_skb_pcount(skb) == 0);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 9c94627c8c..e089a978e1 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -833,8 +833,7 @@ static struct tcp_md5sig_key *
                 return NULL;
         for (i = 0; i < tp->md5sig_info->entries4; i++) {
                 if (tp->md5sig_info->keys4[i].addr == addr)
-                        return (struct tcp_md5sig_key *)
-                                                &tp->md5sig_info->keys4[i];
+                        return &tp->md5sig_info->keys4[i].base;
         }
         return NULL;
 }
@@ -865,9 +864,9 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr,
         key = (struct tcp4_md5sig_key *)tcp_v4_md5_do_lookup(sk, addr);
         if (key) {
                 /* Pre-existing entry - just update that one. */
-                kfree(key->key);
-                key->key = newkey;
-                key->keylen = newkeylen;
+                kfree(key->base.key);
+                key->base.key = newkey;
+                key->base.keylen = newkeylen;
         } else {
                 struct tcp_md5sig_info *md5sig;
 
@@ -906,9 +905,9 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr,
                         md5sig->alloced4++;
                 }
                 md5sig->entries4++;
-                md5sig->keys4[md5sig->entries4 - 1].addr   = addr;
-                md5sig->keys4[md5sig->entries4 - 1].key    = newkey;
-                md5sig->keys4[md5sig->entries4 - 1].keylen = newkeylen;
+                md5sig->keys4[md5sig->entries4 - 1].addr        = addr;
+                md5sig->keys4[md5sig->entries4 - 1].base.key    = newkey;
+                md5sig->keys4[md5sig->entries4 - 1].base.keylen = newkeylen;
         }
         return 0;
 }
@@ -930,7 +929,7 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)
         for (i = 0; i < tp->md5sig_info->entries4; i++) {
                 if (tp->md5sig_info->keys4[i].addr == addr) {
                         /* Free the key */
-                        kfree(tp->md5sig_info->keys4[i].key);
+                        kfree(tp->md5sig_info->keys4[i].base.key);
                         tp->md5sig_info->entries4--;
 
                         if (tp->md5sig_info->entries4 == 0) {
@@ -964,7 +963,7 @@ static void tcp_v4_clear_md5_list(struct sock *sk)
         if (tp->md5sig_info->entries4) {
                 int i;
                 for (i = 0; i < tp->md5sig_info->entries4; i++)
-                        kfree(tp->md5sig_info->keys4[i].key);
+                        kfree(tp->md5sig_info->keys4[i].base.key);
                 tp->md5sig_info->entries4 = 0;
                 tcp_free_md5sig_pool();
         }
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 28355350fb..69d4bd10f9 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -505,6 +505,8 @@ send:
 out:
         up->len = 0;
         up->pending = 0;
+        if (!err)
+                UDP_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, up->pcflag);
         return err;
 }
 
@@ -693,10 +695,8 @@ out:
         ip_rt_put(rt);
         if (free)
                 kfree(ipc.opt);
-        if (!err) {
-                UDP_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, is_udplite);
+        if (!err)
                 return len;
-        }
         /*
          * ENOBUFS = no kernel mem, SOCK_NOSPACE = no sndbuf space.  Reporting
          * ENOBUFS might not be good (it's not tunable per se), but otherwise
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 91ef3be5ab..45b4c82148 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1021,7 +1021,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
                                 hiscore.rule++;
                         }
                         if (ipv6_saddr_preferred(score.addr_type) ||
-                           (((ifa_result->flags &
+                           (((ifa->flags &
                             (IFA_F_DEPRECATED|IFA_F_OPTIMISTIC)) == 0))) {
                                 score.attrs |= IPV6_SADDR_SCORE_PREFERRED;
                                 if (!(hiscore.attrs & IPV6_SADDR_SCORE_PREFERRED)) {
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 5dead399fe..26de3c0ea3 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1427,8 +1427,9 @@ void ip6_flush_pending_frames(struct sock *sk)
         struct sk_buff *skb;
 
         while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL) {
-                IP6_INC_STATS(ip6_dst_idev(skb->dst),
-                              IPSTATS_MIB_OUTDISCARDS);
+                if (skb->dst)
+                        IP6_INC_STATS(ip6_dst_idev(skb->dst),
+                                      IPSTATS_MIB_OUTDISCARDS);
                 kfree_skb(skb);
         }
 
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 761a910f4f..6b038aa72e 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -554,6 +554,10 @@ done:
         {
                 struct ipv6_mreq mreq;
 
+                retv = -EPROTO;
+                if (inet_sk(sk)->is_icsk)
+                        break;
+
                 retv = -EFAULT;
                 if (copy_from_user(&mreq, optval, sizeof(struct ipv6_mreq)))
                         break;
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 0358e6066a..5b59665917 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -736,7 +736,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
                                  * so fail our DAD process
                                  */
                                 addrconf_dad_failure(ifp);
-                                goto out;
+                                return;
                         } else {
                                 /*
                                  * This is not a dad solicitation.
@@ -1268,9 +1268,10 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
 
         if (ipv6_addr_equal(dest, target)) {
                 on_link = 1;
-        } else if (!(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) {
+        } else if (ipv6_addr_type(target) !=
+                   (IPV6_ADDR_UNICAST|IPV6_ADDR_LINKLOCAL)) {
                 ND_PRINTK2(KERN_WARNING
-                           "ICMPv6 Redirect: target address is not link-local.\n");
+                           "ICMPv6 Redirect: target address is not link-local unicast.\n");
                 return;
         }
 
@@ -1344,9 +1345,9 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
         }
 
         if (!ipv6_addr_equal(&ipv6_hdr(skb)->daddr, target) &&
-            !(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) {
+            ipv6_addr_type(target) != (IPV6_ADDR_UNICAST|IPV6_ADDR_LINKLOCAL)) {
                 ND_PRINTK2(KERN_WARNING
-                        "ICMPv6 Redirect: target address is not link-local.\n");
+                        "ICMPv6 Redirect: target address is not link-local unicast.\n");
                 return;
         }
 
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index aeda617246..cd9df02bb8 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1462,6 +1462,7 @@ static struct nf_sockopt_ops ip6t_sockopts = {
         .get_optmin     = IP6T_BASE_CTL,
         .get_optmax     = IP6T_SO_GET_MAX+1,
         .get            = do_ip6t_get_ctl,
+        .owner          = THIS_MODULE,
 };
 
 static struct xt_match icmp6_matchstruct __read_mostly = {
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index e27383d855..77167afa34 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -882,11 +882,10 @@ back_from_confirm:
                         ip6_flush_pending_frames(sk);
                 else if (!(msg->msg_flags & MSG_MORE))
                         err = rawv6_push_pending_frames(sk, &fl, rp);
+                release_sock(sk);
         }
 done:
         dst_release(dst);
-        if (!inet->hdrincl)
-                release_sock(sk);
 out:
         fl6_sock_release(flowlabel);
         return err<0?err:len;
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 0f7defb482..3e06799b37 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -539,7 +539,7 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
 
         for (i = 0; i < tp->md5sig_info->entries6; i++) {
                 if (ipv6_addr_cmp(&tp->md5sig_info->keys6[i].addr, addr) == 0)
-                        return (struct tcp_md5sig_key *)&tp->md5sig_info->keys6[i];
+                        return &tp->md5sig_info->keys6[i].base;
         }
         return NULL;
 }
@@ -567,9 +567,9 @@ static int tcp_v6_md5_do_add(struct sock *sk, struct in6_addr *peer,
         key = (struct tcp6_md5sig_key*) tcp_v6_md5_do_lookup(sk, peer);
         if (key) {
                 /* modify existing entry - just update that one */
-                kfree(key->key);
-                key->key = newkey;
-                key->keylen = newkeylen;
+                kfree(key->base.key);
+                key->base.key = newkey;
+                key->base.keylen = newkeylen;
         } else {
                 /* reallocate new list if current one is full. */
                 if (!tp->md5sig_info) {
@@ -603,8 +603,8 @@ static int tcp_v6_md5_do_add(struct sock *sk, struct in6_addr *peer,
 
                 ipv6_addr_copy(&tp->md5sig_info->keys6[tp->md5sig_info->entries6].addr,
                                peer);
-                tp->md5sig_info->keys6[tp->md5sig_info->entries6].key = newkey;
-                tp->md5sig_info->keys6[tp->md5sig_info->entries6].keylen = newkeylen;
+                tp->md5sig_info->keys6[tp->md5sig_info->entries6].base.key = newkey;
+                tp->md5sig_info->keys6[tp->md5sig_info->entries6].base.keylen = newkeylen;
 
                 tp->md5sig_info->entries6++;
         }
@@ -626,7 +626,7 @@ static int tcp_v6_md5_do_del(struct sock *sk, struct in6_addr *peer)
         for (i = 0; i < tp->md5sig_info->entries6; i++) {
                 if (ipv6_addr_cmp(&tp->md5sig_info->keys6[i].addr, peer) == 0) {
                         /* Free the key */
-                        kfree(tp->md5sig_info->keys6[i].key);
+                        kfree(tp->md5sig_info->keys6[i].base.key);
                         tp->md5sig_info->entries6--;
 
                         if (tp->md5sig_info->entries6 == 0) {
@@ -657,7 +657,7 @@ static void tcp_v6_clear_md5_list (struct sock *sk)
 
         if (tp->md5sig_info->entries6) {
                 for (i = 0; i < tp->md5sig_info->entries6; i++)
-                        kfree(tp->md5sig_info->keys6[i].key);
+                        kfree(tp->md5sig_info->keys6[i].base.key);
                 tp->md5sig_info->entries6 = 0;
                 tcp_free_md5sig_pool();
         }
@@ -668,7 +668,7 @@ static void tcp_v6_clear_md5_list (struct sock *sk)
 
         if (tp->md5sig_info->entries4) {
                 for (i = 0; i < tp->md5sig_info->entries4; i++)
-                        kfree(tp->md5sig_info->keys4[i].key);
+                        kfree(tp->md5sig_info->keys4[i].base.key);
                 tp->md5sig_info->entries4 = 0;
                 tcp_free_md5sig_pool();
         }
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 4210951edb..c347f3e30e 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -555,6 +555,8 @@ static int udp_v6_push_pending_frames(struct sock *sk)
 out:
         up->len = 0;
         up->pending = 0;
+        if (!err)
+                UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, up->pcflag);
         return err;
 }
 
@@ -823,10 +825,8 @@ do_append_data:
         release_sock(sk);
 out:
         fl6_sock_release(flowlabel);
-        if (!err) {
-                UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, is_udplite);
+        if (!err)
                 return len;
-        }
         /*
          * ENOBUFS = no kernel mem, SOCK_NOSPACE = no sndbuf space.  Reporting
          * ENOBUFS might not be good (it's not tunable per se), but otherwise
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 7286c389a4..ff2172ffd8 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -5259,7 +5259,7 @@ static void __exit ieee80211_exit(void)
 }
 
 
-module_init(ieee80211_init);
+subsys_initcall(ieee80211_init);
 module_exit(ieee80211_exit);
 
 MODULE_DESCRIPTION("IEEE 802.11 subsystem");
diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index f6780d63b3..17b9f46bbf 100644
--- a/net/mac80211/rc80211_simple.c
+++ b/net/mac80211/rc80211_simple.c
@@ -431,7 +431,7 @@ static void __exit rate_control_simple_exit(void)
 }
 
 
-module_init(rate_control_simple_init);
+subsys_initcall(rate_control_simple_init);
 module_exit(rate_control_simple_exit);
 
 MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 89ce815296..7ab82b376e 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc *qd, struct rtattr *opt)
                 skb_queue_head_init(&q->requeued[i]);
                 q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
                                                  qd->handle);
-                if (q->queues[i] == 0) {
+                if (!q->queues[i]) {
                         q->queues[i] = &noop_qdisc;
                         printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
                 }
diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
index 8b8ece7503..e32761ce26 100644
--- a/net/netfilter/nf_sockopt.c
+++ b/net/netfilter/nf_sockopt.c
@@ -55,18 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
 
 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
 {
-        /* No point being interruptible: we're probably in cleanup_module() */
- restart:
         mutex_lock(&nf_sockopt_mutex);
-        if (reg->use != 0) {
-                /* To be woken by nf_sockopt call... */
-                /* FIXME: Stuart Young's name appears gratuitously. */
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                reg->cleanup_task = current;
-                mutex_unlock(&nf_sockopt_mutex);
-                schedule();
-                goto restart;
-        }
         list_del(&reg->list);
         mutex_unlock(&nf_sockopt_mutex);
 }
@@ -86,10 +75,11 @@ static int nf_sockopt(struct sock *sk, int pf, int val,
         list_for_each(i, &nf_sockopts) {
                 ops = (struct nf_sockopt_ops *)i;
                 if (ops->pf == pf) {
+                        if (!try_module_get(ops->owner))
+                                goto out_nosup;
                         if (get) {
                                 if (val >= ops->get_optmin
                                     && val < ops->get_optmax) {
-                                        ops->use++;
                                         mutex_unlock(&nf_sockopt_mutex);
                                         ret = ops->get(sk, val, opt, len);
                                         goto out;
@@ -97,23 +87,20 @@ static int nf_sockopt(struct sock *sk, int pf, int val,
                         } else {
                                 if (val >= ops->set_optmin
                                     && val < ops->set_optmax) {
-                                        ops->use++;
                                         mutex_unlock(&nf_sockopt_mutex);
                                         ret = ops->set(sk, val, opt, *len);
                                         goto out;
                                 }
                         }
+                        module_put(ops->owner);
                 }
         }
+ out_nosup:
         mutex_unlock(&nf_sockopt_mutex);
         return -ENOPROTOOPT;
 
  out:
-        mutex_lock(&nf_sockopt_mutex);
-        ops->use--;
-        if (ops->cleanup_task)
-                wake_up_process(ops->cleanup_task);
-        mutex_unlock(&nf_sockopt_mutex);
+        module_put(ops->owner);
         return ret;
 }
 
@@ -144,10 +131,12 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val,
         list_for_each(i, &nf_sockopts) {
                 ops = (struct nf_sockopt_ops *)i;
                 if (ops->pf == pf) {
+                        if (!try_module_get(ops->owner))
+                                goto out_nosup;
+
                         if (get) {
                                 if (val >= ops->get_optmin
                                     && val < ops->get_optmax) {
-                                        ops->use++;
                                         mutex_unlock(&nf_sockopt_mutex);
                                         if (ops->compat_get)
                                                 ret = ops->compat_get(sk,
@@ -160,7 +149,6 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val,
                         } else {
                                 if (val >= ops->set_optmin
                                     && val < ops->set_optmax) {
-                                        ops->use++;
                                         mutex_unlock(&nf_sockopt_mutex);
                                         if (ops->compat_set)
                                                 ret = ops->compat_set(sk,
@@ -171,17 +159,15 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val,
                                         goto out;
                                 }
                         }
+                        module_put(ops->owner);
                 }
         }
+ out_nosup:
         mutex_unlock(&nf_sockopt_mutex);
         return -ENOPROTOOPT;
 
  out:
-        mutex_lock(&nf_sockopt_mutex);
-        ops->use--;
-        if (ops->cleanup_task)
-                wake_up_process(ops->cleanup_task);
-        mutex_unlock(&nf_sockopt_mutex);
+        module_put(ops->owner);
         return ret;
 }
 
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index e185a5b559..2351533a85 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -58,7 +58,6 @@ struct nfulnl_instance {
 
         unsigned int qlen;              /* number of nlmsgs in skb */
         struct sk_buff *skb;            /* pre-allocatd skb */
-        struct nlmsghdr *lastnlh;       /* netlink header of last msg in skb */
         struct timer_list timer;
         int peer_pid;                   /* PID of the peer process */
 
@@ -345,10 +344,12 @@ static struct sk_buff *nfulnl_alloc_skb(unsigned int inst_size,
 static int
 __nfulnl_send(struct nfulnl_instance *inst)
 {
-        int status;
+        int status = -1;
 
         if (inst->qlen > 1)
-                inst->lastnlh->nlmsg_type = NLMSG_DONE;
+                NLMSG_PUT(inst->skb, 0, 0,
+                          NLMSG_DONE,
+                          sizeof(struct nfgenmsg));
 
         status = nfnetlink_unicast(inst->skb, inst->peer_pid, MSG_DONTWAIT);
         if (status < 0) {
@@ -358,8 +359,8 @@ __nfulnl_send(struct nfulnl_instance *inst)
 
         inst->qlen = 0;
         inst->skb = NULL;
-        inst->lastnlh = NULL;
 
+nlmsg_failure:
         return status;
 }
 
@@ -538,7 +539,6 @@ __build_packet_message(struct nfulnl_instance *inst,
         }
 
         nlh->nlmsg_len = inst->skb->tail - old_tail;
-        inst->lastnlh = nlh;
         return 0;
 
 nlmsg_failure:
@@ -644,7 +644,8 @@ nfulnl_log_packet(unsigned int pf,
         }
 
         if (inst->qlen >= qthreshold ||
-            (inst->skb && size > skb_tailroom(inst->skb))) {
+            (inst->skb && size >
+             skb_tailroom(inst->skb) - sizeof(struct nfgenmsg))) {
                 /* either the queue len is too high or we don't have
                  * enough room in the skb left. flush to userspace. */
                 UDEBUG("flushing old skb\n");
diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c
index ab7d845224..223f9bded6 100644
--- a/net/netfilter/xt_tcpudp.c
+++ b/net/netfilter/xt_tcpudp.c
@@ -188,7 +188,7 @@ udp_checkentry(const char *tablename,
                void *matchinfo,
                unsigned int hook_mask)
 {
-        const struct xt_tcp *udpinfo = matchinfo;
+        const struct xt_udp *udpinfo = matchinfo;
 
         /* Must specify no unknown invflags */
         return !(udpinfo->invflags & ~XT_UDP_INV_MASK);
diff --git a/net/rose/rose_loopback.c b/net/rose/rose_loopback.c
index cd01642f04..114df6eec8 100644
--- a/net/rose/rose_loopback.c
+++ b/net/rose/rose_loopback.c
@@ -79,7 +79,7 @@ static void rose_loopback_timer(unsigned long param)
 
                 skb_reset_transport_header(skb);
 
-                sk = rose_find_socket(lci_o, &rose_loopback_neigh);
+                sk = rose_find_socket(lci_o, rose_loopback_neigh);
                 if (sk) {
                         if (rose_process_rx_frame(sk, skb) == 0)
                                 kfree_skb(skb);
@@ -88,7 +88,7 @@ static void rose_loopback_timer(unsigned long param)
 
                 if (frametype == ROSE_CALL_REQUEST) {
                         if ((dev = rose_dev_get(dest)) != NULL) {
-                                if (rose_rx_call_request(skb, dev, &rose_loopback_neigh, lci_o) == 0)
+                                if (rose_rx_call_request(skb, dev, rose_loopback_neigh, lci_o) == 0)
                                         kfree_skb(skb);
                         } else {
                                 kfree_skb(skb);
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index bbcbad1da0..96f61a71b2 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -45,7 +45,7 @@ static DEFINE_SPINLOCK(rose_neigh_list_lock);
 static struct rose_route *rose_route_list;
 static DEFINE_SPINLOCK(rose_route_list_lock);
 
-struct rose_neigh rose_loopback_neigh;
+struct rose_neigh *rose_loopback_neigh;
 
 /*
  *      Add a new route to a node, and in the process add the node and the
@@ -362,7 +362,12 @@ out:
  */
 void rose_add_loopback_neigh(void)
 {
-        struct rose_neigh *sn = &rose_loopback_neigh;
+        struct rose_neigh *sn;
+
+        rose_loopback_neigh = kmalloc(sizeof(struct rose_neigh), GFP_KERNEL);
+        if (!rose_loopback_neigh)
+                return;
+        sn = rose_loopback_neigh;
 
         sn->callsign  = null_ax25_address;
         sn->digipeat  = NULL;
@@ -417,13 +422,13 @@ int rose_add_loopback_node(rose_address *address)
         rose_node->mask         = 10;
         rose_node->count        = 1;
         rose_node->loopback     = 1;
-        rose_node->neighbour[0] = &rose_loopback_neigh;
+        rose_node->neighbour[0] = rose_loopback_neigh;
 
         /* Insert at the head of list. Address is always mask=10 */
         rose_node->next = rose_node_list;
         rose_node_list  = rose_node;
 
-        rose_loopback_neigh.count++;
+        rose_loopback_neigh->count++;
 
 out:
         spin_unlock_bh(&rose_node_list_lock);
@@ -454,7 +459,7 @@ void rose_del_loopback_node(rose_address *address)
 
         rose_remove_node(rose_node);
 
-        rose_loopback_neigh.count--;
+        rose_loopback_neigh->count--;
 
 out:
         spin_unlock_bh(&rose_node_list_lock);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index feef366cad..72cdb0fade 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -68,7 +68,7 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
         int err = 0, index = -1,i = 0, s_i = 0, n_i = 0;
         struct rtattr *r ;
 
-        read_lock(hinfo->lock);
+        read_lock_bh(hinfo->lock);
 
         s_i = cb->args[0];
 
@@ -96,7 +96,7 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
                 }
         }
 done:
-        read_unlock(hinfo->lock);
+        read_unlock_bh(hinfo->lock);
         if (n_i)
                 cb->args[0] += n_i;
         return n_i;
@@ -156,13 +156,13 @@ struct tcf_common *tcf_hash_lookup(u32 index, struct tcf_hashinfo *hinfo)
 {
         struct tcf_common *p;
 
-        read_lock(hinfo->lock);
+        read_lock_bh(hinfo->lock);
         for (p = hinfo->htab[tcf_hash(index, hinfo->hmask)]; p;
              p = p->tcfc_next) {
                 if (p->tcfc_index == index)
                         break;
         }
-        read_unlock(hinfo->lock);
+        read_unlock_bh(hinfo->lock);
 
         return p;
 }
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 6085be5784..17f6f27e28 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -56,7 +56,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c
         int err = 0, index = -1, i = 0, s_i = 0, n_i = 0;
         struct rtattr *r;
 
-        read_lock(&police_lock);
+        read_lock_bh(&police_lock);
 
         s_i = cb->args[0];
 
@@ -85,7 +85,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c
                 }
         }
 done:
-        read_unlock(&police_lock);
+        read_unlock_bh(&police_lock);
         if (n_i)
                 cb->args[0] += n_i;
         return n_i;
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 8dbe36912e..d4d5d2f271 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -502,7 +502,7 @@ static int u32_set_parms(struct tcf_proto *tp, unsigned long base,
 
 #ifdef CONFIG_NET_CLS_IND
         if (tb[TCA_U32_INDEV-1]) {
-                int err = tcf_change_indev(tp, n->indev, tb[TCA_U32_INDEV-1]);
+                err = tcf_change_indev(tp, n->indev, tb[TCA_U32_INDEV-1]);
                 if (err < 0)
                         goto errout;
         }
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index e38c2839b2..cbef3bbfc2 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -380,7 +380,7 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 {
         struct cbq_sched_data *q = qdisc_priv(sch);
         int len = skb->len;
-        int ret;
+        int uninitialized_var(ret);
         struct cbq_class *cl = cbq_classify(skb, sch, &ret);
 
 #ifdef CONFIG_NET_CLS_ACT
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 4a49db6577..abd82fc3ec 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -44,7 +44,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
         if (TC_H_MAJ(skb->priority) != sch->handle) {
                 err = tc_classify(skb, q->filter_list, &res);
 #ifdef CONFIG_NET_CLS_ACT
-                switch (tc_classify(skb, q->filter_list, &res)) {
+                switch (err) {
                 case TC_ACT_STOLEN:
                 case TC_ACT_QUEUED:
                         *qerr = NET_XMIT_SUCCESS;
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 9579573098..b542c875e1 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/ipv6.h>
 #include <linux/skbuff.h>
+#include <linux/jhash.h>
 #include <net/ip.h>
 #include <net/netlink.h>
 #include <net/pkt_sched.h>
@@ -95,7 +96,7 @@ struct sfq_sched_data
 
 /* Variables */
         struct timer_list perturb_timer;
-        int             perturbation;
+        u32             perturbation;
         sfq_index       tail;           /* Index of current slot in round */
         sfq_index       max_depth;      /* Maximal depth */
 
@@ -109,12 +110,7 @@ struct sfq_sched_data
 
 static __inline__ unsigned sfq_fold_hash(struct sfq_sched_data *q, u32 h, u32 h1)
 {
-        int pert = q->perturbation;
-
-        /* Have we any rotation primitives? If not, WHY? */
-        h ^= (h1<<pert) ^ (h1>>(0x1F - pert));
-        h ^= h>>10;
-        return h & 0x3FF;
+        return jhash_2words(h, h1, q->perturbation) & (SFQ_HASH_DIVISOR - 1);
 }
 
 static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb)
@@ -256,6 +252,13 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
                 q->ht[hash] = x = q->dep[SFQ_DEPTH].next;
                 q->hash[x] = hash;
         }
+        /* If selected queue has length q->limit, this means that
+         * all another queues are empty and that we do simple tail drop,
+         * i.e. drop _this_ packet.
+         */
+        if (q->qs[x].qlen >= q->limit)
+                return qdisc_drop(skb, sch);
+
         sch->qstats.backlog += skb->len;
         __skb_queue_tail(&q->qs[x], skb);
         sfq_inc(q, x);
@@ -270,7 +273,7 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
                         q->tail = x;
                 }
         }
-        if (++sch->q.qlen < q->limit-1) {
+        if (++sch->q.qlen <= q->limit) {
                 sch->bstats.bytes += skb->len;
                 sch->bstats.packets++;
                 return 0;
@@ -294,6 +297,19 @@ sfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
         }
         sch->qstats.backlog += skb->len;
         __skb_queue_head(&q->qs[x], skb);
+        /* If selected queue has length q->limit+1, this means that
+         * all another queues are empty and we do simple tail drop.
+         * This packet is still requeued at head of queue, tail packet
+         * is dropped.
+         */
+        if (q->qs[x].qlen > q->limit) {
+                skb = q->qs[x].prev;
+                __skb_unlink(skb, &q->qs[x]);
+                sch->qstats.drops++;
+                sch->qstats.backlog -= skb->len;
+                kfree_skb(skb);
+                return NET_XMIT_CN;
+        }
         sfq_inc(q, x);
         if (q->qs[x].qlen == 1) {               /* The flow is new */
                 if (q->tail == SFQ_DEPTH) {     /* It is the first flow */
@@ -306,7 +322,7 @@ sfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
                         q->tail = x;
                 }
         }
-        if (++sch->q.qlen < q->limit - 1) {
+        if (++sch->q.qlen <= q->limit) {
                 sch->qstats.requeues++;
                 return 0;
         }
@@ -370,12 +386,10 @@ static void sfq_perturbation(unsigned long arg)
         struct Qdisc *sch = (struct Qdisc*)arg;
         struct sfq_sched_data *q = qdisc_priv(sch);
 
-        q->perturbation = net_random()&0x1F;
+        get_random_bytes(&q->perturbation, 4);
 
-        if (q->perturb_period) {
-                q->perturb_timer.expires = jiffies + q->perturb_period;
-                add_timer(&q->perturb_timer);
-        }
+        if (q->perturb_period)
+                mod_timer(&q->perturb_timer, jiffies + q->perturb_period);
 }
 
 static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
@@ -391,17 +405,17 @@ static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
         q->quantum = ctl->quantum ? : psched_mtu(sch->dev);
         q->perturb_period = ctl->perturb_period*HZ;
         if (ctl->limit)
-                q->limit = min_t(u32, ctl->limit, SFQ_DEPTH);
+                q->limit = min_t(u32, ctl->limit, SFQ_DEPTH - 1);
 
         qlen = sch->q.qlen;
-        while (sch->q.qlen >= q->limit-1)
+        while (sch->q.qlen > q->limit)
                 sfq_drop(sch);
         qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen);
 
         del_timer(&q->perturb_timer);
         if (q->perturb_period) {
-                q->perturb_timer.expires = jiffies + q->perturb_period;
-                add_timer(&q->perturb_timer);
+                mod_timer(&q->perturb_timer, jiffies + q->perturb_period);
+                get_random_bytes(&q->perturbation, 4);
         }
         sch_tree_unlock(sch);
         return 0;
@@ -423,12 +437,13 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
                 q->dep[i+SFQ_DEPTH].next = i+SFQ_DEPTH;
                 q->dep[i+SFQ_DEPTH].prev = i+SFQ_DEPTH;
         }
-        q->limit = SFQ_DEPTH;
+        q->limit = SFQ_DEPTH - 1;
         q->max_depth = 0;
         q->tail = SFQ_DEPTH;
         if (opt == NULL) {
                 q->quantum = psched_mtu(sch->dev);
                 q->perturb_period = 0;
+                get_random_bytes(&q->perturbation, 4);
         } else {
                 int err = sfq_change(sch, opt);
                 if (err)
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 498edb0cd4..9bad8ba0fe 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -99,7 +99,6 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
 
         /* Initialize the bind addr area.  */
         sctp_bind_addr_init(&asoc->base.bind_addr, ep->base.bind_addr.port);
-        rwlock_init(&asoc->base.addr_lock);
 
         asoc->state = SCTP_STATE_CLOSED;
 
@@ -727,7 +726,12 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
                 break;
 
         case SCTP_TRANSPORT_DOWN:
-                transport->state = SCTP_INACTIVE;
+                /* if the transort was never confirmed, do not transition it
+                 * to inactive state.
+                 */
+                if (transport->state != SCTP_UNCONFIRMED)
+                        transport->state = SCTP_INACTIVE;
+
                 spc_state = SCTP_ADDR_UNREACHABLE;
                 break;
 
@@ -932,8 +936,6 @@ struct sctp_transport *sctp_assoc_is_match(struct sctp_association *asoc,
 {
         struct sctp_transport *transport;
 
-        sctp_read_lock(&asoc->base.addr_lock);
-
         if ((htons(asoc->base.bind_addr.port) == laddr->v4.sin_port) &&
             (htons(asoc->peer.port) == paddr->v4.sin_port)) {
                 transport = sctp_assoc_lookup_paddr(asoc, paddr);
@@ -947,7 +949,6 @@ struct sctp_transport *sctp_assoc_is_match(struct sctp_association *asoc,
         transport = NULL;
 
 out:
-        sctp_read_unlock(&asoc->base.addr_lock);
         return transport;
 }
 
@@ -1371,19 +1372,13 @@ int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *asoc,
 int sctp_assoc_lookup_laddr(struct sctp_association *asoc,
                             const union sctp_addr *laddr)
 {
-        int found;
+        int found = 0;
 
-        sctp_read_lock(&asoc->base.addr_lock);
         if ((asoc->base.bind_addr.port == ntohs(laddr->v4.sin_port)) &&
             sctp_bind_addr_match(&asoc->base.bind_addr, laddr,
-                                 sctp_sk(asoc->base.sk))) {
+                                 sctp_sk(asoc->base.sk)))
                 found = 1;
-                goto out;
-        }
 
-        found = 0;
-out:
-        sctp_read_unlock(&asoc->base.addr_lock);
         return found;
 }
 
diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
index fdb287a9e2..dfffa94fb9 100644
--- a/net/sctp/bind_addr.c
+++ b/net/sctp/bind_addr.c
@@ -163,9 +163,15 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,
                 addr->a.v4.sin_port = htons(bp->port);
 
         addr->use_as_src = use_as_src;
+        addr->valid = 1;
 
         INIT_LIST_HEAD(&addr->list);
-        list_add_tail(&addr->list, &bp->address_list);
+        INIT_RCU_HEAD(&addr->rcu);
+
+        /* We always hold a socket lock when calling this function,
+         * and that acts as a writer synchronizing lock.
+         */
+        list_add_tail_rcu(&addr->list, &bp->address_list);
         SCTP_DBG_OBJCNT_INC(addr);
 
         return 0;
@@ -174,23 +180,35 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,
 /* Delete an address from the bind address list in the SCTP_bind_addr
  * structure.
  */
-int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr)
+int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr,
+                        void fastcall (*rcu_call)(struct rcu_head *head,
+                                         void (*func)(struct rcu_head *head)))
 {
-        struct list_head *pos, *temp;
-        struct sctp_sockaddr_entry *addr;
+        struct sctp_sockaddr_entry *addr, *temp;
 
-        list_for_each_safe(pos, temp, &bp->address_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        /* We hold the socket lock when calling this function,
+         * and that acts as a writer synchronizing lock.
+         */
+        list_for_each_entry_safe(addr, temp, &bp->address_list, list) {
                 if (sctp_cmp_addr_exact(&addr->a, del_addr)) {
                         /* Found the exact match. */
-                        list_del(pos);
-                        kfree(addr);
-                        SCTP_DBG_OBJCNT_DEC(addr);
-
-                        return 0;
+                        addr->valid = 0;
+                        list_del_rcu(&addr->list);
+                        break;
                 }
         }
 
+        /* Call the rcu callback provided in the args.  This function is
+         * called by both BH packet processing and user side socket option
+         * processing, but it works on different lists in those 2 contexts.
+         * Each context provides it's own callback, whether call_rcu_bh()
+         * or call_rcu(), to make sure that we wait for an appropriate time.
+         */
+        if (addr && !addr->valid) {
+                rcu_call(&addr->rcu, sctp_local_addr_free);
+                SCTP_DBG_OBJCNT_DEC(addr);
+        }
+
         return -EINVAL;
 }
 
@@ -300,15 +318,20 @@ int sctp_bind_addr_match(struct sctp_bind_addr *bp,
                          struct sctp_sock *opt)
 {
         struct sctp_sockaddr_entry *laddr;
-        struct list_head *pos;
-
-        list_for_each(pos, &bp->address_list) {
-                laddr = list_entry(pos, struct sctp_sockaddr_entry, list);
-                if (opt->pf->cmp_addr(&laddr->a, addr, opt))
-                        return 1;
+        int match = 0;
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(laddr, &bp->address_list, list) {
+                if (!laddr->valid)
+                        continue;
+                if (opt->pf->cmp_addr(&laddr->a, addr, opt)) {
+                        match = 1;
+                        break;
+                }
         }
+        rcu_read_unlock();
 
-        return 0;
+        return match;
 }
 
 /* Find the first address in the bind address list that is not present in
@@ -323,18 +346,19 @@ union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr	*bp,
         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);
-
+        /* This is only called sctp_send_asconf_del_ip() and we hold
+         * the socket lock in that code patch, so that address list
+         * can't change.
+         */
+        list_for_each_entry(laddr, &bp->address_list, 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;
+                                break;
 
                         if (opt->pf->cmp_addr(&laddr->a, addr, opt))
                                 break;
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 1404a9e2e7..8f485a0d14 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -92,7 +92,6 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
 
         /* Initialize the bind addr area */
         sctp_bind_addr_init(&ep->base.bind_addr, 0);
-        rwlock_init(&ep->base.addr_lock);
 
         /* Remember who we are attached to.  */
         ep->base.sk = sk;
@@ -225,21 +224,14 @@ void sctp_endpoint_put(struct sctp_endpoint *ep)
 struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *ep,
                                                const union sctp_addr *laddr)
 {
-        struct sctp_endpoint *retval;
+        struct sctp_endpoint *retval = NULL;
 
-        sctp_read_lock(&ep->base.addr_lock);
         if (htons(ep->base.bind_addr.port) == laddr->v4.sin_port) {
                 if (sctp_bind_addr_match(&ep->base.bind_addr, laddr,
-                                         sctp_sk(ep->base.sk))) {
+                                         sctp_sk(ep->base.sk)))
                         retval = ep;
-                        goto out;
-                }
         }
 
-        retval = NULL;
-
-out:
-        sctp_read_unlock(&ep->base.addr_lock);
         return retval;
 }
 
@@ -261,9 +253,7 @@ static struct sctp_association *__sctp_endpoint_lookup_assoc(
         list_for_each(pos, &ep->asocs) {
                 asoc = list_entry(pos, struct sctp_association, asocs);
                 if (rport == asoc->peer.port) {
-                        sctp_read_lock(&asoc->base.addr_lock);
                         *transport = sctp_assoc_lookup_paddr(asoc, paddr);
-                        sctp_read_unlock(&asoc->base.addr_lock);
 
                         if (*transport)
                                 return asoc;
@@ -295,20 +285,17 @@ struct sctp_association *sctp_endpoint_lookup_assoc(
 int sctp_endpoint_is_peeled_off(struct sctp_endpoint *ep,
                                 const union sctp_addr *paddr)
 {
-        struct list_head *pos;
         struct sctp_sockaddr_entry *addr;
         struct sctp_bind_addr *bp;
 
-        sctp_read_lock(&ep->base.addr_lock);
         bp = &ep->base.bind_addr;
-        list_for_each(pos, &bp->address_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
-                if (sctp_has_association(&addr->a, paddr)) {
-                        sctp_read_unlock(&ep->base.addr_lock);
+        /* This function is called with the socket lock held,
+         * so the address_list can not change.
+         */
+        list_for_each_entry(addr, &bp->address_list, list) {
+                if (sctp_has_association(&addr->a, paddr))
                         return 1;
-                }
         }
-        sctp_read_unlock(&ep->base.addr_lock);
 
         return 0;
 }
diff --git a/net/sctp/input.c b/net/sctp/input.c
index 47e56017f4..f9a0c9276e 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -622,6 +622,14 @@ static int sctp_rcv_ootb(struct sk_buff *skb)
                 if (SCTP_CID_SHUTDOWN_COMPLETE == ch->type)
                         goto discard;
 
+                /* RFC 4460, 2.11.2
+                 * This will discard packets with INIT chunk bundled as
+                 * subsequent chunks in the packet.  When INIT is first,
+                 * the normal INIT processing will discard the chunk.
+                 */
+                if (SCTP_CID_INIT == ch->type && (void *)ch != skb->data)
+                        goto discard;
+
                 /* RFC 8.4, 7) If the packet contains a "Stale cookie" ERROR
                  * or a COOKIE ACK the SCTP Packet should be silently
                  * discarded.
diff --git a/net/sctp/inqueue.c b/net/sctp/inqueue.c
index 88aa224075..e4ea7fdf36 100644
--- a/net/sctp/inqueue.c
+++ b/net/sctp/inqueue.c
@@ -130,6 +130,14 @@ struct sctp_chunk *sctp_inq_pop(struct sctp_inq *queue)
                         /* Force chunk->skb->data to chunk->chunk_end.  */
                         skb_pull(chunk->skb,
                                  chunk->chunk_end - chunk->skb->data);
+
+                        /* Verify that we have at least chunk headers
+                         * worth of buffer left.
+                         */
+                        if (skb_headlen(chunk->skb) < sizeof(sctp_chunkhdr_t)) {
+                                sctp_chunk_free(chunk);
+                                chunk = queue->in_progress = NULL;
+                        }
                 }
         }
 
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index f8aa23dda1..670fd2740b 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -77,13 +77,18 @@
 
 #include <asm/uaccess.h>
 
-/* Event handler for inet6 address addition/deletion events.  */
+/* Event handler for inet6 address addition/deletion events.
+ * The sctp_local_addr_list needs to be protocted by a spin lock since
+ * multiple notifiers (say IPv4 and IPv6) may be running at the same
+ * time and thus corrupt the list.
+ * The reader side is protected with RCU.
+ */
 static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev,
                                 void *ptr)
 {
         struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;
-        struct sctp_sockaddr_entry *addr;
-        struct list_head *pos, *temp;
+        struct sctp_sockaddr_entry *addr = NULL;
+        struct sctp_sockaddr_entry *temp;
 
         switch (ev) {
         case NETDEV_UP:
@@ -94,19 +99,26 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev,
                         memcpy(&addr->a.v6.sin6_addr, &ifa->addr,
                                  sizeof(struct in6_addr));
                         addr->a.v6.sin6_scope_id = ifa->idev->dev->ifindex;
-                        list_add_tail(&addr->list, &sctp_local_addr_list);
+                        addr->valid = 1;
+                        spin_lock_bh(&sctp_local_addr_lock);
+                        list_add_tail_rcu(&addr->list, &sctp_local_addr_list);
+                        spin_unlock_bh(&sctp_local_addr_lock);
                 }
                 break;
         case NETDEV_DOWN:
-                list_for_each_safe(pos, temp, &sctp_local_addr_list) {
-                        addr = list_entry(pos, struct sctp_sockaddr_entry, list);
-                        if (ipv6_addr_equal(&addr->a.v6.sin6_addr, &ifa->addr)) {
-                                list_del(pos);
-                                kfree(addr);
+                spin_lock_bh(&sctp_local_addr_lock);
+                list_for_each_entry_safe(addr, temp,
+                                        &sctp_local_addr_list, list) {
+                        if (ipv6_addr_equal(&addr->a.v6.sin6_addr,
+                                             &ifa->addr)) {
+                                addr->valid = 0;
+                                list_del_rcu(&addr->list);
                                 break;
                         }
                 }
-
+                spin_unlock_bh(&sctp_local_addr_lock);
+                if (addr && !addr->valid)
+                        call_rcu(&addr->rcu, sctp_local_addr_free);
                 break;
         }
 
@@ -290,9 +302,7 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc,
                               union sctp_addr *saddr)
 {
         struct sctp_bind_addr *bp;
-        rwlock_t *addr_lock;
         struct sctp_sockaddr_entry *laddr;
-        struct list_head *pos;
         sctp_scope_t scope;
         union sctp_addr *baddr = NULL;
         __u8 matchlen = 0;
@@ -312,14 +322,14 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc,
         scope = sctp_scope(daddr);
 
         bp = &asoc->base.bind_addr;
-        addr_lock = &asoc->base.addr_lock;
 
         /* Go through the bind address list and find the best source address
          * that matches the scope of the destination address.
          */
-        sctp_read_lock(addr_lock);
-        list_for_each(pos, &bp->address_list) {
-                laddr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        rcu_read_lock();
+        list_for_each_entry_rcu(laddr, &bp->address_list, list) {
+                if (!laddr->valid)
+                        continue;
                 if ((laddr->use_as_src) &&
                     (laddr->a.sa.sa_family == AF_INET6) &&
                     (scope <= sctp_scope(&laddr->a))) {
@@ -341,7 +351,7 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc,
                        __FUNCTION__, asoc, NIP6(daddr->v6.sin6_addr));
         }
 
-        sctp_read_unlock(addr_lock);
+        rcu_read_unlock();
 }
 
 /* Make a copy of all potential local addresses. */
@@ -367,7 +377,9 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
                         addr->a.v6.sin6_port = 0;
                         addr->a.v6.sin6_addr = ifp->addr;
                         addr->a.v6.sin6_scope_id = dev->ifindex;
+                        addr->valid = 1;
                         INIT_LIST_HEAD(&addr->list);
+                        INIT_RCU_HEAD(&addr->rcu);
                         list_add_tail(&addr->list, addrlist);
                 }
         }
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 992f361084..28f4fe77ce 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -421,6 +421,13 @@ void sctp_retransmit_mark(struct sctp_outq *q,
                  */
                 if ((fast_retransmit && (chunk->fast_retransmit > 0)) ||
                    (!fast_retransmit && !chunk->tsn_gap_acked)) {
+                        /* If this chunk was sent less then 1 rto ago, do not
+                         * retransmit this chunk, but give the peer time
+                         * to acknowlege it.
+                         */
+                        if ((jiffies - chunk->sent_at) < transport->rto)
+                                continue;
+
                         /* RFC 2960 6.2.1 Processing a Received SACK
                          *
                          * C) Any time a DATA chunk is marked for
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index e98579b788..3d036cdfae 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -153,6 +153,9 @@ static void sctp_v4_copy_addrlist(struct list_head *addrlist,
                         addr->a.v4.sin_family = AF_INET;
                         addr->a.v4.sin_port = 0;
                         addr->a.v4.sin_addr.s_addr = ifa->ifa_local;
+                        addr->valid = 1;
+                        INIT_LIST_HEAD(&addr->list);
+                        INIT_RCU_HEAD(&addr->rcu);
                         list_add_tail(&addr->list, addrlist);
                 }
         }
@@ -192,16 +195,24 @@ static void sctp_free_local_addr_list(void)
         }
 }
 
+void sctp_local_addr_free(struct rcu_head *head)
+{
+        struct sctp_sockaddr_entry *e = container_of(head,
+                                struct sctp_sockaddr_entry, rcu);
+        kfree(e);
+}
+
 /* Copy the local addresses which are valid for 'scope' into 'bp'.  */
 int sctp_copy_local_addr_list(struct sctp_bind_addr *bp, sctp_scope_t scope,
                               gfp_t gfp, int copy_flags)
 {
         struct sctp_sockaddr_entry *addr;
         int error = 0;
-        struct list_head *pos, *temp;
 
-        list_for_each_safe(pos, temp, &sctp_local_addr_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        rcu_read_lock();
+        list_for_each_entry_rcu(addr, &sctp_local_addr_list, list) {
+                if (!addr->valid)
+                        continue;
                 if (sctp_in_scope(&addr->a, scope)) {
                         /* Now that the address is in scope, check to see if
                          * the address type is really supported by the local
@@ -213,7 +224,7 @@ int sctp_copy_local_addr_list(struct sctp_bind_addr *bp, sctp_scope_t scope,
                               (copy_flags & SCTP_ADDR6_ALLOWED) &&
                               (copy_flags & SCTP_ADDR6_PEERSUPP)))) {
                                 error = sctp_add_bind_addr(bp, &addr->a, 1,
-                                                           GFP_ATOMIC);
+                                                    GFP_ATOMIC);
                                 if (error)
                                         goto end_copy;
                         }
@@ -221,6 +232,7 @@ int sctp_copy_local_addr_list(struct sctp_bind_addr *bp, sctp_scope_t scope,
         }
 
 end_copy:
+        rcu_read_unlock();
         return error;
 }
 
@@ -416,9 +428,7 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,
         struct rtable *rt;
         struct flowi fl;
         struct sctp_bind_addr *bp;
-        rwlock_t *addr_lock;
         struct sctp_sockaddr_entry *laddr;
-        struct list_head *pos;
         struct dst_entry *dst = NULL;
         union sctp_addr dst_saddr;
 
@@ -447,23 +457,20 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,
                 goto out;
 
         bp = &asoc->base.bind_addr;
-        addr_lock = &asoc->base.addr_lock;
 
         if (dst) {
                 /* Walk through the bind address list and look for a bind
                  * address that matches the source address of the returned dst.
                  */
-                sctp_read_lock(addr_lock);
-                list_for_each(pos, &bp->address_list) {
-                        laddr = list_entry(pos, struct sctp_sockaddr_entry,
-                                           list);
-                        if (!laddr->use_as_src)
+                rcu_read_lock();
+                list_for_each_entry_rcu(laddr, &bp->address_list, list) {
+                        if (!laddr->valid || !laddr->use_as_src)
                                 continue;
                         sctp_v4_dst_saddr(&dst_saddr, dst, htons(bp->port));
                         if (sctp_v4_cmp_addr(&dst_saddr, &laddr->a))
                                 goto out_unlock;
                 }
-                sctp_read_unlock(addr_lock);
+                rcu_read_unlock();
 
                 /* None of the bound addresses match the source address of the
                  * dst. So release it.
@@ -475,10 +482,10 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,
         /* Walk through the bind address list and try to get a dst that
          * matches a bind address as the source address.
          */
-        sctp_read_lock(addr_lock);
-        list_for_each(pos, &bp->address_list) {
-                laddr = list_entry(pos, struct sctp_sockaddr_entry, list);
-
+        rcu_read_lock();
+        list_for_each_entry_rcu(laddr, &bp->address_list, list) {
+                if (!laddr->valid)
+                        continue;
                 if ((laddr->use_as_src) &&
                     (AF_INET == laddr->a.sa.sa_family)) {
                         fl.fl4_src = laddr->a.v4.sin_addr.s_addr;
@@ -490,7 +497,7 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,
         }
 
 out_unlock:
-        sctp_read_unlock(addr_lock);
+        rcu_read_unlock();
 out:
         if (dst)
                 SCTP_DEBUG_PRINTK("rt_dst:%u.%u.%u.%u, rt_src:%u.%u.%u.%u\n",
@@ -600,13 +607,18 @@ static void sctp_v4_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr)
         seq_printf(seq, "%d.%d.%d.%d ", NIPQUAD(addr->v4.sin_addr));
 }
 
-/* Event handler for inet address addition/deletion events.  */
+/* Event handler for inet address addition/deletion events.
+ * The sctp_local_addr_list needs to be protocted by a spin lock since
+ * multiple notifiers (say IPv4 and IPv6) may be running at the same
+ * time and thus corrupt the list.
+ * The reader side is protected with RCU.
+ */
 static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
                                void *ptr)
 {
         struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
-        struct sctp_sockaddr_entry *addr;
-        struct list_head *pos, *temp;
+        struct sctp_sockaddr_entry *addr = NULL;
+        struct sctp_sockaddr_entry *temp;
 
         switch (ev) {
         case NETDEV_UP:
@@ -615,19 +627,25 @@ static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
                         addr->a.v4.sin_family = AF_INET;
                         addr->a.v4.sin_port = 0;
                         addr->a.v4.sin_addr.s_addr = ifa->ifa_local;
-                        list_add_tail(&addr->list, &sctp_local_addr_list);
+                        addr->valid = 1;
+                        spin_lock_bh(&sctp_local_addr_lock);
+                        list_add_tail_rcu(&addr->list, &sctp_local_addr_list);
+                        spin_unlock_bh(&sctp_local_addr_lock);
                 }
                 break;
         case NETDEV_DOWN:
-                list_for_each_safe(pos, temp, &sctp_local_addr_list) {
-                        addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+                spin_lock_bh(&sctp_local_addr_lock);
+                list_for_each_entry_safe(addr, temp,
+                                        &sctp_local_addr_list, list) {
                         if (addr->a.v4.sin_addr.s_addr == ifa->ifa_local) {
-                                list_del(pos);
-                                kfree(addr);
+                                addr->valid = 0;
+                                list_del_rcu(&addr->list);
                                 break;
                         }
                 }
-
+                spin_unlock_bh(&sctp_local_addr_lock);
+                if (addr && !addr->valid)
+                        call_rcu(&addr->rcu, sctp_local_addr_free);
                 break;
         }
 
@@ -1160,6 +1178,7 @@ SCTP_STATIC __init int sctp_init(void)
 
         /* Initialize the local address list. */
         INIT_LIST_HEAD(&sctp_local_addr_list);
+        spin_lock_init(&sctp_local_addr_lock);
         sctp_get_local_addr_list();
 
         /* Register notifier for inet address additions/deletions. */
@@ -1227,6 +1246,9 @@ SCTP_STATIC __exit void sctp_exit(void)
         sctp_v6_del_protocol();
         inet_del_protocol(&sctp_protocol, IPPROTO_SCTP);
 
+        /* Unregister notifier for inet address additions/deletions. */
+        unregister_inetaddr_notifier(&sctp_inetaddr_notifier);
+
         /* Free the local address list.  */
         sctp_free_local_addr_list();
 
@@ -1240,9 +1262,6 @@ SCTP_STATIC __exit void sctp_exit(void)
         inet_unregister_protosw(&sctp_stream_protosw);
         inet_unregister_protosw(&sctp_seqpacket_protosw);
 
-        /* Unregister notifier for inet address additions/deletions. */
-        unregister_inetaddr_notifier(&sctp_inetaddr_notifier);
-
         sctp_sysctl_unregister();
         list_del(&sctp_ipv4_specific.list);
 
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 51c4d7fef1..23ae37ec87 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -110,7 +110,7 @@ static const struct sctp_paramhdr prsctp_param = {
  * abort chunk.
  */
 void  sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code,
-                      const void *payload, size_t paylen)
+                      size_t paylen)
 {
         sctp_errhdr_t err;
         __u16 len;
@@ -120,7 +120,6 @@ void  sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code,
         len = sizeof(sctp_errhdr_t) + paylen;
         err.length  = htons(len);
         chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err);
-        sctp_addto_chunk(chunk, paylen, payload);
 }
 
 /* 3.3.2 Initiation (INIT) (1)
@@ -780,8 +779,8 @@ struct sctp_chunk *sctp_make_abort_no_data(
 
         /* Put the tsn back into network byte order.  */
         payload = htonl(tsn);
-        sctp_init_cause(retval, SCTP_ERROR_NO_DATA, (const void *)&payload,
-                        sizeof(payload));
+        sctp_init_cause(retval, SCTP_ERROR_NO_DATA, sizeof(payload));
+        sctp_addto_chunk(retval, sizeof(payload), (const void *)&payload);
 
         /* RFC 2960 6.4 Multi-homed SCTP Endpoints
          *
@@ -823,7 +822,8 @@ struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc,
                         goto err_copy;
         }
 
-        sctp_init_cause(retval, SCTP_ERROR_USER_ABORT, payload, paylen);
+        sctp_init_cause(retval, SCTP_ERROR_USER_ABORT, paylen);
+        sctp_addto_chunk(retval, paylen, payload);
 
         if (paylen)
                 kfree(payload);
@@ -850,15 +850,17 @@ struct sctp_chunk *sctp_make_abort_violation(
         struct sctp_paramhdr phdr;
 
         retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t) + paylen
-                                        + sizeof(sctp_chunkhdr_t));
+                                        + sizeof(sctp_paramhdr_t));
         if (!retval)
                 goto end;
 
-        sctp_init_cause(retval, SCTP_ERROR_PROTO_VIOLATION, payload, paylen);
+        sctp_init_cause(retval, SCTP_ERROR_PROTO_VIOLATION, paylen
+                                        + sizeof(sctp_paramhdr_t));
 
         phdr.type = htons(chunk->chunk_hdr->type);
         phdr.length = chunk->chunk_hdr->length;
-        sctp_addto_chunk(retval, sizeof(sctp_paramhdr_t), &phdr);
+        sctp_addto_chunk(retval, paylen, payload);
+        sctp_addto_param(retval, sizeof(sctp_paramhdr_t), &phdr);
 
 end:
         return retval;
@@ -955,7 +957,8 @@ struct sctp_chunk *sctp_make_op_error(const struct sctp_association *asoc,
         if (!retval)
                 goto nodata;
 
-        sctp_init_cause(retval, cause_code, payload, paylen);
+        sctp_init_cause(retval, cause_code, paylen);
+        sctp_addto_chunk(retval, paylen, payload);
 
 nodata:
         return retval;
@@ -1128,7 +1131,7 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data)
         void *target;
         void *padding;
         int chunklen = ntohs(chunk->chunk_hdr->length);
-        int padlen = chunklen % 4;
+        int padlen = WORD_ROUND(chunklen) - chunklen;
 
         padding = skb_put(chunk->skb, padlen);
         target = skb_put(chunk->skb, len);
@@ -1143,6 +1146,25 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data)
         return target;
 }
 
+/* Append bytes to the end of a parameter.  Will panic if chunk is not big
+ * enough.
+ */
+void *sctp_addto_param(struct sctp_chunk *chunk, int len, const void *data)
+{
+        void *target;
+        int chunklen = ntohs(chunk->chunk_hdr->length);
+
+        target = skb_put(chunk->skb, len);
+
+        memcpy(target, data, len);
+
+        /* Adjust the chunk length field.  */
+        chunk->chunk_hdr->length = htons(chunklen + len);
+        chunk->chunk_end = skb_tail_pointer(chunk->skb);
+
+        return target;
+}
+
 /* Append bytes from user space to the end of a chunk.  Will panic if
  * chunk is not big enough.
  * Returns a kernel err value.
@@ -1174,25 +1196,36 @@ out:
  */
 void sctp_chunk_assign_ssn(struct sctp_chunk *chunk)
 {
+        struct sctp_datamsg *msg;
+        struct sctp_chunk *lchunk;
+        struct sctp_stream *stream;
         __u16 ssn;
         __u16 sid;
 
         if (chunk->has_ssn)
                 return;
 
-        /* This is the last possible instant to assign a SSN. */
-        if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) {
-                ssn = 0;
-        } else {
-                sid = ntohs(chunk->subh.data_hdr->stream);
-                if (chunk->chunk_hdr->flags & SCTP_DATA_LAST_FRAG)
-                        ssn = sctp_ssn_next(&chunk->asoc->ssnmap->out, sid);
-                else
-                        ssn = sctp_ssn_peek(&chunk->asoc->ssnmap->out, sid);
-        }
+        /* All fragments will be on the same stream */
+        sid = ntohs(chunk->subh.data_hdr->stream);
+        stream = &chunk->asoc->ssnmap->out;
+
+        /* Now assign the sequence number to the entire message.
+         * All fragments must have the same stream sequence number.
+         */
+        msg = chunk->msg;
+        list_for_each_entry(lchunk, &msg->chunks, frag_list) {
+                if (lchunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) {
+                        ssn = 0;
+                } else {
+                        if (lchunk->chunk_hdr->flags & SCTP_DATA_LAST_FRAG)
+                                ssn = sctp_ssn_next(stream, sid);
+                        else
+                                ssn = sctp_ssn_peek(stream, sid);
+                }
 
-        chunk->subh.data_hdr->ssn = htons(ssn);
-        chunk->has_ssn = 1;
+                lchunk->subh.data_hdr->ssn = htons(ssn);
+                lchunk->has_ssn = 1;
+        }
 }
 
 /* Helper function to assign a TSN if needed.  This assumes that both
@@ -1466,7 +1499,8 @@ no_hmac:
                         __be32 n = htonl(usecs);
 
                         sctp_init_cause(*errp, SCTP_ERROR_STALE_COOKIE,
-                                        &n, sizeof(n));
+                                        sizeof(n));
+                        sctp_addto_chunk(*errp, sizeof(n), &n);
                         *error = -SCTP_IERROR_STALE_COOKIE;
                 } else
                         *error = -SCTP_IERROR_NOMEM;
@@ -1497,7 +1531,7 @@ no_hmac:
         /* Also, add the destination address. */
         if (list_empty(&retval->base.bind_addr.address_list)) {
                 sctp_add_bind_addr(&retval->base.bind_addr, &chunk->dest, 1,
-                                   GFP_ATOMIC);
+                                GFP_ATOMIC);
         }
 
         retval->next_tsn = retval->c.initial_tsn;
@@ -1556,7 +1590,8 @@ static int sctp_process_missing_param(const struct sctp_association *asoc,
                 report.num_missing = htonl(1);
                 report.type = paramtype;
                 sctp_init_cause(*errp, SCTP_ERROR_MISS_PARAM,
-                                &report, sizeof(report));
+                                sizeof(report));
+                sctp_addto_chunk(*errp, sizeof(report), &report);
         }
 
         /* Stop processing this chunk. */
@@ -1574,7 +1609,7 @@ static int sctp_process_inv_mandatory(const struct sctp_association *asoc,
                 *errp = sctp_make_op_error_space(asoc, chunk, 0);
 
         if (*errp)
-                sctp_init_cause(*errp, SCTP_ERROR_INV_PARAM, NULL, 0);
+                sctp_init_cause(*errp, SCTP_ERROR_INV_PARAM, 0);
 
         /* Stop processing this chunk. */
         return 0;
@@ -1595,9 +1630,10 @@ static int sctp_process_inv_paramlength(const struct sctp_association *asoc,
                 *errp = sctp_make_op_error_space(asoc, chunk, payload_len);
 
         if (*errp) {
-                sctp_init_cause(*errp, SCTP_ERROR_PROTO_VIOLATION, error,
-                                sizeof(error));
-                sctp_addto_chunk(*errp, sizeof(sctp_paramhdr_t), param);
+                sctp_init_cause(*errp, SCTP_ERROR_PROTO_VIOLATION,
+                                sizeof(error) + sizeof(sctp_paramhdr_t));
+                sctp_addto_chunk(*errp, sizeof(error), error);
+                sctp_addto_param(*errp, sizeof(sctp_paramhdr_t), param);
         }
 
         return 0;
@@ -1618,9 +1654,10 @@ static int sctp_process_hn_param(const struct sctp_association *asoc,
         if (!*errp)
                 *errp = sctp_make_op_error_space(asoc, chunk, len);
 
-        if (*errp)
-                sctp_init_cause(*errp, SCTP_ERROR_DNS_FAILED,
-                                param.v, len);
+        if (*errp) {
+                sctp_init_cause(*errp, SCTP_ERROR_DNS_FAILED, len);
+                sctp_addto_chunk(*errp, len, param.v);
+        }
 
         /* Stop processing this chunk. */
         return 0;
@@ -1672,10 +1709,13 @@ static int sctp_process_unk_param(const struct sctp_association *asoc,
                         *errp = sctp_make_op_error_space(asoc, chunk,
                                         ntohs(chunk->chunk_hdr->length));
 
-                if (*errp)
+                if (*errp) {
                         sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM,
-                                        param.v,
                                         WORD_ROUND(ntohs(param.p->length)));
+                        sctp_addto_chunk(*errp,
+                                        WORD_ROUND(ntohs(param.p->length)),
+                                        param.v);
+                }
 
                 break;
         case SCTP_PARAM_ACTION_SKIP:
@@ -1690,8 +1730,10 @@ static int sctp_process_unk_param(const struct sctp_association *asoc,
 
                 if (*errp) {
                         sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM,
-                                        param.v,
                                         WORD_ROUND(ntohs(param.p->length)));
+                        sctp_addto_chunk(*errp,
+                                        WORD_ROUND(ntohs(param.p->length)),
+                                        param.v);
                 } else {
                         /* If there is no memory for generating the ERROR
                          * report as specified, an ABORT will be triggered
@@ -1791,7 +1833,7 @@ int sctp_verify_init(const struct sctp_association *asoc,
          * VIOLATION error.  We build the ERROR chunk here and let the normal
          * error handling code build and send the packet.
          */
-        if (param.v < (void*)chunk->chunk_end - sizeof(sctp_paramhdr_t)) {
+        if (param.v != (void*)chunk->chunk_end) {
                 sctp_process_inv_paramlength(asoc, param.p, chunk, errp);
                 return 0;
         }
@@ -2457,6 +2499,52 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
         return SCTP_ERROR_NO_ERROR;
 }
 
+/* Verify the ASCONF packet before we process it.  */
+int sctp_verify_asconf(const struct sctp_association *asoc,
+                       struct sctp_paramhdr *param_hdr, void *chunk_end,
+                       struct sctp_paramhdr **errp) {
+        sctp_addip_param_t *asconf_param;
+        union sctp_params param;
+        int length, plen;
+
+        param.v = (sctp_paramhdr_t *) param_hdr;
+        while (param.v <= chunk_end - sizeof(sctp_paramhdr_t)) {
+                length = ntohs(param.p->length);
+                *errp = param.p;
+
+                if (param.v > chunk_end - length ||
+                    length < sizeof(sctp_paramhdr_t))
+                        return 0;
+
+                switch (param.p->type) {
+                case SCTP_PARAM_ADD_IP:
+                case SCTP_PARAM_DEL_IP:
+                case SCTP_PARAM_SET_PRIMARY:
+                        asconf_param = (sctp_addip_param_t *)param.v;
+                        plen = ntohs(asconf_param->param_hdr.length);
+                        if (plen < sizeof(sctp_addip_param_t) +
+                            sizeof(sctp_paramhdr_t))
+                                return 0;
+                        break;
+                case SCTP_PARAM_SUCCESS_REPORT:
+                case SCTP_PARAM_ADAPTATION_LAYER_IND:
+                        if (length != sizeof(sctp_addip_param_t))
+                                return 0;
+
+                        break;
+                default:
+                        break;
+                }
+
+                param.v += WORD_ROUND(length);
+        }
+
+        if (param.v != chunk_end)
+                return 0;
+
+        return 1;
+}
+
 /* Process an incoming ASCONF chunk with the next expected serial no. and
  * return an ASCONF_ACK chunk to be sent in response.
  */
@@ -2571,22 +2659,16 @@ static int sctp_asconf_param_success(struct sctp_association *asoc,
 
         switch (asconf_param->param_hdr.type) {
         case SCTP_PARAM_ADD_IP:
-                sctp_local_bh_disable();
-                sctp_write_lock(&asoc->base.addr_lock);
-                list_for_each(pos, &bp->address_list) {
-                        saddr = list_entry(pos, struct sctp_sockaddr_entry, list);
+                /* This is always done in BH context with a socket lock
+                 * held, so the list can not change.
+                 */
+                list_for_each_entry(saddr, &bp->address_list, list) {
                         if (sctp_cmp_addr_exact(&saddr->a, &addr))
                                 saddr->use_as_src = 1;
                 }
-                sctp_write_unlock(&asoc->base.addr_lock);
-                sctp_local_bh_enable();
                 break;
         case SCTP_PARAM_DEL_IP:
-                sctp_local_bh_disable();
-                sctp_write_lock(&asoc->base.addr_lock);
-                retval = sctp_del_bind_addr(bp, &addr);
-                sctp_write_unlock(&asoc->base.addr_lock);
-                sctp_local_bh_enable();
+                retval = sctp_del_bind_addr(bp, &addr, call_rcu_bh);
                 list_for_each(pos, &asoc->peer.transport_addr_list) {
                         transport = list_entry(pos, struct sctp_transport,
                                                  transports);
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index d9fad4f6ff..8d78900834 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -1013,8 +1013,9 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
                 break;
 
         case SCTP_DISPOSITION_VIOLATION:
-                printk(KERN_ERR "sctp protocol violation state %d "
-                       "chunkid %d\n", state, subtype.chunk);
+                if (net_ratelimit())
+                        printk(KERN_ERR "sctp protocol violation state %d "
+                               "chunkid %d\n", state, subtype.chunk);
                 break;
 
         case SCTP_DISPOSITION_NOT_IMPL:
@@ -1130,6 +1131,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
                         /* Move the Cumulattive TSN Ack ahead. */
                         sctp_tsnmap_skip(&asoc->peer.tsn_map, cmd->obj.u32);
 
+                        /* purge the fragmentation queue */
+                        sctp_ulpq_reasm_flushtsn(&asoc->ulpq, cmd->obj.u32);
+
                         /* Abort any in progress partial delivery. */
                         sctp_ulpq_abort_pd(&asoc->ulpq, GFP_ATOMIC);
                         break;
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 71cad56dd7..a583d67cab 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -90,6 +90,11 @@ static sctp_disposition_t sctp_sf_shut_8_4_5(const struct sctp_endpoint *ep,
                                              const sctp_subtype_t type,
                                              void *arg,
                                              sctp_cmd_seq_t *commands);
+static sctp_disposition_t sctp_sf_tabort_8_4_8(const struct sctp_endpoint *ep,
+                                        const struct sctp_association *asoc,
+                                        const sctp_subtype_t type,
+                                        void *arg,
+                                        sctp_cmd_seq_t *commands);
 static struct sctp_sackhdr *sctp_sm_pull_sack(struct sctp_chunk *chunk);
 
 static sctp_disposition_t sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands,
@@ -98,6 +103,7 @@ static sctp_disposition_t sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands,
                                            struct sctp_transport *transport);
 
 static sctp_disposition_t sctp_sf_abort_violation(
+                                     const struct sctp_endpoint *ep,
                                      const struct sctp_association *asoc,
                                      void *arg,
                                      sctp_cmd_seq_t *commands,
@@ -111,6 +117,13 @@ static sctp_disposition_t sctp_sf_violation_chunklen(
                                      void *arg,
                                      sctp_cmd_seq_t *commands);
 
+static sctp_disposition_t sctp_sf_violation_paramlen(
+                                     const struct sctp_endpoint *ep,
+                                     const struct sctp_association *asoc,
+                                     const sctp_subtype_t type,
+                                     void *arg,
+                                     sctp_cmd_seq_t *commands);
+
 static sctp_disposition_t sctp_sf_violation_ctsn(
                                      const struct sctp_endpoint *ep,
                                      const struct sctp_association *asoc,
@@ -118,6 +131,13 @@ static sctp_disposition_t sctp_sf_violation_ctsn(
                                      void *arg,
                                      sctp_cmd_seq_t *commands);
 
+static sctp_disposition_t sctp_sf_violation_chunk(
+                                     const struct sctp_endpoint *ep,
+                                     const struct sctp_association *asoc,
+                                     const sctp_subtype_t type,
+                                     void *arg,
+                                     sctp_cmd_seq_t *commands);
+
 /* Small helper function that checks if the chunk length
  * is of the appropriate length.  The 'required_length' argument
  * is set to be the size of a specific chunk we are testing.
@@ -181,16 +201,21 @@ sctp_disposition_t sctp_sf_do_4_C(const struct sctp_endpoint *ep,
         struct sctp_chunk *chunk = arg;
         struct sctp_ulpevent *ev;
 
+        if (!sctp_vtag_verify_either(chunk, asoc))
+                return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
+
         /* RFC 2960 6.10 Bundling
          *
          * An endpoint MUST NOT bundle INIT, INIT ACK or
          * SHUTDOWN COMPLETE with any other chunks.
          */
         if (!chunk->singleton)
-                return SCTP_DISPOSITION_VIOLATION;
+                return sctp_sf_violation_chunk(ep, asoc, type, arg, commands);
 
-        if (!sctp_vtag_verify_either(chunk, asoc))
-                return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
+        /* Make sure that the SHUTDOWN_COMPLETE chunk has a valid length. */
+        if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
+                return sctp_sf_violation_chunklen(ep, asoc, type, arg,
+                                                  commands);
 
         /* RFC 2960 10.2 SCTP-to-ULP
          *
@@ -264,7 +289,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
         struct sctp_chunk *err_chunk;
         struct sctp_packet *packet;
         sctp_unrecognized_param_t *unk_param;
-        struct sock *sk;
         int len;
 
         /* 6.10 Bundling
@@ -285,16 +309,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
         if (ep == sctp_sk((sctp_get_ctl_sock()))->ep)
                 return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
 
-        sk = ep->base.sk;
-        /* If the endpoint is not listening or if the number of associations
-         * on the TCP-style socket exceed the max backlog, respond with an
-         * ABORT.
-         */
-        if (!sctp_sstate(sk, LISTENING) ||
-            (sctp_style(sk, TCP) &&
-             sk_acceptq_is_full(sk)))
-                return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
-
         /* 3.1 A packet containing an INIT chunk MUST have a zero Verification
          * Tag.
          */
@@ -461,17 +475,17 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(const struct sctp_endpoint *ep,
         if (!sctp_vtag_verify(chunk, asoc))
                 return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
 
-        /* Make sure that the INIT-ACK chunk has a valid length */
-        if (!sctp_chunk_length_valid(chunk, sizeof(sctp_initack_chunk_t)))
-                return sctp_sf_violation_chunklen(ep, asoc, type, arg,
-                                                  commands);
         /* 6.10 Bundling
          * An endpoint MUST NOT bundle INIT, INIT ACK or
          * SHUTDOWN COMPLETE with any other chunks.
          */
         if (!chunk->singleton)
-                return SCTP_DISPOSITION_VIOLATION;
+                return sctp_sf_violation_chunk(ep, asoc, type, arg, commands);
 
+        /* Make sure that the INIT-ACK chunk has a valid length */
+        if (!sctp_chunk_length_valid(chunk, sizeof(sctp_initack_chunk_t)))
+                return sctp_sf_violation_chunklen(ep, asoc, type, arg,
+                                                  commands);
         /* Grab the INIT header.  */
         chunk->subh.init_hdr = (sctp_inithdr_t *) chunk->skb->data;
 
@@ -590,12 +604,13 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
         struct sctp_ulpevent *ev, *ai_ev = NULL;
         int error = 0;
         struct sctp_chunk *err_chk_p;
+        struct sock *sk;
 
         /* If the packet is an OOTB packet which is temporarily on the
          * control endpoint, respond with an ABORT.
          */
         if (ep == sctp_sk((sctp_get_ctl_sock()))->ep)
-                return sctp_sf_ootb(ep, asoc, type, arg, commands);
+                return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
 
         /* Make sure that the COOKIE_ECHO chunk has a valid length.
          * In this case, we check that we have enough for at least a
@@ -605,6 +620,15 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
         if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
                 return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
 
+        /* If the endpoint is not listening or if the number of associations
+         * on the TCP-style socket exceed the max backlog, respond with an
+         * ABORT.
+         */
+        sk = ep->base.sk;
+        if (!sctp_sstate(sk, LISTENING) ||
+            (sctp_style(sk, TCP) && sk_acceptq_is_full(sk)))
+                return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
+
         /* "Decode" the chunk.  We have no optional parameters so we
          * are in good shape.
          */
@@ -1032,19 +1056,21 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
         /* This should never happen, but lets log it if so.  */
         if (unlikely(!link)) {
                 if (from_addr.sa.sa_family == AF_INET6) {
-                        printk(KERN_WARNING
-                               "%s association %p could not find address "
-                               NIP6_FMT "\n",
-                               __FUNCTION__,
-                               asoc,
-                               NIP6(from_addr.v6.sin6_addr));
+                        if (net_ratelimit())
+                                printk(KERN_WARNING
+                                    "%s association %p could not find address "
+                                    NIP6_FMT "\n",
+                                    __FUNCTION__,
+                                    asoc,
+                                    NIP6(from_addr.v6.sin6_addr));
                 } else {
-                        printk(KERN_WARNING
-                               "%s association %p could not find address "
-                               NIPQUAD_FMT "\n",
-                               __FUNCTION__,
-                               asoc,
-                               NIPQUAD(from_addr.v4.sin_addr.s_addr));
+                        if (net_ratelimit())
+                                printk(KERN_WARNING
+                                    "%s association %p could not find address "
+                                    NIPQUAD_FMT "\n",
+                                    __FUNCTION__,
+                                    asoc,
+                                    NIPQUAD(from_addr.v4.sin_addr.s_addr));
                 }
                 return SCTP_DISPOSITION_DISCARD;
         }
@@ -2495,6 +2521,11 @@ sctp_disposition_t sctp_sf_do_9_2_reshutack(const struct sctp_endpoint *ep,
         struct sctp_chunk *chunk = (struct sctp_chunk *) arg;
         struct sctp_chunk *reply;
 
+        /* Make sure that the chunk has a valid length */
+        if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
+                return sctp_sf_violation_chunklen(ep, asoc, type, arg,
+                                                  commands);
+
         /* Since we are not going to really process this INIT, there
          * is no point in verifying chunk boundries.  Just generate
          * the SHUTDOWN ACK.
@@ -2928,7 +2959,7 @@ sctp_disposition_t sctp_sf_eat_sack_6_2(const struct sctp_endpoint *ep,
  *
  * The return value is the disposition of the chunk.
 */
-sctp_disposition_t sctp_sf_tabort_8_4_8(const struct sctp_endpoint *ep,
+static sctp_disposition_t sctp_sf_tabort_8_4_8(const struct sctp_endpoint *ep,
                                         const struct sctp_association *asoc,
                                         const sctp_subtype_t type,
                                         void *arg,
@@ -2964,6 +2995,7 @@ sctp_disposition_t sctp_sf_tabort_8_4_8(const struct sctp_endpoint *ep,
 
                 SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS);
 
+                sctp_sf_pdiscard(ep, asoc, type, arg, commands);
                 return SCTP_DISPOSITION_CONSUME;
         }
 
@@ -3124,14 +3156,14 @@ sctp_disposition_t sctp_sf_ootb(const struct sctp_endpoint *ep,
 
         ch = (sctp_chunkhdr_t *) chunk->chunk_hdr;
         do {
-                /* Break out if chunk length is less then minimal. */
+                /* Report violation if the chunk is less then minimal */
                 if (ntohs(ch->length) < sizeof(sctp_chunkhdr_t))
-                        break;
-
-                ch_end = ((__u8 *)ch) + WORD_ROUND(ntohs(ch->length));
-                if (ch_end > skb_tail_pointer(skb))
-                        break;
+                        return sctp_sf_violation_chunklen(ep, asoc, type, arg,
+                                                  commands);
 
+                /* Now that we know we at least have a chunk header,
+                 * do things that are type appropriate.
+                 */
                 if (SCTP_CID_SHUTDOWN_ACK == ch->type)
                         ootb_shut_ack = 1;
 
@@ -3143,15 +3175,19 @@ sctp_disposition_t sctp_sf_ootb(const struct sctp_endpoint *ep,
                 if (SCTP_CID_ABORT == ch->type)
                         return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
 
+                /* Report violation if chunk len overflows */
+                ch_end = ((__u8 *)ch) + WORD_ROUND(ntohs(ch->length));
+                if (ch_end > skb_tail_pointer(skb))
+                        return sctp_sf_violation_chunklen(ep, asoc, type, arg,
+                                                  commands);
+
                 ch = (sctp_chunkhdr_t *) ch_end;
         } while (ch_end < skb_tail_pointer(skb));
 
         if (ootb_shut_ack)
-                sctp_sf_shut_8_4_5(ep, asoc, type, arg, commands);
+                return sctp_sf_shut_8_4_5(ep, asoc, type, arg, commands);
         else
-                sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
-
-        return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
+                return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
 }
 
 /*
@@ -3217,7 +3253,11 @@ static sctp_disposition_t sctp_sf_shut_8_4_5(const struct sctp_endpoint *ep,
                 if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
                         return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
 
-                return SCTP_DISPOSITION_CONSUME;
+                /* We need to discard the rest of the packet to prevent
+                 * potential bomming attacks from additional bundled chunks.
+                 * This is documented in SCTP Threats ID.
+                 */
+                return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
         }
 
         return SCTP_DISPOSITION_NOMEM;
@@ -3240,6 +3280,13 @@ sctp_disposition_t sctp_sf_do_8_5_1_E_sa(const struct sctp_endpoint *ep,
                                       void *arg,
                                       sctp_cmd_seq_t *commands)
 {
+        struct sctp_chunk *chunk = arg;
+
+        /* Make sure that the SHUTDOWN_ACK chunk has a valid length. */
+        if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
+                return sctp_sf_violation_chunklen(ep, asoc, type, arg,
+                                                  commands);
+
         /* Although we do have an association in this case, it corresponds
          * to a restarted association. So the packet is treated as an OOTB
          * packet and the state function that handles OOTB SHUTDOWN_ACK is
@@ -3256,8 +3303,11 @@ sctp_disposition_t sctp_sf_do_asconf(const struct sctp_endpoint *ep,
 {
         struct sctp_chunk       *chunk = arg;
         struct sctp_chunk       *asconf_ack = NULL;
+        struct sctp_paramhdr    *err_param = NULL;
         sctp_addiphdr_t         *hdr;
+        union sctp_addr_param   *addr_param;
         __u32                   serial;
+        int                     length;
 
         if (!sctp_vtag_verify(chunk, asoc)) {
                 sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_BAD_TAG,
@@ -3273,6 +3323,20 @@ sctp_disposition_t sctp_sf_do_asconf(const struct sctp_endpoint *ep,
         hdr = (sctp_addiphdr_t *)chunk->skb->data;
         serial = ntohl(hdr->serial);
 
+        addr_param = (union sctp_addr_param *)hdr->params;
+        length = ntohs(addr_param->p.length);
+        if (length < sizeof(sctp_paramhdr_t))
+                return sctp_sf_violation_paramlen(ep, asoc, type,
+                           (void *)addr_param, commands);
+
+        /* Verify the ASCONF chunk before processing it. */
+        if (!sctp_verify_asconf(asoc,
+            (sctp_paramhdr_t *)((void *)addr_param + length),
+            (void *)chunk->chunk_end,
+            &err_param))
+                return sctp_sf_violation_paramlen(ep, asoc, type,
+                           (void *)&err_param, commands);
+
         /* ADDIP 4.2 C1) Compare the value of the serial number to the value
          * the endpoint stored in a new association variable
          * 'Peer-Serial-Number'.
@@ -3327,6 +3391,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
         struct sctp_chunk       *asconf_ack = arg;
         struct sctp_chunk       *last_asconf = asoc->addip_last_asconf;
         struct sctp_chunk       *abort;
+        struct sctp_paramhdr    *err_param = NULL;
         sctp_addiphdr_t         *addip_hdr;
         __u32                   sent_serial, rcvd_serial;
 
@@ -3344,6 +3409,14 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
         addip_hdr = (sctp_addiphdr_t *)asconf_ack->skb->data;
         rcvd_serial = ntohl(addip_hdr->serial);
 
+        /* Verify the ASCONF-ACK chunk before processing it. */
+        if (!sctp_verify_asconf(asoc,
+            (sctp_paramhdr_t *)addip_hdr->params,
+            (void *)asconf_ack->chunk_end,
+            &err_param))
+                return sctp_sf_violation_paramlen(ep, asoc, type,
+                           (void *)&err_param, commands);
+
         if (last_asconf) {
                 addip_hdr = (sctp_addiphdr_t *)last_asconf->subh.addip_hdr;
                 sent_serial = ntohl(addip_hdr->serial);
@@ -3362,7 +3435,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
                 abort = sctp_make_abort(asoc, asconf_ack,
                                         sizeof(sctp_errhdr_t));
                 if (abort) {
-                        sctp_init_cause(abort, SCTP_ERROR_ASCONF_ACK, NULL, 0);
+                        sctp_init_cause(abort, SCTP_ERROR_ASCONF_ACK, 0);
                         sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
                                         SCTP_CHUNK(abort));
                 }
@@ -3392,7 +3465,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
                 abort = sctp_make_abort(asoc, asconf_ack,
                                         sizeof(sctp_errhdr_t));
                 if (abort) {
-                        sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, NULL, 0);
+                        sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, 0);
                         sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
                                         SCTP_CHUNK(abort));
                 }
@@ -3654,6 +3727,16 @@ sctp_disposition_t sctp_sf_discard_chunk(const struct sctp_endpoint *ep,
                                          void *arg,
                                          sctp_cmd_seq_t *commands)
 {
+        struct sctp_chunk *chunk = arg;
+
+        /* Make sure that the chunk has a valid length.
+         * Since we don't know the chunk type, we use a general
+         * chunkhdr structure to make a comparison.
+         */
+        if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
+                return sctp_sf_violation_chunklen(ep, asoc, type, arg,
+                                                  commands);
+
         SCTP_DEBUG_PRINTK("Chunk %d is discarded\n", type.chunk);
         return SCTP_DISPOSITION_DISCARD;
 }
@@ -3709,6 +3792,13 @@ sctp_disposition_t sctp_sf_violation(const struct sctp_endpoint *ep,
                                      void *arg,
                                      sctp_cmd_seq_t *commands)
 {
+        struct sctp_chunk *chunk = arg;
+
+        /* Make sure that the chunk has a valid length. */
+        if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
+                return sctp_sf_violation_chunklen(ep, asoc, type, arg,
+                                                  commands);
+
         return SCTP_DISPOSITION_VIOLATION;
 }
 
@@ -3716,12 +3806,14 @@ sctp_disposition_t sctp_sf_violation(const struct sctp_endpoint *ep,
  * Common function to handle a protocol violation.
  */
 static sctp_disposition_t sctp_sf_abort_violation(
+                                     const struct sctp_endpoint *ep,
                                      const struct sctp_association *asoc,
                                      void *arg,
                                      sctp_cmd_seq_t *commands,
                                      const __u8 *payload,
                                      const size_t paylen)
 {
+        struct sctp_packet *packet = NULL;
         struct sctp_chunk *chunk =  arg;
         struct sctp_chunk *abort = NULL;
 
@@ -3730,30 +3822,51 @@ static sctp_disposition_t sctp_sf_abort_violation(
         if (!abort)
                 goto nomem;
 
-        sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort));
-        SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS);
+        if (asoc) {
+                sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(abort));
+                SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS);
 
-        if (asoc->state <= SCTP_STATE_COOKIE_ECHOED) {
-                sctp_add_cmd_sf(commands, SCTP_CMD_TIMER_STOP,
-                                SCTP_TO(SCTP_EVENT_TIMEOUT_T1_INIT));
-                sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR,
-                                SCTP_ERROR(ECONNREFUSED));
-                sctp_add_cmd_sf(commands, SCTP_CMD_INIT_FAILED,
-                                SCTP_PERR(SCTP_ERROR_PROTO_VIOLATION));
+                if (asoc->state <= SCTP_STATE_COOKIE_ECHOED) {
+                        sctp_add_cmd_sf(commands, SCTP_CMD_TIMER_STOP,
+                                        SCTP_TO(SCTP_EVENT_TIMEOUT_T1_INIT));
+                        sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR,
+                                        SCTP_ERROR(ECONNREFUSED));
+                        sctp_add_cmd_sf(commands, SCTP_CMD_INIT_FAILED,
+                                        SCTP_PERR(SCTP_ERROR_PROTO_VIOLATION));
+                } else {
+                        sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR,
+                                        SCTP_ERROR(ECONNABORTED));
+                        sctp_add_cmd_sf(commands, SCTP_CMD_ASSOC_FAILED,
+                                        SCTP_PERR(SCTP_ERROR_PROTO_VIOLATION));
+                        SCTP_DEC_STATS(SCTP_MIB_CURRESTAB);
+                }
         } else {
-                sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR,
-                                SCTP_ERROR(ECONNABORTED));
-                sctp_add_cmd_sf(commands, SCTP_CMD_ASSOC_FAILED,
-                                SCTP_PERR(SCTP_ERROR_PROTO_VIOLATION));
-                SCTP_DEC_STATS(SCTP_MIB_CURRESTAB);
+                packet = sctp_ootb_pkt_new(asoc, chunk);
+
+                if (!packet)
+                        goto nomem_pkt;
+
+                if (sctp_test_T_bit(abort))
+                        packet->vtag = ntohl(chunk->sctp_hdr->vtag);
+
+                abort->skb->sk = ep->base.sk;
+
+                sctp_packet_append_chunk(packet, abort);
+
+                sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT,
+                        SCTP_PACKET(packet));
+
+                SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS);
         }
 
-        sctp_add_cmd_sf(commands, SCTP_CMD_DISCARD_PACKET, SCTP_NULL());
+        sctp_sf_pdiscard(ep, asoc, SCTP_ST_CHUNK(0), arg, commands);
 
         SCTP_INC_STATS(SCTP_MIB_ABORTEDS);
 
         return SCTP_DISPOSITION_ABORT;
 
+nomem_pkt:
+        sctp_chunk_free(abort);
 nomem:
         return SCTP_DISPOSITION_NOMEM;
 }
@@ -3786,7 +3899,24 @@ static sctp_disposition_t sctp_sf_violation_chunklen(
 {
         char err_str[]="The following chunk had invalid length:";
 
-        return sctp_sf_abort_violation(asoc, arg, commands, err_str,
+        return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
+                                        sizeof(err_str));
+}
+
+/*
+ * Handle a protocol violation when the parameter length is invalid.
+ * "Invalid" length is identified as smaller then the minimal length a
+ * given parameter can be.
+ */
+static sctp_disposition_t sctp_sf_violation_paramlen(
+                                     const struct sctp_endpoint *ep,
+                                     const struct sctp_association *asoc,
+                                     const sctp_subtype_t type,
+                                     void *arg,
+                                     sctp_cmd_seq_t *commands) {
+        char err_str[] = "The following parameter had invalid length:";
+
+        return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
                                         sizeof(err_str));
 }
 
@@ -3805,10 +3935,31 @@ static sctp_disposition_t sctp_sf_violation_ctsn(
 {
         char err_str[]="The cumulative tsn ack beyond the max tsn currently sent:";
 
-        return sctp_sf_abort_violation(asoc, arg, commands, err_str,
+        return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
                                         sizeof(err_str));
 }
 
+/* Handle protocol violation of an invalid chunk bundling.  For example,
+ * when we have an association and we recieve bundled INIT-ACK, or
+ * SHUDOWN-COMPLETE, our peer is clearly violationg the "MUST NOT bundle"
+ * statement from the specs.  Additinally, there might be an attacker
+ * on the path and we may not want to continue this communication.
+ */
+static sctp_disposition_t sctp_sf_violation_chunk(
+                                     const struct sctp_endpoint *ep,
+                                     const struct sctp_association *asoc,
+                                     const sctp_subtype_t type,
+                                     void *arg,
+                                     sctp_cmd_seq_t *commands)
+{
+        char err_str[]="The following chunk violates protocol:";
+
+        if (!asoc)
+                return sctp_sf_violation(ep, asoc, type, arg, commands);
+
+        return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
+                                        sizeof(err_str));
+}
 /***************************************************************************
  * These are the state functions for handling primitive (Section 10) events.
  ***************************************************************************/
@@ -5175,7 +5326,22 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
          * association exists, otherwise, use the peer's vtag.
          */
         if (asoc) {
-                vtag = asoc->peer.i.init_tag;
+                /* Special case the INIT-ACK as there is no peer's vtag
+                 * yet.
+                 */
+                switch(chunk->chunk_hdr->type) {
+                case SCTP_CID_INIT_ACK:
+                {
+                        sctp_initack_chunk_t *initack;
+
+                        initack = (sctp_initack_chunk_t *)chunk->chunk_hdr;
+                        vtag = ntohl(initack->init_hdr.init_tag);
+                        break;
+                }
+                default:
+                        vtag = asoc->peer.i.init_tag;
+                        break;
+                }
         } else {
                 /* Special case the INIT and stale COOKIE_ECHO as there is no
                  * vtag yet.
diff --git a/net/sctp/sm_statetable.c b/net/sctp/sm_statetable.c
index 70a91ece3c..ddb0ba3974 100644
--- a/net/sctp/sm_statetable.c
+++ b/net/sctp/sm_statetable.c
@@ -110,7 +110,7 @@ const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t event_type,
         /* SCTP_STATE_EMPTY */ \
         TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_CLOSED */ \
-        TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
+        TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_COOKIE_WAIT */ \
         TYPE_SCTP_FUNC(sctp_sf_discard_chunk), \
         /* SCTP_STATE_COOKIE_ECHOED */ \
@@ -173,7 +173,7 @@ const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t event_type,
         /*  SCTP_STATE_EMPTY */ \
         TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_CLOSED */ \
-        TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
+        TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_COOKIE_WAIT */ \
         TYPE_SCTP_FUNC(sctp_sf_discard_chunk), \
         /* SCTP_STATE_COOKIE_ECHOED */ \
@@ -194,7 +194,7 @@ const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t event_type,
         /*  SCTP_STATE_EMPTY */ \
         TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_CLOSED */ \
-        TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
+        TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_COOKIE_WAIT */ \
         TYPE_SCTP_FUNC(sctp_sf_discard_chunk), \
         /* SCTP_STATE_COOKIE_ECHOED */ \
@@ -216,7 +216,7 @@ const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t event_type,
         /*  SCTP_STATE_EMPTY */ \
         TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_CLOSED */ \
-        TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
+        TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_COOKIE_WAIT */ \
         TYPE_SCTP_FUNC(sctp_sf_violation), \
         /* SCTP_STATE_COOKIE_ECHOED */ \
@@ -258,7 +258,7 @@ const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t event_type,
         /* SCTP_STATE_EMPTY */ \
         TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_CLOSED */ \
-        TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
+        TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_COOKIE_WAIT */ \
         TYPE_SCTP_FUNC(sctp_sf_discard_chunk), \
         /* SCTP_STATE_COOKIE_ECHOED */ \
@@ -300,7 +300,7 @@ const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t event_type,
         /* SCTP_STATE_EMPTY */ \
         TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_CLOSED */ \
-        TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
+        TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_COOKIE_WAIT */ \
         TYPE_SCTP_FUNC(sctp_sf_discard_chunk), \
         /* SCTP_STATE_COOKIE_ECHOED */ \
@@ -499,7 +499,7 @@ static const sctp_sm_table_entry_t addip_chunk_event_table[SCTP_NUM_ADDIP_CHUNK_
         /* SCTP_STATE_EMPTY */ \
         TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_CLOSED */ \
-        TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8), \
+        TYPE_SCTP_FUNC(sctp_sf_ootb), \
         /* SCTP_STATE_COOKIE_WAIT */ \
         TYPE_SCTP_FUNC(sctp_sf_discard_chunk), \
         /* SCTP_STATE_COOKIE_ECHOED */ \
@@ -528,7 +528,7 @@ chunk_event_table_unknown[SCTP_STATE_NUM_STATES] = {
         /* SCTP_STATE_EMPTY */
         TYPE_SCTP_FUNC(sctp_sf_ootb),
         /* SCTP_STATE_CLOSED */
-        TYPE_SCTP_FUNC(sctp_sf_tabort_8_4_8),
+        TYPE_SCTP_FUNC(sctp_sf_ootb),
         /* SCTP_STATE_COOKIE_WAIT */
         TYPE_SCTP_FUNC(sctp_sf_unk_chunk),
         /* SCTP_STATE_COOKIE_ECHOED */
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 01c6364245..772fbfb4bf 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -353,6 +353,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
          * The function sctp_get_port_local() does duplicate address
          * detection.
          */
+        addr->v4.sin_port = htons(snum);
         if ((ret = sctp_get_port_local(sk, addr))) {
                 if (ret == (long) sk) {
                         /* This endpoint has a conflicting address. */
@@ -366,14 +367,10 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
         if (!bp->port)
                 bp->port = inet_sk(sk)->num;
 
-        /* Add the address to the bind address list.  */
-        sctp_local_bh_disable();
-        sctp_write_lock(&ep->base.addr_lock);
-
-        /* Use GFP_ATOMIC since BHs are disabled.  */
+        /* Add the address to the bind address list.
+         * Use GFP_ATOMIC since BHs will be disabled.
+         */
         ret = sctp_add_bind_addr(bp, addr, 1, GFP_ATOMIC);
-        sctp_write_unlock(&ep->base.addr_lock);
-        sctp_local_bh_enable();
 
         /* Copy back into socket for getsockname() use. */
         if (!ret) {
@@ -543,15 +540,12 @@ static int sctp_send_asconf_add_ip(struct sock		*sk,
                 if (i < addrcnt)
                         continue;
 
-                /* Use the first address in bind addr list of association as
-                 * Address Parameter of ASCONF CHUNK.
+                /* Use the first valid 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) {
@@ -566,8 +560,6 @@ static int sctp_send_asconf_add_ip(struct sock		*sk,
                 /* Add the new addresses to the bind address list with
                  * use_as_src set to 0.
                  */
-                sctp_local_bh_disable();
-                sctp_write_lock(&asoc->base.addr_lock);
                 addr_buf = addrs;
                 for (i = 0; i < addrcnt; i++) {
                         addr = (union sctp_addr *)addr_buf;
@@ -577,8 +569,6 @@ static int sctp_send_asconf_add_ip(struct sock		*sk,
                                                     GFP_ATOMIC);
                         addr_buf += af->sockaddr_len;
                 }
-                sctp_write_unlock(&asoc->base.addr_lock);
-                sctp_local_bh_enable();
         }
 
 out:
@@ -650,13 +640,7 @@ static int sctp_bindx_rem(struct sock *sk, struct sockaddr *addrs, int addrcnt)
                  * socket routing and failover schemes. Refer to comments in
                  * sctp_do_bind(). -daisy
                  */
-                sctp_local_bh_disable();
-                sctp_write_lock(&ep->base.addr_lock);
-
-                retval = sctp_del_bind_addr(bp, sa_addr);
-
-                sctp_write_unlock(&ep->base.addr_lock);
-                sctp_local_bh_enable();
+                retval = sctp_del_bind_addr(bp, sa_addr, call_rcu);
 
                 addr_buf += af->sockaddr_len;
 err_bindx_rem:
@@ -747,14 +731,16 @@ static int sctp_send_asconf_del_ip(struct sock		*sk,
                  * 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;
 
+                /* We do not need RCU protection throughout this loop
+                 * because this is done under a socket lock from the
+                 * setsockopt call.
+                 */
                 chunk = sctp_make_asconf_update_ip(asoc, laddr, addrs, addrcnt,
                                                    SCTP_PARAM_DEL_IP);
                 if (!chunk) {
@@ -765,23 +751,16 @@ static int sctp_send_asconf_del_ip(struct sock		*sk,
                 /* Reset use_as_src flag for the addresses in the bind address
                  * list that are to be deleted.
                  */
-                sctp_local_bh_disable();
-                sctp_write_lock(&asoc->base.addr_lock);
                 addr_buf = addrs;
                 for (i = 0; i < addrcnt; i++) {
                         laddr = (union sctp_addr *)addr_buf;
                         af = sctp_get_af_specific(laddr->v4.sin_family);
-                        list_for_each(pos1, &bp->address_list) {
-                                saddr = list_entry(pos1,
-                                                   struct sctp_sockaddr_entry,
-                                                   list);
+                        list_for_each_entry(saddr, &bp->address_list, list) {
                                 if (sctp_cmp_addr_exact(&saddr->a, laddr))
                                         saddr->use_as_src = 0;
                         }
                         addr_buf += af->sockaddr_len;
                 }
-                sctp_write_unlock(&asoc->base.addr_lock);
-                sctp_local_bh_enable();
 
                 /* Update the route and saddr entries for all the transports
                  * as some of the addresses in the bind address list are
@@ -4058,9 +4037,7 @@ static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len,
         sctp_assoc_t id;
         struct sctp_bind_addr *bp;
         struct sctp_association *asoc;
-        struct list_head *pos, *temp;
         struct sctp_sockaddr_entry *addr;
-        rwlock_t *addr_lock;
         int cnt = 0;
 
         if (len < sizeof(sctp_assoc_t))
@@ -4077,17 +4054,13 @@ static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len,
          */
         if (0 == id) {
                 bp = &sctp_sk(sk)->ep->base.bind_addr;
-                addr_lock = &sctp_sk(sk)->ep->base.addr_lock;
         } else {
                 asoc = sctp_id2assoc(sk, id);
                 if (!asoc)
                         return -EINVAL;
                 bp = &asoc->base.bind_addr;
-                addr_lock = &asoc->base.addr_lock;
         }
 
-        sctp_read_lock(addr_lock);
-
         /* If the endpoint is bound to 0.0.0.0 or ::0, count the valid
          * addresses from the global local address list.
          */
@@ -4095,27 +4068,33 @@ static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len,
                 addr = list_entry(bp->address_list.next,
                                   struct sctp_sockaddr_entry, list);
                 if (sctp_is_any(&addr->a)) {
-                        list_for_each_safe(pos, temp, &sctp_local_addr_list) {
-                                addr = list_entry(pos,
-                                                  struct sctp_sockaddr_entry,
-                                                  list);
+                        rcu_read_lock();
+                        list_for_each_entry_rcu(addr,
+                                                &sctp_local_addr_list, list) {
+                                if (!addr->valid)
+                                        continue;
+
                                 if ((PF_INET == sk->sk_family) &&
                                     (AF_INET6 == addr->a.sa.sa_family))
                                         continue;
+
                                 cnt++;
                         }
+                        rcu_read_unlock();
                 } else {
                         cnt = 1;
                 }
                 goto done;
         }
 
-        list_for_each(pos, &bp->address_list) {
+        /* Protection on the bound address list is not needed,
+         * since in the socket option context we hold the socket lock,
+         * so there is no way that the bound address list can change.
+         */
+        list_for_each_entry(addr, &bp->address_list, list) {
                 cnt ++;
         }
-
 done:
-        sctp_read_unlock(addr_lock);
         return cnt;
 }
 
@@ -4126,14 +4105,16 @@ static int sctp_copy_laddrs_old(struct sock *sk, __u16 port,
                                         int max_addrs, void *to,
                                         int *bytes_copied)
 {
-        struct list_head *pos, *next;
         struct sctp_sockaddr_entry *addr;
         union sctp_addr temp;
         int cnt = 0;
         int addrlen;
 
-        list_for_each_safe(pos, next, &sctp_local_addr_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        rcu_read_lock();
+        list_for_each_entry_rcu(addr, &sctp_local_addr_list, list) {
+                if (!addr->valid)
+                        continue;
+
                 if ((PF_INET == sk->sk_family) &&
                     (AF_INET6 == addr->a.sa.sa_family))
                         continue;
@@ -4148,6 +4129,7 @@ static int sctp_copy_laddrs_old(struct sock *sk, __u16 port,
                 cnt ++;
                 if (cnt >= max_addrs) break;
         }
+        rcu_read_unlock();
 
         return cnt;
 }
@@ -4155,14 +4137,16 @@ static int sctp_copy_laddrs_old(struct sock *sk, __u16 port,
 static int sctp_copy_laddrs(struct sock *sk, __u16 port, void *to,
                             size_t space_left, int *bytes_copied)
 {
-        struct list_head *pos, *next;
         struct sctp_sockaddr_entry *addr;
         union sctp_addr temp;
         int cnt = 0;
         int addrlen;
 
-        list_for_each_safe(pos, next, &sctp_local_addr_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        rcu_read_lock();
+        list_for_each_entry_rcu(addr, &sctp_local_addr_list, list) {
+                if (!addr->valid)
+                        continue;
+
                 if ((PF_INET == sk->sk_family) &&
                     (AF_INET6 == addr->a.sa.sa_family))
                         continue;
@@ -4170,8 +4154,10 @@ static int sctp_copy_laddrs(struct sock *sk, __u16 port, void *to,
                 sctp_get_pf_specific(sk->sk_family)->addr_v4map(sctp_sk(sk),
                                                                 &temp);
                 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
-                if (space_left < addrlen)
-                        return -ENOMEM;
+                if (space_left < addrlen) {
+                        cnt =  -ENOMEM;
+                        break;
+                }
                 memcpy(to, &temp, addrlen);
 
                 to += addrlen;
@@ -4179,6 +4165,7 @@ static int sctp_copy_laddrs(struct sock *sk, __u16 port, void *to,
                 space_left -= addrlen;
                 *bytes_copied += addrlen;
         }
+        rcu_read_unlock();
 
         return cnt;
 }
@@ -4191,7 +4178,6 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
 {
         struct sctp_bind_addr *bp;
         struct sctp_association *asoc;
-        struct list_head *pos;
         int cnt = 0;
         struct sctp_getaddrs_old getaddrs;
         struct sctp_sockaddr_entry *addr;
@@ -4199,7 +4185,6 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
         union sctp_addr temp;
         struct sctp_sock *sp = sctp_sk(sk);
         int addrlen;
-        rwlock_t *addr_lock;
         int err = 0;
         void *addrs;
         void *buf;
@@ -4221,13 +4206,11 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
          */
         if (0 == getaddrs.assoc_id) {
                 bp = &sctp_sk(sk)->ep->base.bind_addr;
-                addr_lock = &sctp_sk(sk)->ep->base.addr_lock;
         } else {
                 asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
                 if (!asoc)
                         return -EINVAL;
                 bp = &asoc->base.bind_addr;
-                addr_lock = &asoc->base.addr_lock;
         }
 
         to = getaddrs.addrs;
@@ -4241,8 +4224,6 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
         if (!addrs)
                 return -ENOMEM;
 
-        sctp_read_lock(addr_lock);
-
         /* If the endpoint is bound to 0.0.0.0 or ::0, get the valid
          * addresses from the global local address list.
          */
@@ -4258,8 +4239,11 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
         }
 
         buf = addrs;
-        list_for_each(pos, &bp->address_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        /* Protection on the bound address list is not needed since
+         * in the socket option context we hold a socket lock and
+         * thus the bound address list can't change.
+         */
+        list_for_each_entry(addr, &bp->address_list, list) {
                 memcpy(&temp, &addr->a, sizeof(temp));
                 sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp);
                 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
@@ -4271,8 +4255,6 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
         }
 
 copy_getaddrs:
-        sctp_read_unlock(addr_lock);
-
         /* copy the entire address list into the user provided space */
         if (copy_to_user(to, addrs, bytes_copied)) {
                 err = -EFAULT;
@@ -4294,7 +4276,6 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
 {
         struct sctp_bind_addr *bp;
         struct sctp_association *asoc;
-        struct list_head *pos;
         int cnt = 0;
         struct sctp_getaddrs getaddrs;
         struct sctp_sockaddr_entry *addr;
@@ -4302,7 +4283,6 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
         union sctp_addr temp;
         struct sctp_sock *sp = sctp_sk(sk);
         int addrlen;
-        rwlock_t *addr_lock;
         int err = 0;
         size_t space_left;
         int bytes_copied = 0;
@@ -4323,13 +4303,11 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
          */
         if (0 == getaddrs.assoc_id) {
                 bp = &sctp_sk(sk)->ep->base.bind_addr;
-                addr_lock = &sctp_sk(sk)->ep->base.addr_lock;
         } else {
                 asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
                 if (!asoc)
                         return -EINVAL;
                 bp = &asoc->base.bind_addr;
-                addr_lock = &asoc->base.addr_lock;
         }
 
         to = optval + offsetof(struct sctp_getaddrs,addrs);
@@ -4339,8 +4317,6 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
         if (!addrs)
                 return -ENOMEM;
 
-        sctp_read_lock(addr_lock);
-
         /* If the endpoint is bound to 0.0.0.0 or ::0, get the valid
          * addresses from the global local address list.
          */
@@ -4352,21 +4328,24 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
                                                 space_left, &bytes_copied);
                         if (cnt < 0) {
                                 err = cnt;
-                                goto error_lock;
+                                goto out;
                         }
                         goto copy_getaddrs;
                 }
         }
 
         buf = addrs;
-        list_for_each(pos, &bp->address_list) {
-                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+        /* Protection on the bound address list is not needed since
+         * in the socket option context we hold a socket lock and
+         * thus the bound address list can't change.
+         */
+        list_for_each_entry(addr, &bp->address_list, list) {
                 memcpy(&temp, &addr->a, sizeof(temp));
                 sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp);
                 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
                 if (space_left < addrlen) {
                         err =  -ENOMEM; /*fixme: right error?*/
-                        goto error_lock;
+                        goto out;
                 }
                 memcpy(buf, &temp, addrlen);
                 buf += addrlen;
@@ -4376,8 +4355,6 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
         }
 
 copy_getaddrs:
-        sctp_read_unlock(addr_lock);
-
         if (copy_to_user(to, addrs, bytes_copied)) {
                 err = -EFAULT;
                 goto out;
@@ -4388,12 +4365,6 @@ copy_getaddrs:
         }
         if (put_user(bytes_copied, optlen))
                 err = -EFAULT;
-
-        goto out;
-
-error_lock:
-        sctp_read_unlock(addr_lock);
-
 out:
         kfree(addrs);
         return err;
@@ -5202,6 +5173,7 @@ SCTP_STATIC int sctp_seqpacket_listen(struct sock *sk, int backlog)
 
                 sctp_unhash_endpoint(ep);
                 sk->sk_state = SCTP_SS_CLOSED;
+                return 0;
         }
 
         /* Return if we are already listening. */
@@ -5249,6 +5221,7 @@ SCTP_STATIC int sctp_stream_listen(struct sock *sk, int backlog)
 
                 sctp_unhash_endpoint(ep);
                 sk->sk_state = SCTP_SS_CLOSED;
+                return 0;
         }
 
         if (sctp_sstate(sk, LISTENING))
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index 34eb977a20..fa0ba2a556 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -659,6 +659,46 @@ done:
         return retval;
 }
 
+/*
+ * Flush out stale fragments from the reassembly queue when processing
+ * a Forward TSN.
+ *
+ * RFC 3758, Section 3.6
+ *
+ * After receiving and processing a FORWARD TSN, the data receiver MUST
+ * take cautions in updating its re-assembly queue.  The receiver MUST
+ * remove any partially reassembled message, which is still missing one
+ * or more TSNs earlier than or equal to the new cumulative TSN point.
+ * In the event that the receiver has invoked the partial delivery API,
+ * a notification SHOULD also be generated to inform the upper layer API
+ * that the message being partially delivered will NOT be completed.
+ */
+void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *ulpq, __u32 fwd_tsn)
+{
+        struct sk_buff *pos, *tmp;
+        struct sctp_ulpevent *event;
+        __u32 tsn;
+
+        if (skb_queue_empty(&ulpq->reasm))
+                return;
+
+        skb_queue_walk_safe(&ulpq->reasm, pos, tmp) {
+                event = sctp_skb2event(pos);
+                tsn = event->tsn;
+
+                /* Since the entire message must be abandoned by the
+                 * sender (item A3 in Section 3.5, RFC 3758), we can
+                 * free all fragments on the list that are less then
+                 * or equal to ctsn_point
+                 */
+                if (TSN_lte(tsn, fwd_tsn)) {
+                        __skb_unlink(pos, &ulpq->reasm);
+                        sctp_ulpevent_free(event);
+                } else
+                        break;
+        }
+}
+
 /* Helper function to gather skbs that have possibly become
  * ordered by an an incoming chunk.
  */
@@ -794,7 +834,7 @@ static struct sctp_ulpevent *sctp_ulpq_order(struct sctp_ulpq *ulpq,
 /* Helper function to gather skbs that have possibly become
  * ordered by forward tsn skipping their dependencies.
  */
-static inline void sctp_ulpq_reap_ordered(struct sctp_ulpq *ulpq)
+static inline void sctp_ulpq_reap_ordered(struct sctp_ulpq *ulpq, __u16 sid)
 {
         struct sk_buff *pos, *tmp;
         struct sctp_ulpevent *cevent;
@@ -813,31 +853,40 @@ static inline void sctp_ulpq_reap_ordered(struct sctp_ulpq *ulpq)
                 csid = cevent->stream;
                 cssn = cevent->ssn;
 
-                if (cssn != sctp_ssn_peek(in, csid))
+                /* Have we gone too far?  */
+                if (csid > sid)
                         break;
 
-                /* Found it, so mark in the ssnmap. */
-                sctp_ssn_next(in, csid);
+                /* Have we not gone far enough?  */
+                if (csid < sid)
+                        continue;
+
+                /* see if this ssn has been marked by skipping */
+                if (!SSN_lt(cssn, sctp_ssn_peek(in, csid)))
+                        break;
 
                 __skb_unlink(pos, &ulpq->lobby);
-                if (!event) {
+                if (!event)
                         /* Create a temporary list to collect chunks on.  */
                         event = sctp_skb2event(pos);
-                        __skb_queue_tail(&temp, sctp_event2skb(event));
-                } else {
-                        /* Attach all gathered skbs to the event.  */
-                        __skb_queue_tail(&temp, pos);
-                }
+
+                /* Attach all gathered skbs to the event.  */
+                __skb_queue_tail(&temp, pos);
         }
 
         /* Send event to the ULP.  'event' is the sctp_ulpevent for
          * very first SKB on the 'temp' list.
          */
-        if (event)
+        if (event) {
+                /* see if we have more ordered that we can deliver */
+                sctp_ulpq_retrieve_ordered(ulpq, event);
                 sctp_ulpq_tail_event(ulpq, event);
+        }
 }
 
-/* Skip over an SSN. */
+/* Skip over an SSN. This is used during the processing of
+ * Forwared TSN chunk to skip over the abandoned ordered data
+ */
 void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn)
 {
         struct sctp_stream *in;
@@ -855,7 +904,7 @@ void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn)
         /* Go find any other chunks that were waiting for
          * ordering and deliver them if needed.
          */
-        sctp_ulpq_reap_ordered(ulpq);
+        sctp_ulpq_reap_ordered(ulpq, sid);
         return;
 }
 
diff --git a/net/socket.c b/net/socket.c
index 7d44453dfa..b09eb9036a 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -777,9 +777,6 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,
         if (pos != 0)
                 return -ESPIPE;
 
-        if (iocb->ki_left == 0) /* Match SYS5 behaviour */
-                return 0;
-
         x = alloc_sock_iocb(iocb, &siocb);
         if (!x)
                 return -ENOMEM;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 12ff5da816..036ab520df 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1110,7 +1110,8 @@ svc_tcp_accept(struct svc_sock *svsk)
                                                    serv->sv_name);
                                 printk(KERN_NOTICE
                                        "%s: last TCP connect from %s\n",
-                                       serv->sv_name, buf);
+                                       serv->sv_name, __svc_print_addr(sin,
+                                                        buf, sizeof(buf)));
                         }
                         /*
                          * Always select the oldest socket. It's not fair,
@@ -1592,7 +1593,7 @@ svc_age_temp_sockets(unsigned long closure)
 
                 if (!test_and_set_bit(SK_OLD, &svsk->sk_flags))
                         continue;
-                if (atomic_read(&svsk->sk_inuse) || test_bit(SK_BUSY, &svsk->sk_flags))
+                if (atomic_read(&svsk->sk_inuse) > 1 || test_bit(SK_BUSY, &svsk->sk_flags))
                         continue;
                 atomic_inc(&svsk->sk_inuse);
                 list_move(le, &to_be_aged);
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 7eabd55417..9771451eae 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -213,7 +213,7 @@ out_fail_notifier:
 out_fail_sysfs:
         return err;
 }
-module_init(cfg80211_init);
+subsys_initcall(cfg80211_init);
 
 static void cfg80211_exit(void)
 {
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 88aaacd9f8..2d5d2255a2 100644
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -52,12 +52,14 @@ static void wiphy_dev_release(struct device *dev)
         cfg80211_dev_free(rdev);
 }
 
+#ifdef CONFIG_HOTPLUG
 static int wiphy_uevent(struct device *dev, char **envp,
                         int num_envp, char *buf, int size)
 {
         /* TODO, we probably need stuff here */
         return 0;
 }
+#endif
 
 struct class ieee80211_class = {
         .name = "ieee80211",
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 8be6a4269e..a38787a881 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -72,7 +72,7 @@ static void check_stdin(void)
         }
 }
 
-static void conf_askvalue(struct symbol *sym, const char *def)
+static int conf_askvalue(struct symbol *sym, const char *def)
 {
         enum symbol_type type = sym_get_type(sym);
         tristate val;
@@ -87,7 +87,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
                 printf("%s\n", def);
                 line[0] = '\n';
                 line[1] = 0;
-                return;
+                return 0;
         }
 
         switch (input_mode) {
@@ -97,23 +97,23 @@ static void conf_askvalue(struct symbol *sym, const char *def)
         case set_random:
                 if (sym_has_value(sym)) {
                         printf("%s\n", def);
-                        return;
+                        return 0;
                 }
                 break;
         case ask_new:
         case ask_silent:
                 if (sym_has_value(sym)) {
                         printf("%s\n", def);
-                        return;
+                        return 0;
                 }
                 check_stdin();
         case ask_all:
                 fflush(stdout);
                 fgets(line, 128, stdin);
-                return;
+                return 1;
         case set_default:
                 printf("%s\n", def);
-                return;
+                return 1;
         default:
                 break;
         }
@@ -123,7 +123,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
         case S_HEX:
         case S_STRING:
                 printf("%s\n", def);
-                return;
+                return 1;
         default:
                 ;
         }
@@ -174,6 +174,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
                 break;
         }
         printf("%s", line);
+        return 1;
 }
 
 int conf_string(struct menu *menu)
@@ -187,7 +188,8 @@ int conf_string(struct menu *menu)
                 def = sym_get_string_value(sym);
                 if (sym_get_string_value(sym))
                         printf("[%s] ", def);
-                conf_askvalue(sym, def);
+                if (!conf_askvalue(sym, def))
+                        return 0;
                 switch (line[0]) {
                 case '\n':
                         break;
@@ -240,7 +242,8 @@ static int conf_sym(struct menu *menu)
                 if (menu_has_help(menu))
                         printf("/?");
                 printf("] ");
-                conf_askvalue(sym, sym_get_string_value(sym));
+                if (!conf_askvalue(sym, sym_get_string_value(sym)))
+                        return 0;
                 strip(line);
 
                 switch (line[0]) {
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d8bc417281..0753b20e23 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -316,6 +316,7 @@ static inline int inode_doinit(struct inode *inode)
 }
 
 enum {
+        Opt_error = -1,
         Opt_context = 1,
         Opt_fscontext = 2,
         Opt_defcontext = 4,
@@ -327,6 +328,7 @@ static match_table_t tokens = {
         {Opt_fscontext, "fscontext=%s"},
         {Opt_defcontext, "defcontext=%s"},
         {Opt_rootcontext, "rootcontext=%s"},
+        {Opt_error, NULL},
 };
 
 #define SEL_MOUNT_FAIL_MSG "SELinux:  duplicate or incompatible mount options\n"
@@ -1907,6 +1909,9 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm)
                 spin_unlock_irq(&current->sighand->siglock);
         }
 
+        /* Always clear parent death signal on SID transitions. */
+        current->pdeath_signal = 0;
+
         /* Check whether the new SID can inherit resource limits
            from the old SID.  If not, reset all soft limits to
            the lower of the current task's hard limit and the init
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index f057430db0..9b5656d8bc 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -27,6 +27,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/seq_file.h>
 #include <asm/uaccess.h>
 #include <linux/dma-mapping.h>
 #include <linux/moduleparam.h>
@@ -481,53 +482,54 @@ static void free_all_reserved_pages(void)
 #define SND_MEM_PROC_FILE       "driver/snd-page-alloc"
 static struct proc_dir_entry *snd_mem_proc;
 
-static int snd_mem_proc_read(char *page, char **start, off_t off,
-                             int count, int *eof, void *data)
+static int snd_mem_proc_read(struct seq_file *seq, void *offset)
 {
-        int len = 0;
         long pages = snd_allocated_pages >> (PAGE_SHIFT-12);
         struct snd_mem_list *mem;
         int devno;
         static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG", "SBUS" };
 
         mutex_lock(&list_mutex);
-        len += snprintf(page + len, count - len,
-                        "pages  : %li bytes (%li pages per %likB)\n",
-                        pages * PAGE_SIZE, pages, PAGE_SIZE / 1024);
+        seq_printf(seq, "pages  : %li bytes (%li pages per %likB)\n",
+                   pages * PAGE_SIZE, pages, PAGE_SIZE / 1024);
         devno = 0;
         list_for_each_entry(mem, &mem_list_head, list) {
                 devno++;
-                len += snprintf(page + len, count - len,
-                                "buffer %d : ID %08x : type %s\n",
-                                devno, mem->id, types[mem->buffer.dev.type]);
-                len += snprintf(page + len, count - len,
-                                "  addr = 0x%lx, size = %d bytes\n",
-                                (unsigned long)mem->buffer.addr, (int)mem->buffer.bytes);
+                seq_printf(seq, "buffer %d : ID %08x : type %s\n",
+                           devno, mem->id, types[mem->buffer.dev.type]);
+                seq_printf(seq, "  addr = 0x%lx, size = %d bytes\n",
+                           (unsigned long)mem->buffer.addr,
+                           (int)mem->buffer.bytes);
         }
         mutex_unlock(&list_mutex);
-        return len;
+        return 0;
+}
+
+static int snd_mem_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, snd_mem_proc_read, NULL);
 }
 
 /* FIXME: for pci only - other bus? */
 #ifdef CONFIG_PCI
 #define gettoken(bufp) strsep(bufp, " \t\n")
 
-static int snd_mem_proc_write(struct file *file, const char __user *buffer,
-                              unsigned long count, void *data)
+static ssize_t snd_mem_proc_write(struct file *file, const char __user * buffer,
+                                  size_t count, loff_t * ppos)
 {
         char buf[128];
         char *token, *p;
 
-        if (count > ARRAY_SIZE(buf) - 1)
-                count = ARRAY_SIZE(buf) - 1;
+        if (count > sizeof(buf) - 1)
+                return -EINVAL;
         if (copy_from_user(buf, buffer, count))
                 return -EFAULT;
-        buf[ARRAY_SIZE(buf) - 1] = '\0';
+        buf[count] = '\0';
 
         p = buf;
         token = gettoken(&p);
         if (! token || *token == '#')
-                return (int)count;
+                return count;
         if (strcmp(token, "add") == 0) {
                 char *endp;
                 int vendor, device, size, buffers;
@@ -548,7 +550,7 @@ static int snd_mem_proc_write(struct file *file, const char __user *buffer,
                     (buffers = simple_strtol(token, NULL, 0)) <= 0 ||
                     buffers > 4) {
                         printk(KERN_ERR "snd-page-alloc: invalid proc write format\n");
-                        return (int)count;
+                        return count;
                 }
                 vendor &= 0xffff;
                 device &= 0xffff;
@@ -560,7 +562,7 @@ static int snd_mem_proc_write(struct file *file, const char __user *buffer,
                                 if (pci_set_dma_mask(pci, mask) < 0 ||
                                     pci_set_consistent_dma_mask(pci, mask) < 0) {
                                         printk(KERN_ERR "snd-page-alloc: cannot set DMA mask %lx for pci %04x:%04x\n", mask, vendor, device);
-                                        return (int)count;
+                                        return count;
                                 }
                         }
                         for (i = 0; i < buffers; i++) {
@@ -570,7 +572,7 @@ static int snd_mem_proc_write(struct file *file, const char __user *buffer,
                                                         size, &dmab) < 0) {
                                         printk(KERN_ERR "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", size);
                                         pci_dev_put(pci);
-                                        return (int)count;
+                                        return count;
                                 }
                                 snd_dma_reserve_buf(&dmab, snd_dma_pci_buf_id(pci));
                         }
@@ -596,9 +598,21 @@ static int snd_mem_proc_write(struct file *file, const char __user *buffer,
                 free_all_reserved_pages();
         else
                 printk(KERN_ERR "snd-page-alloc: invalid proc cmd\n");
-        return (int)count;
+        return count;
 }
 #endif /* CONFIG_PCI */
+
+static const struct file_operations snd_mem_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = snd_mem_proc_open,
+        .read           = seq_read,
+#ifdef CONFIG_PCI
+        .write          = snd_mem_proc_write,
+#endif
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 #endif /* CONFIG_PROC_FS */
 
 /*
@@ -609,12 +623,8 @@ static int __init snd_mem_init(void)
 {
 #ifdef CONFIG_PROC_FS
         snd_mem_proc = create_proc_entry(SND_MEM_PROC_FILE, 0644, NULL);
-        if (snd_mem_proc) {
-                snd_mem_proc->read_proc = snd_mem_proc_read;
-#ifdef CONFIG_PCI
-                snd_mem_proc->write_proc = snd_mem_proc_write;
-#endif
-        }
+        if (snd_mem_proc)
+                snd_mem_proc->proc_fops = &snd_mem_proc_fops;
 #endif
         return 0;
 }