398 files changed, 6758 insertions, 18039 deletions

diff --git a/Documentation/RCU/NMI-RCU.txt b/Documentation/RCU/NMI-RCU.txt
index c64158ecde43..a6d32e65d222 100644
--- a/Documentation/RCU/NMI-RCU.txt
+++ b/Documentation/RCU/NMI-RCU.txt
@@ -93,6 +93,9 @@ Since NMI handlers disable preemption, synchronize_sched() is guaranteed
 not to return until all ongoing NMI handlers exit.  It is therefore safe
 to free up the handler's data as soon as synchronize_sched() returns.
 
+Important note: for this to work, the architecture in question must
+invoke irq_enter() and irq_exit() on NMI entry and exit, respectively.
+
 
 Answer to Quick Quiz
 
diff --git a/Documentation/RCU/RTFP.txt b/Documentation/RCU/RTFP.txt
index 39ad8f56783a..9f711d2df91b 100644
--- a/Documentation/RCU/RTFP.txt
+++ b/Documentation/RCU/RTFP.txt
@@ -52,6 +52,10 @@ of each iteration.  Unfortunately, chaotic relaxation requires highly
 structured data, such as the matrices used in scientific programs, and
 is thus inapplicable to most data structures in operating-system kernels.
 
+In 1992, Henry (now Alexia) Massalin completed a dissertation advising
+parallel programmers to defer processing when feasible to simplify
+synchronization.  RCU makes extremely heavy use of this advice.
+
 In 1993, Jacobson [Jacobson93] verbally described what is perhaps the
 simplest deferred-free technique: simply waiting a fixed amount of time
 before freeing blocks awaiting deferred free.  Jacobson did not describe
@@ -138,6 +142,13 @@ blocking in read-side critical sections appeared [PaulEMcKenney2006c],
 Robert Olsson described an RCU-protected trie-hash combination
 [RobertOlsson2006a].
 
+2007 saw the journal version of the award-winning RCU paper from 2006
+[ThomasEHart2007a], as well as a paper demonstrating use of Promela
+and Spin to mechanically verify an optimization to Oleg Nesterov's
+QRCU [PaulEMcKenney2007QRCUspin], a design document describing
+preemptible RCU [PaulEMcKenney2007PreemptibleRCU], and the three-part
+LWN "What is RCU?" series [PaulEMcKenney2007WhatIsRCUFundamentally,
+PaulEMcKenney2008WhatIsRCUUsage, and PaulEMcKenney2008WhatIsRCUAPI].
 
 Bibtex Entries
 
@@ -202,6 +213,20 @@ Bibtex Entries
 ,Year="1991"
 }
 
+@phdthesis{HMassalinPhD
+,author="H. Massalin"
+,title="Synthesis: An Efficient Implementation of Fundamental Operating
+System Services"
+,school="Columbia University"
+,address="New York, NY"
+,year="1992"
+,annotation="
+        Mondo optimizing compiler.
+        Wait-free stuff.
+        Good advice: defer work to avoid synchronization.
+"
+}
+
 @unpublished{Jacobson93
 ,author="Van Jacobson"
 ,title="Avoid Read-Side Locking Via Delayed Free"
@@ -635,3 +660,86 @@ Revised:
 "
 }
 
+@unpublished{PaulEMcKenney2007PreemptibleRCU
+,Author="Paul E. McKenney"
+,Title="The design of preemptible read-copy-update"
+,month="October"
+,day="8"
+,year="2007"
+,note="Available:
+\url{http://lwn.net/Articles/253651/}
+[Viewed October 25, 2007]"
+,annotation="
+        LWN article describing the design of preemptible RCU.
+"
+}
+
+########################################################################
+#
+#       "What is RCU?" LWN series.
+#
+
+@unpublished{PaulEMcKenney2007WhatIsRCUFundamentally
+,Author="Paul E. McKenney and Jonathan Walpole"
+,Title="What is {RCU}, Fundamentally?"
+,month="December"
+,day="17"
+,year="2007"
+,note="Available:
+\url{http://lwn.net/Articles/262464/}
+[Viewed December 27, 2007]"
+,annotation="
+        Lays out the three basic components of RCU: (1) publish-subscribe,
+        (2) wait for pre-existing readers to complete, and (2) maintain
+        multiple versions.
+"
+}
+
+@unpublished{PaulEMcKenney2008WhatIsRCUUsage
+,Author="Paul E. McKenney"
+,Title="What is {RCU}? Part 2: Usage"
+,month="January"
+,day="4"
+,year="2008"
+,note="Available:
+\url{http://lwn.net/Articles/263130/}
+[Viewed January 4, 2008]"
+,annotation="
+        Lays out six uses of RCU:
+        1. RCU is a Reader-Writer Lock Replacement
+        2. RCU is a Restricted Reference-Counting Mechanism
+        3. RCU is a Bulk Reference-Counting Mechanism
+        4. RCU is a Poor Man's Garbage Collector
+        5. RCU is a Way of Providing Existence Guarantees
+        6. RCU is a Way of Waiting for Things to Finish 
+"
+}
+
+@unpublished{PaulEMcKenney2008WhatIsRCUAPI
+,Author="Paul E. McKenney"
+,Title="{RCU} part 3: the {RCU} {API}"
+,month="January"
+,day="17"
+,year="2008"
+,note="Available:
+\url{http://lwn.net/Articles/264090/}
+[Viewed January 10, 2008]"
+,annotation="
+        Gives an overview of the Linux-kernel RCU API and a brief annotated RCU
+        bibliography.
+"
+}
+
+@article{DinakarGuniguntala2008IBMSysJ
+,author="D. Guniguntala and P. E. McKenney and J. Triplett and J. Walpole"
+,title="The read-copy-update mechanism for supporting real-time applications on shared-memory multiprocessor systems with {Linux}"
+,Year="2008"
+,Month="April"
+,journal="IBM Systems Journal"
+,volume="47"
+,number="2"
+,pages="@@-@@"
+,annotation="
+        RCU, realtime RCU, sleepable RCU, performance.
+"
+}
diff --git a/Documentation/RCU/checklist.txt b/Documentation/RCU/checklist.txt
index 42b01bc2e1b4..cf5562cbe356 100644
--- a/Documentation/RCU/checklist.txt
+++ b/Documentation/RCU/checklist.txt
@@ -13,10 +13,13 @@ over a rather long period of time, but improvements are always welcome!
         detailed performance measurements show that RCU is nonetheless
         the right tool for the job.
 
-        The other exception would be where performance is not an issue,
-        and RCU provides a simpler implementation.  An example of this
-        situation is the dynamic NMI code in the Linux 2.6 kernel,
-        at least on architectures where NMIs are rare.
+        Another exception is where performance is not an issue, and RCU
+        provides a simpler implementation.  An example of this situation
+        is the dynamic NMI code in the Linux 2.6 kernel, at least on
+        architectures where NMIs are rare.
+
+        Yet another exception is where the low real-time latency of RCU's
+        read-side primitives is critically important.
 
 1.      Does the update code have proper mutual exclusion?
 
@@ -39,9 +42,10 @@ over a rather long period of time, but improvements are always welcome!
 
 2.      Do the RCU read-side critical sections make proper use of
         rcu_read_lock() and friends?  These primitives are needed
-        to suppress preemption (or bottom halves, in the case of
-        rcu_read_lock_bh()) in the read-side critical sections,
-        and are also an excellent aid to readability.
+        to prevent grace periods from ending prematurely, which
+        could result in data being unceremoniously freed out from
+        under your read-side code, which can greatly increase the
+        actuarial risk of your kernel.
 
         As a rough rule of thumb, any dereference of an RCU-protected
         pointer must be covered by rcu_read_lock() or rcu_read_lock_bh()
@@ -54,15 +58,30 @@ over a rather long period of time, but improvements are always welcome!
         be running while updates are in progress.  There are a number
         of ways to handle this concurrency, depending on the situation:
 
-        a.      Make updates appear atomic to readers.  For example,
+        a.      Use the RCU variants of the list and hlist update
+                primitives to add, remove, and replace elements on an
+                RCU-protected list.  Alternatively, use the RCU-protected
+                trees that have been added to the Linux kernel.
+
+                This is almost always the best approach.
+
+        b.      Proceed as in (a) above, but also maintain per-element
+                locks (that are acquired by both readers and writers)
+                that guard per-element state.  Of course, fields that
+                the readers refrain from accessing can be guarded by the
+                update-side lock.
+
+                This works quite well, also.
+
+        c.      Make updates appear atomic to readers.  For example,
                 pointer updates to properly aligned fields will appear
                 atomic, as will individual atomic primitives.  Operations
                 performed under a lock and sequences of multiple atomic
                 primitives will -not- appear to be atomic.
 
-                This is almost always the best approach.
+                This can work, but is starting to get a bit tricky.
 
-        b.      Carefully order the updates and the reads so that
+        d.      Carefully order the updates and the reads so that
                 readers see valid data at all phases of the update.
                 This is often more difficult than it sounds, especially
                 given modern CPUs' tendency to reorder memory references.
@@ -123,18 +142,22 @@ over a rather long period of time, but improvements are always welcome!
                 when publicizing a pointer to a structure that can
                 be traversed by an RCU read-side critical section.
 
-5.      If call_rcu(), or a related primitive such as call_rcu_bh(),
-        is used, the callback function must be written to be called
-        from softirq context.  In particular, it cannot block.
+5.      If call_rcu(), or a related primitive such as call_rcu_bh() or
+        call_rcu_sched(), is used, the callback function must be
+        written to be called from softirq context.  In particular,
+        it cannot block.
 
 6.      Since synchronize_rcu() can block, it cannot be called from
-        any sort of irq context.
+        any sort of irq context.  Ditto for synchronize_sched() and
+        synchronize_srcu().
 
 7.      If the updater uses call_rcu(), then the corresponding readers
         must use rcu_read_lock() and rcu_read_unlock().  If the updater
         uses call_rcu_bh(), then the corresponding readers must use
-        rcu_read_lock_bh() and rcu_read_unlock_bh().  Mixing things up
-        will result in confusion and broken kernels.
+        rcu_read_lock_bh() and rcu_read_unlock_bh().  If the updater
+        uses call_rcu_sched(), then the corresponding readers must
+        disable preemption.  Mixing things up will result in confusion
+        and broken kernels.
 
         One exception to this rule: rcu_read_lock() and rcu_read_unlock()
         may be substituted for rcu_read_lock_bh() and rcu_read_unlock_bh()
@@ -143,9 +166,9 @@ over a rather long period of time, but improvements are always welcome!
         such cases is a must, of course!  And the jury is still out on
         whether the increased speed is worth it.
 
-8.      Although synchronize_rcu() is a bit slower than is call_rcu(),
-        it usually results in simpler code.  So, unless update
-        performance is critically important or the updaters cannot block,
+8.      Although synchronize_rcu() is slower than is call_rcu(), it
+        usually results in simpler code.  So, unless update performance
+        is critically important or the updaters cannot block,
         synchronize_rcu() should be used in preference to call_rcu().
 
         An especially important property of the synchronize_rcu()
@@ -187,23 +210,23 @@ over a rather long period of time, but improvements are always welcome!
                 number of updates per grace period.
 
 9.      All RCU list-traversal primitives, which include
-        list_for_each_rcu(), list_for_each_entry_rcu(),
+        rcu_dereference(), list_for_each_rcu(), list_for_each_entry_rcu(),
         list_for_each_continue_rcu(), and list_for_each_safe_rcu(),
-        must be within an RCU read-side critical section.  RCU
+        must be either within an RCU read-side critical section or
+        must be protected by appropriate update-side locks.  RCU
         read-side critical sections are delimited by rcu_read_lock()
         and rcu_read_unlock(), or by similar primitives such as
         rcu_read_lock_bh() and rcu_read_unlock_bh().
 
-        Use of the _rcu() list-traversal primitives outside of an
-        RCU read-side critical section causes no harm other than
-        a slight performance degradation on Alpha CPUs.  It can
-        also be quite helpful in reducing code bloat when common
-        code is shared between readers and updaters.
+        The reason that it is permissible to use RCU list-traversal
+        primitives when the update-side lock is held is that doing so
+        can be quite helpful in reducing code bloat when common code is
+        shared between readers and updaters.
 
 10.     Conversely, if you are in an RCU read-side critical section,
-        you -must- use the "_rcu()" variants of the list macros.
-        Failing to do so will break Alpha and confuse people reading
-        your code.
+        and you don't hold the appropriate update-side lock, you -must-
+        use the "_rcu()" variants of the list macros.  Failing to do so
+        will break Alpha and confuse people reading your code.
 
 11.     Note that synchronize_rcu() -only- guarantees to wait until
         all currently executing rcu_read_lock()-protected RCU read-side
@@ -230,6 +253,14 @@ over a rather long period of time, but improvements are always welcome!
         must use whatever locking or other synchronization is required
         to safely access and/or modify that data structure.
 
+        RCU callbacks are -usually- executed on the same CPU that executed
+        the corresponding call_rcu(), call_rcu_bh(), or call_rcu_sched(),
+        but are by -no- means guaranteed to be.  For example, if a given
+        CPU goes offline while having an RCU callback pending, then that
+        RCU callback will execute on some surviving CPU.  (If this was
+        not the case, a self-spawning RCU callback would prevent the
+        victim CPU from ever going offline.)
+
 14.     SRCU (srcu_read_lock(), srcu_read_unlock(), and synchronize_srcu())
         may only be invoked from process context.  Unlike other forms of
         RCU, it -is- permissible to block in an SRCU read-side critical
diff --git a/Documentation/RCU/torture.txt b/Documentation/RCU/torture.txt
index 2967a65269d8..a342b6e1cc10 100644
--- a/Documentation/RCU/torture.txt
+++ b/Documentation/RCU/torture.txt
@@ -10,23 +10,30 @@ status messages via printk(), which can be examined via the dmesg
 command (perhaps grepping for "torture").  The test is started
 when the module is loaded, and stops when the module is unloaded.
 
-However, actually setting this config option to "y" results in the system
-running the test immediately upon boot, and ending only when the system
-is taken down.  Normally, one will instead want to build the system
-with CONFIG_RCU_TORTURE_TEST=m and to use modprobe and rmmod to control
-the test, perhaps using a script similar to the one shown at the end of
-this document.  Note that you will need CONFIG_MODULE_UNLOAD in order
-to be able to end the test.
+CONFIG_RCU_TORTURE_TEST_RUNNABLE
+
+It is also possible to specify CONFIG_RCU_TORTURE_TEST=y, which will
+result in the tests being loaded into the base kernel.  In this case,
+the CONFIG_RCU_TORTURE_TEST_RUNNABLE config option is used to specify
+whether the RCU torture tests are to be started immediately during
+boot or whether the /proc/sys/kernel/rcutorture_runnable file is used
+to enable them.  This /proc file can be used to repeatedly pause and
+restart the tests, regardless of the initial state specified by the
+CONFIG_RCU_TORTURE_TEST_RUNNABLE config option.
+
+You will normally -not- want to start the RCU torture tests during boot
+(and thus the default is CONFIG_RCU_TORTURE_TEST_RUNNABLE=n), but doing
+this can sometimes be useful in finding boot-time bugs.
 
 
 MODULE PARAMETERS
 
 This module has the following parameters:
 
-nreaders        This is the number of RCU reading threads supported.
-                The default is twice the number of CPUs.  Why twice?
-                To properly exercise RCU implementations with preemptible
-                read-side critical sections.
+irqreaders      Says to invoke RCU readers from irq level.  This is currently
+                done via timers.  Defaults to "1" for variants of RCU that
+                permit this.  (Or, more accurately, variants of RCU that do
+                -not- permit this know to ignore this variable.)
 
 nfakewriters    This is the number of RCU fake writer threads to run.  Fake
                 writer threads repeatedly use the synchronous "wait for
@@ -37,6 +44,16 @@ nfakewriters	This is the number of RCU fake writer threads to run.  Fake
                 to trigger special cases caused by multiple writers, such as
                 the synchronize_srcu() early return optimization.
 
+nreaders        This is the number of RCU reading threads supported.
+                The default is twice the number of CPUs.  Why twice?
+                To properly exercise RCU implementations with preemptible
+                read-side critical sections.
+
+shuffle_interval
+                The number of seconds to keep the test threads affinitied
+                to a particular subset of the CPUs, defaults to 3 seconds.
+                Used in conjunction with test_no_idle_hz.
+
 stat_interval   The number of seconds between output of torture
                 statistics (via printk()).  Regardless of the interval,
                 statistics are printed when the module is unloaded.
@@ -44,10 +61,11 @@ stat_interval	The number of seconds between output of torture
                 be printed -only- when the module is unloaded, and this
                 is the default.
 
-shuffle_interval
-                The number of seconds to keep the test threads affinitied
-                to a particular subset of the CPUs, defaults to 5 seconds.
-                Used in conjunction with test_no_idle_hz.
+stutter         The length of time to run the test before pausing for this
+                same period of time.  Defaults to "stutter=5", so as
+                to run and pause for (roughly) five-second intervals.
+                Specifying "stutter=0" causes the test to run continuously
+                without pausing, which is the old default behavior.
 
 test_no_idle_hz Whether or not to test the ability of RCU to operate in
                 a kernel that disables the scheduling-clock interrupt to
diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt
index e0d6d99b8f9b..e04d643a9f57 100644
--- a/Documentation/RCU/whatisRCU.txt
+++ b/Documentation/RCU/whatisRCU.txt
@@ -1,3 +1,11 @@
+Please note that the "What is RCU?" LWN series is an excellent place
+to start learning about RCU:
+
+1.      What is RCU, Fundamentally?  http://lwn.net/Articles/262464/
+2.      What is RCU? Part 2: Usage   http://lwn.net/Articles/263130/
+3.      RCU part 3: the RCU API      http://lwn.net/Articles/264090/
+
+
 What is RCU?
 
 RCU is a synchronization mechanism that was added to the Linux kernel
@@ -772,26 +780,18 @@ Linux-kernel source code, but it helps to have a full list of the
 APIs, since there does not appear to be a way to categorize them
 in docbook.  Here is the list, by category.
 
-Markers for RCU read-side critical sections:
-
-        rcu_read_lock
-        rcu_read_unlock
-        rcu_read_lock_bh
-        rcu_read_unlock_bh
-        srcu_read_lock
-        srcu_read_unlock
-
 RCU pointer/list traversal:
 
         rcu_dereference
+        list_for_each_entry_rcu
+        hlist_for_each_entry_rcu
+
         list_for_each_rcu               (to be deprecated in favor of
                                          list_for_each_entry_rcu)
-        list_for_each_entry_rcu
         list_for_each_continue_rcu      (to be deprecated in favor of new
                                          list_for_each_entry_continue_rcu)
-        hlist_for_each_entry_rcu
 
-RCU pointer update:
+RCU pointer/list update:
 
         rcu_assign_pointer
         list_add_rcu
@@ -799,16 +799,36 @@ RCU pointer update:
         list_del_rcu
         list_replace_rcu
         hlist_del_rcu
+        hlist_add_after_rcu
+        hlist_add_before_rcu
         hlist_add_head_rcu
+        hlist_replace_rcu
+        list_splice_init_rcu()
 
-RCU grace period:
+RCU:    Critical sections       Grace period            Barrier
+
+        rcu_read_lock           synchronize_net         rcu_barrier
+        rcu_read_unlock         synchronize_rcu
+                                call_rcu
+
+
+bh:     Critical sections       Grace period            Barrier
+
+        rcu_read_lock_bh        call_rcu_bh             rcu_barrier_bh
+        rcu_read_unlock_bh
+
+
+sched:  Critical sections       Grace period            Barrier
+
+        [preempt_disable]       synchronize_sched       rcu_barrier_sched
+        [and friends]           call_rcu_sched
+
+
+SRCU:   Critical sections       Grace period            Barrier
+
+        srcu_read_lock          synchronize_srcu        N/A
+        srcu_read_unlock
 
-        synchronize_net
-        synchronize_sched
-        synchronize_rcu
-        synchronize_srcu
-        call_rcu
-        call_rcu_bh
 
 See the comment headers in the source code (or the docbook generated
 from them) for more information.
diff --git a/MAINTAINERS b/MAINTAINERS
index 6198fa3deb99..fc6c005c531a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1777,6 +1777,11 @@ M:	hch@infradead.org
 W:      ftp://ftp.openlinux.org/pub/people/hch/vxfs
 S:      Maintained
 
+FTRACE
+P:      Steven Rostedt
+M:      srostedt@redhat.com
+S:      Maintained
+
 FUJITSU FR-V (FRV) PORT
 P:      David Howells
 M:      dhowells@redhat.com
diff --git a/arch/Kconfig b/arch/Kconfig
index 3ea332b009e5..ad89a33d8c6e 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -39,3 +39,6 @@ config HAVE_KRETPROBES
 
 config HAVE_DMA_ATTRS
         def_bool n
+
+config USE_GENERIC_SMP_HELPERS
+        def_bool n
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 729cdbdf8036..dbe8c280fea9 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -528,6 +528,7 @@ config ARCH_MAY_HAVE_PC_FDC
 config SMP
         bool "Symmetric multi-processing support"
         depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL
+        select USE_GENERIC_SMP_HELPERS
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index b04f1feb1dda..04dcc5e5d4c1 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -660,9 +660,9 @@ __marvel_rtc_io(u8 b, unsigned long addr, int write)
 
 #ifdef CONFIG_SMP
                 if (smp_processor_id() != boot_cpuid)
-                        smp_call_function_on_cpu(__marvel_access_rtc,
-                                                 &rtc_access, 1, 1,
-                                                 cpumask_of_cpu(boot_cpuid));
+                        smp_call_function_single(boot_cpuid,
+                                                 __marvel_access_rtc,
+                                                 &rtc_access, 1);
                 else
                         __marvel_access_rtc(&rtc_access);
 #else
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 96ed82fd9eef..351407e07e71 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -160,7 +160,7 @@ common_shutdown(int mode, char *restart_cmd)
         struct halt_info args;
         args.mode = mode;
         args.restart_cmd = restart_cmd;
-        on_each_cpu(common_shutdown_1, &args, 1, 0);
+        on_each_cpu(common_shutdown_1, &args, 0);
 }
 
 void
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 2525692db0ab..83df541650fc 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -62,6 +62,7 @@ static struct {
 enum ipi_message_type {
         IPI_RESCHEDULE,
         IPI_CALL_FUNC,
+        IPI_CALL_FUNC_SINGLE,
         IPI_CPU_STOP,
 };
 
@@ -558,51 +559,6 @@ send_ipi_message(cpumask_t to_whom, enum ipi_message_type operation)
                 wripir(i);
 }
 
-/* Structure and data for smp_call_function.  This is designed to 
-   minimize static memory requirements.  Plus it looks cleaner.  */
-
-struct smp_call_struct {
-        void (*func) (void *info);
-        void *info;
-        long wait;
-        atomic_t unstarted_count;
-        atomic_t unfinished_count;
-};
-
-static struct smp_call_struct *smp_call_function_data;
-
-/* Atomicly drop data into a shared pointer.  The pointer is free if
-   it is initially locked.  If retry, spin until free.  */
-
-static int
-pointer_lock (void *lock, void *data, int retry)
-{
-        void *old, *tmp;
-
-        mb();
- again:
-        /* Compare and swap with zero.  */
-        asm volatile (
-        "1:     ldq_l   %0,%1\n"
-        "       mov     %3,%2\n"
-        "       bne     %0,2f\n"
-        "       stq_c   %2,%1\n"
-        "       beq     %2,1b\n"
-        "2:"
-        : "=&r"(old), "=m"(*(void **)lock), "=&r"(tmp)
-        : "r"(data)
-        : "memory");
-
-        if (old == 0)
-                return 0;
-        if (! retry)
-                return -EBUSY;
-
-        while (*(void **)lock)
-                barrier();
-        goto again;
-}
-
 void
 handle_ipi(struct pt_regs *regs)
 {
@@ -632,31 +588,12 @@ handle_ipi(struct pt_regs *regs)
                         break;
 
                 case IPI_CALL_FUNC:
-                    {
-                        struct smp_call_struct *data;
-                        void (*func)(void *info);
-                        void *info;
-                        int wait;
-
-                        data = smp_call_function_data;
-                        func = data->func;
-                        info = data->info;
-                        wait = data->wait;
-
-                        /* Notify the sending CPU that the data has been
-                           received, and execution is about to begin.  */
-                        mb();
-                        atomic_dec (&data->unstarted_count);
-
-                        /* At this point the structure may be gone unless
-                           wait is true.  */
-                        (*func)(info);
-
-                        /* Notify the sending CPU that the task is done.  */
-                        mb();
-                        if (wait) atomic_dec (&data->unfinished_count);
+                        generic_smp_call_function_interrupt();
+                        break;
+
+                case IPI_CALL_FUNC_SINGLE:
+                        generic_smp_call_function_single_interrupt();
                         break;
-                    }
 
                 case IPI_CPU_STOP:
                         halt();
@@ -700,102 +637,15 @@ smp_send_stop(void)
         send_ipi_message(to_whom, IPI_CPU_STOP);
 }
 
-/*
- * Run a function on all other CPUs.
- *  <func>      The function to run. This must be fast and non-blocking.
- *  <info>      An arbitrary pointer to pass to the function.
- *  <retry>     If true, keep retrying until ready.
- *  <wait>      If true, wait until function has completed on other CPUs.
- *  [RETURNS]   0 on success, else a negative status code.
- *
- * Does not return until remote CPUs are nearly ready to execute <func>
- * or are or have executed.
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-
-int
-smp_call_function_on_cpu (void (*func) (void *info), void *info, int retry,
-                          int wait, cpumask_t to_whom)
+void arch_send_call_function_ipi(cpumask_t mask)
 {
-        struct smp_call_struct data;
-        unsigned long timeout;
-        int num_cpus_to_call;
-        
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        data.func = func;
-        data.info = info;
-        data.wait = wait;
-
-        cpu_clear(smp_processor_id(), to_whom);
-        num_cpus_to_call = cpus_weight(to_whom);
-
-        atomic_set(&data.unstarted_count, num_cpus_to_call);
-        atomic_set(&data.unfinished_count, num_cpus_to_call);
-
-        /* Acquire the smp_call_function_data mutex.  */
-        if (pointer_lock(&smp_call_function_data, &data, retry))
-                return -EBUSY;
-
-        /* Send a message to the requested CPUs.  */
-        send_ipi_message(to_whom, IPI_CALL_FUNC);
-
-        /* Wait for a minimal response.  */
-        timeout = jiffies + HZ;
-        while (atomic_read (&data.unstarted_count) > 0
-               && time_before (jiffies, timeout))
-                barrier();
-
-        /* If there's no response yet, log a message but allow a longer
-         * timeout period -- if we get a response this time, log
-         * a message saying when we got it.. 
-         */
-        if (atomic_read(&data.unstarted_count) > 0) {
-                long start_time = jiffies;
-                printk(KERN_ERR "%s: initial timeout -- trying long wait\n",
-                       __func__);
-                timeout = jiffies + 30 * HZ;
-                while (atomic_read(&data.unstarted_count) > 0
-                       && time_before(jiffies, timeout))
-                        barrier();
-                if (atomic_read(&data.unstarted_count) <= 0) {
-                        long delta = jiffies - start_time;
-                        printk(KERN_ERR 
-                               "%s: response %ld.%ld seconds into long wait\n",
-                               __func__, delta / HZ,
-                               (100 * (delta - ((delta / HZ) * HZ))) / HZ);
-                }
-        }
-
-        /* We either got one or timed out -- clear the lock. */
-        mb();
-        smp_call_function_data = NULL;
-
-        /* 
-         * If after both the initial and long timeout periods we still don't
-         * have a response, something is very wrong...
-         */
-        BUG_ON(atomic_read (&data.unstarted_count) > 0);
-
-        /* Wait for a complete response, if needed.  */
-        if (wait) {
-                while (atomic_read (&data.unfinished_count) > 0)
-                        barrier();
-        }
-
-        return 0;
+        send_ipi_message(mask, IPI_CALL_FUNC);
 }
-EXPORT_SYMBOL(smp_call_function_on_cpu);
 
-int
-smp_call_function (void (*func) (void *info), void *info, int retry, int wait)
+void arch_send_call_function_single_ipi(int cpu)
 {
-        return smp_call_function_on_cpu (func, info, retry, wait,
-                                         cpu_online_map);
+        send_ipi_message(cpumask_of_cpu(cpu), IPI_CALL_FUNC_SINGLE);
 }
-EXPORT_SYMBOL(smp_call_function);
 
 static void
 ipi_imb(void *ignored)
@@ -807,7 +657,7 @@ void
 smp_imb(void)
 {
         /* Must wait other processors to flush their icache before continue. */
-        if (on_each_cpu(ipi_imb, NULL, 1, 1))
+        if (on_each_cpu(ipi_imb, NULL, 1))
                 printk(KERN_CRIT "smp_imb: timed out\n");
 }
 EXPORT_SYMBOL(smp_imb);
@@ -823,7 +673,7 @@ flush_tlb_all(void)
 {
         /* Although we don't have any data to pass, we do want to
            synchronize with the other processors.  */
-        if (on_each_cpu(ipi_flush_tlb_all, NULL, 1, 1)) {
+        if (on_each_cpu(ipi_flush_tlb_all, NULL, 1)) {
                 printk(KERN_CRIT "flush_tlb_all: timed out\n");
         }
 }
@@ -860,7 +710,7 @@ flush_tlb_mm(struct mm_struct *mm)
                 }
         }
 
-        if (smp_call_function(ipi_flush_tlb_mm, mm, 1, 1)) {
+        if (smp_call_function(ipi_flush_tlb_mm, mm, 1)) {
                 printk(KERN_CRIT "flush_tlb_mm: timed out\n");
         }
 
@@ -913,7 +763,7 @@ flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
         data.mm = mm;
         data.addr = addr;
 
-        if (smp_call_function(ipi_flush_tlb_page, &data, 1, 1)) {
+        if (smp_call_function(ipi_flush_tlb_page, &data, 1)) {
                 printk(KERN_CRIT "flush_tlb_page: timed out\n");
         }
 
@@ -965,7 +815,7 @@ flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
                 }
         }
 
-        if (smp_call_function(ipi_flush_icache_page, mm, 1, 1)) {
+        if (smp_call_function(ipi_flush_icache_page, mm, 1)) {
                 printk(KERN_CRIT "flush_icache_page: timed out\n");
         }
 
diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c
index 9fc0eeb4f0ab..7c3d5ec6ec67 100644
--- a/arch/alpha/oprofile/common.c
+++ b/arch/alpha/oprofile/common.c
@@ -65,7 +65,7 @@ op_axp_setup(void)
         model->reg_setup(&reg, ctr, &sys);
 
         /* Configure the registers on all cpus.  */
-        (void)smp_call_function(model->cpu_setup, &reg, 0, 1);
+        (void)smp_call_function(model->cpu_setup, &reg, 1);
         model->cpu_setup(&reg);
         return 0;
 }
@@ -86,7 +86,7 @@ op_axp_cpu_start(void *dummy)
 static int
 op_axp_start(void)
 {
-        (void)smp_call_function(op_axp_cpu_start, NULL, 0, 1);
+        (void)smp_call_function(op_axp_cpu_start, NULL, 1);
         op_axp_cpu_start(NULL);
         return 0;
 }
@@ -101,7 +101,7 @@ op_axp_cpu_stop(void *dummy)
 static void
 op_axp_stop(void)
 {
-        (void)smp_call_function(op_axp_cpu_stop, NULL, 0, 1);
+        (void)smp_call_function(op_axp_cpu_stop, NULL, 1);
         op_axp_cpu_stop(NULL);
 }
 
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 258f1369fb0c..c7ad324ddf2c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -701,6 +701,7 @@ source "kernel/time/Kconfig"
 config SMP
         bool "Symmetric Multi-Processing (EXPERIMENTAL)"
         depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
+        select USE_GENERIC_SMP_HELPERS
         help
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index eefae1de334c..5a7c09564d13 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -68,20 +68,10 @@ enum ipi_msg_type {
         IPI_TIMER,
         IPI_RESCHEDULE,
         IPI_CALL_FUNC,
+        IPI_CALL_FUNC_SINGLE,
         IPI_CPU_STOP,
 };
 
-struct smp_call_struct {
-        void (*func)(void *info);
-        void *info;
-        int wait;
-        cpumask_t pending;
-        cpumask_t unfinished;
-};
-
-static struct smp_call_struct * volatile smp_call_function_data;
-static DEFINE_SPINLOCK(smp_call_function_lock);
-
 int __cpuinit __cpu_up(unsigned int cpu)
 {
         struct cpuinfo_arm *ci = &per_cpu(cpu_data, cpu);
@@ -366,114 +356,15 @@ static void send_ipi_message(cpumask_t callmap, enum ipi_msg_type msg)
         local_irq_restore(flags);
 }
 
-/*
- * You must not call this function with disabled interrupts, from a
- * hardware interrupt handler, nor from a bottom half handler.
- */
-static int smp_call_function_on_cpu(void (*func)(void *info), void *info,
-                                    int retry, int wait, cpumask_t callmap)
-{
-        struct smp_call_struct data;
-        unsigned long timeout;
-        int ret = 0;
-
-        data.func = func;
-        data.info = info;
-        data.wait = wait;
-
-        cpu_clear(smp_processor_id(), callmap);
-        if (cpus_empty(callmap))
-                goto out;
-
-        data.pending = callmap;
-        if (wait)
-                data.unfinished = callmap;
-
-        /*
-         * try to get the mutex on smp_call_function_data
-         */
-        spin_lock(&smp_call_function_lock);
-        smp_call_function_data = &data;
-
-        send_ipi_message(callmap, IPI_CALL_FUNC);
-
-        timeout = jiffies + HZ;
-        while (!cpus_empty(data.pending) && time_before(jiffies, timeout))
-                barrier();
-
-        /*
-         * did we time out?
-         */
-        if (!cpus_empty(data.pending)) {
-                /*
-                 * this may be causing our panic - report it
-                 */
-                printk(KERN_CRIT
-                       "CPU%u: smp_call_function timeout for %p(%p)\n"
-                       "      callmap %lx pending %lx, %swait\n",
-                       smp_processor_id(), func, info, *cpus_addr(callmap),
-                       *cpus_addr(data.pending), wait ? "" : "no ");
-
-                /*
-                 * TRACE
-                 */
-                timeout = jiffies + (5 * HZ);
-                while (!cpus_empty(data.pending) && time_before(jiffies, timeout))
-                        barrier();
-
-                if (cpus_empty(data.pending))
-                        printk(KERN_CRIT "     RESOLVED\n");
-                else
-                        printk(KERN_CRIT "     STILL STUCK\n");
-        }
-
-        /*
-         * whatever happened, we're done with the data, so release it
-         */
-        smp_call_function_data = NULL;
-        spin_unlock(&smp_call_function_lock);
-
-        if (!cpus_empty(data.pending)) {
-                ret = -ETIMEDOUT;
-                goto out;
-        }
-
-        if (wait)
-                while (!cpus_empty(data.unfinished))
-                        barrier();
- out:
-
-        return 0;
-}
-
-int smp_call_function(void (*func)(void *info), void *info, int retry,
-                      int wait)
+void arch_send_call_function_ipi(cpumask_t mask)
 {
-        return smp_call_function_on_cpu(func, info, retry, wait,
-                                        cpu_online_map);
+        send_ipi_message(mask, IPI_CALL_FUNC);
 }
-EXPORT_SYMBOL_GPL(smp_call_function);
 
-int smp_call_function_single(int cpu, void (*func)(void *info), void *info,
-                             int retry, int wait)
+void arch_send_call_function_single_ipi(int cpu)
 {
-        /* prevent preemption and reschedule on another processor */
-        int current_cpu = get_cpu();
-        int ret = 0;
-
-        if (cpu == current_cpu) {
-                local_irq_disable();
-                func(info);
-                local_irq_enable();
-        } else
-                ret = smp_call_function_on_cpu(func, info, retry, wait,
-                                               cpumask_of_cpu(cpu));
-
-        put_cpu();
-
-        return ret;
+        send_ipi_message(cpumask_of_cpu(cpu), IPI_CALL_FUNC_SINGLE);
 }
-EXPORT_SYMBOL_GPL(smp_call_function_single);
 
 void show_ipi_list(struct seq_file *p)
 {
@@ -521,27 +412,6 @@ asmlinkage void __exception do_local_timer(struct pt_regs *regs)
 }
 #endif
 
-/*
- * ipi_call_function - handle IPI from smp_call_function()
- *
- * Note that we copy data out of the cross-call structure and then
- * let the caller know that we're here and have done with their data
- */
-static void ipi_call_function(unsigned int cpu)
-{
-        struct smp_call_struct *data = smp_call_function_data;
-        void (*func)(void *info) = data->func;
-        void *info = data->info;
-        int wait = data->wait;
-
-        cpu_clear(cpu, data->pending);
-
-        func(info);
-
-        if (wait)
-                cpu_clear(cpu, data->unfinished);
-}
-
 static DEFINE_SPINLOCK(stop_lock);
 
 /*
@@ -611,7 +481,11 @@ asmlinkage void __exception do_IPI(struct pt_regs *regs)
                                 break;
 
                         case IPI_CALL_FUNC:
-                                ipi_call_function(cpu);
+                                generic_smp_call_function_interrupt();
+                                break;
+
+                        case IPI_CALL_FUNC_SINGLE:
+                                generic_smp_call_function_single_interrupt();
                                 break;
 
                         case IPI_CPU_STOP:
@@ -662,14 +536,13 @@ int setup_profiling_timer(unsigned int multiplier)
 }
 
 static int
-on_each_cpu_mask(void (*func)(void *), void *info, int retry, int wait,
-                 cpumask_t mask)
+on_each_cpu_mask(void (*func)(void *), void *info, int wait, cpumask_t mask)
 {
         int ret = 0;
 
         preempt_disable();
 
-        ret = smp_call_function_on_cpu(func, info, retry, wait, mask);
+        ret = smp_call_function_mask(mask, func, info, wait);
         if (cpu_isset(smp_processor_id(), mask))
                 func(info);
 
@@ -731,14 +604,14 @@ static inline void ipi_flush_tlb_kernel_range(void *arg)
 
 void flush_tlb_all(void)
 {
-        on_each_cpu(ipi_flush_tlb_all, NULL, 1, 1);
+        on_each_cpu(ipi_flush_tlb_all, NULL, 1);
 }
 
 void flush_tlb_mm(struct mm_struct *mm)
 {
         cpumask_t mask = mm->cpu_vm_mask;
 
-        on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, 1, mask);
+        on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, mask);
 }
 
 void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
@@ -749,7 +622,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
         ta.ta_vma = vma;
         ta.ta_start = uaddr;
 
-        on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, 1, mask);
+        on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, mask);
 }
 
 void flush_tlb_kernel_page(unsigned long kaddr)
@@ -758,7 +631,7 @@ void flush_tlb_kernel_page(unsigned long kaddr)
 
         ta.ta_start = kaddr;
 
-        on_each_cpu(ipi_flush_tlb_kernel_page, &ta, 1, 1);
+        on_each_cpu(ipi_flush_tlb_kernel_page, &ta, 1);
 }
 
 void flush_tlb_range(struct vm_area_struct *vma,
@@ -771,7 +644,7 @@ void flush_tlb_range(struct vm_area_struct *vma,
         ta.ta_start = start;
         ta.ta_end = end;
 
-        on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, 1, mask);
+        on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, mask);
 }
 
 void flush_tlb_kernel_range(unsigned long start, unsigned long end)
@@ -781,5 +654,5 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
         ta.ta_start = start;
         ta.ta_end = end;
 
-        on_each_cpu(ipi_flush_tlb_kernel_range, &ta, 1, 1);
+        on_each_cpu(ipi_flush_tlb_kernel_range, &ta, 1);
 }
diff --git a/arch/arm/oprofile/op_model_mpcore.c b/arch/arm/oprofile/op_model_mpcore.c
index 74fae6045650..4458705021e0 100644
--- a/arch/arm/oprofile/op_model_mpcore.c
+++ b/arch/arm/oprofile/op_model_mpcore.c
@@ -201,7 +201,7 @@ static int em_call_function(int (*fn)(void))
         data.ret = 0;
 
         preempt_disable();
-        smp_call_function(em_func, &data, 1, 1);
+        smp_call_function(em_func, &data, 1);
         em_func(&data);
         preempt_enable();
 
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 32455c633f1c..c0d2c9bb952b 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -352,7 +352,7 @@ static int __init vfp_init(void)
         else if (vfpsid & FPSID_NODOUBLE) {
                 printk("no double precision support\n");
         } else {
-                smp_call_function(vfp_enable, NULL, 1, 1);
+                smp_call_function(vfp_enable, NULL, 1);
 
                 VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT;  /* Extract the architecture version */
                 printk("implementor %02x architecture %d part %02x variant %x rev %x\n",
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index a9c3334e46c9..952a24b2f5a9 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -194,7 +194,7 @@ void stop_this_cpu(void* dummy)
 /* Other calls */
 void smp_send_stop(void)
 {
-        smp_call_function(stop_this_cpu, NULL, 1, 0);
+        smp_call_function(stop_this_cpu, NULL, 0);
 }
 
 int setup_profiling_timer(unsigned int multiplier)
@@ -316,8 +316,7 @@ int send_ipi(int vector, int wait, cpumask_t cpu_mask)
  * You must not call this function with disabled interrupts or from a
  * hardware interrupt handler or from a bottom half handler.
  */
-int smp_call_function(void (*func)(void *info), void *info,
-                      int nonatomic, int wait)
+int smp_call_function(void (*func)(void *info), void *info, int wait)
 {
         cpumask_t cpu_mask = CPU_MASK_ALL;
         struct call_data_struct data;
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 16be41446b5b..18bcc10903b4 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -303,6 +303,7 @@ config VIRT_CPU_ACCOUNTING
 
 config SMP
         bool "Symmetric multi-processing support"
+        select USE_GENERIC_SMP_HELPERS
         help
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, say N.  If you have a system with more
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 705176b434b3..7dd96c127177 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -707,7 +707,7 @@ ia64_mca_cmc_vector_enable (void *dummy)
 static void
 ia64_mca_cmc_vector_disable_keventd(struct work_struct *unused)
 {
-        on_each_cpu(ia64_mca_cmc_vector_disable, NULL, 1, 0);
+        on_each_cpu(ia64_mca_cmc_vector_disable, NULL, 0);
 }
 
 /*
@@ -719,7 +719,7 @@ ia64_mca_cmc_vector_disable_keventd(struct work_struct *unused)
 static void
 ia64_mca_cmc_vector_enable_keventd(struct work_struct *unused)
 {
-        on_each_cpu(ia64_mca_cmc_vector_enable, NULL, 1, 0);
+        on_each_cpu(ia64_mca_cmc_vector_enable, NULL, 0);
 }
 
 /*
@@ -1881,7 +1881,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
                 smp_call_function_single(hotcpu, ia64_mca_cmc_vector_adjust,
-                                         NULL, 1, 0);
+                                         NULL, 0);
                 break;
         }
         return NOTIFY_OK;
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 9dc00f7fe10e..e5c57f413ca2 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -921,7 +921,7 @@ int palinfo_handle_smp(pal_func_cpu_u_t *f, char *page)
 
 
         /* will send IPI to other CPU and wait for completion of remote call */
-        if ((ret=smp_call_function_single(f->req_cpu, palinfo_smp_call, &ptr, 0, 1))) {
+        if ((ret=smp_call_function_single(f->req_cpu, palinfo_smp_call, &ptr, 1))) {
                 printk(KERN_ERR "palinfo: remote CPU call from %d to %d on function %d: "
                        "error %d\n", smp_processor_id(), f->req_cpu, f->func_id, ret);
                 return 0;
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 7714a97b0104..19d4493c6193 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -1820,7 +1820,7 @@ pfm_syswide_cleanup_other_cpu(pfm_context_t *ctx)
         int ret;
 
         DPRINT(("calling CPU%d for cleanup\n", ctx->ctx_cpu));
-        ret = smp_call_function_single(ctx->ctx_cpu, pfm_syswide_force_stop, ctx, 0, 1);
+        ret = smp_call_function_single(ctx->ctx_cpu, pfm_syswide_force_stop, ctx, 1);
         DPRINT(("called CPU%d for cleanup ret=%d\n", ctx->ctx_cpu, ret));
 }
 #endif /* CONFIG_SMP */
@@ -6508,7 +6508,7 @@ pfm_install_alt_pmu_interrupt(pfm_intr_handler_desc_t *hdl)
         }
 
         /* save the current system wide pmu states */
-        ret = on_each_cpu(pfm_alt_save_pmu_state, NULL, 0, 1);
+        ret = on_each_cpu(pfm_alt_save_pmu_state, NULL, 1);
         if (ret) {
                 DPRINT(("on_each_cpu() failed: %d\n", ret));
                 goto cleanup_reserve;
@@ -6553,7 +6553,7 @@ pfm_remove_alt_pmu_interrupt(pfm_intr_handler_desc_t *hdl)
 
         pfm_alt_intr_handler = NULL;
 
-        ret = on_each_cpu(pfm_alt_restore_pmu_state, NULL, 0, 1);
+        ret = on_each_cpu(pfm_alt_restore_pmu_state, NULL, 1);
         if (ret) {
                 DPRINT(("on_each_cpu() failed: %d\n", ret));
         }
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index a3a34b4eb038..fabaf08d9a69 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -286,7 +286,7 @@ void cpu_idle_wait(void)
 {
         smp_mb();
         /* kick all the CPUs so that they exit out of pm_idle */
-        smp_call_function(do_nothing, NULL, 0, 1);
+        smp_call_function(do_nothing, NULL, 1);
 }
 EXPORT_SYMBOL_GPL(cpu_idle_wait);
 
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index 983296f1c813..3676468612b6 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -60,25 +60,9 @@ static struct local_tlb_flush_counts {
 
 static DEFINE_PER_CPU(unsigned int, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned;
 
-
-/*
- * Structure and data for smp_call_function(). This is designed to minimise static memory
- * requirements. It also looks cleaner.
- */
-static  __cacheline_aligned DEFINE_SPINLOCK(call_lock);
-
-struct call_data_struct {
-        void (*func) (void *info);
-        void *info;
-        long wait;
-        atomic_t started;
-        atomic_t finished;
-};
-
-static volatile struct call_data_struct *call_data;
-
 #define IPI_CALL_FUNC           0
 #define IPI_CPU_STOP            1
+#define IPI_CALL_FUNC_SINGLE    2
 #define IPI_KDUMP_CPU_STOP      3
 
 /* This needs to be cacheline aligned because it is written to by *other* CPUs.  */
@@ -86,43 +70,6 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(u64, ipi_operation);
 
 extern void cpu_halt (void);
 
-void
-lock_ipi_calllock(void)
-{
-        spin_lock_irq(&call_lock);
-}
-
-void
-unlock_ipi_calllock(void)
-{
-        spin_unlock_irq(&call_lock);
-}
-
-static inline void
-handle_call_data(void)
-{
-        struct call_data_struct *data;
-        void (*func)(void *info);
-        void *info;
-        int wait;
-
-        /* release the 'pointer lock' */
-        data = (struct call_data_struct *)call_data;
-        func = data->func;
-        info = data->info;
-        wait = data->wait;
-
-        mb();
-        atomic_inc(&data->started);
-        /* At this point the structure may be gone unless wait is true. */
-        (*func)(info);
-
-        /* Notify the sending CPU that the task is done. */
-        mb();
-        if (wait)
-                atomic_inc(&data->finished);
-}
-
 static void
 stop_this_cpu(void)
 {
@@ -163,13 +110,15 @@ handle_IPI (int irq, void *dev_id)
                         ops &= ~(1 << which);
 
                         switch (which) {
-                        case IPI_CALL_FUNC:
-                                handle_call_data();
-                                break;
-
                         case IPI_CPU_STOP:
                                 stop_this_cpu();
                                 break;
+                        case IPI_CALL_FUNC:
+                                generic_smp_call_function_interrupt();
+                                break;
+                        case IPI_CALL_FUNC_SINGLE:
+                                generic_smp_call_function_single_interrupt();
+                                break;
 #ifdef CONFIG_KEXEC
                         case IPI_KDUMP_CPU_STOP:
                                 unw_init_running(kdump_cpu_freeze, NULL);
@@ -187,6 +136,8 @@ handle_IPI (int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
+
+
 /*
  * Called with preemption disabled.
  */
@@ -334,7 +285,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask)
 void
 smp_flush_tlb_all (void)
 {
-        on_each_cpu((void (*)(void *))local_flush_tlb_all, NULL, 1, 1);
+        on_each_cpu((void (*)(void *))local_flush_tlb_all, NULL, 1);
 }
 
 void
@@ -357,193 +308,18 @@ smp_flush_tlb_mm (struct mm_struct *mm)
          * anyhow, and once a CPU is interrupted, the cost of local_flush_tlb_all() is
          * rather trivial.
          */
-        on_each_cpu((void (*)(void *))local_finish_flush_tlb_mm, mm, 1, 1);
+        on_each_cpu((void (*)(void *))local_finish_flush_tlb_mm, mm, 1);
 }
 
-/*
- * Run a function on a specific CPU
- *  <func>      The function to run. This must be fast and non-blocking.
- *  <info>      An arbitrary pointer to pass to the function.
- *  <nonatomic> Currently unused.
- *  <wait>      If true, wait until function has completed on other CPUs.
- *  [RETURNS]   0 on success, else a negative status code.
- *
- * Does not return until the remote CPU is nearly ready to execute <func>
- * or is or has executed.
- */
-
-int
-smp_call_function_single (int cpuid, void (*func) (void *info), void *info, int nonatomic,
-                          int wait)
-{
-        struct call_data_struct data;
-        int cpus = 1;
-        int me = get_cpu(); /* prevent preemption and reschedule on another processor */
-
-        if (cpuid == me) {
-                local_irq_disable();
-                func(info);
-                local_irq_enable();
-                put_cpu();
-                return 0;
-        }
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        spin_lock_bh(&call_lock);
-
-        call_data = &data;
-        mb();   /* ensure store to call_data precedes setting of IPI_CALL_FUNC */
-        send_IPI_single(cpuid, IPI_CALL_FUNC);
-
-        /* Wait for response */
-        while (atomic_read(&data.started) != cpus)
-                cpu_relax();
-
-        if (wait)
-                while (atomic_read(&data.finished) != cpus)
-                        cpu_relax();
-        call_data = NULL;
-
-        spin_unlock_bh(&call_lock);
-        put_cpu();
-        return 0;
-}
-EXPORT_SYMBOL(smp_call_function_single);
-
-/**
- * smp_call_function_mask(): Run a function on a set of other CPUs.
- * <mask>       The set of cpus to run on.  Must not include the current cpu.
- * <func>       The function to run. This must be fast and non-blocking.
- * <info>       An arbitrary pointer to pass to the function.
- * <wait>       If true, wait (atomically) until function
- *              has completed on other CPUs.
- *
- * Returns 0 on success, else a negative status code.
- *
- * If @wait is true, then returns once @func has returned; otherwise
- * it returns just before the target cpu calls @func.
- *
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-int smp_call_function_mask(cpumask_t mask,
-                           void (*func)(void *), void *info,
-                           int wait)
+void arch_send_call_function_single_ipi(int cpu)
 {
-        struct call_data_struct data;
-        cpumask_t allbutself;
-        int cpus;
-
-        spin_lock(&call_lock);
-        allbutself = cpu_online_map;
-        cpu_clear(smp_processor_id(), allbutself);
-
-        cpus_and(mask, mask, allbutself);
-        cpus = cpus_weight(mask);
-        if (!cpus) {
-                spin_unlock(&call_lock);
-                return 0;
-        }
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        call_data = &data;
-        mb(); /* ensure store to call_data precedes setting of IPI_CALL_FUNC*/
-
-        /* Send a message to other CPUs */
-        if (cpus_equal(mask, allbutself))
-                send_IPI_allbutself(IPI_CALL_FUNC);
-        else
-                send_IPI_mask(mask, IPI_CALL_FUNC);
-
-        /* Wait for response */
-        while (atomic_read(&data.started) != cpus)
-                cpu_relax();
-
-        if (wait)
-                while (atomic_read(&data.finished) != cpus)
-                        cpu_relax();
-        call_data = NULL;
-
-        spin_unlock(&call_lock);
-        return 0;
-
+        send_IPI_single(cpu, IPI_CALL_FUNC_SINGLE);
 }
-EXPORT_SYMBOL(smp_call_function_mask);
 
-/*
- * this function sends a 'generic call function' IPI to all other CPUs
- * in the system.
- */
-
-/*
- *  [SUMMARY]   Run a function on all other CPUs.
- *  <func>      The function to run. This must be fast and non-blocking.
- *  <info>      An arbitrary pointer to pass to the function.
- *  <nonatomic> currently unused.
- *  <wait>      If true, wait (atomically) until function has completed on other CPUs.
- *  [RETURNS]   0 on success, else a negative status code.
- *
- * Does not return until remote CPUs are nearly ready to execute <func> or are or have
- * executed.
- *
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-int
-smp_call_function (void (*func) (void *info), void *info, int nonatomic, int wait)
+void arch_send_call_function_ipi(cpumask_t mask)
 {
-        struct call_data_struct data;
-        int cpus;
-
-        spin_lock(&call_lock);
-        cpus = num_online_cpus() - 1;
-        if (!cpus) {
-                spin_unlock(&call_lock);
-                return 0;
-        }
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        call_data = &data;
-        mb();   /* ensure store to call_data precedes setting of IPI_CALL_FUNC */
-        send_IPI_allbutself(IPI_CALL_FUNC);
-
-        /* Wait for response */
-        while (atomic_read(&data.started) != cpus)
-                cpu_relax();
-
-        if (wait)
-                while (atomic_read(&data.finished) != cpus)
-                        cpu_relax();
-        call_data = NULL;
-
-        spin_unlock(&call_lock);
-        return 0;
+        send_IPI_mask(mask, IPI_CALL_FUNC);
 }
-EXPORT_SYMBOL(smp_call_function);
 
 /*
  * this function calls the 'stop' function on all other CPUs in the system.
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index d7ad42b77d41..9d1d429c6c59 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -317,7 +317,7 @@ ia64_sync_itc (unsigned int master)
 
         go[MASTER] = 1;
 
-        if (smp_call_function_single(master, sync_master, NULL, 1, 0) < 0) {
+        if (smp_call_function_single(master, sync_master, NULL, 0) < 0) {
                 printk(KERN_ERR "sync_itc: failed to get attention of CPU %u!\n", master);
                 return;
         }
@@ -395,14 +395,14 @@ smp_callin (void)
 
         fix_b0_for_bsp();
 
-        lock_ipi_calllock();
+        ipi_call_lock_irq();
         spin_lock(&vector_lock);
         /* Setup the per cpu irq handling data structures */
         __setup_vector_irq(cpuid);
         cpu_set(cpuid, cpu_online_map);
         per_cpu(cpu_state, cpuid) = CPU_ONLINE;
         spin_unlock(&vector_lock);
-        unlock_ipi_calllock();
+        ipi_call_unlock_irq();
 
         smp_setup_percpu_timer();
 
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index e77995a6e3ed..8eff8c1d40a6 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -123,8 +123,7 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid)
         status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL);
         if (status == PAL_VISIBILITY_OK_REMOTE_NEEDED) {
                 atomic_set(&uc_pool->status, 0);
-                status = smp_call_function(uncached_ipi_visibility, uc_pool,
-                                           0, 1);
+                status = smp_call_function(uncached_ipi_visibility, uc_pool, 1);
                 if (status || atomic_read(&uc_pool->status))
                         goto failed;
         } else if (status != PAL_VISIBILITY_OK)
@@ -146,7 +145,7 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid)
         if (status != PAL_STATUS_SUCCESS)
                 goto failed;
         atomic_set(&uc_pool->status, 0);
-        status = smp_call_function(uncached_ipi_mc_drain, uc_pool, 0, 1);
+        status = smp_call_function(uncached_ipi_mc_drain, uc_pool, 1);
         if (status || atomic_read(&uc_pool->status))
                 goto failed;
 
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 53351c3cd7b1..96c31b4180c3 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -11,6 +11,7 @@
 #include <linux/irq.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
+#include <linux/rculist.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/arch.h>
 #include <asm/sn/intr.h>
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 8cc0c4753d89..636588e7e068 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -629,7 +629,7 @@ static int sn_hwperf_op_cpu(struct sn_hwperf_op_info *op_info)
                 if (use_ipi) {
                         /* use an interprocessor interrupt to call SAL */
                         smp_call_function_single(cpu, sn_hwperf_call_sal,
-                                op_info, 1, 1);
+                                op_info, 1);
                 }
                 else {
                         /* migrate the task before calling SAL */ 
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index de153de2ea9f..a5f864c445b2 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -296,6 +296,7 @@ config PREEMPT
 
 config SMP
         bool "Symmetric multi-processing support"
+        select USE_GENERIC_SMP_HELPERS
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c
index e6709fe950ba..16bcb189a383 100644
--- a/arch/m32r/kernel/m32r_ksyms.c
+++ b/arch/m32r/kernel/m32r_ksyms.c
@@ -43,9 +43,6 @@ EXPORT_SYMBOL(dcache_dummy);
 #endif
 EXPORT_SYMBOL(cpu_data);
 
-/* Global SMP stuff */
-EXPORT_SYMBOL(smp_call_function);
-
 /* TLB flushing */
 EXPORT_SYMBOL(smp_flush_tlb_page);
 #endif
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c
index c837bc13b015..7577f971ea4e 100644
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
@@ -35,22 +35,6 @@
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
 
 /*
- * Structure and data for smp_call_function(). This is designed to minimise
- * static memory requirements. It also looks cleaner.
- */
-static DEFINE_SPINLOCK(call_lock);
-
-struct call_data_struct {
-        void (*func) (void *info);
-        void *info;
-        atomic_t started;
-        atomic_t finished;
-        int wait;
-} __attribute__ ((__aligned__(SMP_CACHE_BYTES)));
-
-static struct call_data_struct *call_data;
-
-/*
  * For flush_cache_all()
  */
 static DEFINE_SPINLOCK(flushcache_lock);
@@ -96,9 +80,6 @@ void smp_invalidate_interrupt(void);
 void smp_send_stop(void);
 static void stop_this_cpu(void *);
 
-int smp_call_function(void (*) (void *), void *, int, int);
-void smp_call_function_interrupt(void);
-
 void smp_send_timer(void);
 void smp_ipi_timer_interrupt(struct pt_regs *);
 void smp_local_timer_interrupt(void);
@@ -231,7 +212,7 @@ void smp_flush_tlb_all(void)
         local_irq_save(flags);
         __flush_tlb_all();
         local_irq_restore(flags);
-        smp_call_function(flush_tlb_all_ipi, NULL, 1, 1);
+        smp_call_function(flush_tlb_all_ipi, NULL, 1);
         preempt_enable();
 }
 
@@ -524,7 +505,7 @@ void smp_invalidate_interrupt(void)
  *==========================================================================*/
 void smp_send_stop(void)
 {
-        smp_call_function(stop_this_cpu, NULL, 1, 0);
+        smp_call_function(stop_this_cpu, NULL, 0);
 }
 
 /*==========================================================================*
@@ -565,86 +546,14 @@ static void stop_this_cpu(void *dummy)
         for ( ; ; );
 }
 
-/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
-/* Call function Routines                                                    */
-/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
-
-/*==========================================================================*
- * Name:         smp_call_function
- *
- * Description:  This routine sends a 'CALL_FUNCTION_IPI' to all other CPUs
- *               in the system.
- *
- * Born on Date: 2002.02.05
- *
- * Arguments:    *func - The function to run. This must be fast and
- *                       non-blocking.
- *               *info - An arbitrary pointer to pass to the function.
- *               nonatomic - currently unused.
- *               wait - If true, wait (atomically) until function has
- *                      completed on other CPUs.
- *
- * Returns:      0 on success, else a negative status code. Does not return
- *               until remote CPUs are nearly ready to execute <<func>> or
- *               are or have executed.
- *
- * Cautions:     You must not call this function with disabled interrupts or
- *               from a hardware interrupt handler, you may call it from a
- *               bottom half handler.
- *
- * Modification log:
- * Date       Who Description
- * ---------- --- --------------------------------------------------------
- *
- *==========================================================================*/
-int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
-        int wait)
+void arch_send_call_function_ipi(cpumask_t mask)
 {
-        struct call_data_struct data;
-        int cpus;
-
-#ifdef DEBUG_SMP
-        unsigned long flags;
-        __save_flags(flags);
-        if (!(flags & 0x0040))  /* Interrupt Disable NONONO */
-                BUG();
-#endif /* DEBUG_SMP */
-
-        /* Holding any lock stops cpus from going down. */
-        spin_lock(&call_lock);
-        cpus = num_online_cpus() - 1;
-
-        if (!cpus) {
-                spin_unlock(&call_lock);
-                return 0;
-        }
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        call_data = &data;
-        mb();
-
-        /* Send a message to all other CPUs and wait for them to respond */
-        send_IPI_allbutself(CALL_FUNCTION_IPI, 0);
-
-        /* Wait for response */
-        while (atomic_read(&data.started) != cpus)
-                barrier();
-
-        if (wait)
-                while (atomic_read(&data.finished) != cpus)
-                        barrier();
-        spin_unlock(&call_lock);
+        send_IPI_mask(mask, CALL_FUNCTION_IPI, 0);
+}
 
-        return 0;
+void arch_send_call_function_single_ipi(int cpu)
+{
+        send_IPI_mask(cpumask_of_cpu(cpu), CALL_FUNC_SINGLE_IPI, 0);
 }
 
 /*==========================================================================*
@@ -666,27 +575,16 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
  *==========================================================================*/
 void smp_call_function_interrupt(void)
 {
-        void (*func) (void *info) = call_data->func;
-        void *info = call_data->info;
-        int wait = call_data->wait;
-
-        /*
-         * Notify initiating CPU that I've grabbed the data and am
-         * about to execute the function
-         */
-        mb();
-        atomic_inc(&call_data->started);
-        /*
-         * At this point the info structure may be out of scope unless wait==1
-         */
         irq_enter();
-        (*func)(info);
+        generic_smp_call_function_interrupt();
         irq_exit();
+}
 
-        if (wait) {
-                mb();
-                atomic_inc(&call_data->finished);
-        }
+void smp_call_function_single_interrupt(void)
+{
+        irq_enter();
+        generic_smp_call_function_single_interrupt();
+        irq_exit();
 }
 
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
index 89ba4a0b5d51..46159a4e644b 100644
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
@@ -40,6 +40,7 @@ extern void smp_invalidate_interrupt(void);
 extern void smp_call_function_interrupt(void);
 extern void smp_ipi_timer_interrupt(void);
 extern void smp_flush_cache_all_interrupt(void);
+extern void smp_call_function_single_interrupt(void);
 
 /*
  * for Boot AP function
@@ -103,7 +104,7 @@ void	set_eit_vector_entries(void)
         eit_vector[186] = (unsigned long)smp_call_function_interrupt;
         eit_vector[187] = (unsigned long)smp_ipi_timer_interrupt;
         eit_vector[188] = (unsigned long)smp_flush_cache_all_interrupt;
-        eit_vector[189] = 0;
+        eit_vector[189] = (unsigned long)smp_call_function_single_interrupt;
         eit_vector[190] = 0;
         eit_vector[191] = 0;
 #endif
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 24c5dee91768..d21df5f1b1f3 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -181,38 +181,6 @@ config LEMOTE_FULONG
           Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
           an FPGA northbridge
 
-config MIPS_ATLAS
-        bool "MIPS Atlas board"
-        select BOOT_ELF32
-        select BOOT_RAW
-        select CEVT_R4K
-        select CSRC_R4K
-        select DMA_NONCOHERENT
-        select SYS_HAS_EARLY_PRINTK
-        select IRQ_CPU
-        select HW_HAS_PCI
-        select MIPS_BOARDS_GEN
-        select MIPS_BONITO64
-        select PCI_GT64XXX_PCI0
-        select MIPS_MSC
-        select RM7000_CPU_SCACHE
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_MIPS32_R1
-        select SYS_HAS_CPU_MIPS32_R2
-        select SYS_HAS_CPU_MIPS64_R1
-        select SYS_HAS_CPU_NEVADA
-        select SYS_HAS_CPU_RM7000
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
-        select SYS_SUPPORTS_SMARTMIPS
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        help
-          This enables support for the MIPS Technologies Atlas evaluation
-          board.
-
 config MIPS_MALTA
         bool "MIPS Malta board"
         select ARCH_MAY_HAVE_PC_FDC
@@ -249,26 +217,6 @@ config MIPS_MALTA
           This enables support for the MIPS Technologies Malta evaluation
           board.
 
-config MIPS_SEAD
-        bool "MIPS SEAD board"
-        select CEVT_R4K
-        select CSRC_R4K
-        select IRQ_CPU
-        select DMA_NONCOHERENT
-        select SYS_HAS_EARLY_PRINTK
-        select MIPS_BOARDS_GEN
-        select SYS_HAS_CPU_MIPS32_R1
-        select SYS_HAS_CPU_MIPS32_R2
-        select SYS_HAS_CPU_MIPS64_R1
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_SMARTMIPS
-        help
-          This enables support for the MIPS Technologies SEAD evaluation
-          board.
-
 config MIPS_SIM
         bool 'MIPS simulator (MIPSsim)'
         select CEVT_R4K
@@ -437,6 +385,8 @@ config SGI_IP28
         select SGI_HAS_DS1286
         select SGI_HAS_I8042
         select SGI_HAS_INDYDOG
+        select SGI_HAS_HAL2
+        select SGI_HAS_HAL2
         select SGI_HAS_SEEQ
         select SGI_HAS_WD93
         select SGI_HAS_ZILOG
@@ -602,65 +552,11 @@ config SNI_RM
           Technology and now in turn merged with Fujitsu.  Say Y here to
           support this machine type.
 
-config TOSHIBA_JMR3927
-        bool "Toshiba JMR-TX3927 board"
-        select CEVT_TXX9
-        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
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        select GPIO_TXX9
+config MACH_TX39XX
+        bool "Toshiba TX39 series based machines"
 
-config TOSHIBA_RBTX4927
-        bool "Toshiba RBTX49[23]7 board"
-        select CEVT_R4K
-        select CSRC_R4K
-        select CEVT_TXX9
-        select DMA_NONCOHERENT
-        select HAS_TXX9_SERIAL
-        select HW_HAS_PCI
-        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
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_KGDB
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        help
-          This Toshiba board is based on the TX4927 processor. Say Y here to
-          support this machine type
-
-config TOSHIBA_RBTX4938
-        bool "Toshiba RBTX4938 board"
-        select CEVT_R4K
-        select CSRC_R4K
-        select CEVT_TXX9
-        select DMA_NONCOHERENT
-        select HAS_TXX9_SERIAL
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select IRQ_TXX9
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_TX49XX
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_KGDB
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        select GPIO_TXX9
-        help
-          This Toshiba board is based on the TX4938 processor. Say Y here to
-          support this machine type
+config MACH_TX49XX
+        bool "Toshiba TX49 series based machines"
 
 config WR_PPMC
         bool "Wind River PPMC board"
@@ -694,8 +590,7 @@ source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
-source "arch/mips/tx4927/Kconfig"
-source "arch/mips/tx4938/Kconfig"
+source "arch/mips/txx9/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 
 endmenu
@@ -939,10 +834,6 @@ config PCI_GT64XXX_PCI0
 config NO_EXCEPT_FILL
         bool
 
-config MIPS_TX3927
-        bool
-        select HAS_TXX9_SERIAL
-
 config MIPS_RM9122
         bool
         select SERIAL_RM9000
@@ -979,6 +870,9 @@ config SGI_HAS_DS1286
 config SGI_HAS_INDYDOG
         bool
 
+config SGI_HAS_HAL2
+        bool
+
 config SGI_HAS_SEEQ
         bool
 
@@ -1763,6 +1657,7 @@ config SMP
         bool "Multi-Processing support"
         depends on SYS_SUPPORTS_SMP
         select IRQ_PER_CPU
+        select USE_GENERIC_SMP_HELPERS
         help
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
@@ -2064,10 +1959,6 @@ source "fs/Kconfig.binfmt"
 config TRAD_SIGNALS
         bool
 
-config BINFMT_IRIX
-        bool "Include IRIX binary compatibility"
-        depends on CPU_BIG_ENDIAN && 32BIT && BROKEN
-
 config MIPS32_COMPAT
         bool "Kernel support for Linux/MIPS 32-bit binary compatibility"
         depends on 64BIT
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ad36c946ff96..356453322b49 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -14,7 +14,7 @@
 
 KBUILD_DEFCONFIG := ip22_defconfig
 
-cflags-y :=
+cflags-y := -ffunction-sections
 
 #
 # Select the object file format to substitute into the linker script.
@@ -305,36 +305,14 @@ load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000
 cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote
 
 #
-# For all MIPS, Inc. eval boards
-#
-core-$(CONFIG_MIPS_BOARDS_GEN)  += arch/mips/mips-boards/generic/
-
-#
-# MIPS Atlas board
-#
-core-$(CONFIG_MIPS_ATLAS)       += arch/mips/mips-boards/atlas/
-cflags-$(CONFIG_MIPS_ATLAS)     += -Iinclude/asm-mips/mach-atlas
-cflags-$(CONFIG_MIPS_ATLAS)     += -Iinclude/asm-mips/mach-mips
-load-$(CONFIG_MIPS_ATLAS)       += 0xffffffff80100000
-all-$(CONFIG_MIPS_ATLAS)        := vmlinux.bin
-
-#
 # MIPS Malta board
 #
-core-$(CONFIG_MIPS_MALTA)       += arch/mips/mips-boards/malta/
-cflags-$(CONFIG_MIPS_MALTA)     += -Iinclude/asm-mips/mach-mips
+core-$(CONFIG_MIPS_MALTA)       += arch/mips/mti-malta/
+cflags-$(CONFIG_MIPS_MALTA)     += -Iinclude/asm-mips/mach-malta
 load-$(CONFIG_MIPS_MALTA)       += 0xffffffff80100000
 all-$(CONFIG_MIPS_MALTA)        := vmlinux.bin
 
 #
-# MIPS SEAD board
-#
-core-$(CONFIG_MIPS_SEAD)        += arch/mips/mips-boards/sead/
-cflags-$(CONFIG_MIPS_SEAD)      += -Iinclude/asm-mips/mach-mips
-load-$(CONFIG_MIPS_SEAD)        += 0xffffffff80100000
-all-$(CONFIG_MIPS_SEAD)         := vmlinux.srec
-
-#
 # MIPS SIM
 #
 core-$(CONFIG_MIPS_SIM)         += arch/mips/mipssim/
@@ -377,12 +355,6 @@ core-$(CONFIG_MACH_VR41XX)	+= arch/mips/vr41xx/common/
 cflags-$(CONFIG_MACH_VR41XX)    += -Iinclude/asm-mips/mach-vr41xx
 
 #
-# NEC VR4133
-#
-core-$(CONFIG_NEC_CMBVR4133)    += arch/mips/vr41xx/nec-cmbvr4133/
-load-$(CONFIG_NEC_CMBVR4133)    += 0xffffffff80100000
-
-#
 # ZAO Networks Capcella (VR4131)
 #
 load-$(CONFIG_ZAO_CAPCELLA)     += 0xffffffff80000000
@@ -573,29 +545,30 @@ endif
 all-$(CONFIG_SNI_RM)            := vmlinux.ecoff
 
 #
+# Common TXx9
+#
+core-$(CONFIG_MACH_TX39XX)      += arch/mips/txx9/generic/
+cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-tx39xx
+load-$(CONFIG_MACH_TX39XX)      += 0xffffffff80050000
+core-$(CONFIG_MACH_TX49XX)      += arch/mips/txx9/generic/
+cflags-$(CONFIG_MACH_TX49XX) += -Iinclude/asm-mips/mach-tx49xx
+load-$(CONFIG_MACH_TX49XX)      += 0xffffffff80100000
+
+#
 # Toshiba JMR-TX3927 board
 #
-core-$(CONFIG_TOSHIBA_JMR3927)  += arch/mips/jmr3927/rbhma3100/ \
-                                   arch/mips/jmr3927/common/
-cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
-load-$(CONFIG_TOSHIBA_JMR3927)  += 0xffffffff80050000
+core-$(CONFIG_TOSHIBA_JMR3927)  += arch/mips/txx9/jmr3927/
 
 #
 # Toshiba RBTX4927 board or
 # Toshiba RBTX4937 board
 #
-core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/toshiba_rbtx4927/
-core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/common/
-cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx
-load-$(CONFIG_TOSHIBA_RBTX4927) += 0xffffffff80020000
+core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/rbtx4927/
 
 #
 # Toshiba RBTX4938 board
 #
-core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/
-core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
-cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
-load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
+core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
 
 cflags-y                        += -Iinclude/asm-mips/mach-generic
 drivers-$(CONFIG_PCI)           += arch/mips/pci/
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 74d6d4a593be..dc8a67efac28 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -11,6 +11,7 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 #include <linux/init.h>
@@ -77,14 +78,14 @@ static struct resource au1xxx_usb_ohci_resources[] = {
 };
 
 /* The dmamask must be set for OHCI to work */
-static u64 ohci_dmamask = ~(u32)0;
+static u64 ohci_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_usb_ohci_device = {
         .name           = "au1xxx-ohci",
         .id             = 0,
         .dev = {
                 .dma_mask               = &ohci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(au1xxx_usb_ohci_resources),
         .resource       = au1xxx_usb_ohci_resources,
@@ -106,14 +107,14 @@ static struct resource au1100_lcd_resources[] = {
         }
 };
 
-static u64 au1100_lcd_dmamask = ~(u32)0;
+static u64 au1100_lcd_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1100_lcd_device = {
         .name           = "au1100-lcd",
         .id             = 0,
         .dev = {
                 .dma_mask               = &au1100_lcd_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(au1100_lcd_resources),
         .resource       = au1100_lcd_resources,
@@ -135,14 +136,14 @@ static struct resource au1xxx_usb_ehci_resources[] = {
         },
 };
 
-static u64 ehci_dmamask = ~(u32)0;
+static u64 ehci_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_usb_ehci_device = {
         .name           = "au1xxx-ehci",
         .id             = 0,
         .dev = {
                 .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(au1xxx_usb_ehci_resources),
         .resource       = au1xxx_usb_ehci_resources,
@@ -180,14 +181,14 @@ static struct resource au1xxx_mmc_resources[] = {
         }
 };
 
-static u64 udc_dmamask = ~(u32)0;
+static u64 udc_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_usb_gdt_device = {
         .name           = "au1xxx-udc",
         .id             = 0,
         .dev = {
                 .dma_mask               = &udc_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(au1xxx_usb_gdt_resources),
         .resource       = au1xxx_usb_gdt_resources,
@@ -207,14 +208,14 @@ static struct resource au1xxx_usb_otg_resources[] = {
         },
 };
 
-static u64 uoc_dmamask = ~(u32)0;
+static u64 uoc_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_usb_otg_device = {
         .name           = "au1xxx-uoc",
         .id             = 0,
         .dev = {
                 .dma_mask               = &uoc_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(au1xxx_usb_otg_resources),
         .resource       = au1xxx_usb_otg_resources,
@@ -233,27 +234,27 @@ static struct resource au1200_lcd_resources[] = {
         }
 };
 
-static u64 au1200_lcd_dmamask = ~(u32)0;
+static u64 au1200_lcd_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1200_lcd_device = {
         .name           = "au1200-lcd",
         .id             = 0,
         .dev = {
                 .dma_mask               = &au1200_lcd_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(au1200_lcd_resources),
         .resource       = au1200_lcd_resources,
 };
 
-static u64 au1xxx_mmc_dmamask =  ~(u32)0;
+static u64 au1xxx_mmc_dmamask =  DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_mmc_device = {
         .name = "au1xxx-mmc",
         .id = 0,
         .dev = {
                 .dma_mask               = &au1xxx_mmc_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(au1xxx_mmc_resources),
         .resource       = au1xxx_mmc_resources,
diff --git a/arch/mips/au1000/mtx-1/platform.c b/arch/mips/au1000/mtx-1/platform.c
index 9807be37c32f..8b5914d1241f 100644
--- a/arch/mips/au1000/mtx-1/platform.c
+++ b/arch/mips/au1000/mtx-1/platform.c
@@ -24,6 +24,9 @@
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <mtd/mtd-abi.h>
 
 static struct gpio_keys_button mtx1_gpio_button[] = {
         {
@@ -85,10 +88,56 @@ static struct platform_device mtx1_gpio_leds = {
         }
 };
 
+static struct mtd_partition mtx1_mtd_partitions[] = {
+        {
+                .name   = "filesystem",
+                .size   = 0x01C00000,
+                .offset = 0,
+        },
+        {
+                .name   = "yamon",
+                .size   = 0x00100000,
+                .offset = MTDPART_OFS_APPEND,
+                .mask_flags = MTD_WRITEABLE,
+        },
+        {
+                .name   = "kernel",
+                .size   = 0x002c0000,
+                .offset = MTDPART_OFS_APPEND,
+        },
+        {
+                .name   = "yamon env",
+                .size   = 0x00040000,
+                .offset = MTDPART_OFS_APPEND,
+        },
+};
+
+static struct physmap_flash_data mtx1_flash_data = {
+        .width          = 4,
+        .nr_parts       = 4,
+        .parts          = mtx1_mtd_partitions,
+};
+
+static struct resource mtx1_mtd_resource = {
+        .start  = 0x1e000000,
+        .end    = 0x1fffffff,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct platform_device mtx1_mtd = {
+        .name           = "physmap-flash",
+        .dev            = {
+                .platform_data  = &mtx1_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &mtx1_mtd_resource,
+};
+
 static struct __initdata platform_device * mtx1_devs[] = {
         &mtx1_gpio_leds,
         &mtx1_wdt,
-        &mtx1_button
+        &mtx1_button,
+        &mtx1_mtd,
 };
 
 static int __init mtx1_register_devices(void)
diff --git a/arch/mips/au1000/pb1200/platform.c b/arch/mips/au1000/pb1200/platform.c
index 5930110b9b6d..f8fb0aeac571 100644
--- a/arch/mips/au1000/pb1200/platform.c
+++ b/arch/mips/au1000/pb1200/platform.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
@@ -36,14 +37,14 @@ static struct resource ide_resources[] = {
         }
 };
 
-static u64 ide_dmamask = ~(u32)0;
+static u64 ide_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device ide_device = {
         .name           = "au1200-ide",
         .id             = 0,
         .dev = {
                 .dma_mask               = &ide_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(ide_resources),
         .resource       = ide_resources
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index d73833b7c781..237926288d6d 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Cobalt micro systems family specific parts of the kernel
 #
 
-obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o time.o
+obj-y := buttons.o irq.o lcd.o led.o reset.o rtc.o serial.o setup.o time.o
 
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
diff --git a/arch/mips/cobalt/lcd.c b/arch/mips/cobalt/lcd.c
new file mode 100644
index 000000000000..0720e4fae311
--- /dev/null
+++ b/arch/mips/cobalt/lcd.c
@@ -0,0 +1,55 @@
+/*
+ *  Registration of Cobalt LCD platform device.
+ *
+ *  Copyright (C) 2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+
+static struct resource cobalt_lcd_resource __initdata = {
+        .start  = 0x1f000000,
+        .end    = 0x1f00001f,
+        .flags  = IORESOURCE_MEM,
+};
+
+static __init int cobalt_lcd_add(void)
+{
+        struct platform_device *pdev;
+        int retval;
+
+        pdev = platform_device_alloc("cobalt-lcd", -1);
+        if (!pdev)
+                return -ENOMEM;
+
+        retval = platform_device_add_resources(pdev, &cobalt_lcd_resource, 1);
+        if (retval)
+                goto err_free_device;
+
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+
+        return 0;
+
+err_free_device:
+        platform_device_put(pdev);
+
+        return retval;
+}
+device_initcall(cobalt_lcd_add);
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
deleted file mode 100644
index 3443f6cd57bb..000000000000
--- a/arch/mips/configs/atlas_defconfig
+++ /dev/null
@@ -1,1472 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Sun Feb 18 21:27:35 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_BASLER_EXCITE is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-CONFIG_MIPS_ATLAS=y
-# 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_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_PMC_YOSEMITE 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_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE 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_RWSEM_GENERIC_SPINLOCK=y
-# 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_GENERIC_TIME=y
-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_MIPS_BONITO64=y
-CONFIG_MIPS_MSC=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_MIPS_BOARDS_GEN=y
-CONFIG_MIPS_GT64120=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_BOOT_ELF32=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-
-#
-# CPU selection
-#
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_CPU_MIPS64_R1=y
-CONFIG_SYS_HAS_CPU_NEVADA=y
-CONFIG_SYS_HAS_CPU_RM7000=y
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPSR1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_BOARD_SCACHE=y
-CONFIG_RM7000_CPU_SCACHE=y
-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_SYS_SUPPORTS_MULTITHREADING=y
-# CONFIG_64BIT_PHYS_ADDR is not set
-CONFIG_CPU_HAS_LLSC=y
-# CONFIG_CPU_HAS_SMARTMIPS is not set
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_SYS_SUPPORTS_SMARTMIPS=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_HZ_48 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=100
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-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_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-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
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-CONFIG_PCI=y
-CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-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
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-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_MULTIPATH_CACHED is not set
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-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
-
-#
-# IP: Virtual Server Configuration
-#
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-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
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-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_NOTRACK=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_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-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_HASHLIMIT=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_RAW=m
-
-#
-# Bridge: Netfilter Configuration
-#
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-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
-CONFIG_VLAN_8021Q=m
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# 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=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
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-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_POLICE=y
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_ESTIMATOR=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# 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_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-CONFIG_FIB_RULES=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-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
-#
-
-#
-# Block devices
-#
-# 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=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SX8 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_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_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_IDECD=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_IDEPCI 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
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
-
-#
-# SCSI low-level drivers
-#
-CONFIG_ISCSI_TCP=m
-# 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=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-# 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_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_RAID5_RESHAPE=y
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_EMC=m
-
-#
-# 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_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-
-#
-# 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_MII=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=y
-CONFIG_PCNET32=y
-# CONFIG_PCNET32_NAPI 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_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 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_LAN_SAA9730=y
-# 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_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO 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_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
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-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
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_MOUSE_SERIAL=m
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK 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=y
-CONFIG_SERIO_RAW=y
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=m
-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_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
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# 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_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB is not set
-
-#
-# Console display driver support
-#
-# 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_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_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
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
-
-#
-# 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=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=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_ROMFS_FS=m
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_QUOTA=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-CONFIG_DNOTIFY=y
-CONFIG_AUTOFS_FS=y
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_FUSE_FS=m
-CONFIG_GENERIC_ACL=y
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# 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=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS 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=m
-CONFIG_VXFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG 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=y
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=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
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=m
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-
-#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-CONFIG_DLM_TCP=y
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# 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 is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE=""
-
-#
-# 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=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
-#
-
-#
-# 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_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig
index c0e42e74dfbd..d8694332b344 100644
--- a/arch/mips/configs/bcm47xx_defconfig
+++ b/arch/mips/configs/bcm47xx_defconfig
@@ -16,9 +16,7 @@ CONFIG_BCM47XX=y
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 3b42cea2e402..a3bbbf067a3b 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25-rc7
-# Mon Mar 31 08:11:19 2008
+# Linux kernel version: 2.6.26-rc8
+# Wed Jul  2 17:02:55 2008
 #
 CONFIG_MIPS=y
 
@@ -16,9 +16,7 @@ CONFIG_MIPS=y
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
@@ -148,6 +146,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=0
@@ -156,6 +155,7 @@ CONFIG_SMP=y
 CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_NR_CPUS_DEFAULT_4=y
 CONFIG_NR_CPUS=4
+# CONFIG_MIPS_CMP is not set
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -223,6 +223,7 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+# CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
@@ -241,12 +242,14 @@ CONFIG_SLAB=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HAVE_KPROBES is not set
 # CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
@@ -302,7 +305,6 @@ CONFIG_BINFMT_ELF32=y
 # Power management options
 #
 CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 
 #
@@ -399,9 +401,11 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6_MROUTE is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -600,7 +604,7 @@ CONFIG_BLK_DEV_IT8213=m
 CONFIG_BLK_DEV_TC86C001=m
 # CONFIG_BLK_DEV_IDE_SWARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_IDE_ARCH_OBSOLETE_INIT=y
+# CONFIG_BLK_DEV_HD_ONLY is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -617,11 +621,12 @@ CONFIG_SCSI_PROC_FS=y
 # SCSI support type (disk, tape, CD-ROM)
 #
 CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
+CONFIG_CHR_DEV_ST=m
 # CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_SCH is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -650,6 +655,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # 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_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
@@ -675,7 +681,10 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_SRP is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_PMP=y
 # CONFIG_SATA_AHCI is not set
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
 # CONFIG_SATA_SVW is not set
 # CONFIG_ATA_PIIX is not set
 # CONFIG_SATA_MV is not set
@@ -685,7 +694,6 @@ CONFIG_ATA=y
 # CONFIG_SATA_PROMISE is not set
 # CONFIG_SATA_SX4 is not set
 # CONFIG_SATA_SIL is not set
-CONFIG_SATA_SIL24=y
 # CONFIG_SATA_SIS is not set
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
@@ -730,12 +738,17 @@ CONFIG_PATA_SIL680=y
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_SCH is not set
 # CONFIG_MD is not set
 # CONFIG_FUSION is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
@@ -797,7 +810,6 @@ CONFIG_SB1250_MAC=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
@@ -815,6 +827,7 @@ CONFIG_NETXEN_NIC=m
 # CONFIG_MLX4_CORE is not set
 # CONFIG_TEHUTI is not set
 # CONFIG_BNX2X is not set
+# CONFIG_SFC is not set
 # CONFIG_TR is not set
 
 #
@@ -822,6 +835,7 @@ CONFIG_NETXEN_NIC=m
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -867,6 +881,7 @@ CONFIG_SERIO_RAW=m
 # Character devices
 #
 # CONFIG_VT is not set
+CONFIG_DEVKMEM=y
 CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_COMPUTONE is not set
 # CONFIG_ROCKETPORT is not set
@@ -903,7 +918,6 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_RAW_DRIVER is not set
@@ -914,13 +928,6 @@ CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 
 #
-# 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
@@ -946,6 +953,7 @@ CONFIG_I2C_SIBYTE=y
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
 
 #
 # Miscellaneous I2C Chip support
@@ -955,23 +963,18 @@ CONFIG_SENSORS_EEPROM=y
 CONFIG_SENSORS_PCF8574=y
 # CONFIG_PCF8575 is not set
 CONFIG_SENSORS_PCF8591=y
-# CONFIG_TPS65010 is not set
 CONFIG_SENSORS_MAX6875=y
 # CONFIG_SENSORS_TSL2550 is not set
 CONFIG_I2C_DEBUG_CORE=y
 CONFIG_I2C_DEBUG_ALGO=y
 CONFIG_I2C_DEBUG_BUS=y
 CONFIG_I2C_DEBUG_CHIP=y
-
-#
-# 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
 # CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
 # CONFIG_WATCHDOG is not set
 
 #
@@ -984,12 +987,22 @@ CONFIG_SSB_POSSIBLE=y
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
 # Multimedia devices
 #
+
+#
+# Multimedia core support
+#
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
 # CONFIG_DAB is not set
 
 #
@@ -1015,6 +1028,8 @@ 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_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1023,13 +1038,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_RTC_LIB=y
 # CONFIG_RTC_CLASS is not set
-
-#
-# Userspace I/O
-#
 # CONFIG_UIO is not set
 
 #
@@ -1123,7 +1135,6 @@ 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
@@ -1194,6 +1205,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
@@ -1204,6 +1216,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -1217,6 +1230,7 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_BOOT_PRINTK_DELAY is not set
@@ -1237,53 +1251,82 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=y
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
 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_XTS=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CCM=m
-# CONFIG_CRYPTO_CRYPTD is not set
-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_WP512=m
+
+#
+# Ciphers
+#
 CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
 CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-# CONFIG_CRYPTO_CRC32C is not set
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_LZO is not set
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
@@ -1292,9 +1335,10 @@ CONFIG_CRYPTO_HW=y
 # Library routines
 #
 CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index a94f14b5c8fa..185df23fd460 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -14,9 +14,7 @@ CONFIG_MIPS=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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 CONFIG_MACH_VR41XX=y
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index b7295e988381..2678b7ec3351 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -14,9 +14,7 @@ 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 36578968d386..ebb8ad62b3a3 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -27,9 +27,7 @@ CONFIG_MIPS_DB1000=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index 5a90740c363a..ad4e5ef65592 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -27,9 +27,7 @@ CONFIG_MIPS_DB1100=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index 76f37a1159fe..d0dc2e83ad35 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -27,9 +27,7 @@ CONFIG_MIPS_DB1200=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 508c91944f30..9155082313c8 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -27,9 +27,7 @@ CONFIG_MIPS_DB1500=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index 0c2c70d21db9..e4e324422cd9 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -27,9 +27,7 @@ CONFIG_MIPS_DB1550=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 58c2cd68c3a7..9e65e6a2dcb3 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MACH_DECSTATION=y
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 90d81f5dcebc..1bd84d42b14f 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -14,9 +14,7 @@ CONFIG_MIPS=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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 CONFIG_MACH_VR41XX=y
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig
index f9a003c2b3a1..634bb4eaf132 100644
--- a/arch/mips/configs/emma2rh_defconfig
+++ b/arch/mips/configs/emma2rh_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig
index 15efacc75d73..3572e80356d2 100644
--- a/arch/mips/configs/excite_defconfig
+++ b/arch/mips/configs/excite_defconfig
@@ -27,9 +27,7 @@ CONFIG_BASLER_EXCITE=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig
index 5887a1735fba..620980081a30 100644
--- a/arch/mips/configs/fulong_defconfig
+++ b/arch/mips/configs/fulong_defconfig
@@ -14,9 +14,7 @@ CONFIG_LEMOTE_FULONG=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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_PNX8550_JBS is not set
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 4f5e56c9335e..cc8e6bf2b245 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -15,9 +15,7 @@ CONFIG_ZONE_DMA=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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index f40e437bd9e5..138c575a0151 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -14,9 +14,7 @@ CONFIG_MIPS=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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defconfig
index ec188be9a67a..822b01f643e3 100644
--- a/arch/mips/configs/ip28_defconfig
+++ b/arch/mips/configs/ip28_defconfig
@@ -16,9 +16,7 @@ CONFIG_MIPS=y
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 2c5c624c5d42..fe4699df9626 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
index 56148745e8f2..bbacc35d804f 100644
--- a/arch/mips/configs/jazz_defconfig
+++ b/arch/mips/configs/jazz_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 CONFIG_MACH_JAZZ=y
-# 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
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index a7cd67753aac..9d5bd2a0af3d 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc1
-# Thu Aug  2 23:07:36 2007
+# Linux kernel version: 2.6.26-rc9
+# Fri Jul 11 23:01:36 2008
 #
 CONFIG_MIPS=y
 
@@ -10,13 +10,13 @@ CONFIG_MIPS=y
 #
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BCM47XX is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
@@ -26,6 +26,7 @@ CONFIG_MIPS=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
 # CONFIG_SGI_IP32 is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CARMEL is not set
@@ -36,28 +37,37 @@ CONFIG_MIPS=y
 # CONFIG_SIBYTE_SENTOSA 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_MACH_TX39XX=y
+# CONFIG_MACH_TX49XX is not set
 # CONFIG_WR_PPMC is not set
+CONFIG_TOSHIBA_JMR3927=y
+CONFIG_SOC_TX3927=y
+# CONFIG_TOSHIBA_FPCIB0 is not set
+CONFIG_PICMG_PCI_BACKPLANE_DEFAULT=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_CEVT_TXX9=y
+CONFIG_GPIO_TXX9=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_GENERIC_GPIO=y
 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
 
@@ -104,13 +114,20 @@ CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -144,18 +161,25 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
 # CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_HOTPLUG is not set
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
@@ -168,6 +192,14 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -189,20 +221,19 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, ISA, TC)
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
 CONFIG_MMU=y
 
 #
-# PCCARD (PCMCIA/CardBus) support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -212,6 +243,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_PM is not set
 
 #
@@ -245,25 +277,21 @@ CONFIG_IP_PNP_BOOTP=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_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # 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_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
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -271,6 +299,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 
@@ -279,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # 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
 
@@ -307,6 +337,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
 #
@@ -318,10 +349,6 @@ CONFIG_BLK_DEV=y
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
 # CONFIG_FUSION is not set
 
 #
@@ -329,7 +356,7 @@ CONFIG_BLK_DEV=y
 #
 
 #
-# An alternative FireWire stack is available with EXPERIMENTAL=y
+# A new alternative FireWire stack is available with EXPERIMENTAL=y
 #
 # CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
@@ -339,10 +366,27 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_VETH is not set
 # CONFIG_ARCNET is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# 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_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
+# CONFIG_MII is not set
 # CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
@@ -351,6 +395,10 @@ CONFIG_MII=y
 # CONFIG_DM9000 is not set
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 CONFIG_NET_PCI=y
 # CONFIG_PCNET32 is not set
 # CONFIG_AMD8111_ETH is not set
@@ -358,13 +406,13 @@ CONFIG_NET_PCI=y
 # CONFIG_B44 is not set
 # CONFIG_FORCEDETH is not set
 CONFIG_TC35815=y
-# 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_8139TOO is not set
+# CONFIG_R6040 is not set
 # CONFIG_SIS900 is not set
 # CONFIG_EPIC100 is not set
 # CONFIG_SUNDANCE is not set
@@ -379,6 +427,7 @@ CONFIG_TC35815=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_PPP is not set
@@ -400,7 +449,6 @@ 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_EVBUG is not set
 
@@ -424,6 +472,7 @@ CONFIG_INPUT=y
 # Character devices
 #
 # CONFIG_VT is not set
+CONFIG_DEVKMEM=y
 CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_COMPUTONE is not set
 # CONFIG_ROCKETPORT is not set
@@ -431,7 +480,6 @@ CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MOXA_SMARTIO_NEW is not set
 # CONFIG_ISI is not set
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_SYNCLINK_GT is not set
@@ -463,22 +511,30 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_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
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
+# CONFIG_SPI is not set
+CONFIG_HAVE_GPIO_LIB=y
 
 #
-# SPI support
+# GPIO Support
+#
+
+#
+# I2C GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
 #
-# 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
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -495,29 +551,46 @@ CONFIG_TXX9_WDT=y
 # CONFIG_WDTPCI is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
 # Multimedia devices
 #
+
+#
+# Multimedia core support
+#
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
 # CONFIG_DAB is not set
 
 #
 # Graphics support
 #
+# CONFIG_DRM 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
 
 #
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
 
 #
 # Sound
@@ -526,7 +599,9 @@ CONFIG_TXX9_WDT=y
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -551,9 +626,10 @@ CONFIG_RTC_INTF_DEV=y
 # Platform RTC drivers
 #
 # CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1511 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_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
@@ -561,23 +637,6 @@ CONFIG_RTC_DRV_DS1742=y
 #
 # on-CPU RTC drivers
 #
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Userspace I/O
-#
 # CONFIG_UIO is not set
 
 #
@@ -590,12 +649,10 @@ CONFIG_RTC_DRV_DS1742=y
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_DNOTIFY=y
 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
@@ -622,7 +679,7 @@ CONFIG_PROC_SYSCTL=y
 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
@@ -630,17 +687,15 @@ CONFIG_RAMFS=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
-# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
@@ -656,10 +711,6 @@ CONFIG_SUNRPC=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
 # CONFIG_NLS is not set
 
 #
@@ -667,13 +718,15 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 # 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_CROSSCOMPILE=y
+# CONFIG_SAMPLES is not set
 CONFIG_CMDLINE=""
 
 #
@@ -687,6 +740,7 @@ CONFIG_CMDLINE=""
 # Library routines
 #
 CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
diff --git a/arch/mips/configs/lasat_defconfig b/arch/mips/configs/lasat_defconfig
index e6aef999854c..bc9159fda728 100644
--- a/arch/mips/configs/lasat_defconfig
+++ b/arch/mips/configs/lasat_defconfig
@@ -15,9 +15,7 @@ CONFIG_MIPS=y
 # CONFIG_MACH_JAZZ is not set
 CONFIG_LASAT=y
 # 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 3d0da952811c..74daa0cf87e6 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -15,9 +15,7 @@ CONFIG_ZONE_DMA=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=y
-# CONFIG_MIPS_SEAD is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
@@ -68,7 +66,6 @@ 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_PCI_GT64XXX_PCI0=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_BOOT_ELF32=y
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index 4f6bce99d5cf..2c0a6314e901 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -16,9 +16,7 @@ CONFIG_MIPS=y
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_LASAT 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_MIPS_SIM=y
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index 27e23fc9363a..8c720e51795b 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -14,9 +14,7 @@ CONFIG_MIPS=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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 CONFIG_MACH_VR41XX=y
diff --git a/arch/mips/configs/msp71xx_defconfig b/arch/mips/configs/msp71xx_defconfig
index b12b73f6d74f..59d19472b161 100644
--- a/arch/mips/configs/msp71xx_defconfig
+++ b/arch/mips/configs/msp71xx_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig
index fa3aa3919448..bacf0dd0e345 100644
--- a/arch/mips/configs/mtx1_defconfig
+++ b/arch/mips/configs/mtx1_defconfig
@@ -14,9 +14,7 @@ CONFIG_MACH_ALCHEMY=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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 1d0157d3a5bb..6dfe6f793cef 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -27,9 +27,7 @@ CONFIG_MIPS_PB1100=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index d0491a05ee58..c965a87e6a96 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -27,9 +27,7 @@ CONFIG_MIPS_PB1500=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index 16d78d3cd2aa..0778996c682f 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -27,9 +27,7 @@ CONFIG_MIPS_PB1550=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 780c7fc24b82..37c7b5ffd474 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig
index 267f21ed1d0f..893e5c4ab66d 100644
--- a/arch/mips/configs/pnx8550-stb810_defconfig
+++ b/arch/mips/configs/pnx8550-stb810_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/rbhma4200_defconfig b/arch/mips/configs/rbhma4200_defconfig
deleted file mode 100644
index 470f6f4d3ea2..000000000000
--- a/arch/mips/configs/rbhma4200_defconfig
+++ /dev/null
@@ -1,669 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc1
-# Thu Aug  2 22:55:57 2007
-#
-CONFIG_MIPS=y
-
-#
-# Machine selection
-#
-# 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_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_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 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_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
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME=y
-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_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
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-CONFIG_CPU_TX49XX=y
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_TX49XX=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
-
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-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_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-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
-CONFIG_HZ_250=y
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=250
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_SECCOMP is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# General setup
-#
-# CONFIG_EXPERIMENTAL is not set
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS 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_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_HOTPLUG is not set
-CONFIG_PRINTK=y
-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
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-CONFIG_PCI=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
-
-#
-# Power management options
-#
-# CONFIG_PM is not set
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-# 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_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 is not set
-# 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_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_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
-
-#
-# 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
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_RFKILL is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
-# CONFIG_PARPORT is not set
-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_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_SX8 is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-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
-# CONFIG_MISC_DEVICES is not set
-# CONFIG_IDE 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_ATA is not set
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# An alternative FireWire stack is available with EXPERIMENTAL=y
-#
-# CONFIG_IEEE1394 is not set
-# CONFIG_I2O is not set
-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
-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
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-CONFIG_NE2000=y
-# CONFIG_NET_PCI is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_TR is not set
-
-#
-# 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_PPP is not set
-# CONFIG_SLIP 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=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW 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 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_TXX9=y
-CONFIG_HAS_TXX9_SERIAL=y
-CONFIG_SERIAL_TXX9_NR_UARTS=6
-CONFIG_SERIAL_TXX9_CONSOLE=y
-CONFIG_SERIAL_TXX9_STDSERIAL=y
-# CONFIG_SERIAL_JSM is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_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
-CONFIG_DEVPORT=y
-# 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
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-CONFIG_TXX9_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI 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 is not set
-
-#
-# 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 is not set
-# CONFIG_FB is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-# CONFIG_USB_SUPPORT 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
-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
-
-#
-# 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
-
-#
-# on-CPU RTC drivers
-#
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Userspace I/O
-#
-# CONFIG_UIO is not set
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_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_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 is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-CONFIG_GENERIC_ACL=y
-
-#
-# 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 is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_HFSPLUS_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
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL 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_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# 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 is not set
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE=""
-CONFIG_SYS_SUPPORTS_KGDB=y
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-# 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
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbtx49xx_defconfig
index 5a39f56b175e..e42aed5a38bb 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbtx49xx_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc1
-# Thu Aug  2 22:59:53 2007
+# Linux kernel version: 2.6.26-rc9
+# Fri Jul 11 23:03:21 2008
 #
 CONFIG_MIPS=y
 
@@ -10,13 +10,13 @@ CONFIG_MIPS=y
 #
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BCM47XX is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
@@ -26,6 +26,7 @@ CONFIG_MIPS=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
 # CONFIG_SGI_IP32 is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CARMEL is not set
@@ -36,10 +37,15 @@ CONFIG_MIPS=y
 # CONFIG_SIBYTE_SENTOSA 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_MACH_TX39XX is not set
+CONFIG_MACH_TX49XX=y
 # CONFIG_WR_PPMC is not set
+CONFIG_TOSHIBA_RBTX4927=y
+CONFIG_TOSHIBA_RBTX4938=y
+CONFIG_SOC_TX4927=y
+CONFIG_SOC_TX4938=y
+# CONFIG_TOSHIBA_FPCIB0 is not set
+CONFIG_PICMG_PCI_BACKPLANE_DEFAULT=y
 
 #
 # Multiplex Pin Select
@@ -47,21 +53,30 @@ CONFIG_TOSHIBA_RBTX4938=y
 CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61=y
 # CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND is not set
 # CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA is not set
+CONFIG_PCI_TX4927=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_CEVT_R4K=y
+CONFIG_CEVT_TXX9=y
+CONFIG_CSRC_R4K=y
+CONFIG_GPIO_TXX9=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_GENERIC_GPIO=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
+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
@@ -94,6 +109,7 @@ CONFIG_CPU_TX49XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_TX49XX=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
 
@@ -115,13 +131,20 @@ CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -156,19 +179,26 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
+# CONFIG_NAMESPACES 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
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_HOTPLUG is not set
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 # CONFIG_FUTEX is not set
 CONFIG_ANON_INODES=y
@@ -181,9 +211,18 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
@@ -205,20 +244,19 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, ISA, TC)
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCI_LEGACY is not set
 CONFIG_MMU=y
 
 #
-# PCCARD (PCMCIA/CardBus) support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
@@ -228,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y
 #
 # Power management options
 #
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_PM is not set
 
 #
@@ -262,26 +301,22 @@ CONFIG_IP_PNP=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_LRO 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_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_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
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -289,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 
@@ -297,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # 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
 
@@ -325,10 +362,11 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_BLK_DEV_XIP is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
 #
@@ -340,10 +378,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
 # CONFIG_FUSION is not set
 
 #
@@ -351,7 +385,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 
 #
-# An alternative FireWire stack is available with EXPERIMENTAL=y
+# A new alternative FireWire stack is available with EXPERIMENTAL=y
 #
 # CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
@@ -361,10 +395,27 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_VETH is not set
 # CONFIG_ARCNET is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# 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_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
+# CONFIG_MII is not set
 # CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
@@ -374,6 +425,10 @@ CONFIG_MII=y
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_NE2000=y
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 CONFIG_NET_PCI=y
 # CONFIG_PCNET32 is not set
 # CONFIG_AMD8111_ETH is not set
@@ -381,13 +436,13 @@ CONFIG_NET_PCI=y
 # CONFIG_B44 is not set
 # CONFIG_FORCEDETH is not set
 CONFIG_TC35815=y
-# 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_8139TOO is not set
+# CONFIG_R6040 is not set
 # CONFIG_SIS900 is not set
 # CONFIG_EPIC100 is not set
 # CONFIG_SUNDANCE is not set
@@ -402,6 +457,7 @@ CONFIG_TC35815=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_PPP is not set
@@ -426,6 +482,7 @@ CONFIG_TC35815=y
 # Character devices
 #
 # CONFIG_VT is not set
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -449,17 +506,11 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_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
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
-
-#
-# SPI support
-#
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 
@@ -473,9 +524,25 @@ CONFIG_SPI_TXX9=y
 #
 CONFIG_SPI_AT25=y
 # CONFIG_SPI_TLE62X0 is not set
+CONFIG_HAVE_GPIO_LIB=y
+
+#
+# GPIO Support
+#
+
+#
+# I2C GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -492,29 +559,46 @@ CONFIG_TXX9_WDT=m
 # CONFIG_WDTPCI is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
 # Multimedia devices
 #
+
+#
+# Multimedia core support
+#
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
 # CONFIG_DAB is not set
 
 #
 # Graphics support
 #
+# CONFIG_DRM 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
 
 #
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
 
 #
 # Sound
@@ -522,7 +606,9 @@ CONFIG_TXX9_WDT=m
 # CONFIG_SOUND is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -542,16 +628,18 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 #
 # SPI RTC drivers
 #
-CONFIG_RTC_DRV_RS5C348=y
 # CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+CONFIG_RTC_DRV_RS5C348=y
 
 #
 # Platform RTC drivers
 #
 # CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+CONFIG_RTC_DRV_DS1742=y
 # 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
@@ -559,23 +647,6 @@ CONFIG_RTC_DRV_RS5C348=y
 #
 # on-CPU RTC drivers
 #
-
-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Userspace I/O
-#
 # CONFIG_UIO is not set
 
 #
@@ -588,12 +659,10 @@ CONFIG_RTC_DRV_RS5C348=y
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+# CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
-# CONFIG_DNOTIFY is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
@@ -622,7 +691,7 @@ CONFIG_SYSFS=y
 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
@@ -630,18 +699,16 @@ CONFIG_RAMFS=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
@@ -658,10 +725,6 @@ CONFIG_SUNRPC=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
 # CONFIG_NLS is not set
 
 #
@@ -669,13 +732,15 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_CROSSCOMPILE=y
+# CONFIG_SAMPLES is not set
 CONFIG_CMDLINE=""
 CONFIG_SYS_SUPPORTS_KGDB=y
 
@@ -690,6 +755,7 @@ CONFIG_SYS_SUPPORTS_KGDB=y
 # Library routines
 #
 CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 56371b860eb0..0f4da0325ea4 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 4b8799802788..1ea97865f2ce 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -16,9 +16,7 @@ CONFIG_MIPS=y
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
deleted file mode 100644
index 3ee75b15c0b0..000000000000
--- a/arch/mips/configs/sead_defconfig
+++ /dev/null
@@ -1,642 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Sun Feb 18 21:28:10 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_BASLER_EXCITE is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_SEAD=y
-# 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_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_PMC_YOSEMITE 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_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE 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_RWSEM_GENERIC_SPINLOCK=y
-# 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_GENERIC_TIME=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DMA_NEED_PCI_MAP_STATE=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_MIPS_BOARDS_GEN=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-
-#
-# CPU selection
-#
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_CPU_MIPS64_R1=y
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPSR1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-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_64BIT_PHYS_ADDR is not set
-CONFIG_CPU_HAS_LLSC=y
-# CONFIG_CPU_HAS_SMARTMIPS is not set
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_SYS_SUPPORTS_SMARTMIPS=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_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_256 is not set
-CONFIG_HZ_1000=y
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-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_BSD_PROCESS_ACCT is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_RELAY=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_EXTRA_PASS is not set
-# CONFIG_HOTPLUG is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-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
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-
-#
-# PCI Hotplug Support
-#
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-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
-
-#
-# Networking
-#
-# CONFIG_NET is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-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
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=18432
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_CDROM_PKTCDVD is not set
-
-#
-# Misc devices
-#
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=y
-# CONFIG_SCSI 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
-
-#
-# 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
-
-#
-# 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_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_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_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# 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_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-
-#
-# Graphics support
-#
-# CONFIG_FIRMWARE_EDID 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_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_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
-#
-
-#
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
-
-#
-# File systems
-#
-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_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_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=y
-
-#
-# 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 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
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# 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_MSDOS_PARTITION 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
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# 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 is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE=""
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-# CONFIG_CRC32 is not set
-# CONFIG_LIBCRC32C is not set
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig
index 8dd3ae39bcad..b5059881bc7e 100644
--- a/arch/mips/configs/tb0219_defconfig
+++ b/arch/mips/configs/tb0219_defconfig
@@ -16,9 +16,7 @@ CONFIG_MIPS=y
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 CONFIG_MACH_VR41XX=y
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index 2ba240e897c6..b06a716bf23f 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -16,9 +16,7 @@ CONFIG_MIPS=y
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 CONFIG_MACH_VR41XX=y
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index a5d0f3c55ed1..46512cf7ce04 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -16,9 +16,7 @@ CONFIG_MIPS=y
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_LASAT 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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 CONFIG_MACH_VR41XX=y
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index edf90b321fe6..b437eb7f8672 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -14,9 +14,7 @@ CONFIG_MIPS=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_MIPS_SIM is not set
 # CONFIG_MARKEINS is not set
 CONFIG_MACH_VR41XX=y
diff --git a/arch/mips/configs/wrppmc_defconfig b/arch/mips/configs/wrppmc_defconfig
index 2e3c683b2052..fc2c56731b98 100644
--- a/arch/mips/configs/wrppmc_defconfig
+++ b/arch/mips/configs/wrppmc_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
-# CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SEAD is not set
 CONFIG_WR_PPMC=y
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MOMENCO_JAGUAR_ATX is not set
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index b6178ffbc523..7f86c43d1bda 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -26,9 +26,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ 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
diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index 0f791eb6bb66..5e92b3a9c5b8 100644
--- a/arch/mips/emma2rh/common/prom.c
+++ b/arch/mips/emma2rh/common/prom.c
@@ -34,12 +34,11 @@
 
 const char *get_system_type(void)
 {
-        switch (mips_machtype) {
-        case MACH_NEC_MARKEINS:
-                return "NEC EMMA2RH Mark-eins";
-        default:
-                return "Unknown NEC board";
-        }
+#if defined(CONFIG_MARKEINS)
+        return "NEC EMMA2RH Mark-eins";
+#else
+#error  Unknown NEC board
+#endif
 }
 
 /* [jsun@junsun.net] PMON passes arguments in C main() style */
@@ -63,10 +62,10 @@ void __init prom_init(void)
         }
 
 #if defined(CONFIG_MARKEINS)
-        mips_machtype = MACH_NEC_MARKEINS;
         add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
+#else
+#error  Unknown NEC board
 #endif
-
 }
 
 void __init prom_free_prom_memory(void)
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
index 23066985a734..0ce9acf10c39 100644
--- a/arch/mips/fw/arc/identify.c
+++ b/arch/mips/fw/arc/identify.c
@@ -22,7 +22,6 @@
 struct smatch {
         char *arcname;
         char *liname;
-        int type;
         int flags;
 };
 
@@ -30,47 +29,38 @@ static struct smatch mach_table[] = {
         {
                 .arcname        = "SGI-IP22",
                 .liname         = "SGI Indy",
-                .type           = MACH_SGI_IP22,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP27",
                 .liname         = "SGI Origin",
-                .type           = MACH_SGI_IP27,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP28",
                 .liname         = "SGI IP28",
-                .type           = MACH_SGI_IP28,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP30",
                 .liname         = "SGI Octane",
-                .type           = MACH_SGI_IP30,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "SGI-IP32",
                 .liname         = "SGI O2",
-                .type           = MACH_SGI_IP32,
                 .flags          = PROM_FLAG_ARCS,
         }, {
                 .arcname        = "Microsoft-Jazz",
                 .liname         = "Jazz MIPS_Magnum_4000",
-                .type           = MACH_MIPS_MAGNUM_4000,
                 .flags          = 0,
         }, {
                 .arcname        = "PICA-61",
                 .liname         = "Jazz Acer_PICA_61",
-                .type           = MACH_ACER_PICA_61,
                 .flags          = 0,
         }, {
                 .arcname        = "RM200PCI",
                 .liname         = "SNI RM200_PCI",
-                .type           = MACH_SNI_RM200_PCI,
                 .flags          = PROM_FLAG_DONT_FREE_TEMP,
         }, {
                 .arcname        = "RM200PCI-R5K",
                 .liname         = "SNI RM200_PCI-R5K",
-                .type           = MACH_SNI_RM200_PCI,
                 .flags          = PROM_FLAG_DONT_FREE_TEMP,
         }
 };
@@ -121,6 +111,5 @@ void __init prom_identify_arch(void)
         mach = string_to_mach(iname);
         system_type = mach->liname;
 
-        mips_machtype = mach->type;
         prom_flags = mach->flags;
 }
diff --git a/arch/mips/gt64120/wrppmc/reset.c b/arch/mips/gt64120/wrppmc/reset.c
index c355cff38f6c..cc5474b24f06 100644
--- a/arch/mips/gt64120/wrppmc/reset.c
+++ b/arch/mips/gt64120/wrppmc/reset.c
@@ -5,10 +5,12 @@
  *
  * Copyright (C) 1997 Ralf Baechle
  */
+#include <linux/irqflags.h>
 #include <linux/kernel.h>
 
 #include <asm/cacheflush.h>
 #include <asm/mipsregs.h>
+#include <asm/processor.h>
 
 void wrppmc_machine_restart(char *command)
 {
@@ -32,15 +34,7 @@ void wrppmc_machine_halt(void)
 
         printk(KERN_NOTICE "You can safely turn off the power\n");
         while (1) {
-                __asm__(
-                        ".set\tmips3\n\t"
-                        "wait\n\t"
-                        ".set\tmips0"
-                );
+                if (cpu_wait)
+                        cpu_wait();
         }
 }
-
-void wrppmc_machine_power_off(void)
-{
-        wrppmc_machine_halt();
-}
diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c
index 728ef6a80edd..ca65c84031a7 100644
--- a/arch/mips/gt64120/wrppmc/setup.c
+++ b/arch/mips/gt64120/wrppmc/setup.c
@@ -98,11 +98,10 @@ void __init plat_mem_setup(void)
 {
         extern void wrppmc_machine_restart(char *command);
         extern void wrppmc_machine_halt(void);
-        extern void wrppmc_machine_power_off(void);
 
         _machine_restart = wrppmc_machine_restart;
         _machine_halt    = wrppmc_machine_halt;
-        pm_power_off     = wrppmc_machine_power_off;
+        pm_power_off     = wrppmc_machine_halt;
 
         /* This makes the operations of 'in/out[bwl]' to the
          * physical address ( < KSEG0) can work via KSEG1
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index a7947199c99b..f60524e8bc44 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -76,10 +76,8 @@ void __init plat_mem_setup(void)
 
         set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA
-        if (mips_machtype == MACH_MIPS_MAGNUM_4000)
-                EISA_bus = 1;
+        EISA_bus = 1;
 #endif
-        isa_slot_offset = 0xe3000000;
 
         /* request I/O space for devices used on all i[345]86 PCs */
         for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++)
diff --git a/arch/mips/jmr3927/common/Makefile b/arch/mips/jmr3927/common/Makefile
deleted file mode 100644
index 8fd4fcccf10e..000000000000
--- a/arch/mips/jmr3927/common/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for the common code of TOSHIBA JMR-TX3927 board
-#
-
-obj-y    += prom.o puts.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jmr3927/common/puts.c b/arch/mips/jmr3927/common/puts.c
deleted file mode 100644
index c611ab497888..000000000000
--- a/arch/mips/jmr3927/common/puts.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * BRIEF MODULE DESCRIPTION
- *      Low level uart routines to directly access a TX[34]927 SIO.
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *              ahennessy@mvista.com or source@mvista.com
- *
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * Based on arch/mips/au1000/common/puts.c
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <asm/jmr3927/tx3927.h>
-
-#define TIMEOUT       0xffffff
-
-void
-prom_putchar(char c)
-{
-        int i = 0;
-
-        do {
-            i++;
-            if (i>TIMEOUT)
-                break;
-        } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
-        tx3927_sioptr(1)->tfifo = c;
-        return;
-}
-
-void
-puts(const char *cp)
-{
-    while (*cp)
-        prom_putchar(*cp++);
-    prom_putchar('\r');
-    prom_putchar('\n');
-}
diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/jmr3927/rbhma3100/init.c
deleted file mode 100644
index 700b9cf8eb9d..000000000000
--- a/arch/mips/jmr3927/rbhma3100/init.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *              ahennessy@mvista.com
- *
- * arch/mips/jmr3927/common/init.c
- *
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <linux/init.h>
-#include <asm/bootinfo.h>
-#include <asm/jmr3927/jmr3927.h>
-
-extern void  __init prom_init_cmdline(void);
-
-const char *get_system_type(void)
-{
-        return "Toshiba"
-#ifdef CONFIG_TOSHIBA_JMR3927
-               " JMR_TX3927"
-#endif
-        ;
-}
-
-extern void puts(const char *cp);
-
-void __init prom_init(void)
-{
-#ifdef CONFIG_TOSHIBA_JMR3927
-        /* CCFG */
-        if ((tx3927_ccfgptr->ccfg & TX3927_CCFG_TLBOFF) == 0)
-                puts("Warning: TX3927 TLB off\n");
-#endif
-
-        prom_init_cmdline();
-        add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM);
-}
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 65e46a6d4178..0fd31974ba28 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -20,9 +20,6 @@ obj-$(CONFIG_CSRC_R4K)		+= csrc-r4k.o
 obj-$(CONFIG_CSRC_SB1250)       += csrc-sb1250.o
 obj-$(CONFIG_SYNC_R4K)          += sync-r4k.o
 
-binfmt_irix-objs        := irixelf.o irixinv.o irixioctl.o irixsig.o    \
-                           irix5sys.o sysirix.o
-
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
 obj-$(CONFIG_MODULES)           += mips_ksyms.o module.o
 
@@ -63,14 +60,13 @@ obj-$(CONFIG_I8259)		+= i8259.o
 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_MIPS_MSC)          += irq-msc01.o
 obj-$(CONFIG_IRQ_TXX9)          += irq_txx9.o
 obj-$(CONFIG_IRQ_GT641XX)       += irq-gt641xx.o
 obj-$(CONFIG_IRQ_GIC)           += irq-gic.o
 
 obj-$(CONFIG_32BIT)             += scall32-o32.o
 obj-$(CONFIG_64BIT)             += scall64-64.o
-obj-$(CONFIG_BINFMT_IRIX)       += binfmt_irix.o
 obj-$(CONFIG_MIPS32_COMPAT)     += linux32.o ptrace32.o signal32.o
 obj-$(CONFIG_MIPS32_N32)        += binfmt_elfn32.o scall64-n32.o signal_n32.o
 obj-$(CONFIG_MIPS32_O32)        += binfmt_elfo32.o scall64-o32.o
diff --git a/arch/mips/kernel/early_printk.c b/arch/mips/kernel/early_printk.c
index 9dccfa4752b2..9ae813eb782e 100644
--- a/arch/mips/kernel/early_printk.c
+++ b/arch/mips/kernel/early_printk.c
@@ -10,6 +10,8 @@
 #include <linux/console.h>
 #include <linux/init.h>
 
+#include <asm/setup.h>
+
 extern void prom_putchar(char);
 
 static void __init
diff --git a/arch/mips/kernel/gpio_txx9.c b/arch/mips/kernel/gpio_txx9.c
index b1436a857998..c6854d9df926 100644
--- a/arch/mips/kernel/gpio_txx9.c
+++ b/arch/mips/kernel/gpio_txx9.c
@@ -47,23 +47,25 @@ static void txx9_gpio_set(struct gpio_chip *chip, unsigned int offset,
 
 static int txx9_gpio_dir_in(struct gpio_chip *chip, unsigned int offset)
 {
-        spin_lock_irq(&txx9_gpio_lock);
+        unsigned long flags;
+        spin_lock_irqsave(&txx9_gpio_lock, flags);
         __raw_writel(__raw_readl(&txx9_pioptr->dir) & ~(1 << offset),
                      &txx9_pioptr->dir);
         mmiowb();
-        spin_unlock_irq(&txx9_gpio_lock);
+        spin_unlock_irqrestore(&txx9_gpio_lock, flags);
         return 0;
 }
 
 static int txx9_gpio_dir_out(struct gpio_chip *chip, unsigned int offset,
                              int value)
 {
-        spin_lock_irq(&txx9_gpio_lock);
+        unsigned long flags;
+        spin_lock_irqsave(&txx9_gpio_lock, flags);
         txx9_gpio_set_raw(offset, value);
         __raw_writel(__raw_readl(&txx9_pioptr->dir) | (1 << offset),
                      &txx9_pioptr->dir);
         mmiowb();
-        spin_unlock_irq(&txx9_gpio_lock);
+        spin_unlock_irqrestore(&txx9_gpio_lock, flags);
         return 0;
 }
 
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c
index 38fa1a194bf4..b6ac55162b9a 100644
--- a/arch/mips/kernel/i8253.c
+++ b/arch/mips/kernel/i8253.c
@@ -80,7 +80,7 @@ static int pit_next_event(unsigned long delta, struct clock_event_device *evt)
  * registered. This mechanism replaces the previous #ifdef LOCAL_APIC -
  * !using_apic_timer decisions in do_timer_interrupt_hook()
  */
-struct clock_event_device pit_clockevent = {
+static struct clock_event_device pit_clockevent = {
         .name           = "pit",
         .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
         .set_mode       = init_pit_timer,
diff --git a/arch/mips/kernel/irix5sys.S b/arch/mips/kernel/irix5sys.S
deleted file mode 100644
index eeef891093ed..000000000000
--- a/arch/mips/kernel/irix5sys.S
+++ /dev/null
@@ -1,1041 +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.
- *
- * 32-bit IRIX5 ABI system call table derived from original file 'irix5sys.h'
- * created by David S. Miller.
- *
- * Copyright (C) 1996 - 2004 David S. Miller <dm@engr.sgi.com>
- * Copyright (C) 2004 Steven J. Hill <sjhill@realitydiluted.com>
- */
-#include <asm/asm.h>
-
-        /*
-         * Key:
-         *         V == Valid and should work as expected for most cases.
-         *        HV == Half Valid, some things will work, some likely will not
-         *        IV == InValid, certainly will not work at all yet
-         *        ?V == ?'ably Valid, I have not done enough looking into it
-         *        DC == Don't Care, a rats ass we couldn't give
-         */
-
-        .macro  irix5syscalltable
-
-        sys     sys_syscall     0       /* 1000  sysindir()            V*/
-        sys     sys_exit        1       /* 1001  exit()                V*/
-        sys     sys_fork        0       /* 1002  fork()                V*/
-        sys     sys_read        3       /* 1003  read()                V*/
-        sys     sys_write       3       /* 1004  write()               V*/
-        sys     sys_open        3       /* 1005  open()                V*/
-        sys     sys_close       1       /* 1006  close()               V*/
-        sys     irix_unimp      0       /* 1007  (XXX IRIX 4 wait)     V*/
-        sys     sys_creat       2       /* 1008  creat()               V*/
-        sys     sys_link        2       /* 1009  link()                V*/
-        sys     sys_unlink      1       /* 1010  unlink()              V*/
-        sys     irix_exec       0       /* 1011  exec()                V*/
-        sys     sys_chdir       1       /* 1012  chdir()               V*/
-        sys     irix_gtime      0       /* 1013  time()                V*/
-        sys     irix_unimp      0       /* 1014  (XXX IRIX 4 mknod)    V*/
-        sys     sys_chmod       2       /* 1015  chmod()               V*/
-        sys     sys_chown       3       /* 1016  chown()               V*/
-        sys     irix_brk        1       /* 1017  break()               V*/
-        sys     irix_unimp      0       /* 1018  (XXX IRIX 4 stat)     V*/
-        sys     sys_lseek       3       /* 1019  lseek()     XXX64bit HV*/
-        sys     irix_getpid     0       /* 1020  getpid()              V*/
-        sys     irix_mount      6       /* 1021  mount()              IV*/
-        sys     sys_umount      1       /* 1022  umount()              V*/
-        sys     sys_setuid      1       /* 1023  setuid()              V*/
-        sys     irix_getuid     0       /* 1024  getuid()              V*/
-        sys     irix_stime      1       /* 1025  stime()               V*/
-        sys     irix_unimp      4       /* 1026  XXX ptrace()         IV*/
-        sys     irix_alarm      1       /* 1027  alarm()               V*/
-        sys     irix_unimp      0       /* 1028  (XXX IRIX 4 fstat)    V*/
-        sys     irix_pause      0       /* 1029  pause()               V*/
-        sys     sys_utime       2       /* 1030  utime()               V*/
-        sys     irix_unimp      0       /* 1031  nuthin'               V*/
-        sys     irix_unimp      0       /* 1032  nobody home man...    V*/
-        sys     sys_access      2       /* 1033  access()              V*/
-        sys     sys_nice        1       /* 1034  nice()                V*/
-        sys     irix_statfs     2       /* 1035  statfs()              V*/
-        sys     sys_sync        0       /* 1036  sync()                V*/
-        sys     sys_kill        2       /* 1037  kill()                V*/
-        sys     irix_fstatfs    2       /* 1038  fstatfs()             V*/
-        sys     irix_setpgrp    1       /* 1039  setpgrp()             V*/
-        sys     irix_syssgi     0       /* 1040  syssgi()             HV*/
-        sys     sys_dup         1       /* 1041  dup()                 V*/
-        sys     sys_pipe        0       /* 1042  pipe()                V*/
-        sys     irix_times      1       /* 1043  times()               V*/
-        sys     irix_unimp      0       /* 1044  XXX profil()         IV*/
-        sys     irix_unimp      0       /* 1045  XXX lock()           IV*/
-        sys     sys_setgid      1       /* 1046  setgid()              V*/
-        sys     irix_getgid     0       /* 1047  getgid()              V*/
-        sys     irix_unimp      0       /* 1048  (XXX IRIX 4 ssig)     V*/
-        sys     irix_msgsys     6       /* 1049  sys_msgsys            V*/
-        sys     sys_sysmips     4       /* 1050  sysmips()            HV*/
-        sys     irix_unimp      0       /* 1051  XXX sysacct()        IV*/
-        sys     irix_shmsys     5       /* 1052  sys_shmsys            V*/
-        sys     irix_semsys     0       /* 1053  sys_semsys            V*/
-        sys     irix_ioctl      3       /* 1054  ioctl()              HV*/
-        sys     irix_uadmin     0       /* 1055  XXX sys_uadmin()     HC*/
-        sys     irix_sysmp      0       /* 1056  sysmp()              HV*/
-        sys     irix_utssys     4       /* 1057  sys_utssys()         HV*/
-        sys     irix_unimp      0       /* 1058  nada enchilada        V*/
-        sys     irix_exece      0       /* 1059  exece()               V*/
-        sys     sys_umask       1       /* 1060  umask()               V*/
-        sys     sys_chroot      1       /* 1061  chroot()              V*/
-        sys     irix_fcntl      3       /* 1062  fcntl()              ?V*/
-        sys     irix_ulimit     2       /* 1063  ulimit()             HV*/
-        sys     irix_unimp      0       /* 1064  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1065  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1066  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1067  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1068  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1069  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1070  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1071  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1072  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1073  XXX AFS shit         DC*/
-        sys     irix_unimp      0       /* 1074  nuttin'               V*/
-        sys     irix_unimp      0       /* 1075  XXX sys_getrlimit64()IV*/
-        sys     irix_unimp      0       /* 1076  XXX sys_setrlimit64()IV*/
-        sys     sys_nanosleep   2       /* 1077  nanosleep()           V*/
-        sys     irix_lseek64    5       /* 1078  lseek64()            ?V*/
-        sys     sys_rmdir       1       /* 1079  rmdir()               V*/
-        sys     sys_mkdir       2       /* 1080  mkdir()               V*/
-        sys     sys_getdents    3       /* 1081  getdents()            V*/
-        sys     irix_sginap     1       /* 1082  sys_sginap()          V*/
-        sys     irix_sgikopt    3       /* 1083  sys_sgikopt()        DC*/
-        sys     sys_sysfs       3       /* 1084  sysfs()              ?V*/
-        sys     irix_unimp      0       /* 1085  XXX sys_getmsg()     DC*/
-        sys     irix_unimp      0       /* 1086  XXX sys_putmsg()     DC*/
-        sys     sys_poll        3       /* 1087  poll()                V*/
-        sys     irix_sigreturn  0       /* 1088  sigreturn()          ?V*/
-        sys     sys_accept      3       /* 1089  accept()              V*/
-        sys     sys_bind        3       /* 1090  bind()                V*/
-        sys     sys_connect     3       /* 1091  connect()             V*/
-        sys     irix_gethostid  0       /* 1092  sys_gethostid()      ?V*/
-        sys     sys_getpeername 3       /* 1093  getpeername()         V*/
-        sys     sys_getsockname 3       /* 1094  getsockname()         V*/
-        sys     sys_getsockopt  5       /* 1095  getsockopt()          V*/
-        sys     sys_listen      2       /* 1096  listen()              V*/
-        sys     sys_recv        4       /* 1097  recv()                V*/
-        sys     sys_recvfrom    6       /* 1098  recvfrom()            V*/
-        sys     sys_recvmsg     3       /* 1099  recvmsg()             V*/
-        sys     sys_select      5       /* 1100  select()              V*/
-        sys     sys_send        4       /* 1101  send()                V*/
-        sys     sys_sendmsg     3       /* 1102  sendmsg()             V*/
-        sys     sys_sendto      6       /* 1103  sendto()              V*/
-        sys     irix_sethostid  1       /* 1104  sys_sethostid()      ?V*/
-        sys     sys_setsockopt  5       /* 1105  setsockopt()          V*/
-        sys     sys_shutdown    2       /* 1106  shutdown()           ?V*/
-        sys     irix_socket     3       /* 1107  socket()              V*/
-        sys     sys_gethostname 2       /* 1108  sys_gethostname()    ?V*/
-        sys     sys_sethostname 2       /* 1109  sethostname()        ?V*/
-        sys     irix_getdomainname 2    /* 1110  sys_getdomainname()  ?V*/
-        sys     sys_setdomainname 2     /* 1111  setdomainname()      ?V*/
-        sys     sys_truncate    2       /* 1112  truncate()            V*/
-        sys     sys_ftruncate   2       /* 1113  ftruncate()           V*/
-        sys     sys_rename      2       /* 1114  rename()              V*/
-        sys     sys_symlink     2       /* 1115  symlink()             V*/
-        sys     sys_readlink    3       /* 1116  readlink()            V*/
-        sys     irix_unimp      0       /* 1117  XXX IRIX 4 lstat()   DC*/
-        sys     irix_unimp      0       /* 1118  nothin'               V*/
-        sys     irix_unimp      0       /* 1119  XXX nfs_svc()        DC*/
-        sys     irix_unimp      0       /* 1120  XXX nfs_getfh()      DC*/
-        sys     irix_unimp      0       /* 1121  XXX async_daemon()   DC*/
-        sys     irix_unimp      0       /* 1122  XXX exportfs()       DC*/
-        sys     sys_setregid    2       /* 1123  setregid()            V*/
-        sys     sys_setreuid    2       /* 1124  setreuid()            V*/
-        sys     sys_getitimer   2       /* 1125  getitimer()           V*/
-        sys     sys_setitimer   3       /* 1126  setitimer()           V*/
-        sys     irix_unimp      1       /* 1127  XXX adjtime()        IV*/
-        sys     irix_gettimeofday 1     /* 1128  gettimeofday()        V*/
-        sys     irix_unimp      0       /* 1129  XXX sproc()          IV*/
-        sys     irix_prctl      0       /* 1130  prctl()              HV*/
-        sys     irix_unimp      0       /* 1131  XXX procblk()        IV*/
-        sys     irix_unimp      0       /* 1132  XXX sprocsp()        IV*/
-        sys     irix_unimp      0       /* 1133  XXX sgigsc()         IV*/
-        sys     irix_mmap32     6       /* 1134  mmap()    XXXflags?  ?V*/
-        sys     sys_munmap      2       /* 1135  munmap()              V*/
-        sys     sys_mprotect    3       /* 1136  mprotect()            V*/
-        sys     sys_msync       4       /* 1137  msync()               V*/
-        sys     irix_madvise    3       /* 1138  madvise()            DC*/
-        sys     irix_pagelock   3       /* 1139  pagelock()           IV*/
-        sys     irix_getpagesize 0      /* 1140  getpagesize()         V*/
-        sys     irix_quotactl   0       /* 1141  quotactl()            V*/
-        sys     irix_unimp      0       /* 1142  nobody home man       V*/
-        sys     sys_getpgid     1       /* 1143  BSD getpgrp()         V*/
-        sys     irix_BSDsetpgrp 2       /* 1143  BSD setpgrp()         V*/
-        sys     sys_vhangup     0       /* 1144  vhangup()             V*/
-        sys     sys_fsync       1       /* 1145  fsync()               V*/
-        sys     sys_fchdir      1       /* 1146  fchdir()              V*/
-        sys     sys_getrlimit   2       /* 1147  getrlimit()          ?V*/
-        sys     sys_setrlimit   2       /* 1148  setrlimit()          ?V*/
-        sys     sys_cacheflush  3       /* 1150  cacheflush()         HV*/
-        sys     sys_cachectl    3       /* 1151  cachectl()           HV*/
-        sys     sys_fchown      3       /* 1152  fchown()             ?V*/
-        sys     sys_fchmod      2       /* 1153  fchmod()             ?V*/
-        sys     irix_unimp      0       /* 1154  XXX IRIX 4 wait3()    V*/
-        sys     sys_socketpair  4       /* 1155  socketpair()          V*/
-        sys     irix_systeminfo 3       /* 1156  systeminfo()         IV*/
-        sys     irix_uname      1       /* 1157  uname()              IV*/
-        sys     irix_xstat      3       /* 1158  xstat()               V*/
-        sys     irix_lxstat     3       /* 1159  lxstat()              V*/
-        sys     irix_fxstat     3       /* 1160  fxstat()              V*/
-        sys     irix_xmknod     0       /* 1161  xmknod()             ?V*/
-        sys     irix_sigaction  4       /* 1162  sigaction()          ?V*/
-        sys     irix_sigpending 1       /* 1163  sigpending()         ?V*/
-        sys     irix_sigprocmask 3      /* 1164  sigprocmask()        ?V*/
-        sys     irix_sigsuspend 0       /* 1165  sigsuspend()         ?V*/
-        sys     irix_sigpoll_sys 3      /* 1166  sigpoll_sys()        IV*/
-        sys     irix_swapctl    2       /* 1167  swapctl()            IV*/
-        sys     irix_getcontext 0       /* 1168  getcontext()         HV*/
-        sys     irix_setcontext 0       /* 1169  setcontext()         HV*/
-        sys     irix_waitsys    5       /* 1170  waitsys()            IV*/
-        sys     irix_sigstack   2       /* 1171  sigstack()           HV*/
-        sys     irix_sigaltstack 2      /* 1172  sigaltstack()        HV*/
-        sys     irix_sigsendset 2       /* 1173  sigsendset()         IV*/
-        sys     irix_statvfs    2       /* 1174  statvfs()             V*/
-        sys     irix_fstatvfs   2       /* 1175  fstatvfs()            V*/
-        sys     irix_unimp      0       /* 1176  XXX getpmsg()        DC*/
-        sys     irix_unimp      0       /* 1177  XXX putpmsg()        DC*/
-        sys     sys_lchown      3       /* 1178  lchown()              V*/
-        sys     irix_priocntl   0       /* 1179  priocntl()           DC*/
-        sys     irix_sigqueue   4       /* 1180  sigqueue()           IV*/
-        sys     sys_readv       3       /* 1181  readv()               V*/
-        sys     sys_writev      3       /* 1182  writev()              V*/
-        sys     irix_truncate64 4       /* 1183  truncate64() XX32bit HV*/
-        sys     irix_ftruncate64 4      /* 1184  ftruncate64()XX32bit HV*/
-        sys     irix_mmap64     0       /* 1185  mmap64()     XX32bit HV*/
-        sys     irix_dmi        0       /* 1186  dmi()                DC*/
-        sys     irix_pread      6       /* 1187  pread()              IV*/
-        sys     irix_pwrite     6       /* 1188  pwrite()             IV*/
-        sys     sys_fsync       1       /* 1189  fdatasync()  XXPOSIX HV*/
-        sys     irix_sgifastpath 7      /* 1190  sgifastpath() WHEEE  IV*/
-        sys     irix_unimp      0       /* 1191  XXX attr_get()       DC*/
-        sys     irix_unimp      0       /* 1192  XXX attr_getf()      DC*/
-        sys     irix_unimp      0       /* 1193  XXX attr_set()       DC*/
-        sys     irix_unimp      0       /* 1194  XXX attr_setf()      DC*/
-        sys     irix_unimp      0       /* 1195  XXX attr_remove()    DC*/
-        sys     irix_unimp      0       /* 1196  XXX attr_removef()   DC*/
-        sys     irix_unimp      0       /* 1197  XXX attr_list()      DC*/
-        sys     irix_unimp      0       /* 1198  XXX attr_listf()     DC*/
-        sys     irix_unimp      0       /* 1199  XXX attr_multi()     DC*/
-        sys     irix_unimp      0       /* 1200  XXX attr_multif()    DC*/
-        sys     irix_statvfs64  2       /* 1201  statvfs64()           V*/
-        sys     irix_fstatvfs64 2       /* 1202  fstatvfs64()          V*/
-        sys     irix_getmountid 2       /* 1203  getmountid()XXXfsids HV*/
-        sys     irix_nsproc     5       /* 1204  nsproc()             IV*/
-        sys     irix_getdents64 3       /* 1205  getdents64()         HV*/
-        sys     irix_unimp      0       /* 1206  XXX DFS garbage      DC*/
-        sys     irix_ngetdents  4       /* 1207  ngetdents() XXXeop   HV*/
-        sys     irix_ngetdents64 4      /* 1208  ngetdents64() XXXeop HV*/
-        sys     irix_unimp      0       /* 1209  nothin'               V*/
-        sys     irix_unimp      0       /* 1210  XXX pidsprocsp()       */
-        sys     irix_unimp      0       /* 1211  XXX rexec()            */
-        sys     irix_unimp      0       /* 1212  XXX timer_create()     */
-        sys     irix_unimp      0       /* 1213  XXX timer_delete()     */
-        sys     irix_unimp      0       /* 1214  XXX timer_settime()    */
-        sys     irix_unimp      0       /* 1215  XXX timer_gettime()    */
-        sys     irix_unimp      0       /* 1216  XXX timer_setoverrun() */
-        sys     sys_sched_rr_get_interval 2             /* 1217  sched_rr_get_interval()V*/
-        sys     sys_sched_yield 0       /* 1218  sched_yield()         V*/
-        sys     sys_sched_getscheduler 1 /* 1219  sched_getscheduler()  V*/
-        sys     sys_sched_setscheduler 3 /* 1220  sched_setscheduler()  V*/
-        sys     sys_sched_getparam 2    /* 1221  sched_getparam()      V*/
-        sys     sys_sched_setparam 2    /* 1222  sched_setparam()      V*/
-        sys     irix_unimp      0       /* 1223  XXX usync_cntl()       */
-        sys     irix_unimp      0       /* 1224  XXX psema_cntl()       */
-        sys     irix_unimp      0       /* 1225  XXX restartreturn()    */
-
-        /* Just to pad things out nicely. */
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-        sys     irix_unimp      0
-
-        .endm
-
-        /*
-         * Pre-compute the number of _instruction_ bytes needed to load
-         * or store the arguments 6-8. Negative values are ignored.
-         */
-        .macro  sys function, nargs
-        PTR     \function
-        LONG    (\nargs << 2) - (5 << 2)
-        .endm
-
-        .align  4
-EXPORT(sys_call_table_irix5)
-        irix5syscalltable
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
deleted file mode 100644
index 469c7237e5ba..000000000000
--- a/arch/mips/kernel/irixelf.c
+++ /dev/null
@@ -1,1361 +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.
- *
- * irixelf.c: Code to load IRIX ELF executables conforming to the MIPS ABI.
- *            Based off of work by Eric Youngdale.
- *
- * Copyright (C) 1993 - 1994 Eric Youngdale <ericy@cais.com>
- * Copyright (C) 1996 - 2004 David S. Miller <dm@engr.sgi.com>
- * Copyright (C) 2004 - 2005 Steven J. Hill <sjhill@realitydiluted.com>
- */
-#undef DEBUG
-
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/stat.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/mman.h>
-#include <linux/a.out.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/signal.h>
-#include <linux/binfmts.h>
-#include <linux/string.h>
-#include <linux/file.h>
-#include <linux/fcntl.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/shm.h>
-#include <linux/personality.h>
-#include <linux/elfcore.h>
-
-#include <asm/mipsregs.h>
-#include <asm/namei.h>
-#include <asm/prctl.h>
-#include <asm/uaccess.h>
-
-#define DLINFO_ITEMS 12
-
-#include <linux/elf.h>
-
-static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs);
-static int load_irix_library(struct file *);
-static int irix_core_dump(long signr, struct pt_regs * regs,
-                          struct file *file, unsigned long limit);
-
-static struct linux_binfmt irix_format = {
-        .module         = THIS_MODULE,
-        .load_binary    = load_irix_binary,
-        .load_shlib     = load_irix_library,
-        .core_dump      = irix_core_dump,
-        .min_coredump   = PAGE_SIZE,
-};
-
-/* Debugging routines. */
-static char *get_elf_p_type(Elf32_Word p_type)
-{
-#ifdef DEBUG
-        switch (p_type) {
-        case PT_NULL:
-                return "PT_NULL";
-                break;
-
-        case PT_LOAD:
-                return "PT_LOAD";
-                break;
-
-        case PT_DYNAMIC:
-                return "PT_DYNAMIC";
-                break;
-
-        case PT_INTERP:
-                return "PT_INTERP";
-                break;
-
-        case PT_NOTE:
-                return "PT_NOTE";
-                break;
-
-        case PT_SHLIB:
-                return "PT_SHLIB";
-                break;
-
-        case PT_PHDR:
-                return "PT_PHDR";
-                break;
-
-        case PT_LOPROC:
-                return "PT_LOPROC/REGINFO";
-                break;
-
-        case PT_HIPROC:
-                return "PT_HIPROC";
-                break;
-
-        default:
-                return "PT_BOGUS";
-                break;
-        }
-#endif
-}
-
-static void print_elfhdr(struct elfhdr *ehp)
-{
-        int i;
-
-        pr_debug("ELFHDR: e_ident<");
-        for (i = 0; i < (EI_NIDENT - 1); i++)
-                pr_debug("%x ", ehp->e_ident[i]);
-        pr_debug("%x>\n", ehp->e_ident[i]);
-        pr_debug("        e_type[%04x] e_machine[%04x] e_version[%08lx]\n",
-                 (unsigned short) ehp->e_type, (unsigned short) ehp->e_machine,
-                 (unsigned long) ehp->e_version);
-        pr_debug("        e_entry[%08lx] e_phoff[%08lx] e_shoff[%08lx] "
-                 "e_flags[%08lx]\n",
-                 (unsigned long) ehp->e_entry, (unsigned long) ehp->e_phoff,
-                 (unsigned long) ehp->e_shoff, (unsigned long) ehp->e_flags);
-        pr_debug("        e_ehsize[%04x] e_phentsize[%04x] e_phnum[%04x]\n",
-                 (unsigned short) ehp->e_ehsize,
-                 (unsigned short) ehp->e_phentsize,
-                 (unsigned short) ehp->e_phnum);
-        pr_debug("        e_shentsize[%04x] e_shnum[%04x] e_shstrndx[%04x]\n",
-                 (unsigned short) ehp->e_shentsize,
-                 (unsigned short) ehp->e_shnum,
-                 (unsigned short) ehp->e_shstrndx);
-}
-
-static void print_phdr(int i, struct elf_phdr *ep)
-{
-        pr_debug("PHDR[%d]: p_type[%s] p_offset[%08lx] p_vaddr[%08lx] "
-                 "p_paddr[%08lx]\n", i, get_elf_p_type(ep->p_type),
-                 (unsigned long) ep->p_offset, (unsigned long) ep->p_vaddr,
-                 (unsigned long) ep->p_paddr);
-        pr_debug("         p_filesz[%08lx] p_memsz[%08lx] p_flags[%08lx] "
-                 "p_align[%08lx]\n", (unsigned long) ep->p_filesz,
-                 (unsigned long) ep->p_memsz, (unsigned long) ep->p_flags,
-                 (unsigned long) ep->p_align);
-}
-
-static void dump_phdrs(struct elf_phdr *ep, int pnum)
-{
-        int i;
-
-        for (i = 0; i < pnum; i++, ep++) {
-                if ((ep->p_type == PT_LOAD) ||
-                    (ep->p_type == PT_INTERP) ||
-                    (ep->p_type == PT_PHDR))
-                        print_phdr(i, ep);
-        }
-}
-
-static void set_brk(unsigned long start, unsigned long end)
-{
-        start = PAGE_ALIGN(start);
-        end = PAGE_ALIGN(end);
-        if (end <= start)
-                return;
-        down_write(&current->mm->mmap_sem);
-        do_brk(start, end - start);
-        up_write(&current->mm->mmap_sem);
-}
-
-
-/* We need to explicitly zero any fractional pages
- * after the data section (i.e. bss).  This would
- * contain the junk from the file that should not
- * be in memory.
- */
-static void padzero(unsigned long elf_bss)
-{
-        unsigned long nbyte;
-
-        nbyte = elf_bss & (PAGE_SIZE-1);
-        if (nbyte) {
-                nbyte = PAGE_SIZE - nbyte;
-                clear_user((void __user *) elf_bss, nbyte);
-        }
-}
-
-static unsigned long * create_irix_tables(char * p, int argc, int envc,
-        struct elfhdr * exec, unsigned int load_addr,
-        unsigned int interp_load_addr, struct pt_regs *regs,
-        struct elf_phdr *ephdr)
-{
-        elf_addr_t *argv;
-        elf_addr_t *envp;
-        elf_addr_t *sp, *csp;
-
-        pr_debug("create_irix_tables: p[%p] argc[%d] envc[%d] "
-                 "load_addr[%08x] interp_load_addr[%08x]\n",
-                 p, argc, envc, load_addr, interp_load_addr);
-
-        sp = (elf_addr_t *) (~15UL & (unsigned long) p);
-        csp = sp;
-        csp -= exec ? DLINFO_ITEMS*2 : 2;
-        csp -= envc+1;
-        csp -= argc+1;
-        csp -= 1;               /* argc itself */
-        if ((unsigned long)csp & 15UL) {
-                sp -= (16UL - ((unsigned long)csp & 15UL)) / sizeof(*sp);
-        }
-
-        /*
-         * Put the ELF interpreter info on the stack
-         */
-#define NEW_AUX_ENT(nr, id, val) \
-          __put_user((id), sp+(nr*2)); \
-          __put_user((val), sp+(nr*2+1)); \
-
-        sp -= 2;
-        NEW_AUX_ENT(0, AT_NULL, 0);
-
-        if (exec) {
-                sp -= 11*2;
-
-                NEW_AUX_ENT(0, AT_PHDR, load_addr + exec->e_phoff);
-                NEW_AUX_ENT(1, AT_PHENT, sizeof(struct elf_phdr));
-                NEW_AUX_ENT(2, AT_PHNUM, exec->e_phnum);
-                NEW_AUX_ENT(3, AT_PAGESZ, ELF_EXEC_PAGESIZE);
-                NEW_AUX_ENT(4, AT_BASE, interp_load_addr);
-                NEW_AUX_ENT(5, AT_FLAGS, 0);
-                NEW_AUX_ENT(6, AT_ENTRY, (elf_addr_t) exec->e_entry);
-                NEW_AUX_ENT(7, AT_UID, (elf_addr_t) current->uid);
-                NEW_AUX_ENT(8, AT_EUID, (elf_addr_t) current->euid);
-                NEW_AUX_ENT(9, AT_GID, (elf_addr_t) current->gid);
-                NEW_AUX_ENT(10, AT_EGID, (elf_addr_t) current->egid);
-        }
-#undef NEW_AUX_ENT
-
-        sp -= envc+1;
-        envp = sp;
-        sp -= argc+1;
-        argv = sp;
-
-        __put_user((elf_addr_t)argc, --sp);
-        current->mm->arg_start = (unsigned long) p;
-        while (argc-->0) {
-                __put_user((unsigned long)p, argv++);
-                p += strlen_user(p);
-        }
-        __put_user((unsigned long) NULL, argv);
-        current->mm->arg_end = current->mm->env_start = (unsigned long) p;
-        while (envc-->0) {
-                __put_user((unsigned long)p, envp++);
-                p += strlen_user(p);
-        }
-        __put_user((unsigned long) NULL, envp);
-        current->mm->env_end = (unsigned long) p;
-        return sp;
-}
-
-
-/* This is much more generalized than the library routine read function,
- * so we keep this separate.  Technically the library read function
- * is only provided so that we can read a.out libraries that have
- * an ELF header.
- */
-static unsigned int load_irix_interp(struct elfhdr * interp_elf_ex,
-                                     struct file * interpreter,
-                                     unsigned int *interp_load_addr)
-{
-        struct elf_phdr *elf_phdata  =  NULL;
-        struct elf_phdr *eppnt;
-        unsigned int len;
-        unsigned int load_addr;
-        int elf_bss;
-        int retval;
-        unsigned int last_bss;
-        int error;
-        int i;
-        unsigned int k;
-
-        elf_bss = 0;
-        last_bss = 0;
-        error = load_addr = 0;
-
-        print_elfhdr(interp_elf_ex);
-
-        /* First of all, some simple consistency checks */
-        if ((interp_elf_ex->e_type != ET_EXEC &&
-             interp_elf_ex->e_type != ET_DYN) ||
-             !interpreter->f_op->mmap) {
-                printk("IRIX interp has bad e_type %d\n", interp_elf_ex->e_type);
-                return 0xffffffff;
-        }
-
-        /* Now read in all of the header information */
-        if (sizeof(struct elf_phdr) * interp_elf_ex->e_phnum > PAGE_SIZE) {
-            printk("IRIX interp header bigger than a page (%d)\n",
-                   (sizeof(struct elf_phdr) * interp_elf_ex->e_phnum));
-            return 0xffffffff;
-        }
-
-        elf_phdata = kmalloc(sizeof(struct elf_phdr) * interp_elf_ex->e_phnum,
-                             GFP_KERNEL);
-
-        if (!elf_phdata) {
-                printk("Cannot kmalloc phdata for IRIX interp.\n");
-                return 0xffffffff;
-        }
-
-        /* If the size of this structure has changed, then punt, since
-         * we will be doing the wrong thing.
-         */
-        if (interp_elf_ex->e_phentsize != 32) {
-                printk("IRIX interp e_phentsize == %d != 32 ",
-                       interp_elf_ex->e_phentsize);
-                kfree(elf_phdata);
-                return 0xffffffff;
-        }
-
-        retval = kernel_read(interpreter, interp_elf_ex->e_phoff,
-                           (char *) elf_phdata,
-                           sizeof(struct elf_phdr) * interp_elf_ex->e_phnum);
-
-        dump_phdrs(elf_phdata, interp_elf_ex->e_phnum);
-
-        eppnt = elf_phdata;
-        for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
-                if (eppnt->p_type == PT_LOAD) {
-                        int elf_type = MAP_PRIVATE | MAP_DENYWRITE;
-                        int elf_prot = 0;
-                        unsigned long vaddr = 0;
-                        if (eppnt->p_flags & PF_R)
-                                elf_prot =  PROT_READ;
-                        if (eppnt->p_flags & PF_W)
-                                elf_prot |= PROT_WRITE;
-                        if (eppnt->p_flags & PF_X)
-                                elf_prot |= PROT_EXEC;
-                        elf_type |= MAP_FIXED;
-                        vaddr = eppnt->p_vaddr;
-
-                        pr_debug("INTERP do_mmap"
-                                 "(%p, %08lx, %08lx, %08lx, %08lx, %08lx) ",
-                                 interpreter, vaddr,
-                                 (unsigned long)
-                                 (eppnt->p_filesz + (eppnt->p_vaddr & 0xfff)),
-                                 (unsigned long)
-                                 elf_prot, (unsigned long) elf_type,
-                                 (unsigned long)
-                                 (eppnt->p_offset & 0xfffff000));
-
-                        down_write(&current->mm->mmap_sem);
-                        error = do_mmap(interpreter, vaddr,
-                        eppnt->p_filesz + (eppnt->p_vaddr & 0xfff),
-                        elf_prot, elf_type,
-                        eppnt->p_offset & 0xfffff000);
-                        up_write(&current->mm->mmap_sem);
-
-                        if (error < 0 && error > -1024) {
-                                printk("Aieee IRIX interp mmap error=%d\n",
-                                       error);
-                                break;  /* Real error */
-                        }
-                        pr_debug("error=%08lx ", (unsigned long) error);
-                        if (!load_addr && interp_elf_ex->e_type == ET_DYN) {
-                                load_addr = error;
-                                pr_debug("load_addr = error ");
-                        }
-
-                        /*
-                         * Find the end of the file  mapping for this phdr, and
-                         * keep track of the largest address we see for this.
-                         */
-                        k = eppnt->p_vaddr + eppnt->p_filesz;
-                        if (k > elf_bss)
-                                elf_bss = k;
-
-                        /* Do the same thing for the memory mapping - between
-                         * elf_bss and last_bss is the bss section.
-                         */
-                        k = eppnt->p_memsz + eppnt->p_vaddr;
-                        if (k > last_bss)
-                                last_bss = k;
-                        pr_debug("\n");
-                }
-        }
-
-        /* Now use mmap to map the library into memory. */
-        if (error < 0 && error > -1024) {
-                pr_debug("got error %d\n", error);
-                kfree(elf_phdata);
-                return 0xffffffff;
-        }
-
-        /* Now fill out the bss section.  First pad the last page up
-         * to the page boundary, and then perform a mmap to make sure
-         * that there are zero-mapped pages up to and including the
-         * last bss page.
-         */
-        pr_debug("padzero(%08lx) ", (unsigned long) (elf_bss));
-        padzero(elf_bss);
-        len = (elf_bss + 0xfff) & 0xfffff000; /* What we have mapped so far */
-
-        pr_debug("last_bss[%08lx] len[%08lx]\n", (unsigned long) last_bss,
-                 (unsigned long) len);
-
-        /* Map the last of the bss segment */
-        if (last_bss > len) {
-                down_write(&current->mm->mmap_sem);
-                do_brk(len, (last_bss - len));
-                up_write(&current->mm->mmap_sem);
-        }
-        kfree(elf_phdata);
-
-        *interp_load_addr = load_addr;
-        return ((unsigned int) interp_elf_ex->e_entry);
-}
-
-/* Check sanity of IRIX elf executable header. */
-static int verify_binary(struct elfhdr *ehp, struct linux_binprm *bprm)
-{
-        if (memcmp(ehp->e_ident, ELFMAG, SELFMAG) != 0)
-                return -ENOEXEC;
-
-        /* First of all, some simple consistency checks */
-        if ((ehp->e_type != ET_EXEC && ehp->e_type != ET_DYN) ||
-            !bprm->file->f_op->mmap) {
-                return -ENOEXEC;
-        }
-
-        /* XXX Don't support N32 or 64bit binaries yet because they can
-         * XXX and do execute 64 bit instructions and expect all registers
-         * XXX to be 64 bit as well.  We need to make the kernel save
-         * XXX all registers as 64bits on cpu's capable of this at
-         * XXX exception time plus frob the XTLB exception vector.
-         */
-        if ((ehp->e_flags & EF_MIPS_ABI2))
-                return -ENOEXEC;
-
-        return 0;
-}
-
-/*
- * This is where the detailed check is performed. Irix binaries
- * use interpreters with 'libc.so' in the name, so this function
- * can differentiate between Linux and Irix binaries.
- */
-static inline int look_for_irix_interpreter(char **name,
-                                            struct file **interpreter,
-                                            struct elfhdr *interp_elf_ex,
-                                            struct elf_phdr *epp,
-                                            struct linux_binprm *bprm, int pnum)
-{
-        int i;
-        int retval = -EINVAL;
-        struct file *file = NULL;
-
-        *name = NULL;
-        for (i = 0; i < pnum; i++, epp++) {
-                if (epp->p_type != PT_INTERP)
-                        continue;
-
-                /* It is illegal to have two interpreters for one executable. */
-                if (*name != NULL)
-                        goto out;
-
-                *name = kmalloc(epp->p_filesz + strlen(IRIX_EMUL), GFP_KERNEL);
-                if (!*name)
-                        return -ENOMEM;
-
-                strcpy(*name, IRIX_EMUL);
-                retval = kernel_read(bprm->file, epp->p_offset, (*name + 16),
-                                     epp->p_filesz);
-                if (retval < 0)
-                        goto out;
-
-                file = open_exec(*name);
-                if (IS_ERR(file)) {
-                        retval = PTR_ERR(file);
-                        goto out;
-                }
-                retval = kernel_read(file, 0, bprm->buf, 128);
-                if (retval < 0)
-                        goto dput_and_out;
-
-                *interp_elf_ex = *(struct elfhdr *) bprm->buf;
-        }
-        *interpreter = file;
-        return 0;
-
-dput_and_out:
-        fput(file);
-out:
-        kfree(*name);
-        return retval;
-}
-
-static inline int verify_irix_interpreter(struct elfhdr *ihp)
-{
-        if (memcmp(ihp->e_ident, ELFMAG, SELFMAG) != 0)
-                return -ELIBBAD;
-        return 0;
-}
-
-#define EXEC_MAP_FLAGS (MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE)
-
-static inline void map_executable(struct file *fp, struct elf_phdr *epp, int pnum,
-                                  unsigned int *estack, unsigned int *laddr,
-                                  unsigned int *scode, unsigned int *ebss,
-                                  unsigned int *ecode, unsigned int *edata,
-                                  unsigned int *ebrk)
-{
-        unsigned int tmp;
-        int i, prot;
-
-        for (i = 0; i < pnum; i++, epp++) {
-                if (epp->p_type != PT_LOAD)
-                        continue;
-
-                /* Map it. */
-                prot  = (epp->p_flags & PF_R) ? PROT_READ : 0;
-                prot |= (epp->p_flags & PF_W) ? PROT_WRITE : 0;
-                prot |= (epp->p_flags & PF_X) ? PROT_EXEC : 0;
-                down_write(&current->mm->mmap_sem);
-                (void) do_mmap(fp, (epp->p_vaddr & 0xfffff000),
-                               (epp->p_filesz + (epp->p_vaddr & 0xfff)),
-                               prot, EXEC_MAP_FLAGS,
-                               (epp->p_offset & 0xfffff000));
-                up_write(&current->mm->mmap_sem);
-
-                /* Fixup location tracking vars. */
-                if ((epp->p_vaddr & 0xfffff000) < *estack)
-                        *estack = (epp->p_vaddr & 0xfffff000);
-                if (!*laddr)
-                        *laddr = epp->p_vaddr - epp->p_offset;
-                if (epp->p_vaddr < *scode)
-                        *scode = epp->p_vaddr;
-
-                tmp = epp->p_vaddr + epp->p_filesz;
-                if (tmp > *ebss)
-                        *ebss = tmp;
-                if ((epp->p_flags & PF_X) && *ecode < tmp)
-                        *ecode = tmp;
-                if (*edata < tmp)
-                        *edata = tmp;
-
-                tmp = epp->p_vaddr + epp->p_memsz;
-                if (tmp > *ebrk)
-                        *ebrk = tmp;
-        }
-
-}
-
-static inline int map_interpreter(struct elf_phdr *epp, struct elfhdr *ihp,
-                                  struct file *interp, unsigned int *iladdr,
-                                  int pnum, mm_segment_t old_fs,
-                                  unsigned int *eentry)
-{
-        int i;
-
-        *eentry = 0xffffffff;
-        for (i = 0; i < pnum; i++, epp++) {
-                if (epp->p_type != PT_INTERP)
-                        continue;
-
-                /* We should have fielded this error elsewhere... */
-                if (*eentry != 0xffffffff)
-                        return -1;
-
-                set_fs(old_fs);
-                *eentry = load_irix_interp(ihp, interp, iladdr);
-                old_fs = get_fs();
-                set_fs(get_ds());
-
-                fput(interp);
-
-                if (*eentry == 0xffffffff)
-                        return -1;
-        }
-        return 0;
-}
-
-/*
- * IRIX maps a page at 0x200000 that holds information about the
- * process and the system, here we map the page and fill the
- * structure
- */
-static int irix_map_prda_page(void)
-{
-        unsigned long v;
-        struct prda *pp;
-
-        down_write(&current->mm->mmap_sem);
-        v =  do_brk(PRDA_ADDRESS, PAGE_SIZE);
-        up_write(&current->mm->mmap_sem);
-
-        if (v != PRDA_ADDRESS)
-                return v;               /* v must be an error code */
-
-        pp = (struct prda *) v;
-        pp->prda_sys.t_pid  = task_pid_vnr(current);
-        pp->prda_sys.t_prid = read_c0_prid();
-        pp->prda_sys.t_rpid = task_pid_vnr(current);
-
-        /* We leave the rest set to zero */
-
-        return 0;
-}
-
-
-
-/* These are the functions used to load ELF style executables and shared
- * libraries.  There is no binary dependent code anywhere else.
- */
-static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs)
-{
-        struct elfhdr elf_ex, interp_elf_ex;
-        struct file *interpreter;
-        struct elf_phdr *elf_phdata, *elf_ihdr, *elf_ephdr;
-        unsigned int load_addr, elf_bss, elf_brk;
-        unsigned int elf_entry, interp_load_addr = 0;
-        unsigned int start_code, end_code, end_data, elf_stack;
-        int retval, has_interp, has_ephdr, size, i;
-        char *elf_interpreter;
-        mm_segment_t old_fs;
-
-        load_addr = 0;
-        has_interp = has_ephdr = 0;
-        elf_ihdr = elf_ephdr = NULL;
-        elf_ex = *((struct elfhdr *) bprm->buf);
-        retval = -ENOEXEC;
-
-        if (verify_binary(&elf_ex, bprm))
-                goto out;
-
-        /*
-         * Telling -o32 static binaries from Linux and Irix apart from each
-         * other is difficult. There are 2 differences to be noted for static
-         * binaries from the 2 operating systems:
-         *
-         *    1) Irix binaries have their .text section before their .init
-         *       section. Linux binaries are just the opposite.
-         *
-         *    2) Irix binaries usually have <= 12 sections and Linux
-         *       binaries have > 20.
-         *
-         * We will use Method #2 since Method #1 would require us to read in
-         * the section headers which is way too much overhead. This appears
-         * to work for everything we have ran into so far. If anyone has a
-         * better method to tell the binaries apart, I'm listening.
-         */
-        if (elf_ex.e_shnum > 20)
-                goto out;
-
-        print_elfhdr(&elf_ex);
-
-        /* Now read in all of the header information */
-        size = elf_ex.e_phentsize * elf_ex.e_phnum;
-        if (size > 65536)
-                goto out;
-        elf_phdata = kmalloc(size, GFP_KERNEL);
-        if (elf_phdata == NULL) {
-                retval = -ENOMEM;
-                goto out;
-        }
-
-        retval = kernel_read(bprm->file, elf_ex.e_phoff, (char *)elf_phdata, size);
-        if (retval < 0)
-                goto out_free_ph;
-
-        dump_phdrs(elf_phdata, elf_ex.e_phnum);
-
-        /* Set some things for later. */
-        for (i = 0; i < elf_ex.e_phnum; i++) {
-                switch (elf_phdata[i].p_type) {
-                case PT_INTERP:
-                        has_interp = 1;
-                        elf_ihdr = &elf_phdata[i];
-                        break;
-                case PT_PHDR:
-                        has_ephdr = 1;
-                        elf_ephdr = &elf_phdata[i];
-                        break;
-                };
-        }
-
-        pr_debug("\n");
-
-        elf_bss = 0;
-        elf_brk = 0;
-
-        elf_stack = 0xffffffff;
-        elf_interpreter = NULL;
-        start_code = 0xffffffff;
-        end_code = 0;
-        end_data = 0;
-
-        /*
-         * If we get a return value, we change the value to be ENOEXEC
-         * so that we can exit gracefully and the main binary format
-         * search loop in 'fs/exec.c' will move onto the next handler
-         * which should be the normal ELF binary handler.
-         */
-        retval = look_for_irix_interpreter(&elf_interpreter, &interpreter,
-                                           &interp_elf_ex, elf_phdata, bprm,
-                                           elf_ex.e_phnum);
-        if (retval) {
-                retval = -ENOEXEC;
-                goto out_free_file;
-        }
-
-        if (elf_interpreter) {
-                retval = verify_irix_interpreter(&interp_elf_ex);
-                if (retval)
-                        goto out_free_interp;
-        }
-
-        /* OK, we are done with that, now set up the arg stuff,
-         * and then start this sucker up.
-         */
-        retval = -E2BIG;
-        if (!bprm->sh_bang && !bprm->p)
-                goto out_free_interp;
-
-        /* Flush all traces of the currently running executable */
-        retval = flush_old_exec(bprm);
-        if (retval)
-                goto out_free_dentry;
-
-        /* OK, This is the point of no return */
-        current->mm->end_data = 0;
-        current->mm->end_code = 0;
-        current->mm->mmap = NULL;
-        current->flags &= ~PF_FORKNOEXEC;
-        elf_entry = (unsigned int) elf_ex.e_entry;
-
-        /* Do this so that we can load the interpreter, if need be.  We will
-         * change some of these later.
-         */
-        setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
-        current->mm->start_stack = bprm->p;
-
-        /* At this point, we assume that the image should be loaded at
-         * fixed address, not at a variable address.
-         */
-        old_fs = get_fs();
-        set_fs(get_ds());
-
-        map_executable(bprm->file, elf_phdata, elf_ex.e_phnum, &elf_stack,
-                       &load_addr, &start_code, &elf_bss, &end_code,
-                       &end_data, &elf_brk);
-
-        if (elf_interpreter) {
-                retval = map_interpreter(elf_phdata, &interp_elf_ex,
-                                         interpreter, &interp_load_addr,
-                                         elf_ex.e_phnum, old_fs, &elf_entry);
-                kfree(elf_interpreter);
-                if (retval) {
-                        set_fs(old_fs);
-                        printk("Unable to load IRIX ELF interpreter\n");
-                        send_sig(SIGSEGV, current, 0);
-                        retval = 0;
-                        goto out_free_file;
-                }
-        }
-
-        set_fs(old_fs);
-
-        kfree(elf_phdata);
-        set_personality(PER_IRIX32);
-        set_binfmt(&irix_format);
-        compute_creds(bprm);
-        current->flags &= ~PF_FORKNOEXEC;
-        bprm->p = (unsigned long)
-          create_irix_tables((char *)bprm->p, bprm->argc, bprm->envc,
-                        (elf_interpreter ? &elf_ex : NULL),
-                        load_addr, interp_load_addr, regs, elf_ephdr);
-        current->mm->start_brk = current->mm->brk = elf_brk;
-        current->mm->end_code = end_code;
-        current->mm->start_code = start_code;
-        current->mm->end_data = end_data;
-        current->mm->start_stack = bprm->p;
-
-        /* Calling set_brk effectively mmaps the pages that we need for the
-         * bss and break sections.
-         */
-        set_brk(elf_bss, elf_brk);
-
-        /*
-         * IRIX maps a page at 0x200000 which holds some system
-         * information.  Programs depend on this.
-         */
-        if (irix_map_prda_page())
-                goto out_free_dentry;
-
-        padzero(elf_bss);
-
-        pr_debug("(start_brk) %lx\n" , (long) current->mm->start_brk);
-        pr_debug("(end_code) %lx\n" , (long) current->mm->end_code);
-        pr_debug("(start_code) %lx\n" , (long) current->mm->start_code);
-        pr_debug("(end_data) %lx\n" , (long) current->mm->end_data);
-        pr_debug("(start_stack) %lx\n" , (long) current->mm->start_stack);
-        pr_debug("(brk) %lx\n" , (long) current->mm->brk);
-
-#if 0 /* XXX No fucking way dude... */
-        /* Why this, you ask???  Well SVr4 maps page 0 as read-only,
-         * and some applications "depend" upon this behavior.
-         * Since we do not have the power to recompile these, we
-         * emulate the SVr4 behavior.  Sigh.
-         */
-        down_write(&current->mm->mmap_sem);
-        (void) do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC,
-                       MAP_FIXED | MAP_PRIVATE, 0);
-        up_write(&current->mm->mmap_sem);
-#endif
-
-        start_thread(regs, elf_entry, bprm->p);
-        if (current->ptrace & PT_PTRACED)
-                send_sig(SIGTRAP, current, 0);
-        return 0;
-out:
-        return retval;
-
-out_free_dentry:
-        allow_write_access(interpreter);
-        fput(interpreter);
-out_free_interp:
-        kfree(elf_interpreter);
-out_free_file:
-out_free_ph:
-        kfree(elf_phdata);
-        goto out;
-}
-
-/* This is really simpleminded and specialized - we are loading an
- * a.out library that is given an ELF header.
- */
-static int load_irix_library(struct file *file)
-{
-        struct elfhdr elf_ex;
-        struct elf_phdr *elf_phdata  =  NULL;
-        unsigned int len = 0;
-        int elf_bss = 0;
-        int retval;
-        unsigned int bss;
-        int error;
-        int i, j, k;
-
-        error = kernel_read(file, 0, (char *) &elf_ex, sizeof(elf_ex));
-        if (error != sizeof(elf_ex))
-                return -ENOEXEC;
-
-        if (memcmp(elf_ex.e_ident, ELFMAG, SELFMAG) != 0)
-                return -ENOEXEC;
-
-        /* First of all, some simple consistency checks. */
-        if (elf_ex.e_type != ET_EXEC || elf_ex.e_phnum > 2 ||
-           !file->f_op->mmap)
-                return -ENOEXEC;
-
-        /* Now read in all of the header information. */
-        if (sizeof(struct elf_phdr) * elf_ex.e_phnum > PAGE_SIZE)
-                return -ENOEXEC;
-
-        elf_phdata = kmalloc(sizeof(struct elf_phdr) * elf_ex.e_phnum, GFP_KERNEL);
-        if (elf_phdata == NULL)
-                return -ENOMEM;
-
-        retval = kernel_read(file, elf_ex.e_phoff, (char *) elf_phdata,
-                           sizeof(struct elf_phdr) * elf_ex.e_phnum);
-
-        j = 0;
-        for (i=0; i<elf_ex.e_phnum; i++)
-                if ((elf_phdata + i)->p_type == PT_LOAD) j++;
-
-        if (j != 1)  {
-                kfree(elf_phdata);
-                return -ENOEXEC;
-        }
-
-        while (elf_phdata->p_type != PT_LOAD) elf_phdata++;
-
-        /* Now use mmap to map the library into memory. */
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap(file,
-                        elf_phdata->p_vaddr & 0xfffff000,
-                        elf_phdata->p_filesz + (elf_phdata->p_vaddr & 0xfff),
-                        PROT_READ | PROT_WRITE | PROT_EXEC,
-                        MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,
-                        elf_phdata->p_offset & 0xfffff000);
-        up_write(&current->mm->mmap_sem);
-
-        k = elf_phdata->p_vaddr + elf_phdata->p_filesz;
-        if (k > elf_bss) elf_bss = k;
-
-        if (error != (elf_phdata->p_vaddr & 0xfffff000)) {
-                kfree(elf_phdata);
-                return error;
-        }
-
-        padzero(elf_bss);
-
-        len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000;
-        bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
-        if (bss > len) {
-          down_write(&current->mm->mmap_sem);
-          do_brk(len, bss-len);
-          up_write(&current->mm->mmap_sem);
-        }
-        kfree(elf_phdata);
-        return 0;
-}
-
-/* Called through irix_syssgi() to map an elf image given an FD,
- * a phdr ptr USER_PHDRP in userspace, and a count CNT telling how many
- * phdrs there are in the USER_PHDRP array.  We return the vaddr the
- * first phdr was successfully mapped to.
- */
-unsigned long irix_mapelf(int fd, struct elf_phdr __user *user_phdrp, int cnt)
-{
-        unsigned long type, vaddr, filesz, offset, flags;
-        struct elf_phdr __user *hp;
-        struct file *filp;
-        int i, retval;
-
-        pr_debug("irix_mapelf: fd[%d] user_phdrp[%p] cnt[%d]\n",
-                 fd, user_phdrp, cnt);
-
-        /* First get the verification out of the way. */
-        hp = user_phdrp;
-        if (!access_ok(VERIFY_READ, hp, (sizeof(struct elf_phdr) * cnt))) {
-                pr_debug("irix_mapelf: bad pointer to ELF PHDR!\n");
-
-                return -EFAULT;
-        }
-
-        dump_phdrs(user_phdrp, cnt);
-
-        for (i = 0; i < cnt; i++, hp++) {
-                if (__get_user(type, &hp->p_type))
-                        return -EFAULT;
-                if (type != PT_LOAD) {
-                        printk("irix_mapelf: One section is not PT_LOAD!\n");
-                        return -ENOEXEC;
-                }
-        }
-
-        filp = fget(fd);
-        if (!filp)
-                return -EACCES;
-        if (!filp->f_op) {
-                printk("irix_mapelf: Bogon filp!\n");
-                fput(filp);
-                return -EACCES;
-        }
-
-        hp = user_phdrp;
-        for (i = 0; i < cnt; i++, hp++) {
-                int prot;
-
-                retval = __get_user(vaddr, &hp->p_vaddr);
-                retval |= __get_user(filesz, &hp->p_filesz);
-                retval |= __get_user(offset, &hp->p_offset);
-                retval |= __get_user(flags, &hp->p_flags);
-                if (retval)
-                        return retval;
-
-                prot  = (flags & PF_R) ? PROT_READ : 0;
-                prot |= (flags & PF_W) ? PROT_WRITE : 0;
-                prot |= (flags & PF_X) ? PROT_EXEC : 0;
-
-                down_write(&current->mm->mmap_sem);
-                retval = do_mmap(filp, (vaddr & 0xfffff000),
-                                 (filesz + (vaddr & 0xfff)),
-                                 prot, (MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE),
-                                 (offset & 0xfffff000));
-                up_write(&current->mm->mmap_sem);
-
-                if (retval != (vaddr & 0xfffff000)) {
-                        printk("irix_mapelf: do_mmap fails with %d!\n", retval);
-                        fput(filp);
-                        return retval;
-                }
-        }
-
-        pr_debug("irix_mapelf: Success, returning %08lx\n",
-                 (unsigned long) user_phdrp->p_vaddr);
-
-        fput(filp);
-
-        if (__get_user(vaddr, &user_phdrp->p_vaddr))
-                return -EFAULT;
-
-        return vaddr;
-}
-
-/*
- * ELF core dumper
- *
- * Modelled on fs/exec.c:aout_core_dump()
- * Jeremy Fitzhardinge <jeremy@sw.oz.au>
- */
-
-/* These are the only things you should do on a core-file: use only these
- * functions to write out all the necessary info.
- */
-static int dump_write(struct file *file, const void __user *addr, int nr)
-{
-        return file->f_op->write(file, (const char __user *) addr, nr, &file->f_pos) == nr;
-}
-
-static int dump_seek(struct file *file, off_t off)
-{
-        if (file->f_op->llseek) {
-                if (file->f_op->llseek(file, off, 0) != off)
-                        return 0;
-        } else
-                file->f_pos = off;
-        return 1;
-}
-
-/* Decide whether a segment is worth dumping; default is yes to be
- * sure (missing info is worse than too much; etc).
- * Personally I'd include everything, and use the coredump limit...
- *
- * I think we should skip something. But I am not sure how. H.J.
- */
-static inline int maydump(struct vm_area_struct *vma)
-{
-        if (!(vma->vm_flags & (VM_READ|VM_WRITE|VM_EXEC)))
-                return 0;
-#if 1
-        if (vma->vm_flags & (VM_WRITE|VM_GROWSUP|VM_GROWSDOWN))
-                return 1;
-        if (vma->vm_flags & (VM_READ|VM_EXEC|VM_EXECUTABLE|VM_SHARED))
-                return 0;
-#endif
-        return 1;
-}
-
-/* An ELF note in memory. */
-struct memelfnote
-{
-        const char *name;
-        int type;
-        unsigned int datasz;
-        void *data;
-};
-
-static int notesize(struct memelfnote *en)
-{
-        int sz;
-
-        sz = sizeof(struct elf_note);
-        sz += roundup(strlen(en->name) + 1, 4);
-        sz += roundup(en->datasz, 4);
-
-        return sz;
-}
-
-#define DUMP_WRITE(addr, nr)    \
-        if (!dump_write(file, (addr), (nr))) \
-                goto end_coredump;
-#define DUMP_SEEK(off)  \
-        if (!dump_seek(file, (off))) \
-                goto end_coredump;
-
-static int writenote(struct memelfnote *men, struct file *file)
-{
-        struct elf_note en;
-
-        en.n_namesz = strlen(men->name) + 1;
-        en.n_descsz = men->datasz;
-        en.n_type = men->type;
-
-        DUMP_WRITE(&en, sizeof(en));
-        DUMP_WRITE(men->name, en.n_namesz);
-        /* XXX - cast from long long to long to avoid need for libgcc.a */
-        DUMP_SEEK(roundup((unsigned long)file->f_pos, 4));      /* XXX */
-        DUMP_WRITE(men->data, men->datasz);
-        DUMP_SEEK(roundup((unsigned long)file->f_pos, 4));      /* XXX */
-
-        return 1;
-
-end_coredump:
-        return 0;
-}
-#undef DUMP_WRITE
-#undef DUMP_SEEK
-
-#define DUMP_WRITE(addr, nr)    \
-        if (!dump_write(file, (addr), (nr))) \
-                goto end_coredump;
-#define DUMP_SEEK(off)  \
-        if (!dump_seek(file, (off))) \
-                goto end_coredump;
-
-/* Actual dumper.
- *
- * This is a two-pass process; first we find the offsets of the bits,
- * and then they are actually written out.  If we run out of core limit
- * we just truncate.
- */
-static int irix_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit)
-{
-        int has_dumped = 0;
-        mm_segment_t fs;
-        int segs;
-        int i;
-        size_t size;
-        struct vm_area_struct *vma;
-        struct elfhdr elf;
-        off_t offset = 0, dataoff;
-        int numnote = 3;
-        struct memelfnote notes[3];
-        struct elf_prstatus prstatus;   /* NT_PRSTATUS */
-        elf_fpregset_t fpu;             /* NT_PRFPREG */
-        struct elf_prpsinfo psinfo;     /* NT_PRPSINFO */
-
-        /* Count what's needed to dump, up to the limit of coredump size. */
-        segs = 0;
-        size = 0;
-        for (vma = current->mm->mmap; vma != NULL; vma = vma->vm_next) {
-                if (maydump(vma))
-                {
-                        int sz = vma->vm_end-vma->vm_start;
-
-                        if (size+sz >= limit)
-                                break;
-                        else
-                                size += sz;
-                }
-
-                segs++;
-        }
-        pr_debug("irix_core_dump: %d segs taking %d bytes\n", segs, size);
-
-        /* Set up header. */
-        memcpy(elf.e_ident, ELFMAG, SELFMAG);
-        elf.e_ident[EI_CLASS] = ELFCLASS32;
-        elf.e_ident[EI_DATA] = ELFDATA2LSB;
-        elf.e_ident[EI_VERSION] = EV_CURRENT;
-        elf.e_ident[EI_OSABI] = ELF_OSABI;
-        memset(elf.e_ident+EI_PAD, 0, EI_NIDENT-EI_PAD);
-
-        elf.e_type = ET_CORE;
-        elf.e_machine = ELF_ARCH;
-        elf.e_version = EV_CURRENT;
-        elf.e_entry = 0;
-        elf.e_phoff = sizeof(elf);
-        elf.e_shoff = 0;
-        elf.e_flags = 0;
-        elf.e_ehsize = sizeof(elf);
-        elf.e_phentsize = sizeof(struct elf_phdr);
-        elf.e_phnum = segs+1;           /* Include notes. */
-        elf.e_shentsize = 0;
-        elf.e_shnum = 0;
-        elf.e_shstrndx = 0;
-
-        fs = get_fs();
-        set_fs(KERNEL_DS);
-
-        has_dumped = 1;
-        current->flags |= PF_DUMPCORE;
-
-        DUMP_WRITE(&elf, sizeof(elf));
-        offset += sizeof(elf);                          /* Elf header. */
-        offset += (segs+1) * sizeof(struct elf_phdr);   /* Program headers. */
-
-        /* Set up the notes in similar form to SVR4 core dumps made
-         * with info from their /proc.
-         */
-        memset(&psinfo, 0, sizeof(psinfo));
-        memset(&prstatus, 0, sizeof(prstatus));
-
-        notes[0].name = "CORE";
-        notes[0].type = NT_PRSTATUS;
-        notes[0].datasz = sizeof(prstatus);
-        notes[0].data = &prstatus;
-        prstatus.pr_info.si_signo = prstatus.pr_cursig = signr;
-        prstatus.pr_sigpend = current->pending.signal.sig[0];
-        prstatus.pr_sighold = current->blocked.sig[0];
-        psinfo.pr_pid = prstatus.pr_pid = task_pid_vnr(current);
-        psinfo.pr_ppid = prstatus.pr_ppid = task_pid_vnr(current->parent);
-        psinfo.pr_pgrp = prstatus.pr_pgrp = task_pgrp_vnr(current);
-        psinfo.pr_sid = prstatus.pr_sid = task_session_vnr(current);
-        if (thread_group_leader(current)) {
-                /*
-                 * This is the record for the group leader.  Add in the
-                 * cumulative times of previous dead threads.  This total
-                 * won't include the time of each live thread whose state
-                 * is included in the core dump.  The final total reported
-                 * to our parent process when it calls wait4 will include
-                 * those sums as well as the little bit more time it takes
-                 * this and each other thread to finish dying after the
-                 * core dump synchronization phase.
-                 */
-                jiffies_to_timeval(current->utime + current->signal->utime,
-                                   &prstatus.pr_utime);
-                jiffies_to_timeval(current->stime + current->signal->stime,
-                                   &prstatus.pr_stime);
-        } else {
-                jiffies_to_timeval(current->utime, &prstatus.pr_utime);
-                jiffies_to_timeval(current->stime, &prstatus.pr_stime);
-        }
-        jiffies_to_timeval(current->signal->cutime, &prstatus.pr_cutime);
-        jiffies_to_timeval(current->signal->cstime, &prstatus.pr_cstime);
-
-        if (sizeof(elf_gregset_t) != sizeof(struct pt_regs)) {
-                printk("sizeof(elf_gregset_t) (%d) != sizeof(struct pt_regs) "
-                       "(%d)\n", sizeof(elf_gregset_t), sizeof(struct pt_regs));
-        } else {
-                *(struct pt_regs *)&prstatus.pr_reg = *regs;
-        }
-
-        notes[1].name = "CORE";
-        notes[1].type = NT_PRPSINFO;
-        notes[1].datasz = sizeof(psinfo);
-        notes[1].data = &psinfo;
-        i = current->state ? ffz(~current->state) + 1 : 0;
-        psinfo.pr_state = i;
-        psinfo.pr_sname = (i < 0 || i > 5) ? '.' : "RSDZTD"[i];
-        psinfo.pr_zomb = psinfo.pr_sname == 'Z';
-        psinfo.pr_nice = task_nice(current);
-        psinfo.pr_flag = current->flags;
-        psinfo.pr_uid = current->uid;
-        psinfo.pr_gid = current->gid;
-        {
-                int i, len;
-
-                set_fs(fs);
-
-                len = current->mm->arg_end - current->mm->arg_start;
-                len = len >= ELF_PRARGSZ ? ELF_PRARGSZ : len;
-                (void *) copy_from_user(&psinfo.pr_psargs,
-                               (const char __user *)current->mm->arg_start, len);
-                for (i = 0; i < len; i++)
-                        if (psinfo.pr_psargs[i] == 0)
-                                psinfo.pr_psargs[i] = ' ';
-                psinfo.pr_psargs[len] = 0;
-
-                set_fs(KERNEL_DS);
-        }
-        strlcpy(psinfo.pr_fname, current->comm, sizeof(psinfo.pr_fname));
-
-        /* Try to dump the FPU. */
-        prstatus.pr_fpvalid = dump_fpu(regs, &fpu);
-        if (!prstatus.pr_fpvalid) {
-                numnote--;
-        } else {
-                notes[2].name = "CORE";
-                notes[2].type = NT_PRFPREG;
-                notes[2].datasz = sizeof(fpu);
-                notes[2].data = &fpu;
-        }
-
-        /* Write notes phdr entry. */
-        {
-                struct elf_phdr phdr;
-                int sz = 0;
-
-                for (i = 0; i < numnote; i++)
-                        sz += notesize(&notes[i]);
-
-                phdr.p_type = PT_NOTE;
-                phdr.p_offset = offset;
-                phdr.p_vaddr = 0;
-                phdr.p_paddr = 0;
-                phdr.p_filesz = sz;
-                phdr.p_memsz = 0;
-                phdr.p_flags = 0;
-                phdr.p_align = 0;
-
-                offset += phdr.p_filesz;
-                DUMP_WRITE(&phdr, sizeof(phdr));
-        }
-
-        /* Page-align dumped data. */
-        dataoff = offset = roundup(offset, PAGE_SIZE);
-
-        /* Write program headers for segments dump. */
-        for (vma = current->mm->mmap, i = 0;
-                i < segs && vma != NULL; vma = vma->vm_next) {
-                struct elf_phdr phdr;
-                size_t sz;
-
-                i++;
-
-                sz = vma->vm_end - vma->vm_start;
-
-                phdr.p_type = PT_LOAD;
-                phdr.p_offset = offset;
-                phdr.p_vaddr = vma->vm_start;
-                phdr.p_paddr = 0;
-                phdr.p_filesz = maydump(vma) ? sz : 0;
-                phdr.p_memsz = sz;
-                offset += phdr.p_filesz;
-                phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-                if (vma->vm_flags & VM_WRITE)
-                        phdr.p_flags |= PF_W;
-                if (vma->vm_flags & VM_EXEC)
-                        phdr.p_flags |= PF_X;
-                phdr.p_align = PAGE_SIZE;
-
-                DUMP_WRITE(&phdr, sizeof(phdr));
-        }
-
-        for (i = 0; i < numnote; i++)
-                if (!writenote(&notes[i], file))
-                        goto end_coredump;
-
-        set_fs(fs);
-
-        DUMP_SEEK(dataoff);
-
-        for (i = 0, vma = current->mm->mmap;
-            i < segs && vma != NULL;
-            vma = vma->vm_next) {
-                unsigned long addr = vma->vm_start;
-                unsigned long len = vma->vm_end - vma->vm_start;
-
-                if (!maydump(vma))
-                        continue;
-                i++;
-                pr_debug("elf_core_dump: writing %08lx %lx\n", addr, len);
-                DUMP_WRITE((void __user *)addr, len);
-        }
-
-        if ((off_t) file->f_pos != offset) {
-                /* Sanity check. */
-                printk("elf_core_dump: file->f_pos (%ld) != offset (%ld)\n",
-                       (off_t) file->f_pos, offset);
-        }
-
-end_coredump:
-        set_fs(fs);
-        return has_dumped;
-}
-
-static int __init init_irix_binfmt(void)
-{
-        extern int init_inventory(void);
-        extern asmlinkage unsigned long sys_call_table;
-        extern asmlinkage unsigned long sys_call_table_irix5;
-
-        init_inventory();
-
-        /*
-         * Copy the IRIX5 syscall table (8000 bytes) into the main syscall
-         * table. The IRIX5 calls are located by an offset of 8000 bytes
-         * from the beginning of the main table.
-         */
-        memcpy((void *) ((unsigned long) &sys_call_table + 8000),
-                &sys_call_table_irix5, 8000);
-
-        return register_binfmt(&irix_format);
-}
-
-static void __exit exit_irix_binfmt(void)
-{
-        /*
-         * Remove the Irix ELF loader.
-         */
-        unregister_binfmt(&irix_format);
-}
-
-module_init(init_irix_binfmt)
-module_exit(exit_irix_binfmt)
diff --git a/arch/mips/kernel/irixinv.c b/arch/mips/kernel/irixinv.c
deleted file mode 100644
index cf2dcd3d6a93..000000000000
--- a/arch/mips/kernel/irixinv.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Support the inventory interface for IRIX binaries
- * This is invoked before the mm layer is working, so we do not
- * use the linked lists for the inventory yet.
- *
- * Miguel de Icaza, 1997.
- */
-#include <linux/mm.h>
-#include <asm/inventory.h>
-#include <asm/uaccess.h>
-
-#define MAX_INVENTORY 50
-int inventory_items = 0;
-
-static inventory_t inventory [MAX_INVENTORY];
-
-void add_to_inventory(int class, int type, int controller, int unit, int state)
-{
-        inventory_t *ni = &inventory [inventory_items];
-
-        if (inventory_items == MAX_INVENTORY)
-                return;
-
-        ni->inv_class      = class;
-        ni->inv_type       = type;
-        ni->inv_controller = controller;
-        ni->inv_unit       = unit;
-        ni->inv_state      = state;
-        ni->inv_next       = ni;
-        inventory_items++;
-}
-
-int dump_inventory_to_user(void __user *userbuf, int size)
-{
-        inventory_t *inv  = &inventory [0];
-        inventory_t __user *user = userbuf;
-        int v;
-
-        if (!access_ok(VERIFY_WRITE, userbuf, size))
-                return -EFAULT;
-
-        for (v = 0; v < inventory_items; v++){
-                inv = &inventory [v];
-                if (copy_to_user (user, inv, sizeof (inventory_t)))
-                        return -EFAULT;
-                user++;
-        }
-        return inventory_items * sizeof(inventory_t);
-}
-
-int __init init_inventory(void)
-{
-        /*
-         * gross hack while we put the right bits all over the kernel
-         * most likely this will not let just anyone run the X server
-         * until we put the right values all over the place
-         */
-        add_to_inventory(10, 3, 0, 0, 16400);
-        add_to_inventory(1, 1, 150, -1, 12);
-        add_to_inventory(1, 3, 0, 0, 8976);
-        add_to_inventory(1, 2, 0, 0, 8976);
-        add_to_inventory(4, 8, 0, 0, 2);
-        add_to_inventory(5, 5, 0, 0, 1);
-        add_to_inventory(3, 3, 0, 0, 32768);
-        add_to_inventory(3, 4, 0, 0, 32768);
-        add_to_inventory(3, 8, 0, 0, 524288);
-        add_to_inventory(3, 9, 0, 0, 64);
-        add_to_inventory(3, 1, 0, 0, 67108864);
-        add_to_inventory(12, 3, 0, 0, 16);
-        add_to_inventory(8, 7, 17, 0, 16777472);
-        add_to_inventory(8, 0, 0, 0, 1);
-        add_to_inventory(2, 1, 0, 13, 2);
-        add_to_inventory(2, 2, 0, 2, 0);
-        add_to_inventory(2, 2, 0, 1, 0);
-        add_to_inventory(7, 14, 0, 0, 6);
-
-        return 0;
-}
diff --git a/arch/mips/kernel/irixioctl.c b/arch/mips/kernel/irixioctl.c
deleted file mode 100644
index b39bdba82e02..000000000000
--- a/arch/mips/kernel/irixioctl.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * irixioctl.c: A fucking mess...
- *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
- */
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/sockios.h>
-#include <linux/syscalls.h>
-#include <linux/tty.h>
-#include <linux/file.h>
-#include <linux/rcupdate.h>
-
-#include <asm/uaccess.h>
-#include <asm/ioctl.h>
-#include <asm/ioctls.h>
-
-#undef DEBUG_IOCTLS
-#undef DEBUG_MISSING_IOCTL
-
-struct irix_termios {
-        tcflag_t c_iflag, c_oflag, c_cflag, c_lflag;
-        cc_t c_cc[NCCS];
-};
-
-asmlinkage int irix_ioctl(int fd, unsigned long cmd, unsigned long arg)
-{
-        struct tty_struct *tp, *rtp;
-        mm_segment_t old_fs;
-        int i, error = 0;
-
-#ifdef DEBUG_IOCTLS
-        printk("[%s:%d] irix_ioctl(%d, ", current->comm, current->pid, fd);
-#endif
-        switch(cmd) {
-        case 0x00005401:
-#ifdef DEBUG_IOCTLS
-                printk("TCGETA, %08lx) ", arg);
-#endif
-                error = sys_ioctl(fd, TCGETA, arg);
-                break;
-
-        case 0x0000540d: {
-                struct termios kt;
-                struct irix_termios __user *it =
-                        (struct irix_termios __user *) arg;
-
-#ifdef DEBUG_IOCTLS
-                printk("TCGETS, %08lx) ", arg);
-#endif
-                if (!access_ok(VERIFY_WRITE, it, sizeof(*it))) {
-                        error = -EFAULT;
-                        break;
-                }
-                old_fs = get_fs(); set_fs(get_ds());
-                error = sys_ioctl(fd, TCGETS, (unsigned long) &kt);
-                set_fs(old_fs);
-                if (error)
-                        break;
-
-                error = __put_user(kt.c_iflag, &it->c_iflag);
-                error |= __put_user(kt.c_oflag, &it->c_oflag);
-                error |= __put_user(kt.c_cflag, &it->c_cflag);
-                error |= __put_user(kt.c_lflag, &it->c_lflag);
-
-                for (i = 0; i < NCCS; i++)
-                        error |= __put_user(kt.c_cc[i], &it->c_cc[i]);
-                break;
-        }
-
-        case 0x0000540e: {
-                struct termios kt;
-                struct irix_termios *it = (struct irix_termios *) arg;
-
-#ifdef DEBUG_IOCTLS
-                printk("TCSETS, %08lx) ", arg);
-#endif
-                if (!access_ok(VERIFY_READ, it, sizeof(*it))) {
-                        error = -EFAULT;
-                        break;
-                }
-                old_fs = get_fs(); set_fs(get_ds());
-                error = sys_ioctl(fd, TCGETS, (unsigned long) &kt);
-                set_fs(old_fs);
-                if (error)
-                        break;
-
-                error = __get_user(kt.c_iflag, &it->c_iflag);
-                error |= __get_user(kt.c_oflag, &it->c_oflag);
-                error |= __get_user(kt.c_cflag, &it->c_cflag);
-                error |= __get_user(kt.c_lflag, &it->c_lflag);
-
-                for (i = 0; i < NCCS; i++)
-                        error |= __get_user(kt.c_cc[i], &it->c_cc[i]);
-
-                if (error)
-                        break;
-                old_fs = get_fs(); set_fs(get_ds());
-                error = sys_ioctl(fd, TCSETS, (unsigned long) &kt);
-                set_fs(old_fs);
-                break;
-        }
-
-        case 0x0000540f:
-#ifdef DEBUG_IOCTLS
-                printk("TCSETSW, %08lx) ", arg);
-#endif
-                error = sys_ioctl(fd, TCSETSW, arg);
-                break;
-
-        case 0x00005471:
-#ifdef DEBUG_IOCTLS
-                printk("TIOCNOTTY, %08lx) ", arg);
-#endif
-                error = sys_ioctl(fd, TIOCNOTTY, arg);
-                break;
-
-        case 0x00007416: {
-                pid_t pid;
-#ifdef DEBUG_IOCTLS
-                printk("TIOCGSID, %08lx) ", arg);
-#endif
-                old_fs = get_fs(); set_fs(get_ds());
-                error = sys_ioctl(fd, TIOCGSID, (unsigned long)&pid);
-                set_fs(old_fs);
-                if (!error)
-                        error = put_user(pid, (unsigned long __user *) arg);
-                break;
-        }
-        case 0x746e:
-                /* TIOCSTART, same effect as hitting ^Q */
-#ifdef DEBUG_IOCTLS
-                printk("TIOCSTART, %08lx) ", arg);
-#endif
-                error = sys_ioctl(fd, TCXONC, TCOON);
-                break;
-
-        case 0x20006968:
-#ifdef DEBUG_IOCTLS
-                printk("SIOCGETLABEL, %08lx) ", arg);
-#endif
-                error = -ENOPKG;
-                break;
-
-        case 0x40047477:
-#ifdef DEBUG_IOCTLS
-                printk("TIOCGPGRP, %08lx) ", arg);
-#endif
-                error = sys_ioctl(fd, TIOCGPGRP, arg);
-#ifdef DEBUG_IOCTLS
-                printk("arg=%d ", *(int *)arg);
-#endif
-                break;
-
-        case 0x40087468:
-#ifdef DEBUG_IOCTLS
-                printk("TIOCGWINSZ, %08lx) ", arg);
-#endif
-                error = sys_ioctl(fd, TIOCGWINSZ, arg);
-                break;
-
-        case 0x8004667e:
-                error = sys_ioctl(fd, FIONBIO, arg);
-                break;
-
-        case 0x80047476:
-                error = sys_ioctl(fd, TIOCSPGRP, arg);
-                break;
-
-        case 0x8020690c:
-                error = sys_ioctl(fd, SIOCSIFADDR, arg);
-                break;
-
-        case 0x80206910:
-                error = sys_ioctl(fd, SIOCSIFFLAGS, arg);
-                break;
-
-        case 0xc0206911:
-                error = sys_ioctl(fd, SIOCGIFFLAGS, arg);
-                break;
-
-        case 0xc020691b:
-                error = sys_ioctl(fd, SIOCGIFMETRIC, arg);
-                break;
-
-        default: {
-#ifdef DEBUG_MISSING_IOCTL
-                char *msg = "Unimplemented IOCTL cmd tell linux-mips@linux-mips.org\n";
-
-#ifdef DEBUG_IOCTLS
-                printk("UNIMP_IOCTL, %08lx)\n", arg);
-#endif
-                old_fs = get_fs(); set_fs(get_ds());
-                sys_write(2, msg, strlen(msg));
-                set_fs(old_fs);
-                printk("[%s:%d] Does unimplemented IRIX ioctl cmd %08lx\n",
-                       current->comm, current->pid, cmd);
-                do_exit(255);
-#else
-                error = sys_ioctl(fd, cmd, arg);
-#endif
-        }
-
-        };
-#ifdef DEBUG_IOCTLS
-        printk("error=%d\n", error);
-#endif
-        return error;
-}
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
deleted file mode 100644
index 0215c805a592..000000000000
--- a/arch/mips/kernel/irixsig.c
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
- * irixsig.c: WHEEE, IRIX signals!  YOW, am I compatible or what?!?!
- *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
- * Copyright (C) 1997 - 2000 Ralf Baechle (ralf@gnu.org)
- * Copyright (C) 2000 Silicon Graphics, Inc.
- */
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/smp.h>
-#include <linux/time.h>
-#include <linux/ptrace.h>
-#include <linux/resource.h>
-
-#include <asm/ptrace.h>
-#include <asm/uaccess.h>
-#include <asm/unistd.h>
-
-#undef DEBUG_SIG
-
-#define _S(nr) (1<<((nr)-1))
-
-#define _BLOCKABLE (~(_S(SIGKILL) | _S(SIGSTOP)))
-
-#define _IRIX_NSIG              128
-#define _IRIX_NSIG_BPW          BITS_PER_LONG
-#define _IRIX_NSIG_WORDS        (_IRIX_NSIG / _IRIX_NSIG_BPW)
-
-typedef struct {
-        unsigned long sig[_IRIX_NSIG_WORDS];
-} irix_sigset_t;
-
-struct sigctx_irix5 {
-        u32 rmask, cp0_status;
-        u64 pc;
-        u64 regs[32];
-        u64 fpregs[32];
-        u32 usedfp, fpcsr, fpeir, sstk_flags;
-        u64 hi, lo;
-        u64 cp0_cause, cp0_badvaddr, _unused0;
-        irix_sigset_t sigset;
-        u64 weird_fpu_thing;
-        u64 _unused1[31];
-};
-
-#ifdef DEBUG_SIG
-/* Debugging */
-static inline void dump_irix5_sigctx(struct sigctx_irix5 *c)
-{
-        int i;
-
-        printk("misc: rmask[%08lx] status[%08lx] pc[%08lx]\n",
-               (unsigned long) c->rmask,
-               (unsigned long) c->cp0_status,
-               (unsigned long) c->pc);
-        printk("regs: ");
-        for(i = 0; i < 16; i++)
-                printk("[%d]<%08lx> ", i, (unsigned long) c->regs[i]);
-        printk("\nregs: ");
-        for(i = 16; i < 32; i++)
-                printk("[%d]<%08lx> ", i, (unsigned long) c->regs[i]);
-        printk("\nfpregs: ");
-        for(i = 0; i < 16; i++)
-                printk("[%d]<%08lx> ", i, (unsigned long) c->fpregs[i]);
-        printk("\nfpregs: ");
-        for(i = 16; i < 32; i++)
-                printk("[%d]<%08lx> ", i, (unsigned long) c->fpregs[i]);
-        printk("misc: usedfp[%d] fpcsr[%08lx] fpeir[%08lx] stk_flgs[%08lx]\n",
-               (int) c->usedfp, (unsigned long) c->fpcsr,
-               (unsigned long) c->fpeir, (unsigned long) c->sstk_flags);
-        printk("misc: hi[%08lx] lo[%08lx] cause[%08lx] badvaddr[%08lx]\n",
-               (unsigned long) c->hi, (unsigned long) c->lo,
-               (unsigned long) c->cp0_cause, (unsigned long) c->cp0_badvaddr);
-        printk("misc: sigset<0>[%08lx] sigset<1>[%08lx] sigset<2>[%08lx] "
-               "sigset<3>[%08lx]\n", (unsigned long) c->sigset.sig[0],
-               (unsigned long) c->sigset.sig[1],
-               (unsigned long) c->sigset.sig[2],
-               (unsigned long) c->sigset.sig[3]);
-}
-#endif
-
-static int setup_irix_frame(struct k_sigaction *ka, struct pt_regs *regs,
-                            int signr, sigset_t *oldmask)
-{
-        struct sigctx_irix5 __user *ctx;
-        unsigned long sp;
-        int error, i;
-
-        sp = regs->regs[29];
-        sp -= sizeof(struct sigctx_irix5);
-        sp &= ~(0xf);
-        ctx = (struct sigctx_irix5 __user *) sp;
-        if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx)))
-                goto segv_and_exit;
-
-        error = __put_user(0, &ctx->weird_fpu_thing);
-        error |= __put_user(~(0x00000001), &ctx->rmask);
-        error |= __put_user(0, &ctx->regs[0]);
-        for(i = 1; i < 32; i++)
-                error |= __put_user((u64) regs->regs[i], &ctx->regs[i]);
-
-        error |= __put_user((u64) regs->hi, &ctx->hi);
-        error |= __put_user((u64) regs->lo, &ctx->lo);
-        error |= __put_user((u64) regs->cp0_epc, &ctx->pc);
-        error |= __put_user(!!used_math(), &ctx->usedfp);
-        error |= __put_user((u64) regs->cp0_cause, &ctx->cp0_cause);
-        error |= __put_user((u64) regs->cp0_badvaddr, &ctx->cp0_badvaddr);
-
-        error |= __put_user(0, &ctx->sstk_flags); /* XXX sigstack unimp... todo... */
-
-        error |= __copy_to_user(&ctx->sigset, oldmask, sizeof(irix_sigset_t)) ? -EFAULT : 0;
-
-        if (error)
-                goto segv_and_exit;
-
-#ifdef DEBUG_SIG
-        dump_irix5_sigctx(ctx);
-#endif
-
-        regs->regs[4] = (unsigned long) signr;
-        regs->regs[5] = 0; /* XXX sigcode XXX */
-        regs->regs[6] = regs->regs[29] = sp;
-        regs->regs[7] = (unsigned long) ka->sa.sa_handler;
-        regs->regs[25] = regs->cp0_epc = (unsigned long) ka->sa_restorer;
-
-        return 1;
-
-segv_and_exit:
-        force_sigsegv(signr, current);
-        return 0;
-}
-
-static int inline
-setup_irix_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
-               int signr, sigset_t *oldmask, siginfo_t *info)
-{
-        printk("Aiee: setup_tr_frame wants to be written");
-        do_exit(SIGSEGV);
-}
-
-static inline int handle_signal(unsigned long sig, siginfo_t *info,
-        struct k_sigaction *ka, sigset_t *oldset, struct pt_regs * regs)
-{
-        int ret;
-
-        switch(regs->regs[0]) {
-        case ERESTARTNOHAND:
-                regs->regs[2] = EINTR;
-                break;
-        case ERESTARTSYS:
-                if(!(ka->sa.sa_flags & SA_RESTART)) {
-                        regs->regs[2] = EINTR;
-                        break;
-                }
-        /* fallthrough */
-        case ERESTARTNOINTR:            /* Userland will reload $v0.  */
-                regs->cp0_epc -= 8;
-        }
-
-        regs->regs[0] = 0;              /* Don't deal with this again.  */
-
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_irix_rt_frame(ka, regs, sig, oldset, info);
-        else
-                ret = setup_irix_frame(ka, regs, sig, oldset);
-
-        spin_lock_irq(&current->sighand->siglock);
-        sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
-        if (!(ka->sa.sa_flags & SA_NODEFER))
-                sigaddset(&current->blocked, sig);
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-
-        return ret;
-}
-
-void do_irix_signal(struct pt_regs *regs)
-{
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
-        sigset_t *oldset;
-
-        /*
-         * We want the common case to go fast, which is why we may in certain
-         * cases get here from kernel mode. Just return without doing anything
-         * if so.
-         */
-        if (!user_mode(regs))
-                return;
-
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                oldset = &current->saved_sigmask;
-        else
-                oldset = &current->blocked;
-
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
-                /* Whee!  Actually deliver the signal.  */
-                if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
-                        /* a signal was successfully delivered; the saved
-                         * sigmask will have been stored in the signal frame,
-                         * and will be restored by sigreturn, so we can simply
-                         * clear the TIF_RESTORE_SIGMASK flag */
-                        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                                clear_thread_flag(TIF_RESTORE_SIGMASK);
-                }
-
-                return;
-        }
-
-        /*
-         * Who's code doesn't conform to the restartable syscall convention
-         * dies here!!!  The li instruction, a single machine instruction,
-         * must directly be followed by the syscall instruction.
-         */
-        if (regs->regs[0]) {
-                if (regs->regs[2] == ERESTARTNOHAND ||
-                    regs->regs[2] == ERESTARTSYS ||
-                    regs->regs[2] == ERESTARTNOINTR) {
-                        regs->cp0_epc -= 8;
-                }
-                if (regs->regs[2] == ERESTART_RESTARTBLOCK) {
-                        regs->regs[2] = __NR_restart_syscall;
-                        regs->regs[7] = regs->regs[26];
-                        regs->cp0_epc -= 4;
-                }
-                regs->regs[0] = 0;      /* Don't deal with this again.  */
-        }
-
-        /*
-        * If there's no signal to deliver, we just put the saved sigmask
-        * back
-        */
-        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
-                sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
-        }
-}
-
-asmlinkage void
-irix_sigreturn(struct pt_regs *regs)
-{
-        struct sigctx_irix5 __user *context, *magic;
-        unsigned long umask, mask;
-        u64 *fregs;
-        u32 usedfp;
-        int error, sig, i, base = 0;
-        sigset_t blocked;
-
-        /* Always make any pending restarted system calls return -EINTR */
-        current_thread_info()->restart_block.fn = do_no_restart_syscall;
-
-        if (regs->regs[2] == 1000)
-                base = 1;
-
-        context = (struct sigctx_irix5 __user *) regs->regs[base + 4];
-        magic = (struct sigctx_irix5 __user *) regs->regs[base + 5];
-        sig = (int) regs->regs[base + 6];
-#ifdef DEBUG_SIG
-        printk("[%s:%d] IRIX sigreturn(scp[%p],ucp[%p],sig[%d])\n",
-               current->comm, current->pid, context, magic, sig);
-#endif
-        if (!context)
-                context = magic;
-        if (!access_ok(VERIFY_READ, context, sizeof(struct sigctx_irix5)))
-                goto badframe;
-
-#ifdef DEBUG_SIG
-        dump_irix5_sigctx(context);
-#endif
-
-        error = __get_user(regs->cp0_epc, &context->pc);
-        error |= __get_user(umask, &context->rmask);
-
-        mask = 2;
-        for (i = 1; i < 32; i++, mask <<= 1) {
-                if (umask & mask)
-                        error |= __get_user(regs->regs[i], &context->regs[i]);
-        }
-        error |= __get_user(regs->hi, &context->hi);
-        error |= __get_user(regs->lo, &context->lo);
-
-        error |= __get_user(usedfp, &context->usedfp);
-        if ((umask & 1) && usedfp) {
-                fregs = (u64 *) &current->thread.fpu;
-
-                for(i = 0; i < 32; i++)
-                        error |= __get_user(fregs[i], &context->fpregs[i]);
-                error |= __get_user(current->thread.fpu.fcr31, &context->fpcsr);
-        }
-
-        /* XXX do sigstack crapola here... XXX */
-
-        error |= __copy_from_user(&blocked, &context->sigset, sizeof(blocked)) ? -EFAULT : 0;
-
-        if (error)
-                goto badframe;
-
-        sigdelsetmask(&blocked, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = blocked;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-
-        /*
-         * Don't let your children do this ...
-         */
-        __asm__ __volatile__(
-                "move\t$29,%0\n\t"
-                "j\tsyscall_exit"
-                :/* no outputs */
-                :"r" (&regs));
-                /* Unreached */
-
-badframe:
-        force_sig(SIGSEGV, current);
-}
-
-struct sigact_irix5 {
-        int flags;
-        void (*handler)(int);
-        u32 sigset[4];
-        int _unused0[2];
-};
-
-#define SIG_SETMASK32   256     /* Goodie from SGI for BSD compatibility:
-                                   set only the low 32 bit of the sigset.  */
-
-#ifdef DEBUG_SIG
-static inline void dump_sigact_irix5(struct sigact_irix5 *p)
-{
-        printk("<f[%d] hndlr[%08lx] msk[%08lx]>", p->flags,
-               (unsigned long) p->handler,
-               (unsigned long) p->sigset[0]);
-}
-#endif
-
-asmlinkage int
-irix_sigaction(int sig, const struct sigaction __user *act,
-              struct sigaction __user *oact, void __user *trampoline)
-{
-        struct k_sigaction new_ka, old_ka;
-        int ret;
-
-#ifdef DEBUG_SIG
-        printk(" (%d,%s,%s,%08lx) ", sig, (!new ? "0" : "NEW"),
-               (!old ? "0" : "OLD"), trampoline);
-        if(new) {
-                dump_sigact_irix5(new); printk(" ");
-        }
-#endif
-        if (act) {
-                sigset_t mask;
-                int err;
-
-                if (!access_ok(VERIFY_READ, act, sizeof(*act)))
-                        return -EFAULT;
-                err = __get_user(new_ka.sa.sa_handler, &act->sa_handler);
-                err |= __get_user(new_ka.sa.sa_flags, &act->sa_flags);
-
-                err |= __copy_from_user(&mask, &act->sa_mask, sizeof(sigset_t)) ? -EFAULT : 0;
-                if (err)
-                        return err;
-
-                /*
-                 * Hmmm... methinks IRIX libc always passes a valid trampoline
-                 * value for all invocations of sigaction.  Will have to
-                 * investigate.  POSIX POSIX, die die die...
-                 */
-                new_ka.sa_restorer = trampoline;
-        }
-
-/* XXX Implement SIG_SETMASK32 for IRIX compatibility */
-        ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
-
-        if (!ret && oact) {
-                int err;
-
-                if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)))
-                        return -EFAULT;
-
-                err = __put_user(old_ka.sa.sa_handler, &oact->sa_handler);
-                err |= __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-                err |= __copy_to_user(&oact->sa_mask, &old_ka.sa.sa_mask,
-                               sizeof(sigset_t)) ? -EFAULT : 0;
-                if (err)
-                        return -EFAULT;
-        }
-
-        return ret;
-}
-
-asmlinkage int irix_sigpending(irix_sigset_t __user *set)
-{
-        return do_sigpending(set, sizeof(*set));
-}
-
-asmlinkage int irix_sigprocmask(int how, irix_sigset_t __user *new,
-        irix_sigset_t __user *old)
-{
-        sigset_t oldbits, newbits;
-
-        if (new) {
-                if (!access_ok(VERIFY_READ, new, sizeof(*new)))
-                        return -EFAULT;
-                if (__copy_from_user(&newbits, new, sizeof(unsigned long)*4))
-                        return -EFAULT;
-                sigdelsetmask(&newbits, ~_BLOCKABLE);
-
-                spin_lock_irq(&current->sighand->siglock);
-                oldbits = current->blocked;
-
-                switch(how) {
-                case 1:
-                        sigorsets(&newbits, &oldbits, &newbits);
-                        break;
-
-                case 2:
-                        sigandsets(&newbits, &oldbits, &newbits);
-                        break;
-
-                case 3:
-                        break;
-
-                case 256:
-                        siginitset(&newbits, newbits.sig[0]);
-                        break;
-
-                default:
-                        spin_unlock_irq(&current->sighand->siglock);
-                        return -EINVAL;
-                }
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
-        }
-        if (old)
-                return copy_to_user(old, &current->blocked,
-                                  sizeof(unsigned long)*4) ? -EFAULT : 0;
-
-        return 0;
-}
-
-asmlinkage int irix_sigsuspend(struct pt_regs *regs)
-{
-        sigset_t newset;
-        sigset_t __user *uset;
-
-        uset = (sigset_t __user *) regs->regs[4];
-        if (copy_from_user(&newset, uset, sizeof(sigset_t)))
-                return -EFAULT;
-        sigdelsetmask(&newset, ~_BLOCKABLE);
-
-        spin_lock_irq(&current->sighand->siglock);
-        current->saved_sigmask = current->blocked;
-        current->blocked = newset;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-
-        current->state = TASK_INTERRUPTIBLE;
-        schedule();
-        set_thread_flag(TIF_RESTORE_SIGMASK);
-        return -ERESTARTNOHAND;
-}
-
-/* hate hate hate... */
-struct irix5_siginfo {
-        int sig, code, error;
-        union {
-                char unused[128 - (3 * 4)]; /* Safety net. */
-                struct {
-                        int pid;
-                        union {
-                                int uid;
-                                struct {
-                                        int utime, status, stime;
-                                } child;
-                        } procdata;
-                } procinfo;
-
-                unsigned long fault_addr;
-
-                struct {
-                        int fd;
-                        long band;
-                } fileinfo;
-
-                unsigned long sigval;
-        } stuff;
-};
-
-asmlinkage int irix_sigpoll_sys(unsigned long __user *set,
-        struct irix5_siginfo __user *info, struct timespec __user *tp)
-{
-        long expire = MAX_SCHEDULE_TIMEOUT;
-        sigset_t kset;
-        int i, sig, error, timeo = 0;
-        struct timespec ktp;
-
-#ifdef DEBUG_SIG
-        printk("[%s:%d] irix_sigpoll_sys(%p,%p,%p)\n",
-               current->comm, current->pid, set, info, tp);
-#endif
-
-        /* Must always specify the signal set. */
-        if (!set)
-                return -EINVAL;
-
-        if (copy_from_user(&kset, set, sizeof(set)))
-                return -EFAULT;
-
-        if (info && clear_user(info, sizeof(*info))) {
-                error = -EFAULT;
-                goto out;
-        }
-
-        if (tp) {
-                if (copy_from_user(&ktp, tp, sizeof(*tp)))
-                        return -EFAULT;
-
-                if (!ktp.tv_sec && !ktp.tv_nsec)
-                        return -EINVAL;
-
-                expire = timespec_to_jiffies(&ktp) +
-                         (ktp.tv_sec || ktp.tv_nsec);
-        }
-
-        while(1) {
-                long tmp = 0;
-
-                expire = schedule_timeout_interruptible(expire);
-
-                for (i=0; i < _IRIX_NSIG_WORDS; i++)
-                        tmp |= (current->pending.signal.sig[i] & kset.sig[i]);
-
-                if (tmp)
-                        break;
-                if (!expire) {
-                        timeo = 1;
-                        break;
-                }
-                if (signal_pending(current))
-                        return -EINTR;
-        }
-        if (timeo)
-                return -EAGAIN;
-
-        for (sig = 1; i <= 65 /* IRIX_NSIG */; sig++) {
-                if (sigismember (&kset, sig))
-                        continue;
-                if (sigismember (&current->pending.signal, sig)) {
-                        /* XXX need more than this... */
-                        if (info)
-                                return copy_to_user(&info->sig, &sig, sizeof(sig));
-                        return 0;
-                }
-        }
-
-        /* Should not get here, but do something sane if we do. */
-        error = -EINTR;
-
-out:
-        return error;
-}
-
-/* This is here because of irix5_siginfo definition. */
-#define IRIX_P_PID    0
-#define IRIX_P_PGID   2
-#define IRIX_P_ALL    7
-
-#define W_EXITED     1
-#define W_TRAPPED    2
-#define W_STOPPED    4
-#define W_CONT       8
-#define W_NOHANG    64
-
-#define W_MASK      (W_EXITED | W_TRAPPED | W_STOPPED | W_CONT | W_NOHANG)
-
-asmlinkage int irix_waitsys(int type, int upid,
-        struct irix5_siginfo __user *info, int options,
-        struct rusage __user *ru)
-{
-        struct pid *pid = NULL;
-        int flag, retval;
-        DECLARE_WAITQUEUE(wait, current);
-        struct task_struct *tsk;
-        struct task_struct *p;
-        struct list_head *_p;
-
-        if (!info)
-                return -EINVAL;
-
-        if (!access_ok(VERIFY_WRITE, info, sizeof(*info)))
-                return -EFAULT;
-
-        if (ru)
-                if (!access_ok(VERIFY_WRITE, ru, sizeof(*ru)))
-                        return -EFAULT;
-
-        if (options & ~W_MASK)
-                return -EINVAL;
-
-        if (type != IRIX_P_PID && type != IRIX_P_PGID && type != IRIX_P_ALL)
-                return -EINVAL;
-
-        if (type != IRIX_P_ALL)
-                pid = find_get_pid(upid);
-        add_wait_queue(&current->signal->wait_chldexit, &wait);
-repeat:
-        flag = 0;
-        current->state = TASK_INTERRUPTIBLE;
-        read_lock(&tasklist_lock);
-        tsk = current;
-        list_for_each(_p, &tsk->children) {
-                p = list_entry(_p, struct task_struct, sibling);
-                if ((type == IRIX_P_PID) && task_pid(p) != pid)
-                        continue;
-                if ((type == IRIX_P_PGID) && task_pgrp(p) != pid)
-                        continue;
-                if ((p->exit_signal != SIGCHLD))
-                        continue;
-                flag = 1;
-                switch (p->state) {
-                case TASK_STOPPED:
-                        if (!p->exit_code)
-                                continue;
-                        if (!(options & (W_TRAPPED|W_STOPPED)) &&
-                            !(p->ptrace & PT_PTRACED))
-                                continue;
-                        read_unlock(&tasklist_lock);
-
-                        /* move to end of parent's list to avoid starvation */
-                        write_lock_irq(&tasklist_lock);
-                        remove_parent(p);
-                        add_parent(p);
-                        write_unlock_irq(&tasklist_lock);
-                        retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0;
-                        if (retval)
-                                goto end_waitsys;
-
-                        retval = __put_user(SIGCHLD, &info->sig);
-                        retval |= __put_user(0, &info->code);
-                        retval |= __put_user(task_pid_vnr(p), &info->stuff.procinfo.pid);
-                        retval |= __put_user((p->exit_code >> 8) & 0xff,
-                                   &info->stuff.procinfo.procdata.child.status);
-                        retval |= __put_user(p->utime, &info->stuff.procinfo.procdata.child.utime);
-                        retval |= __put_user(p->stime, &info->stuff.procinfo.procdata.child.stime);
-                        if (retval)
-                                goto end_waitsys;
-
-                        p->exit_code = 0;
-                        goto end_waitsys;
-
-                case EXIT_ZOMBIE:
-                        current->signal->cutime += p->utime + p->signal->cutime;
-                        current->signal->cstime += p->stime + p->signal->cstime;
-                        if (ru != NULL)
-                                getrusage(p, RUSAGE_BOTH, ru);
-                        retval = __put_user(SIGCHLD, &info->sig);
-                        retval |= __put_user(1, &info->code);      /* CLD_EXITED */
-                        retval |= __put_user(task_pid_vnr(p), &info->stuff.procinfo.pid);
-                        retval |= __put_user((p->exit_code >> 8) & 0xff,
-                                   &info->stuff.procinfo.procdata.child.status);
-                        retval |= __put_user(p->utime,
-                                   &info->stuff.procinfo.procdata.child.utime);
-                        retval |= __put_user(p->stime,
-                                   &info->stuff.procinfo.procdata.child.stime);
-                        if (retval)
-                                goto end_waitsys;
-
-                        if (p->real_parent != p->parent) {
-                                write_lock_irq(&tasklist_lock);
-                                remove_parent(p);
-                                p->parent = p->real_parent;
-                                add_parent(p);
-                                do_notify_parent(p, SIGCHLD);
-                                write_unlock_irq(&tasklist_lock);
-                        } else
-                                release_task(p);
-                        goto end_waitsys;
-                default:
-                        continue;
-                }
-                tsk = next_thread(tsk);
-        }
-        read_unlock(&tasklist_lock);
-        if (flag) {
-                retval = 0;
-                if (options & W_NOHANG)
-                        goto end_waitsys;
-                retval = -ERESTARTSYS;
-                if (signal_pending(current))
-                        goto end_waitsys;
-                current->state = TASK_INTERRUPTIBLE;
-                schedule();
-                goto repeat;
-        }
-        retval = -ECHILD;
-end_waitsys:
-        current->state = TASK_RUNNING;
-        remove_wait_queue(&current->signal->wait_chldexit, &wait);
-        put_pid(pid);
-
-        return retval;
-}
-
-struct irix5_context {
-        u32 flags;
-        u32 link;
-        u32 sigmask[4];
-        struct { u32 sp, size, flags; } stack;
-        int regs[36];
-        u32 fpregs[32];
-        u32 fpcsr;
-        u32 _unused0;
-        u32 _unused1[47];
-        u32 weird_graphics_thing;
-};
-
-asmlinkage int irix_getcontext(struct pt_regs *regs)
-{
-        int error, i, base = 0;
-        struct irix5_context __user *ctx;
-        unsigned long flags;
-
-        if (regs->regs[2] == 1000)
-                base = 1;
-        ctx = (struct irix5_context __user *) regs->regs[base + 4];
-
-#ifdef DEBUG_SIG
-        printk("[%s:%d] irix_getcontext(%p)\n",
-               current->comm, current->pid, ctx);
-#endif
-
-        if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx)))
-                return -EFAULT;
-
-        error = __put_user(current->thread.irix_oldctx, &ctx->link);
-
-        error |= __copy_to_user(&ctx->sigmask, &current->blocked, sizeof(irix_sigset_t)) ? -EFAULT : 0;
-
-        /* XXX Do sigstack stuff someday... */
-        error |= __put_user(0, &ctx->stack.sp);
-        error |= __put_user(0, &ctx->stack.size);
-        error |= __put_user(0, &ctx->stack.flags);
-
-        error |= __put_user(0, &ctx->weird_graphics_thing);
-        error |= __put_user(0, &ctx->regs[0]);
-        for (i = 1; i < 32; i++)
-                error |= __put_user(regs->regs[i], &ctx->regs[i]);
-        error |= __put_user(regs->lo, &ctx->regs[32]);
-        error |= __put_user(regs->hi, &ctx->regs[33]);
-        error |= __put_user(regs->cp0_cause, &ctx->regs[34]);
-        error |= __put_user(regs->cp0_epc, &ctx->regs[35]);
-
-        flags = 0x0f;
-        if (!used_math()) {
-                flags &= ~(0x08);
-        } else {
-                /* XXX wheee... */
-                printk("Wheee, no code for saving IRIX FPU context yet.\n");
-        }
-        error |= __put_user(flags, &ctx->flags);
-
-        return error;
-}
-
-asmlinkage void irix_setcontext(struct pt_regs *regs)
-{
-        struct irix5_context __user *ctx;
-        int err, base = 0;
-        u32 flags;
-
-        if (regs->regs[2] == 1000)
-                base = 1;
-        ctx = (struct irix5_context __user *) regs->regs[base + 4];
-
-#ifdef DEBUG_SIG
-        printk("[%s:%d] irix_setcontext(%p)\n",
-               current->comm, current->pid, ctx);
-#endif
-
-        if (!access_ok(VERIFY_READ, ctx, sizeof(*ctx)))
-                goto segv_and_exit;
-
-        err = __get_user(flags, &ctx->flags);
-        if (flags & 0x02) {
-                /* XXX sigstack garbage, todo... */
-                printk("Wheee, cannot do sigstack stuff in setcontext\n");
-        }
-
-        if (flags & 0x04) {
-                int i;
-
-                /* XXX extra control block stuff... todo... */
-                for (i = 1; i < 32; i++)
-                        err |= __get_user(regs->regs[i], &ctx->regs[i]);
-                err |= __get_user(regs->lo, &ctx->regs[32]);
-                err |= __get_user(regs->hi, &ctx->regs[33]);
-                err |= __get_user(regs->cp0_epc, &ctx->regs[35]);
-        }
-
-        if (flags & 0x08)
-                /* XXX fpu context, blah... */
-                printk(KERN_ERR "Wheee, cannot restore FPU context yet...\n");
-
-        err |= __get_user(current->thread.irix_oldctx, &ctx->link);
-        if (err)
-                goto segv_and_exit;
-
-        /*
-         * Don't let your children do this ...
-         */
-        __asm__ __volatile__(
-                "move\t$29,%0\n\t"
-                "j\tsyscall_exit"
-                :/* no outputs */
-                :"r" (&regs));
-                /* Unreached */
-
-segv_and_exit:
-        force_sigsegv(SIGSEGV, current);
-}
-
-struct irix_sigstack {
-        unsigned long sp;
-        int status;
-};
-
-asmlinkage int irix_sigstack(struct irix_sigstack __user *new,
-        struct irix_sigstack __user *old)
-{
-#ifdef DEBUG_SIG
-        printk("[%s:%d] irix_sigstack(%p,%p)\n",
-               current->comm, current->pid, new, old);
-#endif
-        if (new) {
-                if (!access_ok(VERIFY_READ, new, sizeof(*new)))
-                        return -EFAULT;
-        }
-
-        if (old) {
-                if (!access_ok(VERIFY_WRITE, old, sizeof(*old)))
-                        return -EFAULT;
-        }
-
-        return 0;
-}
-
-struct irix_sigaltstack { unsigned long sp; int size; int status; };
-
-asmlinkage int irix_sigaltstack(struct irix_sigaltstack __user *new,
-                                struct irix_sigaltstack __user *old)
-{
-#ifdef DEBUG_SIG
-        printk("[%s:%d] irix_sigaltstack(%p,%p)\n",
-               current->comm, current->pid, new, old);
-#endif
-        if (new)
-                if (!access_ok(VERIFY_READ, new, sizeof(*new)))
-                        return -EFAULT;
-
-        if (old) {
-                if (!access_ok(VERIFY_WRITE, old, sizeof(*old)))
-                        return -EFAULT;
-        }
-
-        return 0;
-}
-
-struct irix_procset {
-        int cmd, ltype, lid, rtype, rid;
-};
-
-asmlinkage int irix_sigsendset(struct irix_procset __user *pset, int sig)
-{
-        if (!access_ok(VERIFY_READ, pset, sizeof(*pset)))
-                return -EFAULT;
-#ifdef DEBUG_SIG
-        printk("[%s:%d] irix_sigsendset([%d,%d,%d,%d,%d],%d)\n",
-               current->comm, current->pid,
-               pset->cmd, pset->ltype, pset->lid, pset->rtype, pset->rid,
-               sig);
-#endif
-        return -EINVAL;
-}
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index ed9febe63d72..b47e4615ec12 100644
--- a/arch/mips/kernel/irq-rm9000.c
+++ b/arch/mips/kernel/irq-rm9000.c
@@ -49,7 +49,7 @@ static void local_rm9k_perfcounter_irq_startup(void *args)
 
 static unsigned int rm9k_perfcounter_irq_startup(unsigned int irq)
 {
-        on_each_cpu(local_rm9k_perfcounter_irq_startup, (void *) irq, 0, 1);
+        on_each_cpu(local_rm9k_perfcounter_irq_startup, (void *) irq, 1);
 
         return 0;
 }
@@ -66,7 +66,7 @@ static void local_rm9k_perfcounter_irq_shutdown(void *args)
 
 static void rm9k_perfcounter_irq_shutdown(unsigned int irq)
 {
-        on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 0, 1);
+        on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 1);
 }
 
 static struct irq_chip rm9k_irq_controller = {
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index e3309ff9ece4..6045b9a51a35 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -44,8 +44,6 @@ again:
         return irq;
 }
 
-EXPORT_SYMBOL_GPL(allocate_irqno);
-
 /*
  * Allocate the 16 legacy interrupts for i8259 devices.  This happens early
  * in the kernel initialization so treating allocation failure as BUG() is
@@ -66,8 +64,6 @@ void free_irqno(unsigned int irq)
         smp_mb__after_clear_bit();
 }
 
-EXPORT_SYMBOL_GPL(free_irqno);
-
 /*
  * 'what should we do if we get a hw irq event on an illegal vector'.
  * each architecture has to answer this themselves.
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index 640fb0cc6e39..d01665a453f5 100644
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/kallsyms.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/module.h>
@@ -84,9 +83,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 ",
-                                       i, read_vpe_c0_epc());
-                                print_symbol("%s\n", read_vpe_c0_epc());
+                                printk("   VPE%d.EPC : %08lx %pS\n",
+                                       i, read_vpe_c0_epc(),
+                                       (void *) read_vpe_c0_epc());
                                 printk("   VPE%d.Cause : %08lx\n",
                                        i, read_vpe_c0_cause());
                                 printk("   VPE%d.Config7 : %08lx\n",
@@ -111,8 +110,8 @@ void mips_mt_regdump(unsigned long mvpctl)
                 }
                 printk("   TCStatus : %08lx\n", tcstatval);
                 printk("   TCBind : %08lx\n", read_tc_c0_tcbind());
-                printk("   TCRestart : %08lx ", read_tc_c0_tcrestart());
-                print_symbol("%s\n", read_tc_c0_tcrestart());
+                printk("   TCRestart : %08lx %pS\n",
+                       read_tc_c0_tcrestart(), (void *) 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/process.c b/arch/mips/kernel/process.c
index 2c09a442e5e5..c06f5b5d764c 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -125,13 +125,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
         *childregs = *regs;
         childregs->regs[7] = 0; /* Clear error flag */
 
-#if defined(CONFIG_BINFMT_IRIX)
-        if (current->personality != PER_LINUX) {
-                /* Under IRIX things are a little different. */
-                childregs->regs[3] = 1;
-                regs->regs[3] = 0;
-        }
-#endif
         childregs->regs[2] = 0; /* Child gets zero as return value */
         regs->regs[2] = p->pid;
 
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 08a9c5070ea8..c058c0b61a2a 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -34,12 +34,8 @@ NESTED(handle_sys, PT_SIZE, sp)
 
         lw      t1, PT_EPC(sp)          # skip syscall on return
 
-#if defined(CONFIG_BINFMT_IRIX)
-        sltiu   t0, v0, MAX_SYSCALL_NO + 1 # check syscall number
-#else
         subu    v0, v0, __NR_O32_Linux  # check syscall number
         sltiu   t0, v0, __NR_O32_Linux_syscalls + 1
-#endif
         addiu   t1, 4                   # skip to next instruction
         sw      t1, PT_EPC(sp)
         beqz    t0, illegal_syscall
@@ -264,22 +260,14 @@ bad_alignment:
         END(sys_sysmips)
 
         LEAF(sys_syscall)
-#if defined(CONFIG_BINFMT_IRIX)
-        sltiu   v0, a0, MAX_SYSCALL_NO + 1 # check syscall number
-#else
         subu    t0, a0, __NR_O32_Linux  # check syscall number
         sltiu   v0, t0, __NR_O32_Linux_syscalls + 1
-#endif
         sll     t1, t0, 3
         beqz    v0, einval
 
         lw      t2, sys_call_table(t1)          # syscall routine
 
-#if defined(CONFIG_BINFMT_IRIX)
-        li      v1, 4000                        # nr of sys_syscall
-#else
         li      v1, 4000 - __NR_O32_Linux       # index of sys_syscall
-#endif
         beq     t0, v1, einval                  # do not recurse
 
         /* Some syscalls like execve get their arguments from struct pt_regs
@@ -324,13 +312,6 @@ einval:	li	v0, -EINVAL
         .endm
 
         .macro  syscalltable
-#if defined(CONFIG_BINFMT_IRIX)
-        mille   sys_ni_syscall          0       /*    0 -  999 SVR4 flavour */
-        mille   sys_ni_syscall          0       /* 1000 - 1999 32-bit IRIX */
-        mille   sys_ni_syscall          0       /* 2000 - 2999 BSD43 flavour */
-        mille   sys_ni_syscall          0       /* 3000 - 3999 POSIX flavour */
-#endif
-
         sys     sys_syscall             8       /* 4000 */
         sys     sys_exit                1
         sys     sys_fork                0
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index c6a063b2a0d9..8af84867e74d 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -68,13 +68,6 @@ static char command_line[CL_SIZE];
 const unsigned long mips_io_port_base __read_mostly = -1;
 EXPORT_SYMBOL(mips_io_port_base);
 
-/*
- * isa_slot_offset is the address where E(ISA) busaddress 0 is mapped
- * for the processor.
- */
-unsigned long isa_slot_offset;
-EXPORT_SYMBOL(isa_slot_offset);
-
 static struct resource code_resource = { .name = "Kernel code", };
 static struct resource data_resource = { .name = "Kernel data", };
 
@@ -557,11 +550,7 @@ void __init setup_arch(char **cmdline_p)
         prom_init();
 
 #ifdef CONFIG_EARLY_PRINTK
-        {
-                extern void setup_early_printk(void);
-
-                setup_early_printk();
-        }
+        setup_early_printk();
 #endif
         cpu_report();
         check_bugs_early();
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index cdf87a9dd4ba..4410f172b8ab 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -131,148 +131,29 @@ asmlinkage __cpuinit void start_secondary(void)
         cpu_idle();
 }
 
-DEFINE_SPINLOCK(smp_call_lock);
-
-struct call_data_struct *call_data;
-
-/*
- * Run a function on all other CPUs.
- *
- *  <mask>      cpuset_t of all processors to run the function on.
- *  <func>      The function to run. This must be fast and non-blocking.
- *  <info>      An arbitrary pointer to pass to the function.
- *  <retry>     If true, keep retrying until ready.
- *  <wait>      If true, wait until function has completed on other CPUs.
- *  [RETURNS]   0 on success, else a negative status code.
- *
- * Does not return until remote CPUs are nearly ready to execute <func>
- * or are or have executed.
- *
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler:
- *
- * CPU A                               CPU B
- * Disable interrupts
- *                                     smp_call_function()
- *                                     Take call_lock
- *                                     Send IPIs
- *                                     Wait for all cpus to acknowledge IPI
- *                                     CPU A has not responded, spin waiting
- *                                     for cpu A to respond, holding call_lock
- * smp_call_function()
- * Spin waiting for call_lock
- * Deadlock                            Deadlock
- */
-int smp_call_function_mask(cpumask_t mask, void (*func) (void *info),
-        void *info, int retry, int wait)
+void arch_send_call_function_ipi(cpumask_t mask)
 {
-        struct call_data_struct data;
-        int cpu = smp_processor_id();
-        int cpus;
-
-        /*
-         * Can die spectacularly if this CPU isn't yet marked online
-         */
-        BUG_ON(!cpu_online(cpu));
-
-        cpu_clear(cpu, mask);
-        cpus = cpus_weight(mask);
-        if (!cpus)
-                return 0;
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        spin_lock(&smp_call_lock);
-        call_data = &data;
-        smp_mb();
-
-        /* Send a message to all other CPUs and wait for them to respond */
         mp_ops->send_ipi_mask(mask, SMP_CALL_FUNCTION);
-
-        /* Wait for response */
-        /* FIXME: lock-up detection, backtrace on lock-up */
-        while (atomic_read(&data.started) != cpus)
-                barrier();
-
-        if (wait)
-                while (atomic_read(&data.finished) != cpus)
-                        barrier();
-        call_data = NULL;
-        spin_unlock(&smp_call_lock);
-
-        return 0;
 }
 
-int smp_call_function(void (*func) (void *info), void *info, int retry,
-        int wait)
+/*
+ * We reuse the same vector for the single IPI
+ */
+void arch_send_call_function_single_ipi(int cpu)
 {
-        return smp_call_function_mask(cpu_online_map, func, info, retry, wait);
+        mp_ops->send_ipi_mask(cpumask_of_cpu(cpu), SMP_CALL_FUNCTION);
 }
-EXPORT_SYMBOL(smp_call_function);
 
+/*
+ * Call into both interrupt handlers, as we share the IPI for them
+ */
 void smp_call_function_interrupt(void)
 {
-        void (*func) (void *info) = call_data->func;
-        void *info = call_data->info;
-        int wait = call_data->wait;
-
-        /*
-         * Notify initiating CPU that I've grabbed the data and am
-         * about to execute the function.
-         */
-        smp_mb();
-        atomic_inc(&call_data->started);
-
-        /*
-         * At this point the info structure may be out of scope unless wait==1.
-         */
         irq_enter();
-        (*func)(info);
+        generic_smp_call_function_single_interrupt();
+        generic_smp_call_function_interrupt();
         irq_exit();
-
-        if (wait) {
-                smp_mb();
-                atomic_inc(&call_data->finished);
-        }
-}
-
-int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
-                             int retry, int wait)
-{
-        int ret, me;
-
-        /*
-         * Can die spectacularly if this CPU isn't yet marked online
-         */
-        if (!cpu_online(cpu))
-                return 0;
-
-        me = get_cpu();
-        BUG_ON(!cpu_online(me));
-
-        if (cpu == me) {
-                local_irq_disable();
-                func(info);
-                local_irq_enable();
-                put_cpu();
-                return 0;
-        }
-
-        ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, retry,
-                                     wait);
-
-        put_cpu();
-        return 0;
 }
-EXPORT_SYMBOL(smp_call_function_single);
 
 static void stop_this_cpu(void *dummy)
 {
@@ -286,7 +167,7 @@ static void stop_this_cpu(void *dummy)
 
 void smp_send_stop(void)
 {
-        smp_call_function(stop_this_cpu, NULL, 1, 0);
+        smp_call_function(stop_this_cpu, NULL, 0);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
@@ -365,7 +246,7 @@ static void flush_tlb_all_ipi(void *info)
 
 void flush_tlb_all(void)
 {
-        on_each_cpu(flush_tlb_all_ipi, NULL, 1, 1);
+        on_each_cpu(flush_tlb_all_ipi, NULL, 1);
 }
 
 static void flush_tlb_mm_ipi(void *mm)
@@ -385,7 +266,7 @@ static void flush_tlb_mm_ipi(void *mm)
 static inline void smp_on_other_tlbs(void (*func) (void *info), void *info)
 {
 #ifndef CONFIG_MIPS_MT_SMTC
-        smp_call_function(func, info, 1, 1);
+        smp_call_function(func, info, 1);
 #endif
 }
 
@@ -485,7 +366,7 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
                 .addr2 = end,
         };
 
-        on_each_cpu(flush_tlb_kernel_range_ipi, &fd, 1, 1);
+        on_each_cpu(flush_tlb_kernel_range_ipi, &fd, 1);
 }
 
 static void flush_tlb_page_ipi(void *info)
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 3e863186cd22..a516286532ab 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -877,7 +877,6 @@ static void ipi_resched_interrupt(void)
         /* Return from interrupt should be enough to cause scheduler check */
 }
 
-
 static void ipi_call_interrupt(void)
 {
         /* Invoke generic function invocation code in smp.c */
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
deleted file mode 100644
index c357762b8012..000000000000
--- a/arch/mips/kernel/sysirix.c
+++ /dev/null
@@ -1,2140 +0,0 @@
-/*
- * sysirix.c: IRIX system call emulation.
- *
- * Copyright (C) 1996 David S. Miller
- * Copyright (C) 1997 Miguel de Icaza
- * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle
- */
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/binfmts.h>
-#include <linux/capability.h>
-#include <linux/highuid.h>
-#include <linux/pagemap.h>
-#include <linux/mm.h>
-#include <linux/mman.h>
-#include <linux/slab.h>
-#include <linux/swap.h>
-#include <linux/errno.h>
-#include <linux/time.h>
-#include <linux/timex.h>
-#include <linux/times.h>
-#include <linux/elf.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/utsname.h>
-#include <linux/file.h>
-#include <linux/vfs.h>
-#include <linux/namei.h>
-#include <linux/socket.h>
-#include <linux/security.h>
-#include <linux/syscalls.h>
-#include <linux/resource.h>
-
-#include <asm/ptrace.h>
-#include <asm/page.h>
-#include <asm/uaccess.h>
-#include <asm/inventory.h>
-
-/* 2,191 lines of complete and utter shit coming up... */
-
-extern int max_threads;
-
-/* The sysmp commands supported thus far. */
-#define MP_NPROCS               1 /* # processor in complex */
-#define MP_NAPROCS              2 /* # active processors in complex */
-#define MP_PGSIZE               14 /* Return system page size in v1. */
-
-asmlinkage int irix_sysmp(struct pt_regs *regs)
-{
-        unsigned long cmd;
-        int base = 0;
-        int error = 0;
-
-        if(regs->regs[2] == 1000)
-                base = 1;
-        cmd = regs->regs[base + 4];
-        switch(cmd) {
-        case MP_PGSIZE:
-                error = PAGE_SIZE;
-                break;
-        case MP_NPROCS:
-        case MP_NAPROCS:
-                error = num_online_cpus();
-                break;
-        default:
-                printk("SYSMP[%s:%d]: Unsupported opcode %d\n",
-                       current->comm, current->pid, (int)cmd);
-                error = -EINVAL;
-                break;
-        }
-
-        return error;
-}
-
-/* The prctl commands. */
-#define PR_MAXPROCS              1 /* Tasks/user. */
-#define PR_ISBLOCKED             2 /* If blocked, return 1. */
-#define PR_SETSTACKSIZE          3 /* Set largest task stack size. */
-#define PR_GETSTACKSIZE          4 /* Get largest task stack size. */
-#define PR_MAXPPROCS             5 /* Num parallel tasks. */
-#define PR_UNBLKONEXEC           6 /* When task exec/exit's, unblock. */
-#define PR_SETEXITSIG            8 /* When task exit's, set signal. */
-#define PR_RESIDENT              9 /* Make task unswappable. */
-#define PR_ATTACHADDR           10 /* (Re-)Connect a vma to a task. */
-#define PR_DETACHADDR           11 /* Disconnect a vma from a task. */
-#define PR_TERMCHILD            12 /* Kill child if the parent dies. */
-#define PR_GETSHMASK            13 /* Get the sproc() share mask. */
-#define PR_GETNSHARE            14 /* Number of share group members. */
-#define PR_COREPID              15 /* Add task pid to name when it core. */
-#define PR_ATTACHADDRPERM       16 /* (Re-)Connect vma, with specified prot. */
-#define PR_PTHREADEXIT          17 /* Kill a pthread, only for IRIX 6.[234] */
-
-asmlinkage int irix_prctl(unsigned option, ...)
-{
-        va_list args;
-        int error = 0;
-
-        va_start(args, option);
-        switch (option) {
-        case PR_MAXPROCS:
-                printk("irix_prctl[%s:%d]: Wants PR_MAXPROCS\n",
-                       current->comm, current->pid);
-                error = max_threads;
-                break;
-
-        case PR_ISBLOCKED: {
-                struct task_struct *task;
-
-                printk("irix_prctl[%s:%d]: Wants PR_ISBLOCKED\n",
-                       current->comm, current->pid);
-                read_lock(&tasklist_lock);
-                task = find_task_by_vpid(va_arg(args, pid_t));
-                error = -ESRCH;
-                if (error)
-                        error = (task->run_list.next != NULL);
-                read_unlock(&tasklist_lock);
-                /* Can _your_ OS find this out that fast? */
-                break;
-        }
-
-        case PR_SETSTACKSIZE: {
-                long value = va_arg(args, long);
-
-                printk("irix_prctl[%s:%d]: Wants PR_SETSTACKSIZE<%08lx>\n",
-                       current->comm, current->pid, (unsigned long) value);
-                if (value > RLIM_INFINITY)
-                        value = RLIM_INFINITY;
-                if (capable(CAP_SYS_ADMIN)) {
-                        task_lock(current->group_leader);
-                        current->signal->rlim[RLIMIT_STACK].rlim_max =
-                                current->signal->rlim[RLIMIT_STACK].rlim_cur = value;
-                        task_unlock(current->group_leader);
-                        error = value;
-                        break;
-                }
-                task_lock(current->group_leader);
-                if (value > current->signal->rlim[RLIMIT_STACK].rlim_max) {
-                        error = -EINVAL;
-                        task_unlock(current->group_leader);
-                        break;
-                }
-                current->signal->rlim[RLIMIT_STACK].rlim_cur = value;
-                task_unlock(current->group_leader);
-                error = value;
-                break;
-        }
-
-        case PR_GETSTACKSIZE:
-                printk("irix_prctl[%s:%d]: Wants PR_GETSTACKSIZE\n",
-                       current->comm, current->pid);
-                error = current->signal->rlim[RLIMIT_STACK].rlim_cur;
-                break;
-
-        case PR_MAXPPROCS:
-                printk("irix_prctl[%s:%d]: Wants PR_MAXPROCS\n",
-                       current->comm, current->pid);
-                error = 1;
-                break;
-
-        case PR_UNBLKONEXEC:
-                printk("irix_prctl[%s:%d]: Wants PR_UNBLKONEXEC\n",
-                       current->comm, current->pid);
-                error = -EINVAL;
-                break;
-
-        case PR_SETEXITSIG:
-                printk("irix_prctl[%s:%d]: Wants PR_SETEXITSIG\n",
-                       current->comm, current->pid);
-
-                /* We can probably play some game where we set the task
-                 * exit_code to some non-zero value when this is requested,
-                 * and check whether exit_code is already set in do_exit().
-                 */
-                error = -EINVAL;
-                break;
-
-        case PR_RESIDENT:
-                printk("irix_prctl[%s:%d]: Wants PR_RESIDENT\n",
-                       current->comm, current->pid);
-                error = 0; /* Compatibility indeed. */
-                break;
-
-        case PR_ATTACHADDR:
-                printk("irix_prctl[%s:%d]: Wants PR_ATTACHADDR\n",
-                       current->comm, current->pid);
-                error = -EINVAL;
-                break;
-
-        case PR_DETACHADDR:
-                printk("irix_prctl[%s:%d]: Wants PR_DETACHADDR\n",
-                       current->comm, current->pid);
-                error = -EINVAL;
-                break;
-
-        case PR_TERMCHILD:
-                printk("irix_prctl[%s:%d]: Wants PR_TERMCHILD\n",
-                       current->comm, current->pid);
-                error = -EINVAL;
-                break;
-
-        case PR_GETSHMASK:
-                printk("irix_prctl[%s:%d]: Wants PR_GETSHMASK\n",
-                       current->comm, current->pid);
-                error = -EINVAL; /* Until I have the sproc() stuff in. */
-                break;
-
-        case PR_GETNSHARE:
-                error = 0;       /* Until I have the sproc() stuff in. */
-                break;
-
-        case PR_COREPID:
-                printk("irix_prctl[%s:%d]: Wants PR_COREPID\n",
-                       current->comm, current->pid);
-                error = -EINVAL;
-                break;
-
-        case PR_ATTACHADDRPERM:
-                printk("irix_prctl[%s:%d]: Wants PR_ATTACHADDRPERM\n",
-                       current->comm, current->pid);
-                error = -EINVAL;
-                break;
-
-        default:
-                printk("irix_prctl[%s:%d]: Non-existant opcode %d\n",
-                       current->comm, current->pid, option);
-                error = -EINVAL;
-                break;
-        }
-        va_end(args);
-
-        return error;
-}
-
-#undef DEBUG_PROCGRPS
-
-extern unsigned long irix_mapelf(int fd, struct elf_phdr __user *user_phdrp, int cnt);
-extern char *prom_getenv(char *name);
-extern long prom_setenv(char *name, char *value);
-
-/* The syssgi commands supported thus far. */
-#define SGI_SYSID         1       /* Return unique per-machine identifier. */
-#define SGI_INVENT        5       /* Fetch inventory  */
-#   define SGI_INV_SIZEOF 1
-#   define SGI_INV_READ   2
-#define SGI_RDNAME        6       /* Return string name of a process. */
-#define SGI_SETNVRAM      8       /* Set PROM variable. */
-#define SGI_GETNVRAM      9       /* Get PROM variable. */
-#define SGI_SETPGID      21       /* Set process group id. */
-#define SGI_SYSCONF      22       /* POSIX sysconf garbage. */
-#define SGI_PATHCONF     24       /* POSIX sysconf garbage. */
-#define SGI_SETGROUPS    40       /* POSIX sysconf garbage. */
-#define SGI_GETGROUPS    41       /* POSIX sysconf garbage. */
-#define SGI_RUSAGE       56       /* BSD style rusage(). */
-#define SGI_SSYNC        62       /* Synchronous fs sync. */
-#define SGI_GETSID       65       /* SysVr4 get session id. */
-#define SGI_ELFMAP       68       /* Map an elf image. */
-#define SGI_TOSSTSAVE   108       /* Toss saved vma's. */
-#define SGI_FP_BCOPY    129       /* Should FPU bcopy be used on this machine? */
-#define SGI_PHYSP      1011       /* Translate virtual into physical page. */
-
-asmlinkage int irix_syssgi(struct pt_regs *regs)
-{
-        unsigned long cmd;
-        int retval, base = 0;
-
-        if (regs->regs[2] == 1000)
-                base = 1;
-
-        cmd = regs->regs[base + 4];
-        switch(cmd) {
-        case SGI_SYSID: {
-                char __user *buf = (char __user *) regs->regs[base + 5];
-
-                /* XXX Use ethernet addr.... */
-                retval = clear_user(buf, 64) ? -EFAULT : 0;
-                break;
-        }
-#if 0
-        case SGI_RDNAME: {
-                int pid = (int) regs->regs[base + 5];
-                char __user *buf = (char __user *) regs->regs[base + 6];
-                struct task_struct *p;
-                char tcomm[sizeof(current->comm)];
-
-                read_lock(&tasklist_lock);
-                p = find_task_by_pid(pid);
-                if (!p) {
-                        read_unlock(&tasklist_lock);
-                        retval = -ESRCH;
-                        break;
-                }
-                get_task_comm(tcomm, p);
-                read_unlock(&tasklist_lock);
-
-                /* XXX Need to check sizes. */
-                retval = copy_to_user(buf, tcomm, sizeof(tcomm)) ? -EFAULT : 0;
-                break;
-        }
-
-        case SGI_GETNVRAM: {
-                char __user *name = (char __user *) regs->regs[base+5];
-                char __user *buf = (char __user *) regs->regs[base+6];
-                char *value;
-                return -EINVAL; /* til I fix it */
-                value = prom_getenv(name);      /* PROM lock?  */
-                if (!value) {
-                        retval = -EINVAL;
-                        break;
-                }
-                /* Do I strlen() for the length? */
-                retval = copy_to_user(buf, value, 128) ? -EFAULT : 0;
-                break;
-        }
-
-        case SGI_SETNVRAM: {
-                char __user *name = (char __user *) regs->regs[base+5];
-                char __user *value = (char __user *) regs->regs[base+6];
-                return -EINVAL; /* til I fix it */
-                retval = prom_setenv(name, value);
-                /* XXX make sure retval conforms to syssgi(2) */
-                printk("[%s:%d] setnvram(\"%s\", \"%s\"): retval %d",
-                       current->comm, current->pid, name, value, retval);
-/*              if (retval == PROM_ENOENT)
-                        retval = -ENOENT; */
-                break;
-        }
-#endif
-
-        case SGI_SETPGID: {
-#ifdef DEBUG_PROCGRPS
-                printk("[%s:%d] setpgid(%d, %d) ",
-                       current->comm, current->pid,
-                       (int) regs->regs[base + 5], (int)regs->regs[base + 6]);
-#endif
-                retval = sys_setpgid(regs->regs[base + 5], regs->regs[base + 6]);
-
-#ifdef DEBUG_PROCGRPS
-                printk("retval=%d\n", retval);
-#endif
-        }
-
-        case SGI_SYSCONF: {
-                switch(regs->regs[base + 5]) {
-                case 1:
-                        retval = (MAX_ARG_PAGES >> 4); /* XXX estimate... */
-                        goto out;
-                case 2:
-                        retval = max_threads;
-                        goto out;
-                case 3:
-                        retval = HZ;
-                        goto out;
-                case 4:
-                        retval = NGROUPS_MAX;
-                        goto out;
-                case 5:
-                        retval = sysctl_nr_open;
-                        goto out;
-                case 6:
-                        retval = 1;
-                        goto out;
-                case 7:
-                        retval = 1;
-                        goto out;
-                case 8:
-                        retval = 199009;
-                        goto out;
-                case 11:
-                        retval = PAGE_SIZE;
-                        goto out;
-                case 12:
-                        retval = 4;
-                        goto out;
-                case 25:
-                case 26:
-                case 27:
-                case 28:
-                case 29:
-                case 30:
-                        retval = 0;
-                        goto out;
-                case 31:
-                        retval = 32;
-                        goto out;
-                default:
-                        retval = -EINVAL;
-                        goto out;
-                };
-        }
-
-        case SGI_SETGROUPS:
-                retval = sys_setgroups((int) regs->regs[base + 5],
-                                       (gid_t __user *) regs->regs[base + 6]);
-                break;
-
-        case SGI_GETGROUPS:
-                retval = sys_getgroups((int) regs->regs[base + 5],
-                                       (gid_t __user *) regs->regs[base + 6]);
-                break;
-
-        case SGI_RUSAGE: {
-                struct rusage __user *ru = (struct rusage __user *) regs->regs[base + 6];
-
-                switch((int) regs->regs[base + 5]) {
-                case 0:
-                        /* rusage self */
-                        retval = getrusage(current, RUSAGE_SELF, ru);
-                        goto out;
-
-                case -1:
-                        /* rusage children */
-                        retval = getrusage(current, RUSAGE_CHILDREN, ru);
-                        goto out;
-
-                default:
-                        retval = -EINVAL;
-                        goto out;
-                };
-        }
-
-        case SGI_SSYNC:
-                sys_sync();
-                retval = 0;
-                break;
-
-        case SGI_GETSID:
-#ifdef DEBUG_PROCGRPS
-                printk("[%s:%d] getsid(%d) ", current->comm, current->pid,
-                       (int) regs->regs[base + 5]);
-#endif
-                retval = sys_getsid(regs->regs[base + 5]);
-#ifdef DEBUG_PROCGRPS
-                printk("retval=%d\n", retval);
-#endif
-                break;
-
-        case SGI_ELFMAP:
-                retval = irix_mapelf((int) regs->regs[base + 5],
-                                     (struct elf_phdr __user *) regs->regs[base + 6],
-                                     (int) regs->regs[base + 7]);
-                break;
-
-        case SGI_TOSSTSAVE:
-                /* XXX We don't need to do anything? */
-                retval = 0;
-                break;
-
-        case SGI_FP_BCOPY:
-                retval = 0;
-                break;
-
-        case SGI_PHYSP: {
-                unsigned long addr = regs->regs[base + 5];
-                int __user *pageno = (int __user *) (regs->regs[base + 6]);
-                struct mm_struct *mm = current->mm;
-                pgd_t *pgdp;
-                pud_t *pudp;
-                pmd_t *pmdp;
-                pte_t *ptep;
-
-                down_read(&mm->mmap_sem);
-                pgdp = pgd_offset(mm, addr);
-                pudp = pud_offset(pgdp, addr);
-                pmdp = pmd_offset(pudp, addr);
-                ptep = pte_offset(pmdp, addr);
-                retval = -EINVAL;
-                if (ptep) {
-                        pte_t pte = *ptep;
-
-                        if (pte_val(pte) & (_PAGE_VALID | _PAGE_PRESENT)) {
-                                /* b0rked on 64-bit */
-                                retval =  put_user((pte_val(pte) & PAGE_MASK) >>
-                                                   PAGE_SHIFT, pageno);
-                        }
-                }
-                up_read(&mm->mmap_sem);
-                break;
-        }
-
-        case SGI_INVENT: {
-                int  arg1    = (int)    regs->regs [base + 5];
-                void __user *buffer = (void __user *) regs->regs [base + 6];
-                int  count   = (int)    regs->regs [base + 7];
-
-                switch (arg1) {
-                case SGI_INV_SIZEOF:
-                        retval = sizeof(inventory_t);
-                        break;
-                case SGI_INV_READ:
-                        retval = dump_inventory_to_user(buffer, count);
-                        break;
-                default:
-                        retval = -EINVAL;
-                }
-                break;
-        }
-
-        default:
-                printk("irix_syssgi: Unsupported command %d\n", (int)cmd);
-                retval = -EINVAL;
-                break;
-        };
-
-out:
-        return retval;
-}
-
-asmlinkage int irix_gtime(struct pt_regs *regs)
-{
-        return get_seconds();
-}
-
-/*
- * IRIX is completely broken... it returns 0 on success, otherwise
- * ENOMEM.
- */
-asmlinkage int irix_brk(unsigned long brk)
-{
-        unsigned long rlim;
-        unsigned long newbrk, oldbrk;
-        struct mm_struct *mm = current->mm;
-        int ret;
-
-        down_write(&mm->mmap_sem);
-        if (brk < mm->end_code) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        newbrk = PAGE_ALIGN(brk);
-        oldbrk = PAGE_ALIGN(mm->brk);
-        if (oldbrk == newbrk) {
-                mm->brk = brk;
-                ret = 0;
-                goto out;
-        }
-
-        /*
-         * Always allow shrinking brk
-         */
-        if (brk <= mm->brk) {
-                mm->brk = brk;
-                do_munmap(mm, newbrk, oldbrk-newbrk);
-                ret = 0;
-                goto out;
-        }
-        /*
-         * Check against rlimit and stack..
-         */
-        rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
-        if (rlim >= RLIM_INFINITY)
-                rlim = ~0;
-        if (brk - mm->end_code > rlim) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        /*
-         * Check against existing mmap mappings.
-         */
-        if (find_vma_intersection(mm, oldbrk, newbrk+PAGE_SIZE)) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        /*
-         * Ok, looks good - let it rip.
-         */
-        if (do_brk(oldbrk, newbrk-oldbrk) != oldbrk) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        mm->brk = brk;
-        ret = 0;
-
-out:
-        up_write(&mm->mmap_sem);
-        return ret;
-}
-
-asmlinkage int irix_getpid(struct pt_regs *regs)
-{
-        regs->regs[3] = task_pid_vnr(current->real_parent);
-        return task_pid_vnr(current);
-}
-
-asmlinkage int irix_getuid(struct pt_regs *regs)
-{
-        regs->regs[3] = current->euid;
-        return current->uid;
-}
-
-asmlinkage int irix_getgid(struct pt_regs *regs)
-{
-        regs->regs[3] = current->egid;
-        return current->gid;
-}
-
-asmlinkage int irix_stime(int value)
-{
-        int err;
-        struct timespec tv;
-
-        tv.tv_sec = value;
-        tv.tv_nsec = 0;
-        err = security_settime(&tv, NULL);
-        if (err)
-                return err;
-
-        write_seqlock_irq(&xtime_lock);
-        xtime.tv_sec = value;
-        xtime.tv_nsec = 0;
-        ntp_clear();
-        write_sequnlock_irq(&xtime_lock);
-
-        return 0;
-}
-
-static inline void jiffiestotv(unsigned long jiffies, struct timeval *value)
-{
-        value->tv_usec = (jiffies % HZ) * (1000000 / HZ);
-        value->tv_sec = jiffies / HZ;
-}
-
-static inline void getitimer_real(struct itimerval *value)
-{
-        register unsigned long val, interval;
-
-        interval = current->it_real_incr;
-        val = 0;
-        if (del_timer(&current->real_timer)) {
-                unsigned long now = jiffies;
-                val = current->real_timer.expires;
-                add_timer(&current->real_timer);
-                /* look out for negative/zero itimer.. */
-                if (val <= now)
-                        val = now+1;
-                val -= now;
-        }
-        jiffiestotv(val, &value->it_value);
-        jiffiestotv(interval, &value->it_interval);
-}
-
-asmlinkage unsigned int irix_alarm(unsigned int seconds)
-{
-        return alarm_setitimer(seconds);
-}
-
-asmlinkage int irix_pause(void)
-{
-        current->state = TASK_INTERRUPTIBLE;
-        schedule();
-
-        return -EINTR;
-}
-
-/* XXX need more than this... */
-asmlinkage int irix_mount(char __user *dev_name, char __user *dir_name,
-        unsigned long flags, char __user *type, void __user *data, int datalen)
-{
-        printk("[%s:%d] irix_mount(%p,%p,%08lx,%p,%p,%d)\n",
-               current->comm, current->pid,
-               dev_name, dir_name, flags, type, data, datalen);
-
-        return sys_mount(dev_name, dir_name, type, flags, data);
-}
-
-struct irix_statfs {
-        short f_type;
-        long  f_bsize, f_frsize, f_blocks, f_bfree, f_files, f_ffree;
-        char  f_fname[6], f_fpack[6];
-};
-
-asmlinkage int irix_statfs(const char __user *path,
-        struct irix_statfs __user *buf, int len, int fs_type)
-{
-        struct nameidata nd;
-        struct kstatfs kbuf;
-        int error, i;
-
-        /* We don't support this feature yet. */
-        if (fs_type) {
-                error = -EINVAL;
-                goto out;
-        }
-        if (!access_ok(VERIFY_WRITE, buf, sizeof(struct irix_statfs))) {
-                error = -EFAULT;
-                goto out;
-        }
-
-        error = user_path_walk(path, &nd);
-        if (error)
-                goto out;
-
-        error = vfs_statfs(nd.path.dentry, &kbuf);
-        if (error)
-                goto dput_and_out;
-
-        error = __put_user(kbuf.f_type, &buf->f_type);
-        error |= __put_user(kbuf.f_bsize, &buf->f_bsize);
-        error |= __put_user(kbuf.f_frsize, &buf->f_frsize);
-        error |= __put_user(kbuf.f_blocks, &buf->f_blocks);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bfree);
-        error |= __put_user(kbuf.f_files, &buf->f_files);
-        error |= __put_user(kbuf.f_ffree, &buf->f_ffree);
-        for (i = 0; i < 6; i++) {
-                error |= __put_user(0, &buf->f_fname[i]);
-                error |= __put_user(0, &buf->f_fpack[i]);
-        }
-
-dput_and_out:
-        path_put(&nd.path);
-out:
-        return error;
-}
-
-asmlinkage int irix_fstatfs(unsigned int fd, struct irix_statfs __user *buf)
-{
-        struct kstatfs kbuf;
-        struct file *file;
-        int error, i;
-
-        if (!access_ok(VERIFY_WRITE, buf, sizeof(struct irix_statfs))) {
-                error = -EFAULT;
-                goto out;
-        }
-
-        if (!(file = fget(fd))) {
-                error = -EBADF;
-                goto out;
-        }
-
-        error = vfs_statfs(file->f_path.dentry, &kbuf);
-        if (error)
-                goto out_f;
-
-        error = __put_user(kbuf.f_type, &buf->f_type);
-        error |= __put_user(kbuf.f_bsize, &buf->f_bsize);
-        error |= __put_user(kbuf.f_frsize, &buf->f_frsize);
-        error |= __put_user(kbuf.f_blocks, &buf->f_blocks);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bfree);
-        error |= __put_user(kbuf.f_files, &buf->f_files);
-        error |= __put_user(kbuf.f_ffree, &buf->f_ffree);
-
-        for (i = 0; i < 6; i++) {
-                error |= __put_user(0, &buf->f_fname[i]);
-                error |= __put_user(0, &buf->f_fpack[i]);
-        }
-
-out_f:
-        fput(file);
-out:
-        return error;
-}
-
-asmlinkage int irix_setpgrp(int flags)
-{
-        int error;
-
-#ifdef DEBUG_PROCGRPS
-        printk("[%s:%d] setpgrp(%d) ", current->comm, current->pid, flags);
-#endif
-        if(!flags)
-                error = task_pgrp_vnr(current);
-        else
-                error = sys_setsid();
-#ifdef DEBUG_PROCGRPS
-        printk("returning %d\n", error);
-#endif
-
-        return error;
-}
-
-asmlinkage int irix_times(struct tms __user *tbuf)
-{
-        int err = 0;
-
-        if (tbuf) {
-                if (!access_ok(VERIFY_WRITE, tbuf, sizeof *tbuf))
-                        return -EFAULT;
-
-                err = __put_user(current->utime, &tbuf->tms_utime);
-                err |= __put_user(current->stime, &tbuf->tms_stime);
-                err |= __put_user(current->signal->cutime, &tbuf->tms_cutime);
-                err |= __put_user(current->signal->cstime, &tbuf->tms_cstime);
-        }
-
-        return err;
-}
-
-asmlinkage int irix_exec(struct pt_regs *regs)
-{
-        int error, base = 0;
-        char *filename;
-
-        if(regs->regs[2] == 1000)
-                base = 1;
-        filename = getname((char __user *) (long)regs->regs[base + 4]);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                return error;
-
-        error = do_execve(filename, (char __user * __user *) (long)regs->regs[base + 5],
-                          NULL, regs);
-        putname(filename);
-
-        return error;
-}
-
-asmlinkage int irix_exece(struct pt_regs *regs)
-{
-        int error, base = 0;
-        char *filename;
-
-        if (regs->regs[2] == 1000)
-                base = 1;
-        filename = getname((char __user *) (long)regs->regs[base + 4]);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                return error;
-        error = do_execve(filename, (char __user * __user *) (long)regs->regs[base + 5],
-                          (char __user * __user *) (long)regs->regs[base + 6], regs);
-        putname(filename);
-
-        return error;
-}
-
-asmlinkage unsigned long irix_gethostid(void)
-{
-        printk("[%s:%d]: irix_gethostid() called...\n",
-               current->comm, current->pid);
-
-        return -EINVAL;
-}
-
-asmlinkage unsigned long irix_sethostid(unsigned long val)
-{
-        printk("[%s:%d]: irix_sethostid(%08lx) called...\n",
-               current->comm, current->pid, val);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_socket(int family, int type, int protocol)
-{
-        switch(type) {
-        case 1:
-                type = SOCK_DGRAM;
-                break;
-
-        case 2:
-                type = SOCK_STREAM;
-                break;
-
-        case 3:
-                type = 9; /* Invalid... */
-                break;
-
-        case 4:
-                type = SOCK_RAW;
-                break;
-
-        case 5:
-                type = SOCK_RDM;
-                break;
-
-        case 6:
-                type = SOCK_SEQPACKET;
-                break;
-
-        default:
-                break;
-        }
-
-        return sys_socket(family, type, protocol);
-}
-
-asmlinkage int irix_getdomainname(char __user *name, int len)
-{
-        int err;
-
-        down_read(&uts_sem);
-        if (len > __NEW_UTS_LEN)
-                len = __NEW_UTS_LEN;
-        err = copy_to_user(name, utsname()->domainname, len) ? -EFAULT : 0;
-        up_read(&uts_sem);
-
-        return err;
-}
-
-asmlinkage unsigned long irix_getpagesize(void)
-{
-        return PAGE_SIZE;
-}
-
-asmlinkage int irix_msgsys(int opcode, unsigned long arg0, unsigned long arg1,
-                           unsigned long arg2, unsigned long arg3,
-                           unsigned long arg4)
-{
-        switch (opcode) {
-        case 0:
-                return sys_msgget((key_t) arg0, (int) arg1);
-        case 1:
-                return sys_msgctl((int) arg0, (int) arg1,
-                                  (struct msqid_ds __user *)arg2);
-        case 2:
-                return sys_msgrcv((int) arg0, (struct msgbuf __user *) arg1,
-                                  (size_t) arg2, (long) arg3, (int) arg4);
-        case 3:
-                return sys_msgsnd((int) arg0, (struct msgbuf __user *) arg1,
-                                  (size_t) arg2, (int) arg3);
-        default:
-                return -EINVAL;
-        }
-}
-
-asmlinkage int irix_shmsys(int opcode, unsigned long arg0, unsigned long arg1,
-                           unsigned long arg2, unsigned long arg3)
-{
-        switch (opcode) {
-        case 0:
-                return do_shmat((int) arg0, (char __user *) arg1, (int) arg2,
-                                 (unsigned long *) arg3);
-        case 1:
-                return sys_shmctl((int)arg0, (int)arg1,
-                                  (struct shmid_ds __user *)arg2);
-        case 2:
-                return sys_shmdt((char __user *)arg0);
-        case 3:
-                return sys_shmget((key_t) arg0, (int) arg1, (int) arg2);
-        default:
-                return -EINVAL;
-        }
-}
-
-asmlinkage int irix_semsys(int opcode, unsigned long arg0, unsigned long arg1,
-                           unsigned long arg2, int arg3)
-{
-        switch (opcode) {
-        case 0:
-                return sys_semctl((int) arg0, (int) arg1, (int) arg2,
-                                  (union semun) arg3);
-        case 1:
-                return sys_semget((key_t) arg0, (int) arg1, (int) arg2);
-        case 2:
-                return sys_semop((int) arg0, (struct sembuf __user *)arg1,
-                                 (unsigned int) arg2);
-        default:
-                return -EINVAL;
-        }
-}
-
-static inline loff_t llseek(struct file *file, loff_t offset, int origin)
-{
-        loff_t (*fn)(struct file *, loff_t, int);
-        loff_t retval;
-
-        fn = default_llseek;
-        if (file->f_op && file->f_op->llseek)
-        fn = file->f_op->llseek;
-        lock_kernel();
-        retval = fn(file, offset, origin);
-        unlock_kernel();
-
-        return retval;
-}
-
-asmlinkage int irix_lseek64(int fd, int _unused, int offhi, int offlow,
-                            int origin)
-{
-        struct file * file;
-        loff_t offset;
-        int retval;
-
-        retval = -EBADF;
-        file = fget(fd);
-        if (!file)
-                goto bad;
-        retval = -EINVAL;
-        if (origin > 2)
-                goto out_putf;
-
-        offset = llseek(file, ((loff_t) offhi << 32) | offlow, origin);
-        retval = (int) offset;
-
-out_putf:
-        fput(file);
-bad:
-        return retval;
-}
-
-asmlinkage int irix_sginap(int ticks)
-{
-        schedule_timeout_interruptible(ticks);
-        return 0;
-}
-
-asmlinkage int irix_sgikopt(char __user *istring, char __user *ostring, int len)
-{
-        return -EINVAL;
-}
-
-asmlinkage int irix_gettimeofday(struct timeval __user *tv)
-{
-        time_t sec;
-        long nsec, seq;
-        int err;
-
-        if (!access_ok(VERIFY_WRITE, tv, sizeof(struct timeval)))
-                return -EFAULT;
-
-        do {
-                seq = read_seqbegin(&xtime_lock);
-                sec = xtime.tv_sec;
-                nsec = xtime.tv_nsec;
-        } while (read_seqretry(&xtime_lock, seq));
-
-        err = __put_user(sec, &tv->tv_sec);
-        err |= __put_user((nsec / 1000), &tv->tv_usec);
-
-        return err;
-}
-
-#define IRIX_MAP_AUTOGROW 0x40
-
-asmlinkage unsigned long irix_mmap32(unsigned long addr, size_t len, int prot,
-                                     int flags, int fd, off_t offset)
-{
-        struct file *file = NULL;
-        unsigned long retval;
-
-        if (!(flags & MAP_ANONYMOUS)) {
-                if (!(file = fget(fd)))
-                        return -EBADF;
-
-                /* Ok, bad taste hack follows, try to think in something else
-                 * when reading this.  */
-                if (flags & IRIX_MAP_AUTOGROW) {
-                        unsigned long old_pos;
-                        long max_size = offset + len;
-
-                        if (max_size > file->f_path.dentry->d_inode->i_size) {
-                                old_pos = sys_lseek(fd, max_size - 1, 0);
-                                sys_write(fd, (void __user *) "", 1);
-                                sys_lseek(fd, old_pos, 0);
-                        }
-                }
-        }
-
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-        down_write(&current->mm->mmap_sem);
-        retval = do_mmap(file, addr, len, prot, flags, offset);
-        up_write(&current->mm->mmap_sem);
-        if (file)
-                fput(file);
-
-        return retval;
-}
-
-asmlinkage int irix_madvise(unsigned long addr, int len, int behavior)
-{
-        printk("[%s:%d] Wheee.. irix_madvise(%08lx,%d,%d)\n",
-               current->comm, current->pid, addr, len, behavior);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_pagelock(char __user *addr, int len, int op)
-{
-        printk("[%s:%d] Wheee.. irix_pagelock(%p,%d,%d)\n",
-               current->comm, current->pid, addr, len, op);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_quotactl(struct pt_regs *regs)
-{
-        printk("[%s:%d] Wheee.. irix_quotactl()\n",
-               current->comm, current->pid);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_BSDsetpgrp(int pid, int pgrp)
-{
-        int error;
-
-#ifdef DEBUG_PROCGRPS
-        printk("[%s:%d] BSDsetpgrp(%d, %d) ", current->comm, current->pid,
-               pid, pgrp);
-#endif
-        if(!pid)
-                pid = task_pid_vnr(current);
-
-        /* Wheee, weird sysv thing... */
-        if ((pgrp == 0) && (pid == task_pid_vnr(current)))
-                error = sys_setsid();
-        else
-                error = sys_setpgid(pid, pgrp);
-
-#ifdef DEBUG_PROCGRPS
-        printk("error = %d\n", error);
-#endif
-
-        return error;
-}
-
-asmlinkage int irix_systeminfo(int cmd, char __user *buf, int cnt)
-{
-        printk("[%s:%d] Wheee.. irix_systeminfo(%d,%p,%d)\n",
-               current->comm, current->pid, cmd, buf, cnt);
-
-        return -EINVAL;
-}
-
-struct iuname {
-        char sysname[257], nodename[257], release[257];
-        char version[257], machine[257];
-        char m_type[257], base_rel[257];
-        char _unused0[257], _unused1[257], _unused2[257];
-        char _unused3[257], _unused4[257], _unused5[257];
-};
-
-asmlinkage int irix_uname(struct iuname __user *buf)
-{
-        down_read(&uts_sem);
-        if (copy_from_user(utsname()->sysname, buf->sysname, 65)
-            || copy_from_user(utsname()->nodename, buf->nodename, 65)
-            || copy_from_user(utsname()->release, buf->release, 65)
-            || copy_from_user(utsname()->version, buf->version, 65)
-            || copy_from_user(utsname()->machine, buf->machine, 65)) {
-                return -EFAULT;
-        }
-        up_read(&uts_sem);
-
-        return 1;
-}
-
-#undef DEBUG_XSTAT
-
-static int irix_xstat32_xlate(struct kstat *stat, void __user *ubuf)
-{
-        struct xstat32 {
-                u32 st_dev, st_pad1[3], st_ino, st_mode, st_nlink, st_uid, st_gid;
-                u32 st_rdev, st_pad2[2], st_size, st_pad3;
-                u32 st_atime0, st_atime1;
-                u32 st_mtime0, st_mtime1;
-                u32 st_ctime0, st_ctime1;
-                u32 st_blksize, st_blocks;
-                char st_fstype[16];
-                u32 st_pad4[8];
-        } ub;
-
-        if (!sysv_valid_dev(stat->dev) || !sysv_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-        ub.st_dev     = sysv_encode_dev(stat->dev);
-        ub.st_ino     = stat->ino;
-        ub.st_mode    = stat->mode;
-        ub.st_nlink   = stat->nlink;
-        SET_UID(ub.st_uid, stat->uid);
-        SET_GID(ub.st_gid, stat->gid);
-        ub.st_rdev    = sysv_encode_dev(stat->rdev);
-#if BITS_PER_LONG == 32
-        if (stat->size > MAX_NON_LFS)
-                return -EOVERFLOW;
-#endif
-        ub.st_size    = stat->size;
-        ub.st_atime0  = stat->atime.tv_sec;
-        ub.st_atime1  = stat->atime.tv_nsec;
-        ub.st_mtime0  = stat->mtime.tv_sec;
-        ub.st_mtime1  = stat->atime.tv_nsec;
-        ub.st_ctime0  = stat->ctime.tv_sec;
-        ub.st_ctime1  = stat->atime.tv_nsec;
-        ub.st_blksize = stat->blksize;
-        ub.st_blocks  = stat->blocks;
-        strcpy(ub.st_fstype, "efs");
-
-        return copy_to_user(ubuf, &ub, sizeof(ub)) ? -EFAULT : 0;
-}
-
-static int irix_xstat64_xlate(struct kstat *stat, void __user *ubuf)
-{
-        struct xstat64 {
-                u32 st_dev; s32 st_pad1[3];
-                unsigned long long st_ino;
-                u32 st_mode;
-                u32 st_nlink; s32 st_uid; s32 st_gid; u32 st_rdev;
-                s32 st_pad2[2];
-                long long st_size;
-                s32 st_pad3;
-                struct { s32 tv_sec, tv_nsec; } st_atime, st_mtime, st_ctime;
-                s32 st_blksize;
-                long long  st_blocks;
-                char st_fstype[16];
-                s32 st_pad4[8];
-        } ks;
-
-        if (!sysv_valid_dev(stat->dev) || !sysv_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        ks.st_dev = sysv_encode_dev(stat->dev);
-        ks.st_pad1[0] = ks.st_pad1[1] = ks.st_pad1[2] = 0;
-        ks.st_ino = (unsigned long long) stat->ino;
-        ks.st_mode = (u32) stat->mode;
-        ks.st_nlink = (u32) stat->nlink;
-        ks.st_uid = (s32) stat->uid;
-        ks.st_gid = (s32) stat->gid;
-        ks.st_rdev = sysv_encode_dev(stat->rdev);
-        ks.st_pad2[0] = ks.st_pad2[1] = 0;
-        ks.st_size = (long long) stat->size;
-        ks.st_pad3 = 0;
-
-        /* XXX hackety hack... */
-        ks.st_atime.tv_sec = (s32) stat->atime.tv_sec;
-        ks.st_atime.tv_nsec = stat->atime.tv_nsec;
-        ks.st_mtime.tv_sec = (s32) stat->mtime.tv_sec;
-        ks.st_mtime.tv_nsec = stat->mtime.tv_nsec;
-        ks.st_ctime.tv_sec = (s32) stat->ctime.tv_sec;
-        ks.st_ctime.tv_nsec = stat->ctime.tv_nsec;
-
-        ks.st_blksize = (s32) stat->blksize;
-        ks.st_blocks = (long long) stat->blocks;
-        memset(ks.st_fstype, 0, 16);
-        ks.st_pad4[0] = ks.st_pad4[1] = ks.st_pad4[2] = ks.st_pad4[3] = 0;
-        ks.st_pad4[4] = ks.st_pad4[5] = ks.st_pad4[6] = ks.st_pad4[7] = 0;
-
-        /* Now write it all back. */
-        return copy_to_user(ubuf, &ks, sizeof(ks)) ? -EFAULT : 0;
-}
-
-asmlinkage int irix_xstat(int version, char __user *filename, struct stat __user *statbuf)
-{
-        int retval;
-        struct kstat stat;
-
-#ifdef DEBUG_XSTAT
-        printk("[%s:%d] Wheee.. irix_xstat(%d,%s,%p) ",
-               current->comm, current->pid, version, filename, statbuf);
-#endif
-
-        retval = vfs_stat(filename, &stat);
-        if (!retval) {
-                switch(version) {
-                        case 2:
-                                retval = irix_xstat32_xlate(&stat, statbuf);
-                                break;
-                        case 3:
-                                retval = irix_xstat64_xlate(&stat, statbuf);
-                                break;
-                        default:
-                                retval = -EINVAL;
-                }
-        }
-        return retval;
-}
-
-asmlinkage int irix_lxstat(int version, char __user *filename, struct stat __user *statbuf)
-{
-        int error;
-        struct kstat stat;
-
-#ifdef DEBUG_XSTAT
-        printk("[%s:%d] Wheee.. irix_lxstat(%d,%s,%p) ",
-               current->comm, current->pid, version, filename, statbuf);
-#endif
-
-        error = vfs_lstat(filename, &stat);
-
-        if (!error) {
-                switch (version) {
-                        case 2:
-                                error = irix_xstat32_xlate(&stat, statbuf);
-                                break;
-                        case 3:
-                                error = irix_xstat64_xlate(&stat, statbuf);
-                                break;
-                        default:
-                                error = -EINVAL;
-                }
-        }
-        return error;
-}
-
-asmlinkage int irix_fxstat(int version, int fd, struct stat __user *statbuf)
-{
-        int error;
-        struct kstat stat;
-
-#ifdef DEBUG_XSTAT
-        printk("[%s:%d] Wheee.. irix_fxstat(%d,%d,%p) ",
-               current->comm, current->pid, version, fd, statbuf);
-#endif
-
-        error = vfs_fstat(fd, &stat);
-        if (!error) {
-                switch (version) {
-                        case 2:
-                                error = irix_xstat32_xlate(&stat, statbuf);
-                                break;
-                        case 3:
-                                error = irix_xstat64_xlate(&stat, statbuf);
-                                break;
-                        default:
-                                error = -EINVAL;
-                }
-        }
-        return error;
-}
-
-asmlinkage int irix_xmknod(int ver, char __user *filename, int mode, unsigned dev)
-{
-        int retval;
-        printk("[%s:%d] Wheee.. irix_xmknod(%d,%s,%x,%x)\n",
-               current->comm, current->pid, ver, filename, mode, dev);
-
-        switch(ver) {
-        case 2:
-                /* shouldn't we convert here as well as on stat()? */
-                retval = sys_mknod(filename, mode, dev);
-                break;
-
-        default:
-                retval = -EINVAL;
-                break;
-        };
-
-        return retval;
-}
-
-asmlinkage int irix_swapctl(int cmd, char __user *arg)
-{
-        printk("[%s:%d] Wheee.. irix_swapctl(%d,%p)\n",
-               current->comm, current->pid, cmd, arg);
-
-        return -EINVAL;
-}
-
-struct irix_statvfs {
-        u32 f_bsize; u32 f_frsize; u32 f_blocks;
-        u32 f_bfree; u32 f_bavail; u32 f_files; u32 f_ffree; u32 f_favail;
-        u32 f_fsid; char f_basetype[16];
-        u32 f_flag; u32 f_namemax;
-        char    f_fstr[32]; u32 f_filler[16];
-};
-
-asmlinkage int irix_statvfs(char __user *fname, struct irix_statvfs __user *buf)
-{
-        struct nameidata nd;
-        struct kstatfs kbuf;
-        int error, i;
-
-        printk("[%s:%d] Wheee.. irix_statvfs(%s,%p)\n",
-               current->comm, current->pid, fname, buf);
-        if (!access_ok(VERIFY_WRITE, buf, sizeof(struct irix_statvfs)))
-                return -EFAULT;
-
-        error = user_path_walk(fname, &nd);
-        if (error)
-                goto out;
-        error = vfs_statfs(nd.path.dentry, &kbuf);
-        if (error)
-                goto dput_and_out;
-
-        error |= __put_user(kbuf.f_bsize, &buf->f_bsize);
-        error |= __put_user(kbuf.f_frsize, &buf->f_frsize);
-        error |= __put_user(kbuf.f_blocks, &buf->f_blocks);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bfree);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bavail);  /* XXX hackety hack... */
-        error |= __put_user(kbuf.f_files, &buf->f_files);
-        error |= __put_user(kbuf.f_ffree, &buf->f_ffree);
-        error |= __put_user(kbuf.f_ffree, &buf->f_favail);  /* XXX hackety hack... */
-#ifdef __MIPSEB__
-        error |= __put_user(kbuf.f_fsid.val[1], &buf->f_fsid);
-#else
-        error |= __put_user(kbuf.f_fsid.val[0], &buf->f_fsid);
-#endif
-        for (i = 0; i < 16; i++)
-                error |= __put_user(0, &buf->f_basetype[i]);
-        error |= __put_user(0, &buf->f_flag);
-        error |= __put_user(kbuf.f_namelen, &buf->f_namemax);
-        for (i = 0; i < 32; i++)
-                error |= __put_user(0, &buf->f_fstr[i]);
-
-dput_and_out:
-        path_put(&nd.path);
-out:
-        return error;
-}
-
-asmlinkage int irix_fstatvfs(int fd, struct irix_statvfs __user *buf)
-{
-        struct kstatfs kbuf;
-        struct file *file;
-        int error, i;
-
-        printk("[%s:%d] Wheee.. irix_fstatvfs(%d,%p)\n",
-               current->comm, current->pid, fd, buf);
-
-        if (!access_ok(VERIFY_WRITE, buf, sizeof(struct irix_statvfs)))
-                return -EFAULT;
-
-        if (!(file = fget(fd))) {
-                error = -EBADF;
-                goto out;
-        }
-        error = vfs_statfs(file->f_path.dentry, &kbuf);
-        if (error)
-                goto out_f;
-
-        error = __put_user(kbuf.f_bsize, &buf->f_bsize);
-        error |= __put_user(kbuf.f_frsize, &buf->f_frsize);
-        error |= __put_user(kbuf.f_blocks, &buf->f_blocks);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bfree);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bavail); /* XXX hackety hack... */
-        error |= __put_user(kbuf.f_files, &buf->f_files);
-        error |= __put_user(kbuf.f_ffree, &buf->f_ffree);
-        error |= __put_user(kbuf.f_ffree, &buf->f_favail); /* XXX hackety hack... */
-#ifdef __MIPSEB__
-        error |= __put_user(kbuf.f_fsid.val[1], &buf->f_fsid);
-#else
-        error |= __put_user(kbuf.f_fsid.val[0], &buf->f_fsid);
-#endif
-        for(i = 0; i < 16; i++)
-                error |= __put_user(0, &buf->f_basetype[i]);
-        error |= __put_user(0, &buf->f_flag);
-        error |= __put_user(kbuf.f_namelen, &buf->f_namemax);
-        error |= __clear_user(&buf->f_fstr, sizeof(buf->f_fstr)) ? -EFAULT : 0;
-
-out_f:
-        fput(file);
-out:
-        return error;
-}
-
-asmlinkage int irix_priocntl(struct pt_regs *regs)
-{
-        printk("[%s:%d] Wheee.. irix_priocntl()\n",
-               current->comm, current->pid);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_sigqueue(int pid, int sig, int code, int val)
-{
-        printk("[%s:%d] Wheee.. irix_sigqueue(%d,%d,%d,%d)\n",
-               current->comm, current->pid, pid, sig, code, val);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_truncate64(char __user *name, int pad, int size1, int size2)
-{
-        int retval;
-
-        if (size1) {
-                retval = -EINVAL;
-                goto out;
-        }
-        retval = sys_truncate(name, size2);
-
-out:
-        return retval;
-}
-
-asmlinkage int irix_ftruncate64(int fd, int pad, int size1, int size2)
-{
-        int retval;
-
-        if (size1) {
-                retval = -EINVAL;
-                goto out;
-        }
-        retval = sys_ftruncate(fd, size2);
-
-out:
-        return retval;
-}
-
-asmlinkage int irix_mmap64(struct pt_regs *regs)
-{
-        int len, prot, flags, fd, off1, off2, error, base = 0;
-        unsigned long addr, pgoff, *sp;
-        struct file *file = NULL;
-        int err;
-
-        if (regs->regs[2] == 1000)
-                base = 1;
-        sp = (unsigned long *) (regs->regs[29] + 16);
-        addr = regs->regs[base + 4];
-        len = regs->regs[base + 5];
-        prot = regs->regs[base + 6];
-        if (!base) {
-                flags = regs->regs[base + 7];
-                if (!access_ok(VERIFY_READ, sp, (4 * sizeof(unsigned long))))
-                        return -EFAULT;
-                fd = sp[0];
-                err = __get_user(off1, &sp[1]);
-                err |= __get_user(off2, &sp[2]);
-        } else {
-                if (!access_ok(VERIFY_READ, sp, (5 * sizeof(unsigned long))))
-                        return -EFAULT;
-                err = __get_user(flags, &sp[0]);
-                err |= __get_user(fd, &sp[1]);
-                err |= __get_user(off1, &sp[2]);
-                err |= __get_user(off2, &sp[3]);
-        }
-
-        if (err)
-                return err;
-
-        if (off1 & PAGE_MASK)
-                return -EOVERFLOW;
-
-        pgoff = (off1 << (32 - PAGE_SHIFT)) | (off2 >> PAGE_SHIFT);
-
-        if (!(flags & MAP_ANONYMOUS)) {
-                if (!(file = fget(fd)))
-                        return -EBADF;
-
-                /* Ok, bad taste hack follows, try to think in something else
-                   when reading this */
-                if (flags & IRIX_MAP_AUTOGROW) {
-                        unsigned long old_pos;
-                        long max_size = off2 + len;
-
-                        if (max_size > file->f_path.dentry->d_inode->i_size) {
-                                old_pos = sys_lseek(fd, max_size - 1, 0);
-                                sys_write(fd, (void __user *) "", 1);
-                                sys_lseek(fd, old_pos, 0);
-                        }
-                }
-        }
-
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-
-        down_write(&current->mm->mmap_sem);
-        error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-        up_write(&current->mm->mmap_sem);
-
-        if (file)
-                fput(file);
-
-        return error;
-}
-
-asmlinkage int irix_dmi(struct pt_regs *regs)
-{
-        printk("[%s:%d] Wheee.. irix_dmi()\n",
-               current->comm, current->pid);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_pread(int fd, char __user *buf, int cnt, int off64,
-                          int off1, int off2)
-{
-        printk("[%s:%d] Wheee.. irix_pread(%d,%p,%d,%d,%d,%d)\n",
-               current->comm, current->pid, fd, buf, cnt, off64, off1, off2);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_pwrite(int fd, char __user *buf, int cnt, int off64,
-                           int off1, int off2)
-{
-        printk("[%s:%d] Wheee.. irix_pwrite(%d,%p,%d,%d,%d,%d)\n",
-               current->comm, current->pid, fd, buf, cnt, off64, off1, off2);
-
-        return -EINVAL;
-}
-
-asmlinkage int irix_sgifastpath(int cmd, unsigned long arg0, unsigned long arg1,
-                                unsigned long arg2, unsigned long arg3,
-                                unsigned long arg4, unsigned long arg5)
-{
-        printk("[%s:%d] Wheee.. irix_fastpath(%d,%08lx,%08lx,%08lx,%08lx,"
-               "%08lx,%08lx)\n",
-               current->comm, current->pid, cmd, arg0, arg1, arg2,
-               arg3, arg4, arg5);
-
-        return -EINVAL;
-}
-
-struct irix_statvfs64 {
-        u32  f_bsize; u32 f_frsize;
-        u64  f_blocks; u64 f_bfree; u64 f_bavail;
-        u64  f_files; u64 f_ffree; u64 f_favail;
-        u32  f_fsid;
-        char f_basetype[16];
-        u32  f_flag; u32 f_namemax;
-        char f_fstr[32];
-        u32  f_filler[16];
-};
-
-asmlinkage int irix_statvfs64(char __user *fname, struct irix_statvfs64 __user *buf)
-{
-        struct nameidata nd;
-        struct kstatfs kbuf;
-        int error, i;
-
-        printk("[%s:%d] Wheee.. irix_statvfs64(%s,%p)\n",
-               current->comm, current->pid, fname, buf);
-        if (!access_ok(VERIFY_WRITE, buf, sizeof(struct irix_statvfs64))) {
-                error = -EFAULT;
-                goto out;
-        }
-
-        error = user_path_walk(fname, &nd);
-        if (error)
-                goto out;
-        error = vfs_statfs(nd.path.dentry, &kbuf);
-        if (error)
-                goto dput_and_out;
-
-        error = __put_user(kbuf.f_bsize, &buf->f_bsize);
-        error |= __put_user(kbuf.f_frsize, &buf->f_frsize);
-        error |= __put_user(kbuf.f_blocks, &buf->f_blocks);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bfree);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bavail);  /* XXX hackety hack... */
-        error |= __put_user(kbuf.f_files, &buf->f_files);
-        error |= __put_user(kbuf.f_ffree, &buf->f_ffree);
-        error |= __put_user(kbuf.f_ffree, &buf->f_favail);  /* XXX hackety hack... */
-#ifdef __MIPSEB__
-        error |= __put_user(kbuf.f_fsid.val[1], &buf->f_fsid);
-#else
-        error |= __put_user(kbuf.f_fsid.val[0], &buf->f_fsid);
-#endif
-        for(i = 0; i < 16; i++)
-                error |= __put_user(0, &buf->f_basetype[i]);
-        error |= __put_user(0, &buf->f_flag);
-        error |= __put_user(kbuf.f_namelen, &buf->f_namemax);
-        for(i = 0; i < 32; i++)
-                error |= __put_user(0, &buf->f_fstr[i]);
-
-dput_and_out:
-        path_put(&nd.path);
-out:
-        return error;
-}
-
-asmlinkage int irix_fstatvfs64(int fd, struct irix_statvfs __user *buf)
-{
-        struct kstatfs kbuf;
-        struct file *file;
-        int error, i;
-
-        printk("[%s:%d] Wheee.. irix_fstatvfs64(%d,%p)\n",
-               current->comm, current->pid, fd, buf);
-
-        if (!access_ok(VERIFY_WRITE, buf, sizeof(struct irix_statvfs))) {
-                error = -EFAULT;
-                goto out;
-        }
-        if (!(file = fget(fd))) {
-                error = -EBADF;
-                goto out;
-        }
-        error = vfs_statfs(file->f_path.dentry, &kbuf);
-        if (error)
-                goto out_f;
-
-        error = __put_user(kbuf.f_bsize, &buf->f_bsize);
-        error |= __put_user(kbuf.f_frsize, &buf->f_frsize);
-        error |= __put_user(kbuf.f_blocks, &buf->f_blocks);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bfree);
-        error |= __put_user(kbuf.f_bfree, &buf->f_bavail);  /* XXX hackety hack... */
-        error |= __put_user(kbuf.f_files, &buf->f_files);
-        error |= __put_user(kbuf.f_ffree, &buf->f_ffree);
-        error |= __put_user(kbuf.f_ffree, &buf->f_favail);  /* XXX hackety hack... */
-#ifdef __MIPSEB__
-        error |= __put_user(kbuf.f_fsid.val[1], &buf->f_fsid);
-#else
-        error |= __put_user(kbuf.f_fsid.val[0], &buf->f_fsid);
-#endif
-        for(i = 0; i < 16; i++)
-                error |= __put_user(0, &buf->f_basetype[i]);
-        error |= __put_user(0, &buf->f_flag);
-        error |= __put_user(kbuf.f_namelen, &buf->f_namemax);
-        error |= __clear_user(buf->f_fstr, sizeof(buf->f_fstr[i])) ? -EFAULT : 0;
-
-out_f:
-        fput(file);
-out:
-        return error;
-}
-
-asmlinkage int irix_getmountid(char __user *fname, unsigned long __user *midbuf)
-{
-        int err;
-
-        printk("[%s:%d] irix_getmountid(%s, %p)\n",
-               current->comm, current->pid, fname, midbuf);
-        if (!access_ok(VERIFY_WRITE, midbuf, (sizeof(unsigned long) * 4)))
-                return -EFAULT;
-
-        /*
-         * The idea with this system call is that when trying to determine
-         * 'pwd' and it's a toss-up for some reason, userland can use the
-         * fsid of the filesystem to try and make the right decision, but
-         * we don't have this so for now. XXX
-         */
-        err = __put_user(0, &midbuf[0]);
-        err |= __put_user(0, &midbuf[1]);
-        err |= __put_user(0, &midbuf[2]);
-        err |= __put_user(0, &midbuf[3]);
-
-        return err;
-}
-
-asmlinkage int irix_nsproc(unsigned long entry, unsigned long mask,
-                           unsigned long arg, unsigned long sp, int slen)
-{
-        printk("[%s:%d] Wheee.. irix_nsproc(%08lx,%08lx,%08lx,%08lx,%d)\n",
-               current->comm, current->pid, entry, mask, arg, sp, slen);
-
-        return -EINVAL;
-}
-
-#undef DEBUG_GETDENTS
-
-struct irix_dirent32 {
-        u32  d_ino;
-        u32  d_off;
-        unsigned short  d_reclen;
-        char d_name[1];
-};
-
-struct irix_dirent32_callback {
-        struct irix_dirent32 __user *current_dir;
-        struct irix_dirent32 __user *previous;
-        int count;
-        int error;
-};
-
-#define NAME_OFFSET32(de) ((int) ((de)->d_name - (char *) (de)))
-#define ROUND_UP32(x) (((x)+sizeof(u32)-1) & ~(sizeof(u32)-1))
-
-static int irix_filldir32(void *__buf, const char *name,
-        int namlen, loff_t offset, u64 ino, unsigned int d_type)
-{
-        struct irix_dirent32 __user *dirent;
-        struct irix_dirent32_callback *buf = __buf;
-        unsigned short reclen = ROUND_UP32(NAME_OFFSET32(dirent) + namlen + 1);
-        int err = 0;
-        u32 d_ino;
-
-#ifdef DEBUG_GETDENTS
-        printk("\nirix_filldir32[reclen<%d>namlen<%d>count<%d>]",
-               reclen, namlen, buf->count);
-#endif
-        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)
-                err = __put_user(offset, &dirent->d_off);
-        dirent = buf->current_dir;
-        err |= __put_user(dirent, &buf->previous);
-        err |= __put_user(d_ino, &dirent->d_ino);
-        err |= __put_user(reclen, &dirent->d_reclen);
-        err |= copy_to_user((char __user *)dirent->d_name, name, namlen) ? -EFAULT : 0;
-        err |= __put_user(0, &dirent->d_name[namlen]);
-        dirent = (struct irix_dirent32 __user *) ((char __user *) dirent + reclen);
-
-        buf->current_dir = dirent;
-        buf->count -= reclen;
-
-        return err;
-}
-
-asmlinkage int irix_ngetdents(unsigned int fd, void __user * dirent,
-        unsigned int count, int __user *eob)
-{
-        struct file *file;
-        struct irix_dirent32 __user *lastdirent;
-        struct irix_dirent32_callback buf;
-        int error;
-
-#ifdef DEBUG_GETDENTS
-        printk("[%s:%d] ngetdents(%d, %p, %d, %p) ", current->comm,
-               current->pid, fd, dirent, count, eob);
-#endif
-        error = -EBADF;
-        file = fget(fd);
-        if (!file)
-                goto out;
-
-        buf.current_dir = (struct irix_dirent32 __user *) dirent;
-        buf.previous = NULL;
-        buf.count = count;
-        buf.error = 0;
-
-        error = vfs_readdir(file, irix_filldir32, &buf);
-        if (error < 0)
-                goto out_putf;
-
-        error = buf.error;
-        lastdirent = buf.previous;
-        if (lastdirent) {
-                put_user(file->f_pos, &lastdirent->d_off);
-                error = count - buf.count;
-        }
-
-        if (put_user(0, eob) < 0) {
-                error = -EFAULT;
-                goto out_putf;
-        }
-
-#ifdef DEBUG_GETDENTS
-        printk("eob=%d returning %d\n", *eob, count - buf.count);
-#endif
-        error = count - buf.count;
-
-out_putf:
-        fput(file);
-out:
-        return error;
-}
-
-struct irix_dirent64 {
-        u64            d_ino;
-        u64            d_off;
-        unsigned short d_reclen;
-        char           d_name[1];
-};
-
-struct irix_dirent64_callback {
-        struct irix_dirent64 __user *curr;
-        struct irix_dirent64 __user *previous;
-        int count;
-        int error;
-};
-
-#define NAME_OFFSET64(de) ((int) ((de)->d_name - (char *) (de)))
-#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-
-static int irix_filldir64(void *__buf, const char *name,
-        int namlen, loff_t offset, u64 ino, unsigned int d_type)
-{
-        struct irix_dirent64 __user *dirent;
-        struct irix_dirent64_callback * buf = __buf;
-        unsigned short reclen = ROUND_UP64(NAME_OFFSET64(dirent) + namlen + 1);
-        int err = 0;
-
-        if (!access_ok(VERIFY_WRITE, buf, sizeof(*buf)))
-                return -EFAULT;
-
-        if (__put_user(-EINVAL, &buf->error))   /* only used if we fail.. */
-                return -EFAULT;
-        if (reclen > buf->count)
-                return -EINVAL;
-        dirent = buf->previous;
-        if (dirent)
-                err = __put_user(offset, &dirent->d_off);
-        dirent = buf->curr;
-        buf->previous = dirent;
-        err |= __put_user(ino, &dirent->d_ino);
-        err |= __put_user(reclen, &dirent->d_reclen);
-        err |= __copy_to_user((char __user *)dirent->d_name, name, namlen)
-               ? -EFAULT : 0;
-        err |= __put_user(0, &dirent->d_name[namlen]);
-
-        dirent = (struct irix_dirent64 __user *) ((char __user *) dirent + reclen);
-
-        buf->curr = dirent;
-        buf->count -= reclen;
-
-        return err;
-}
-
-asmlinkage int irix_getdents64(int fd, void __user *dirent, int cnt)
-{
-        struct file *file;
-        struct irix_dirent64 __user *lastdirent;
-        struct irix_dirent64_callback buf;
-        int error;
-
-#ifdef DEBUG_GETDENTS
-        printk("[%s:%d] getdents64(%d, %p, %d) ", current->comm,
-               current->pid, fd, dirent, cnt);
-#endif
-        error = -EBADF;
-        if (!(file = fget(fd)))
-                goto out;
-
-        error = -EFAULT;
-        if (!access_ok(VERIFY_WRITE, dirent, cnt))
-                goto out_f;
-
-        error = -EINVAL;
-        if (cnt < (sizeof(struct irix_dirent64) + 255))
-                goto out_f;
-
-        buf.curr = (struct irix_dirent64 __user *) dirent;
-        buf.previous = NULL;
-        buf.count = cnt;
-        buf.error = 0;
-        error = vfs_readdir(file, irix_filldir64, &buf);
-        if (error < 0)
-                goto out_f;
-        lastdirent = buf.previous;
-        if (!lastdirent) {
-                error = buf.error;
-                goto out_f;
-        }
-        if (put_user(file->f_pos, &lastdirent->d_off))
-                return -EFAULT;
-#ifdef DEBUG_GETDENTS
-        printk("returning %d\n", cnt - buf.count);
-#endif
-        error = cnt - buf.count;
-
-out_f:
-        fput(file);
-out:
-        return error;
-}
-
-asmlinkage int irix_ngetdents64(int fd, void __user *dirent, int cnt, int *eob)
-{
-        struct file *file;
-        struct irix_dirent64 __user *lastdirent;
-        struct irix_dirent64_callback buf;
-        int error;
-
-#ifdef DEBUG_GETDENTS
-        printk("[%s:%d] ngetdents64(%d, %p, %d) ", current->comm,
-               current->pid, fd, dirent, cnt);
-#endif
-        error = -EBADF;
-        if (!(file = fget(fd)))
-                goto out;
-
-        error = -EFAULT;
-        if (!access_ok(VERIFY_WRITE, dirent, cnt) ||
-            !access_ok(VERIFY_WRITE, eob, sizeof(*eob)))
-                goto out_f;
-
-        error = -EINVAL;
-        if (cnt < (sizeof(struct irix_dirent64) + 255))
-                goto out_f;
-
-        *eob = 0;
-        buf.curr = (struct irix_dirent64 __user *) dirent;
-        buf.previous = NULL;
-        buf.count = cnt;
-        buf.error = 0;
-        error = vfs_readdir(file, irix_filldir64, &buf);
-        if (error < 0)
-                goto out_f;
-        lastdirent = buf.previous;
-        if (!lastdirent) {
-                error = buf.error;
-                goto out_f;
-        }
-        if (put_user(file->f_pos, &lastdirent->d_off))
-                return -EFAULT;
-#ifdef DEBUG_GETDENTS
-        printk("eob=%d returning %d\n", *eob, cnt - buf.count);
-#endif
-        error = cnt - buf.count;
-
-out_f:
-        fput(file);
-out:
-        return error;
-}
-
-asmlinkage int irix_uadmin(unsigned long op, unsigned long func, unsigned long arg)
-{
-        int retval;
-
-        switch (op) {
-        case 1:
-                /* Reboot */
-                printk("[%s:%d] irix_uadmin: Wants to reboot...\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        case 2:
-                /* Shutdown */
-                printk("[%s:%d] irix_uadmin: Wants to shutdown...\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        case 4:
-                /* Remount-root */
-                printk("[%s:%d] irix_uadmin: Wants to remount root...\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        case 8:
-                /* Kill all tasks. */
-                printk("[%s:%d] irix_uadmin: Wants to kill all tasks...\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        case 256:
-                /* Set magic mushrooms... */
-                printk("[%s:%d] irix_uadmin: Wants to set magic mushroom[%d]...\n",
-                       current->comm, current->pid, (int) func);
-                retval = -EINVAL;
-                goto out;
-
-        default:
-                printk("[%s:%d] irix_uadmin: Unknown operation [%d]...\n",
-                       current->comm, current->pid, (int) op);
-                retval = -EINVAL;
-                goto out;
-        };
-
-out:
-        return retval;
-}
-
-asmlinkage int irix_utssys(char __user *inbuf, int arg, int type, char __user *outbuf)
-{
-        int retval;
-
-        switch(type) {
-        case 0:
-                /* uname() */
-                retval = irix_uname((struct iuname __user *)inbuf);
-                goto out;
-
-        case 2:
-                /* ustat() */
-                printk("[%s:%d] irix_utssys: Wants to do ustat()\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        case 3:
-                /* fusers() */
-                printk("[%s:%d] irix_utssys: Wants to do fusers()\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        default:
-                printk("[%s:%d] irix_utssys: Wants to do unknown type[%d]\n",
-                       current->comm, current->pid, (int) type);
-                retval = -EINVAL;
-                goto out;
-        }
-
-out:
-        return retval;
-}
-
-#undef DEBUG_FCNTL
-
-#define IRIX_F_ALLOCSP 10
-
-asmlinkage int irix_fcntl(int fd, int cmd, int arg)
-{
-        int retval;
-
-#ifdef DEBUG_FCNTL
-        printk("[%s:%d] irix_fcntl(%d, %d, %d) ", current->comm,
-               current->pid, fd, cmd, arg);
-#endif
-        if (cmd == IRIX_F_ALLOCSP){
-                return 0;
-        }
-        retval = sys_fcntl(fd, cmd, arg);
-#ifdef DEBUG_FCNTL
-        printk("%d\n", retval);
-#endif
-        return retval;
-}
-
-asmlinkage int irix_ulimit(int cmd, int arg)
-{
-        int retval;
-
-        switch(cmd) {
-        case 1:
-                printk("[%s:%d] irix_ulimit: Wants to get file size limit.\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        case 2:
-                printk("[%s:%d] irix_ulimit: Wants to set file size limit.\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        case 3:
-                printk("[%s:%d] irix_ulimit: Wants to get brk limit.\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        case 4:
-#if 0
-                printk("[%s:%d] irix_ulimit: Wants to get fd limit.\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-#endif
-                retval = current->signal->rlim[RLIMIT_NOFILE].rlim_cur;
-                goto out;
-
-        case 5:
-                printk("[%s:%d] irix_ulimit: Wants to get txt offset.\n",
-                       current->comm, current->pid);
-                retval = -EINVAL;
-                goto out;
-
-        default:
-                printk("[%s:%d] irix_ulimit: Unknown command [%d].\n",
-                       current->comm, current->pid, cmd);
-                retval = -EINVAL;
-                goto out;
-        }
-out:
-        return retval;
-}
-
-asmlinkage int irix_unimp(struct pt_regs *regs)
-{
-        printk("irix_unimp [%s:%d] v0=%d v1=%d a0=%08lx a1=%08lx a2=%08lx "
-               "a3=%08lx\n", current->comm, current->pid,
-               (int) regs->regs[2], (int) regs->regs[3],
-               regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]);
-
-        return -ENOSYS;
-}
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index f9165d1a17bf..b8ea4e9d0d87 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -71,7 +71,6 @@ extern asmlinkage void handle_reserved(void);
 extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
         struct mips_fpu_struct *ctx, int has_fpu);
 
-void (*board_watchpoint_handler)(struct pt_regs *regs);
 void (*board_be_init)(void);
 int (*board_be_handler)(struct pt_regs *regs, int is_fixup);
 void (*board_nmi_handler_setup)(void);
@@ -249,11 +248,11 @@ static void __show_regs(const struct pt_regs *regs)
         /*
          * Saved cp0 registers
          */
-        printk("epc   : %0*lx ", field, regs->cp0_epc);
-        print_symbol("%s ", regs->cp0_epc);
+        printk("epc   : %0*lx %pS\n", field, regs->cp0_epc,
+               (void *) regs->cp0_epc);
         printk("    %s\n", print_tainted());
-        printk("ra    : %0*lx ", field, regs->regs[31]);
-        print_symbol("%s\n", regs->regs[31]);
+        printk("ra    : %0*lx %pS\n", field, regs->regs[31],
+               (void *) regs->regs[31]);
 
         printk("Status: %08x    ", (uint32_t) regs->cp0_status);
 
@@ -892,11 +891,6 @@ asmlinkage void do_mdmx(struct pt_regs *regs)
 
 asmlinkage void do_watch(struct pt_regs *regs)
 {
-        if (board_watchpoint_handler) {
-                (*board_watchpoint_handler)(regs);
-                return;
-        }
-
         /*
          * We use the watch exception where available to detect stack
          * overflows.
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index a56c15026965..d1ac7a25c856 100644
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -22,8 +22,8 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 
-#include <asm/bootinfo.h>
 #include <asm/irq_cpu.h>
+#include <asm/lasat/lasat.h>
 #include <asm/lasat/lasatint.h>
 
 #include <irq.h>
@@ -112,23 +112,18 @@ void __init arch_init_irq(void)
 {
         int i;
 
-        switch (mips_machtype) {
-        case MACH_LASAT_100:
-                lasat_int_status = (void *)LASAT_INT_STATUS_REG_100;
-                lasat_int_mask = (void *)LASAT_INT_MASK_REG_100;
-                lasat_int_mask_shift = LASATINT_MASK_SHIFT_100;
-                get_int_status = get_int_status_100;
-                *lasat_int_mask = 0;
-                break;
-        case MACH_LASAT_200:
+        if (IS_LASAT_200()) {
                 lasat_int_status = (void *)LASAT_INT_STATUS_REG_200;
                 lasat_int_mask = (void *)LASAT_INT_MASK_REG_200;
                 lasat_int_mask_shift = LASATINT_MASK_SHIFT_200;
                 get_int_status = get_int_status_200;
                 *lasat_int_mask &= 0xffff;
-                break;
-        default:
-                panic("arch_init_irq: mips_machtype incorrect");
+        } else {
+                lasat_int_status = (void *)LASAT_INT_STATUS_REG_100;
+                lasat_int_mask = (void *)LASAT_INT_MASK_REG_100;
+                lasat_int_mask_shift = LASATINT_MASK_SHIFT_100;
+                get_int_status = get_int_status_100;
+                *lasat_int_mask = 0;
         }
 
         mips_cpu_irq_init();
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c
index 31e328b3814d..577bb463a871 100644
--- a/arch/mips/lasat/lasat_board.c
+++ b/arch/mips/lasat/lasat_board.c
@@ -24,7 +24,6 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/mutex.h>
-#include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 #include "at93c.h"
 /* New model description table */
@@ -66,7 +65,7 @@ static void init_flash_sizes(void)
         ls[LASAT_MTD_SERVICE] = 0xC0000;
         ls[LASAT_MTD_NORMAL] = 0x100000;
 
-        if (mips_machtype == MACH_LASAT_100) {
+        if (!IS_LASAT_200()) {
                 lasat_board_info.li_flash_base = 0x1e000000;
 
                 lb[LASAT_MTD_BOOTLOADER] = 0x1e400000;
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c
index 209edcc26f07..6acc6cb85f0a 100644
--- a/arch/mips/lasat/prom.c
+++ b/arch/mips/lasat/prom.c
@@ -86,18 +86,16 @@ void __init prom_init(void)
 
         setup_prom_vectors();
 
-        if (current_cpu_data.cputype == CPU_R5000) {
+        if (IS_LASAT_200()) {
                 printk(KERN_INFO "LASAT 200 board\n");
-                mips_machtype = MACH_LASAT_200;
                 lasat_ndelay_divider = LASAT_200_DIVIDER;
+                at93c = &at93c_defs[1];
         } else {
                 printk(KERN_INFO "LASAT 100 board\n");
-                mips_machtype = MACH_LASAT_100;
                 lasat_ndelay_divider = LASAT_100_DIVIDER;
+                at93c = &at93c_defs[0];
         }
 
-        at93c = &at93c_defs[mips_machtype];
-
         lasat_init_board_info();                /* Read info from EEPROM */
 
         /* Get the command line */
diff --git a/arch/mips/lasat/serial.c b/arch/mips/lasat/serial.c
index 205bd397d75b..5bcb6e89ab78 100644
--- a/arch/mips/lasat/serial.c
+++ b/arch/mips/lasat/serial.c
@@ -23,7 +23,6 @@
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 
-#include <asm/bootinfo.h>
 #include <asm/lasat/lasat.h>
 #include <asm/lasat/serial.h>
 
@@ -47,7 +46,7 @@ static __init int lasat_uart_add(void)
         if (!pdev)
                 return -ENOMEM;
 
-        if (mips_machtype == MACH_LASAT_100) {
+        if (!IS_LASAT_200()) {
                 lasat_serial_res[0].start = KSEG1ADDR(LASAT_UART_REGS_BASE_100);
                 lasat_serial_res[0].end = lasat_serial_res[0].start + LASAT_UART_REGS_SHIFT_100 * 8 - 1;
                 lasat_serial_res[0].flags = IORESOURCE_MEM;
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index e072da4ff3b3..dbd3163a85c2 100644
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -127,9 +127,11 @@ void __init plat_time_init(void)
 void __init plat_mem_setup(void)
 {
         int i;
-        lasat_misc  = &lasat_misc_info[mips_machtype];
+        int lasat_type = IS_LASAT_200() ? 1 : 0;
+
+        lasat_misc  = &lasat_misc_info[lasat_type];
 #ifdef CONFIG_PICVUE
-        picvue = &pvc_defs[mips_machtype];
+        picvue = &pvc_defs[lasat_type];
 #endif
 
         /* Set up panic notifier */
@@ -140,7 +142,7 @@ void __init plat_mem_setup(void)
         lasat_reboot_setup();
 
 #ifdef CONFIG_DS1603
-        ds1603 = &ds_defs[mips_machtype];
+        ds1603 = &ds_defs[lasat_type];
 #endif
 
 #ifdef DYNAMIC_SERIAL_INIT
diff --git a/arch/mips/mips-boards/atlas/Makefile b/arch/mips/mips-boards/atlas/Makefile
deleted file mode 100644
index f71c2dd1041a..000000000000
--- a/arch/mips/mips-boards/atlas/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Carsten Langgaard, carstenl@mips.com
-# Copyright (C) 1999,2000 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.
-#
-
-obj-y                   := atlas_int.o atlas_setup.o
-obj-$(CONFIG_KGDB)      += atlas_gdb.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/atlas/atlas_gdb.c b/arch/mips/mips-boards/atlas/atlas_gdb.c
deleted file mode 100644
index 00c98cff62dc..000000000000
--- a/arch/mips/mips-boards/atlas/atlas_gdb.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 2000 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.
- *
- * This is the interface to the remote debugger stub.
- */
-#include <asm/io.h>
-#include <asm/mips-boards/atlas.h>
-#include <asm/mips-boards/saa9730_uart.h>
-
-#define INB(a)     inb((unsigned long)a)
-#define OUTB(x, a)  outb(x, (unsigned long)a)
-
-/*
- * This is the interface to the remote debugger stub
- * if the Philips part is used for the debug port,
- * called from the platform setup code.
- */
-void *saa9730_base = (void *)ATLAS_SAA9730_REG;
-
-static int saa9730_kgdb_active = 0;
-
-#define SAA9730_BAUDCLOCK(baud) (((ATLAS_SAA9730_BAUDCLOCK/(baud))/16)-1)
-
-int saa9730_kgdb_hook(int speed)
-{
-        int baudclock;
-        t_uart_saa9730_regmap *kgdb_uart = (t_uart_saa9730_regmap *)(saa9730_base + SAA9730_UART_REGS_ADDR);
-
-        /*
-         * Clear all interrupts
-         */
-        (void) INB(&kgdb_uart->Lsr);
-        (void) INB(&kgdb_uart->Msr);
-        (void) INB(&kgdb_uart->Thr_Rbr);
-        (void) INB(&kgdb_uart->Iir_Fcr);
-
-        /*
-         * Now, initialize the UART
-         */
-        /* 8 data bits, one stop bit, no parity */
-        OUTB(SAA9730_LCR_DATA8, &kgdb_uart->Lcr);
-
-        baudclock = SAA9730_BAUDCLOCK(speed);
-
-        OUTB((baudclock >> 16) & 0xff, &kgdb_uart->BaudDivMsb);
-        OUTB( baudclock        & 0xff, &kgdb_uart->BaudDivLsb);
-
-        /* Set RTS/DTR active */
-        OUTB(SAA9730_MCR_DTR | SAA9730_MCR_RTS, &kgdb_uart->Mcr);
-        saa9730_kgdb_active = 1;
-
-        return speed;
-}
-
-int saa9730_putDebugChar(char c)
-{
-        t_uart_saa9730_regmap *kgdb_uart = (t_uart_saa9730_regmap *)(saa9730_base + SAA9730_UART_REGS_ADDR);
-
-        if (!saa9730_kgdb_active) {     /* need to init device first */
-                return 0;
-        }
-
-        while (!(INB(&kgdb_uart->Lsr) & SAA9730_LSR_THRE))
-                ;
-        OUTB(c, &kgdb_uart->Thr_Rbr);
-
-        return 1;
-}
-
-char saa9730_getDebugChar(void)
-{
-        t_uart_saa9730_regmap *kgdb_uart = (t_uart_saa9730_regmap *)(saa9730_base + SAA9730_UART_REGS_ADDR);
-        char c;
-
-        if (!saa9730_kgdb_active) {     /* need to init device first */
-                return 0;
-        }
-        while (!(INB(&kgdb_uart->Lsr) & SAA9730_LSR_DR))
-                ;
-
-        c = INB(&kgdb_uart->Thr_Rbr);
-        return(c);
-}
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c
deleted file mode 100644
index 6fb29c3ff62d..000000000000
--- a/arch/mips/mips-boards/atlas/atlas_int.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (C) 1999, 2000, 2006  MIPS Technologies, Inc.
- *      All rights reserved.
- *      Authors: Carsten Langgaard <carstenl@mips.com>
- *               Maciej W. Rozycki <macro@mips.com>
- *
- * ########################################################################
- *
- *  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.
- *
- * ########################################################################
- *
- * Routines for generic manipulation of the interrupts found on the MIPS
- * Atlas board.
- *
- */
-#include <linux/compiler.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/kernel_stat.h>
-#include <linux/kernel.h>
-
-#include <asm/gdb-stub.h>
-#include <asm/io.h>
-#include <asm/irq_cpu.h>
-#include <asm/msc01_ic.h>
-
-#include <asm/mips-boards/atlas.h>
-#include <asm/mips-boards/atlasint.h>
-#include <asm/mips-boards/generic.h>
-
-static struct atlas_ictrl_regs *atlas_hw0_icregs;
-
-#if 0
-#define DEBUG_INT(x...) printk(x)
-#else
-#define DEBUG_INT(x...)
-#endif
-
-void disable_atlas_irq(unsigned int irq_nr)
-{
-        atlas_hw0_icregs->intrsten = 1 << (irq_nr - ATLAS_INT_BASE);
-        iob();
-}
-
-void enable_atlas_irq(unsigned int irq_nr)
-{
-        atlas_hw0_icregs->intseten = 1 << (irq_nr - ATLAS_INT_BASE);
-        iob();
-}
-
-static void end_atlas_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                enable_atlas_irq(irq);
-}
-
-static struct irq_chip atlas_irq_type = {
-        .name = "Atlas",
-        .ack = disable_atlas_irq,
-        .mask = disable_atlas_irq,
-        .mask_ack = disable_atlas_irq,
-        .unmask = enable_atlas_irq,
-        .eoi = enable_atlas_irq,
-        .end = end_atlas_irq,
-};
-
-static inline int ls1bit32(unsigned int x)
-{
-        int b = 31, s;
-
-        s = 16; if (x << 16 == 0) s = 0; b -= s; x <<= s;
-        s =  8; if (x <<  8 == 0) s = 0; b -= s; x <<= s;
-        s =  4; if (x <<  4 == 0) s = 0; b -= s; x <<= s;
-        s =  2; if (x <<  2 == 0) s = 0; b -= s; x <<= s;
-        s =  1; if (x <<  1 == 0) s = 0; b -= s;
-
-        return b;
-}
-
-static inline void atlas_hw0_irqdispatch(void)
-{
-        unsigned long int_status;
-        int irq;
-
-        int_status = atlas_hw0_icregs->intstatus;
-
-        /* if int_status == 0, then the interrupt has already been cleared */
-        if (unlikely(int_status == 0))
-                return;
-
-        irq = ATLAS_INT_BASE + ls1bit32(int_status);
-
-        DEBUG_INT("atlas_hw0_irqdispatch: irq=%d\n", irq);
-
-        do_IRQ(irq);
-}
-
-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
-}
-
-/*
- * IRQs on the Atlas board look basically like (all external interrupt
- * sources are combined together on hardware interrupt 0 (MIPS IRQ 2)):
- *
- *      MIPS IRQ        Source
- *      --------        ------
- *             0        Software 0 (reschedule IPI on MT)
- *             1        Software 1 (remote call IPI on MT)
- *             2        Combined Atlas hardware interrupt (hw0)
- *             3        Hardware (ignored)
- *             4        Hardware (ignored)
- *             5        Hardware (ignored)
- *             6        Hardware (ignored)
- *             7        R4k timer (what we use)
- *
- * We handle the IRQ according to _our_ priority which is:
- *
- * Highest ----     R4k Timer
- * Lowest  ----     Software 0
- *
- * then we just return, if multiple IRQs are pending then we will just take
- * another exception, big deal.
- */
-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 == MIPSCPU_INT_ATLAS)
-                atlas_hw0_irqdispatch();
-        else if (irq >= 0)
-                do_IRQ(MIPS_CPU_IRQ_BASE + irq);
-        else
-                spurious_interrupt();
-}
-
-static inline void init_atlas_irqs(int base)
-{
-        int i;
-
-        atlas_hw0_icregs = (struct atlas_ictrl_regs *)
-                           ioremap(ATLAS_ICTRL_REGS_BASE,
-                                   sizeof(struct atlas_ictrl_regs *));
-
-        /*
-         * Mask out all interrupt by writing "1" to all bit position in
-         * the interrupt reset reg.
-         */
-        atlas_hw0_icregs->intrsten = 0xffffffff;
-
-        for (i = ATLAS_INT_BASE; i <= ATLAS_INT_END; i++)
-                set_irq_chip_and_handler(i, &atlas_irq_type, handle_level_irq);
-}
-
-static struct irqaction atlasirq = {
-        .handler = no_action,
-        .name = "Atlas cascade"
-};
-
-msc_irqmap_t __initdata msc_irqmap[] = {
-        {MSC01C_INT_TMR,                MSC01_IRQ_EDGE, 0},
-        {MSC01C_INT_PCI,                MSC01_IRQ_LEVEL, 0},
-};
-int __initdata msc_nr_irqs = ARRAY_SIZE(msc_irqmap);
-
-msc_irqmap_t __initdata msc_eicirqmap[] = {
-        {MSC01E_INT_SW0,                MSC01_IRQ_LEVEL, 0},
-        {MSC01E_INT_SW1,                MSC01_IRQ_LEVEL, 0},
-        {MSC01E_INT_ATLAS,              MSC01_IRQ_LEVEL, 0},
-        {MSC01E_INT_TMR,                MSC01_IRQ_EDGE, 0},
-        {MSC01E_INT_PCI,                MSC01_IRQ_LEVEL, 0},
-        {MSC01E_INT_PERFCTR,            MSC01_IRQ_LEVEL, 0},
-        {MSC01E_INT_CPUCTR,             MSC01_IRQ_LEVEL, 0}
-};
-int __initdata msc_nr_eicirqs = ARRAY_SIZE(msc_eicirqmap);
-
-void __init arch_init_irq(void)
-{
-        init_atlas_irqs(ATLAS_INT_BASE);
-
-        if (!cpu_has_veic)
-                mips_cpu_irq_init();
-
-        switch(mips_revision_corid) {
-        case MIPS_REVISION_CORID_CORE_MSC:
-        case MIPS_REVISION_CORID_CORE_FPGA2:
-        case MIPS_REVISION_CORID_CORE_FPGA3:
-        case MIPS_REVISION_CORID_CORE_FPGA4:
-        case MIPS_REVISION_CORID_CORE_24K:
-        case MIPS_REVISION_CORID_CORE_EMUL_MSC:
-                if (cpu_has_veic)
-                        init_msc_irqs(MSC01E_INT_BASE, MSC01E_INT_BASE,
-                                      msc_eicirqmap, msc_nr_eicirqs);
-                else
-                        init_msc_irqs(MSC01E_INT_BASE, MSC01C_INT_BASE,
-                                      msc_irqmap, msc_nr_irqs);
-        }
-
-        if (cpu_has_veic) {
-                set_vi_handler(MSC01E_INT_ATLAS, atlas_hw0_irqdispatch);
-                setup_irq(MSC01E_INT_BASE + MSC01E_INT_ATLAS, &atlasirq);
-        } else if (cpu_has_vint) {
-                set_vi_handler(MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch);
-#ifdef CONFIG_MIPS_MT_SMTC
-                setup_irq_smtc(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS,
-                               &atlasirq, (0x100 << MIPSCPU_INT_ATLAS));
-#else /* Not SMTC */
-                setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq);
-#endif /* CONFIG_MIPS_MT_SMTC */
-        } else
-                setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq);
-}
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
deleted file mode 100644
index 5c500802271e..000000000000
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 1999,2000 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/interrupt.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/serial_8250.h>
-
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/mips-boards/generic.h>
-#include <asm/mips-boards/prom.h>
-#include <asm/mips-boards/atlas.h>
-#include <asm/mips-boards/atlasint.h>
-#include <asm/time.h>
-#include <asm/traps.h>
-
-static void __init serial_init(void);
-
-const char *get_system_type(void)
-{
-        return "MIPS Atlas";
-}
-
-const char display_string[] = "        LINUX ON ATLAS       ";
-
-void __init plat_mem_setup(void)
-{
-        mips_pcibios_init();
-
-        ioport_resource.end = 0x7fffffff;
-
-        serial_init();
-
-#ifdef CONFIG_KGDB
-        kgdb_config();
-#endif
-        mips_reboot_setup();
-}
-
-static void __init serial_init(void)
-{
-#ifdef CONFIG_SERIAL_8250
-        struct uart_port s;
-
-        memset(&s, 0, sizeof(s));
-
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-        s.iobase = ATLAS_UART_REGS_BASE;
-#else
-        s.iobase = ATLAS_UART_REGS_BASE+3;
-#endif
-        s.irq = ATLAS_INT_UART;
-        s.uartclk = ATLAS_BASE_BAUD * 16;
-        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
-        s.iotype = UPIO_PORT;
-        s.regshift = 3;
-
-        if (early_serial_setup(&s) != 0) {
-                printk(KERN_ERR "Serial setup failed!\n");
-        }
-#endif
-}
diff --git a/arch/mips/mips-boards/generic/Makefile b/arch/mips/mips-boards/generic/Makefile
deleted file mode 100644
index f7f87fc09d1e..000000000000
--- a/arch/mips/mips-boards/generic/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Carsten Langgaard, carstenl@mips.com
-# Copyright (C) 1999,2000 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.
-#
-# Makefile for the MIPS boards generic routines under Linux.
-#
-
-obj-y                           := reset.o display.o init.o memory.o \
-                                   cmdline.o time.o
-obj-y                           += amon.o
-
-obj-$(CONFIG_EARLY_PRINTK)      += console.o
-obj-$(CONFIG_PCI)               += pci.o
-obj-$(CONFIG_KGDB)              += gdb_hook.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile
deleted file mode 100644
index db4ad654a6d3..000000000000
--- a/arch/mips/mips-boards/malta/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Carsten Langgaard, carstenl@mips.com
-# Copyright (C) 2000 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.
-#
-# Makefile for the MIPS Malta specific kernel interface routines
-# under Linux.
-#
-
-obj-y := malta_int.o malta_mtd.o malta_platform.o malta_setup.o
-
-# FIXME FIXME FIXME
-obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/sead/Makefile b/arch/mips/mips-boards/sead/Makefile
deleted file mode 100644
index 3682fe217bd5..000000000000
--- a/arch/mips/mips-boards/sead/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Carsten Langgaard, carstenl@mips.com
-# Copyright (C) 2002 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.
-#
-# #######################################################################
-#
-# Makefile for the MIPS SEAD specific kernel interface routines
-# under Linux.
-#
-
-obj-y           := sead_int.o sead_setup.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c
deleted file mode 100644
index ec6dd194c14a..000000000000
--- a/arch/mips/mips-boards/sead/sead_int.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 2002 MIPS Technologies, Inc.  All rights reserved.
- * Copyright (C) 2003 Ralf Baechle (ralf@linux-mips.org)
- * Copyright (C) 2004  Maciej W. Rozycki
- *
- *  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.
- *
- * Routines for generic manipulation of the interrupts found on the MIPS
- * Sead board.
- */
-#include <linux/init.h>
-#include <linux/interrupt.h>
-
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-
-#include <asm/mips-boards/seadint.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
-}
-
-/*
- * IRQs on the SEAD board look basically are combined together on hardware
- * interrupt 0 (MIPS IRQ 2)) like:
- *
- *      MIPS IRQ        Source
- *      --------        ------
- *             0        Software (ignored)
- *             1        Software (ignored)
- *             2        UART0 (hw0)
- *             3        UART1 (hw1)
- *             4        Hardware (ignored)
- *             5        Hardware (ignored)
- *             6        Hardware (ignored)
- *             7        R4k timer (what we use)
- *
- * We handle the IRQ according to _our_ priority which is:
- *
- * Highest ----     R4k Timer
- * Lowest  ----     Combined hardware interrupt
- *
- * then we just return, if multiple IRQs are pending then we will just take
- * another exception, big deal.
- */
-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/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c
deleted file mode 100644
index 8aa8e5b7b074..000000000000
--- a/arch/mips/mips-boards/sead/sead_setup.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 2002 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.
- *
- * SEAD specific setup.
- */
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/serial_8250.h>
-
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/mips-boards/generic.h>
-#include <asm/mips-boards/prom.h>
-#include <asm/mips-boards/sead.h>
-#include <asm/mips-boards/seadint.h>
-#include <asm/time.h>
-
-static void __init serial_init(void);
-
-const char *get_system_type(void)
-{
-        return "MIPS SEAD";
-}
-
-const char display_string[] = "        LINUX ON SEAD       ";
-
-void __init plat_mem_setup(void)
-{
-        ioport_resource.end = 0x7fffffff;
-
-        serial_init();
-
-        mips_reboot_setup();
-}
-
-static void __init serial_init(void)
-{
-#ifdef CONFIG_SERIAL_8250
-        struct uart_port s;
-
-        memset(&s, 0, sizeof(s));
-
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-        s.iobase = SEAD_UART0_REGS_BASE;
-#else
-        s.iobase = SEAD_UART0_REGS_BASE+3;
-#endif
-        s.irq = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_UART0;
-        s.uartclk = SEAD_BASE_BAUD * 16;
-        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
-        s.iotype = UPIO_PORT;
-        s.regshift = 3;
-
-        if (early_serial_setup(&s) != 0) {
-                printk(KERN_ERR "Serial setup failed!\n");
-        }
-#endif
-}
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 27096751ddce..71df3390c07b 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -43,12 +43,12 @@
  *    primary cache.
  */
 static inline void r4k_on_each_cpu(void (*func) (void *info), void *info,
-                                   int retry, int wait)
+                                   int wait)
 {
         preempt_disable();
 
 #if !defined(CONFIG_MIPS_MT_SMP) && !defined(CONFIG_MIPS_MT_SMTC)
-        smp_call_function(func, info, retry, wait);
+        smp_call_function(func, info, wait);
 #endif
         func(info);
         preempt_enable();
@@ -350,7 +350,7 @@ static inline void local_r4k___flush_cache_all(void * args)
 
 static void r4k___flush_cache_all(void)
 {
-        r4k_on_each_cpu(local_r4k___flush_cache_all, NULL, 1, 1);
+        r4k_on_each_cpu(local_r4k___flush_cache_all, NULL, 1);
 }
 
 static inline int has_valid_asid(const struct mm_struct *mm)
@@ -397,7 +397,7 @@ static void r4k_flush_cache_range(struct vm_area_struct *vma,
         int exec = vma->vm_flags & VM_EXEC;
 
         if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc))
-                r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1, 1);
+                r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1);
 }
 
 static inline void local_r4k_flush_cache_mm(void * args)
@@ -429,7 +429,7 @@ static void r4k_flush_cache_mm(struct mm_struct *mm)
         if (!cpu_has_dc_aliases)
                 return;
 
-        r4k_on_each_cpu(local_r4k_flush_cache_mm, mm, 1, 1);
+        r4k_on_each_cpu(local_r4k_flush_cache_mm, mm, 1);
 }
 
 struct flush_cache_page_args {
@@ -521,7 +521,7 @@ static void r4k_flush_cache_page(struct vm_area_struct *vma,
         args.addr = addr;
         args.pfn = pfn;
 
-        r4k_on_each_cpu(local_r4k_flush_cache_page, &args, 1, 1);
+        r4k_on_each_cpu(local_r4k_flush_cache_page, &args, 1);
 }
 
 static inline void local_r4k_flush_data_cache_page(void * addr)
@@ -535,7 +535,7 @@ static void r4k_flush_data_cache_page(unsigned long addr)
                 local_r4k_flush_data_cache_page((void *)addr);
         else
                 r4k_on_each_cpu(local_r4k_flush_data_cache_page, (void *) addr,
-                                1, 1);
+                                1);
 }
 
 struct flush_icache_range_args {
@@ -571,7 +571,7 @@ static void r4k_flush_icache_range(unsigned long start, unsigned long end)
         args.start = start;
         args.end = end;
 
-        r4k_on_each_cpu(local_r4k_flush_icache_range, &args, 1, 1);
+        r4k_on_each_cpu(local_r4k_flush_icache_range, &args, 1);
         instruction_hazard();
 }
 
@@ -672,7 +672,7 @@ static void local_r4k_flush_cache_sigtramp(void * arg)
 
 static void r4k_flush_cache_sigtramp(unsigned long addr)
 {
-        r4k_on_each_cpu(local_r4k_flush_cache_sigtramp, (void *) addr, 1, 1);
+        r4k_on_each_cpu(local_r4k_flush_cache_sigtramp, (void *) addr, 1);
 }
 
 static void r4k_flush_icache_all(void)
diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c
index 1655aa69e133..f467199676a8 100644
--- a/arch/mips/mm/uasm.c
+++ b/arch/mips/mm/uasm.c
@@ -396,7 +396,7 @@ int __cpuinit uasm_in_compat_space_p(long addr)
 #endif
 }
 
-int __cpuinit uasm_rel_highest(long val)
+static int __cpuinit uasm_rel_highest(long val)
 {
 #ifdef CONFIG_64BIT
         return ((((val + 0x800080008000L) >> 48) & 0xffff) ^ 0x8000) - 0x8000;
@@ -405,7 +405,7 @@ int __cpuinit uasm_rel_highest(long val)
 #endif
 }
 
-int __cpuinit uasm_rel_higher(long val)
+static int __cpuinit uasm_rel_higher(long val)
 {
 #ifdef CONFIG_64BIT
         return ((((val + 0x80008000L) >> 32) & 0xffff) ^ 0x8000) - 0x8000;
diff --git a/arch/mips/mm/uasm.h b/arch/mips/mm/uasm.h
index 0d6a66f32030..c6d1e3dd82d4 100644
--- a/arch/mips/mm/uasm.h
+++ b/arch/mips/mm/uasm.h
@@ -103,8 +103,6 @@ struct uasm_label {
 void __cpuinit uasm_build_label(struct uasm_label **lab, u32 *addr, int lid);
 #ifdef CONFIG_64BIT
 int uasm_in_compat_space_p(long addr);
-int uasm_rel_highest(long val);
-int uasm_rel_higher(long val);
 #endif
 int uasm_rel_hi(long val);
 int uasm_rel_lo(long val);
diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile
new file mode 100644
index 000000000000..f8064446e812
--- /dev/null
+++ b/arch/mips/mti-malta/Makefile
@@ -0,0 +1,21 @@
+#
+# Carsten Langgaard, carstenl@mips.com
+# Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
+#
+# Copyright (C) 2008 Wind River Systems, Inc.
+#   written by Ralf Baechle <ralf@linux-mips.org>
+#
+obj-y                           := malta-amon.o malta-cmdline.o \
+                                   malta-display.o malta-init.o malta-int.o \
+                                   malta-memory.o malta-mtd.o \
+                                   malta-platform.o malta-reset.o \
+                                   malta-setup.o malta-time.o
+
+obj-$(CONFIG_EARLY_PRINTK)      += malta-console.o
+obj-$(CONFIG_PCI)               += malta-pci.o
+obj-$(CONFIG_KGDB)              += malta-kgdb.o
+
+# FIXME FIXME FIXME
+obj-$(CONFIG_MIPS_MT_SMTC)      += malta_smtc.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mti-malta/malta-amon.c
index 96236bf33838..96236bf33838 100644
--- a/arch/mips/mips-boards/generic/amon.c
+++ b/arch/mips/mti-malta/malta-amon.c
diff --git a/arch/mips/mips-boards/generic/cmdline.c b/arch/mips/mti-malta/malta-cmdline.c
index 1871c30ed2eb..1871c30ed2eb 100644
--- a/arch/mips/mips-boards/generic/cmdline.c
+++ b/arch/mips/mti-malta/malta-cmdline.c
diff --git a/arch/mips/mips-boards/generic/console.c b/arch/mips/mti-malta/malta-console.c
index 4d8ab99e4155..43bcfb4f8167 100644
--- a/arch/mips/mips-boards/generic/console.c
+++ b/arch/mips/mti-malta/malta-console.c
@@ -22,30 +22,9 @@
 #include <linux/serial_reg.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_MIPS_ATLAS
-#include <asm/mips-boards/atlas.h>
-
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-#define PORT(offset) (ATLAS_UART_REGS_BASE     + ((offset)<<3))
-#else
-#define PORT(offset) (ATLAS_UART_REGS_BASE + 3 + ((offset)<<3))
-#endif
-
-#elif defined(CONFIG_MIPS_SEAD)
-
-#include <asm/mips-boards/sead.h>
-
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-#define PORT(offset) (SEAD_UART0_REGS_BASE     + ((offset)<<3))
-#else
-#define PORT(offset) (SEAD_UART0_REGS_BASE + 3 + ((offset)<<3))
-#endif
-
-#else
 
 #define PORT(offset) (0x3f8 + (offset))
 
-#endif
 
 static inline unsigned int serial_in(int offset)
 {
diff --git a/arch/mips/mips-boards/generic/display.c b/arch/mips/mti-malta/malta-display.c
index 2a0057cfc30d..7c8828fcb0ad 100644
--- a/arch/mips/mips-boards/generic/display.c
+++ b/arch/mips/mti-malta/malta-display.c
@@ -22,6 +22,7 @@
 #include <linux/timer.h>
 #include <asm/io.h>
 #include <asm/mips-boards/generic.h>
+#include <asm/mips-boards/prom.h>
 
 extern const char display_string[];
 static unsigned int display_count;
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mti-malta/malta-init.c
index 83b9dc739203..c0653021a171 100644
--- a/arch/mips/mips-boards/generic/init.c
+++ b/arch/mips/mti-malta/malta-init.c
@@ -197,14 +197,6 @@ void __init kgdb_config(void)
                         while ((c = *++argptr) && ('0' <= c && c <= '9'))
                                 speed = speed * 10 + c - '0';
                 }
-#ifdef CONFIG_MIPS_ATLAS
-                if (line == 1) {
-                        speed = saa9730_kgdb_hook(speed);
-                        generic_putDebugChar = saa9730_putDebugChar;
-                        generic_getDebugChar = saa9730_getDebugChar;
-                }
-                else
-#endif
                 {
                         speed = rs_kgdb_hook(line, speed);
                         generic_putDebugChar = rs_putDebugChar;
@@ -260,9 +252,6 @@ void __init prom_init(void)
 
         mips_display_message("LINUX");
 
-#ifdef CONFIG_MIPS_SEAD
-        set_io_port_base(KSEG1);
-#else
         /*
          * early setup of _pcictrl_bonito so that we can determine
          * the system controller on a CORE_EMUL board
@@ -414,7 +403,6 @@ void __init prom_init(void)
                 mips_display_message("SC Error");
                 while (1);   /* We die here... */
         }
-#endif
         board_nmi_handler_setup = mips_nmi_setup;
         board_ejtag_handler_setup = mips_ejtag_setup;
 
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mti-malta/malta-int.c
index 8c495104b321..ea176113fea9 100644
--- a/arch/mips/mips-boards/malta/malta_int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@ -363,6 +363,7 @@ static msc_irqmap_t __initdata msc_eicirqmap[] = {
 
 static int __initdata msc_nr_eicirqs = ARRAY_SIZE(msc_eicirqmap);
 
+#if defined(CONFIG_MIPS_MT_SMP)
 /*
  * This GIC specific tabular array defines the association between External
  * Interrupts and CPUs/Core Interrupts. The nature of the External
@@ -394,11 +395,12 @@ static struct gic_intr_map gic_intr_map[] = {
         { GIC_EXT_INTR(22),     3,      GIC_CPU_INT1,   GIC_POL_POS, GIC_TRIG_EDGE,     1 },
         { GIC_EXT_INTR(23),     3,      GIC_CPU_INT2,   GIC_POL_POS, GIC_TRIG_EDGE,     1 },
 };
+#endif
 
 /*
  * GCMP needs to be detected before any SMP initialisation
  */
-int __init gcmp_probe(unsigned long addr, unsigned long size)
+static int __init gcmp_probe(unsigned long addr, unsigned long size)
 {
         if (gcmp_present >= 0)
                 return gcmp_present;
@@ -412,7 +414,8 @@ int __init gcmp_probe(unsigned long addr, unsigned long size)
         return gcmp_present;
 }
 
-void __init fill_ipi_map(void)
+#if defined(CONFIG_MIPS_MT_SMP)
+static void __init fill_ipi_map(void)
 {
         int i;
 
@@ -422,6 +425,7 @@ void __init fill_ipi_map(void)
                                 (1 << (gic_intr_map[i].pin + 2));
         }
 }
+#endif
 
 void __init arch_init_irq(void)
 {
@@ -527,7 +531,6 @@ void __init arch_init_irq(void)
                                 .call =  GIC_IPI_EXT_INTR_CALLFNC_VPE3
                         }
                 };
-#define NIPI (sizeof(ipiirq)/sizeof(ipiirq[0]))
                 fill_ipi_map();
                 gic_init(GIC_BASE_ADDR, GIC_ADDRSPACE_SZ, gic_intr_map, ARRAY_SIZE(gic_intr_map), MIPS_GIC_IRQ_BASE);
                 if (!gcmp_present) {
@@ -549,7 +552,7 @@ void __init arch_init_irq(void)
                 printk("CPU%d: status register now %08x\n", smp_processor_id(), read_c0_status());
                 write_c0_status(0x1100dc00);
                 printk("CPU%d: status register frc %08x\n", smp_processor_id(), read_c0_status());
-                for (i = 0; i < NIPI; i++) {
+                for (i = 0; i < ARRAY_SIZE(ipiirq); i++) {
                         setup_irq(MIPS_GIC_IRQ_BASE + ipiirq[i].resched, &irq_resched);
                         setup_irq(MIPS_GIC_IRQ_BASE + ipiirq[i].call, &irq_call);
 
diff --git a/arch/mips/mips-boards/generic/gdb_hook.c b/arch/mips/mti-malta/malta-kgdb.c
index 6a1854de4579..6a1854de4579 100644
--- a/arch/mips/mips-boards/generic/gdb_hook.c
+++ b/arch/mips/mti-malta/malta-kgdb.c
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mti-malta/malta-memory.c
index 5e443bba5662..61888ff72c87 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -97,7 +97,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
         mdesc[1].base = 0x00001000;
         mdesc[1].size = 0x000ef000;
 
-#ifdef CONFIG_MIPS_MALTA
         /*
          * The area 0x000f0000-0x000fffff is allocated for BIOS memory by the
          * south bridge and PCI access always forwarded to the ISA Bus and
@@ -108,11 +107,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
         mdesc[2].type = yamon_dontuse;
         mdesc[2].base = 0x000f0000;
         mdesc[2].size = 0x00010000;
-#else
-        mdesc[2].type = yamon_prom;
-        mdesc[2].base = 0x000f0000;
-        mdesc[2].size = 0x00010000;
-#endif
 
         mdesc[3].type = yamon_dontuse;
         mdesc[3].base = 0x00100000;
diff --git a/arch/mips/mips-boards/malta/malta_mtd.c b/arch/mips/mti-malta/malta-mtd.c
index 8ad9bdf25dce..8ad9bdf25dce 100644
--- a/arch/mips/mips-boards/malta/malta_mtd.c
+++ b/arch/mips/mti-malta/malta-mtd.c
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mti-malta/malta-pci.c
index b9743190609a..b9743190609a 100644
--- a/arch/mips/mips-boards/generic/pci.c
+++ b/arch/mips/mti-malta/malta-pci.c
diff --git a/arch/mips/mips-boards/malta/malta_platform.c b/arch/mips/mti-malta/malta-platform.c
index 83b9bab3cd3f..83b9bab3cd3f 100644
--- a/arch/mips/mips-boards/malta/malta_platform.c
+++ b/arch/mips/mti-malta/malta-platform.c
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mti-malta/malta-reset.c
index 583d468d98a9..42dee4da37ba 100644
--- a/arch/mips/mips-boards/generic/reset.c
+++ b/arch/mips/mti-malta/malta-reset.c
@@ -27,15 +27,9 @@
 #include <asm/io.h>
 #include <asm/reboot.h>
 #include <asm/mips-boards/generic.h>
-#if defined(CONFIG_MIPS_ATLAS)
-#include <asm/mips-boards/atlas.h>
-#endif
 
 static void mips_machine_restart(char *command);
 static void mips_machine_halt(void);
-#if defined(CONFIG_MIPS_ATLAS)
-static void atlas_machine_power_off(void);
-#endif
 
 static void mips_machine_restart(char *command)
 {
@@ -53,23 +47,10 @@ static void mips_machine_halt(void)
         __raw_writel(GORESET, softres_reg);
 }
 
-#if defined(CONFIG_MIPS_ATLAS)
-static void atlas_machine_power_off(void)
-{
-        unsigned int __iomem *psustby_reg = ioremap(ATLAS_PSUSTBY_REG, sizeof(unsigned int));
-
-        writew(ATLAS_GOSTBY, psustby_reg);
-}
-#endif
 
 void mips_reboot_setup(void)
 {
         _machine_restart = mips_machine_restart;
         _machine_halt = mips_machine_halt;
-#if defined(CONFIG_MIPS_ATLAS)
-        pm_power_off = atlas_machine_power_off;
-#endif
-#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_SEAD)
         pm_power_off = mips_machine_halt;
-#endif
 }
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mti-malta/malta-setup.c
index e7cad54936ca..e7cad54936ca 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mti-malta/malta-setup.c
diff --git a/arch/mips/mips-boards/malta/malta_smtc.c b/arch/mips/mti-malta/malta-smtc.c
index 5ea705e49454..5ea705e49454 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mti-malta/malta-smtc.c
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mti-malta/malta-time.c
index fe2cac1b4514..0b97d47691fc 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -42,15 +42,7 @@
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
 
-#ifdef CONFIG_MIPS_ATLAS
-#include <asm/mips-boards/atlasint.h>
-#endif
-#ifdef CONFIG_MIPS_MALTA
 #include <asm/mips-boards/maltaint.h>
-#endif
-#ifdef CONFIG_MIPS_SEAD
-#include <asm/mips-boards/seadint.h>
-#endif
 
 unsigned long cpu_khz;
 
@@ -76,20 +68,6 @@ static unsigned int __init estimate_cpu_frequency(void)
         unsigned int prid = read_c0_prid() & 0xffff00;
         unsigned int count;
 
-#if defined(CONFIG_MIPS_SEAD) || defined(CONFIG_MIPS_SIM)
-        /*
-         * The SEAD board doesn't have a real time clock, so we can't
-         * really calculate the timer frequency
-         * For now we hardwire the SEAD board frequency to 12MHz.
-         */
-
-        if ((prid == (PRID_COMP_MIPS | PRID_IMP_20KC)) ||
-            (prid == (PRID_COMP_MIPS | PRID_IMP_25KF)))
-                count = 12000000;
-        else
-                count = 6000000;
-#endif
-#if defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_MALTA)
         unsigned long flags;
         unsigned int start;
 
@@ -110,7 +88,6 @@ static unsigned int __init estimate_cpu_frequency(void)
 
         /* restore interrupts */
         local_irq_restore(flags);
-#endif
 
         mips_hpt_frequency = count;
         if ((prid != (PRID_COMP_MIPS | PRID_IMP_20KC)) &&
diff --git a/arch/mips/nxp/pnx8550/common/platform.c b/arch/mips/nxp/pnx8550/common/platform.c
index c7c763dbe588..21d2955359b3 100644
--- a/arch/mips/nxp/pnx8550/common/platform.c
+++ b/arch/mips/nxp/pnx8550/common/platform.c
@@ -13,6 +13,7 @@
  * warranty of any kind, whether express or implied.
  */
 #include <linux/device.h>
+#include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/resource.h>
@@ -91,16 +92,16 @@ struct pnx8xxx_port pnx8xxx_ports[] = {
 };
 
 /* The dmamask must be set for OHCI to work */
-static u64 ohci_dmamask = ~(u32)0;
+static u64 ohci_dmamask = DMA_32BIT_MASK;
 
-static u64 uart_dmamask = ~(u32)0;
+static u64 uart_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device pnx8550_usb_ohci_device = {
         .name           = "pnx8550-ohci",
         .id             = -1,
         .dev = {
                 .dma_mask               = &ohci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
         },
         .num_resources  = ARRAY_SIZE(pnx8550_usb_ohci_resources),
         .resource       = pnx8550_usb_ohci_resources,
@@ -111,7 +112,7 @@ static struct platform_device pnx8550_uart_device = {
         .id             = -1,
         .dev = {
                 .dma_mask               = &uart_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_32BIT_MASK,
                 .platform_data = pnx8xxx_ports,
         },
         .num_resources  = ARRAY_SIZE(pnx8550_uart_resources),
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index b5f6f71b27bc..dd2fbd6645c1 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -27,7 +27,7 @@ static int op_mips_setup(void)
         model->reg_setup(ctr);
 
         /* Configure the registers on all cpus.  */
-        on_each_cpu(model->cpu_setup, NULL, 0, 1);
+        on_each_cpu(model->cpu_setup, NULL, 1);
 
         return 0;
 }
@@ -58,7 +58,7 @@ static int op_mips_create_files(struct super_block * sb, struct dentry * root)
 
 static int op_mips_start(void)
 {
-        on_each_cpu(model->cpu_start, NULL, 0, 1);
+        on_each_cpu(model->cpu_start, NULL, 1);
 
         return 0;
 }
@@ -66,7 +66,7 @@ static int op_mips_start(void)
 static void op_mips_stop(void)
 {
         /* Disable performance monitoring for all counters.  */
-        on_each_cpu(model->cpu_stop, NULL, 0, 1);
+        on_each_cpu(model->cpu_stop, NULL, 1);
 }
 
 int __init oprofile_arch_init(struct oprofile_operations *ops)
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index b40df7d2cf44..54759f1669d3 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -313,7 +313,7 @@ static int __init mipsxx_init(void)
         if (!cpu_has_mipsmt_pertccounters)
                 counters = counters_total_to_per_cpu(counters);
 #endif
-        on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);
+        on_each_cpu(reset_counters, (void *)(long)counters, 1);
 
         op_model_mipsxx_ops.num_counters = counters;
         switch (current_cpu_type()) {
@@ -382,7 +382,7 @@ static void mipsxx_exit(void)
         int counters = op_model_mipsxx_ops.num_counters;
 
         counters = counters_per_cpu_to_total(counters);
-        on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);
+        on_each_cpu(reset_counters, (void *)(long)counters, 1);
 
         perf_irq = save_perf_irq;
 }
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index ed0c07622baa..57e34cafa497 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -11,17 +11,16 @@ obj-$(CONFIG_MIPS_BONITO64)	+= ops-bonito64.o
 obj-$(CONFIG_PCI_GT64XXX_PCI0)  += ops-gt64xxx_pci0.o
 obj-$(CONFIG_MIPS_MSC)          += ops-msc.o
 obj-$(CONFIG_MIPS_NILE4)        += ops-nile4.o
-obj-$(CONFIG_MIPS_TX3927)       += ops-tx3927.o
+obj-$(CONFIG_SOC_TX3927)        += ops-tx3927.o
 obj-$(CONFIG_PCI_VR41XX)        += ops-vr41xx.o pci-vr41xx.o
-obj-$(CONFIG_NEC_CMBVR4133)     += fixup-vr4133.o
 obj-$(CONFIG_MARKEINS)          += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
+obj-$(CONFIG_PCI_TX4927)        += ops-tx4927.o
 
 #
 # These are still pretty much in the old state, watch, go blind.
 #
 obj-$(CONFIG_BASLER_EXCITE)     += ops-titan.o pci-excite.o fixup-excite.o
 obj-$(CONFIG_LASAT)             += pci-lasat.o
-obj-$(CONFIG_MIPS_ATLAS)        += fixup-atlas.o
 obj-$(CONFIG_MIPS_COBALT)       += fixup-cobalt.o
 obj-$(CONFIG_SOC_AU1500)        += fixup-au1000.o ops-au1000.o
 obj-$(CONFIG_SOC_AU1550)        += fixup-au1000.o ops-au1000.o
@@ -42,9 +41,11 @@ obj-$(CONFIG_SNI_RM)		+= fixup-sni.o ops-sni.o
 obj-$(CONFIG_TANBAC_TB0219)     += fixup-tb0219.o
 obj-$(CONFIG_TANBAC_TB0226)     += fixup-tb0226.o
 obj-$(CONFIG_TANBAC_TB0287)     += fixup-tb0287.o
-obj-$(CONFIG_TOSHIBA_JMR3927)   += fixup-jmr3927.o pci-jmr3927.o
-obj-$(CONFIG_TOSHIBA_RBTX4927)  += fixup-rbtx4927.o ops-tx4927.o
-obj-$(CONFIG_TOSHIBA_RBTX4938)  += fixup-tx4938.o ops-tx4938.o
+obj-$(CONFIG_TOSHIBA_JMR3927)   += fixup-jmr3927.o
+obj-$(CONFIG_SOC_TX4927)        += pci-tx4927.o
+obj-$(CONFIG_SOC_TX4938)        += pci-tx4938.o
+obj-$(CONFIG_TOSHIBA_RBTX4927)  += fixup-rbtx4927.o
+obj-$(CONFIG_TOSHIBA_RBTX4938)  += fixup-rbtx4938.o
 obj-$(CONFIG_VICTOR_MPC30X)     += fixup-mpc30x.o
 obj-$(CONFIG_ZAO_CAPCELLA)      += fixup-capcella.o
 obj-$(CONFIG_WR_PPMC)           += fixup-wrppmc.o
diff --git a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c
deleted file mode 100644
index 506e883a8c71..000000000000
--- a/arch/mips/pci/fixup-atlas.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2003, 2004  Ralf Baechle (ralf@linux-mips.org)
- * Copyright (C) 2005  MIPS Technologies, Inc.  All rights reserved.
- *      Author:  Maciej W. Rozycki <macro@mips.com>
- *
- *  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/pci.h>
-
-#include <asm/mips-boards/atlasint.h>
-
-#define PCIA            ATLAS_INT_PCIA
-#define PCIB            ATLAS_INT_PCIB
-#define PCIC            ATLAS_INT_PCIC
-#define PCID            ATLAS_INT_PCID
-#define INTA            ATLAS_INT_INTA
-#define INTB            ATLAS_INT_INTB
-#define ETH             ATLAS_INT_ETH
-#define INTC            ATLAS_INT_INTC
-#define SCSI            ATLAS_INT_SCSI
-#define INTD            ATLAS_INT_INTD
-
-static char irq_tab[][5] __initdata = {
-        /*      INTA    INTB    INTC    INTD */
-        {0,     0,      0,      0,      0 },    /*  0: Unused */
-        {0,     0,      0,      0,      0 },    /*  1: Unused */
-        {0,     0,      0,      0,      0 },    /*  2: Unused */
-        {0,     0,      0,      0,      0 },    /*  3: Unused */
-        {0,     0,      0,      0,      0 },    /*  4: Unused */
-        {0,     0,      0,      0,      0 },    /*  5: Unused */
-        {0,     0,      0,      0,      0 },    /*  6: Unused */
-        {0,     0,      0,      0,      0 },    /*  7: Unused */
-        {0,     0,      0,      0,      0 },    /*  8: Unused */
-        {0,     0,      0,      0,      0 },    /*  9: Unused */
-        {0,     0,      0,      0,      0 },    /* 10: Unused */
-        {0,     0,      0,      0,      0 },    /* 11: Unused */
-        {0,     0,      0,      0,      0 },    /* 12: Unused */
-        {0,     0,      0,      0,      0 },    /* 13: Unused */
-        {0,     0,      0,      0,      0 },    /* 14: Unused */
-        {0,     PCIA,   PCIB,   PCIC,   PCID }, /* 15: cPCI (behind 21150) */
-        {0,     SCSI,   0,      0,      0 },    /* 16: SYM53C810A SCSI */
-        {0,     0,      0,      0,      0 },    /* 17: Core */
-        {0,     INTA,   INTB,   INTC,   INTD }, /* 18: PCI Slot */
-        {0,     ETH,    0,      0,      0 },    /* 19: SAA9730 Eth. et al. */
-        {0,     0,      0,      0,      0 },    /* 20: Unused */
-        {0,     0,      0,      0,      0 }     /* 21: Unused */
-};
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        return irq_tab[slot][pin];
-}
-
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
-
-#ifdef CONFIG_KGDB
-/*
- * The PCI scan may have moved the saa9730 I/O address, so reread
- * the address here.
- * This does mean that it's not possible to debug the PCI bus configuration
- * code, but it is better than nothing...
- */
-
-static void atlas_saa9730_base_fixup(struct pci_dev *pdev)
-{
-        extern void *saa9730_base;
-        if (pdev->bus == 0 && PCI_SLOT(pdev->devfn) == 19)
-                (void) pci_read_config_dword(pdev, 0x14, (u32 *)&saa9730_base);
-        printk("saa9730_base = %x\n", saa9730_base);
-}
-
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9730,
-         atlas_saa9730_base_fixup);
-
-#endif
diff --git a/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c
index e974394be7bc..0f1069527cba 100644
--- a/arch/mips/pci/fixup-jmr3927.c
+++ b/arch/mips/pci/fixup-jmr3927.c
@@ -28,36 +28,31 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/init.h>
+#include <asm/txx9/pci.h>
+#include <asm/txx9/jmr3927.h>
 
-#include <asm/jmr3927/jmr3927.h>
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int __init jmr3927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
         unsigned char irq = pin;
 
-        /* SMSC SLC90E66 IDE uses irq 14, 15 (default) */
-        if (dev->vendor == PCI_VENDOR_ID_EFAR &&
-            dev->device == PCI_DEVICE_ID_EFAR_SLC90E66_1)
-                return irq;
         /* IRQ rotation (PICMG) */
         irq--;                  /* 0-3 */
-        if (dev->bus->parent == NULL &&
-            slot == TX3927_PCIC_IDSEL_AD_TO_SLOT(23)) {
+        if (slot == TX3927_PCIC_IDSEL_AD_TO_SLOT(23)) {
                 /* PCI CardSlot (IDSEL=A23, DevNu=12) */
                 /* PCIA => PCIC (IDSEL=A23) */
                 /* NOTE: JMR3927 JP1 must be set to OPEN */
                 irq = (irq + 2) % 4;
-        } else if (dev->bus->parent == NULL &&
-                   slot == TX3927_PCIC_IDSEL_AD_TO_SLOT(22)) {
+        } else if (slot == TX3927_PCIC_IDSEL_AD_TO_SLOT(22)) {
                 /* PCI CardSlot (IDSEL=A22, DevNu=11) */
                 /* PCIA => PCIA (IDSEL=A22) */
                 /* NOTE: JMR3927 JP1 must be set to OPEN */
                 irq = (irq + 0) % 4;
         } else {
                 /* PCI Backplane */
-                irq = (irq + 3 + slot) % 4;
+                if (txx9_pci_option & TXX9_PCI_OPT_PICMG)
+                        irq = (irq + 33 - slot) % 4;
+                else
+                        irq = (irq + 3 + slot) % 4;
         }
         irq++;                  /* 1-4 */
 
@@ -66,15 +61,13 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
                 irq = JMR3927_IRQ_IOC_PCIA;
                 break;
         case 2:
-                // wrong for backplane irq = JMR3927_IRQ_IOC_PCIB;
-                irq = JMR3927_IRQ_IOC_PCID;
+                irq = JMR3927_IRQ_IOC_PCIB;
                 break;
         case 3:
                 irq = JMR3927_IRQ_IOC_PCIC;
                 break;
         case 4:
-                // wrong for backplane irq = JMR3927_IRQ_IOC_PCID;
-                irq = JMR3927_IRQ_IOC_PCIB;
+                irq = JMR3927_IRQ_IOC_PCID;
                 break;
         }
 
@@ -84,9 +77,3 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
                 irq = JMR3927_IRQ_ETHER0;
         return irq;
 }
-
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c
index 7450c335b387..321db265829c 100644
--- a/arch/mips/pci/fixup-rbtx4927.c
+++ b/arch/mips/pci/fixup-rbtx4927.c
@@ -33,108 +33,41 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
+#include <asm/txx9/pci.h>
+#include <asm/txx9/rbtx4927.h>
 
-#include <asm/tx4927/tx4927.h>
-#include <asm/tx4927/tx4927_pci.h>
-
-#undef  DEBUG
-#ifdef  DEBUG
-#define DBG(x...)       printk(x)
-#else
-#define DBG(x...)
-#endif
-
-/* look up table for backplane pci irq for slots 17-20 by pin # */
-static unsigned char backplane_pci_irq[4][4] = {
-        /* PJ6 SLOT:  17, PIN: 1 */ {TX4927_IRQ_IOC_PCIA,
-                                     /* PJ6 SLOT:  17, PIN: 2 */
-                                     TX4927_IRQ_IOC_PCIB,
-                                     /* PJ6 SLOT:  17, PIN: 3 */
-                                     TX4927_IRQ_IOC_PCIC,
-                                     /* PJ6 SLOT:  17, PIN: 4 */
-                                     TX4927_IRQ_IOC_PCID},
-        /* SB  SLOT:  18, PIN: 1 */ {TX4927_IRQ_IOC_PCIB,
-                                     /* SB  SLOT:  18, PIN: 2 */
-                                     TX4927_IRQ_IOC_PCIC,
-                                     /* SB  SLOT:  18, PIN: 3 */
-                                     TX4927_IRQ_IOC_PCID,
-                                     /* SB  SLOT:  18, PIN: 4 */
-                                     TX4927_IRQ_IOC_PCIA},
-        /* PJ5 SLOT:  19, PIN: 1 */ {TX4927_IRQ_IOC_PCIC,
-                                     /* PJ5 SLOT:  19, PIN: 2 */
-                                     TX4927_IRQ_IOC_PCID,
-                                     /* PJ5 SLOT:  19, PIN: 3 */
-                                     TX4927_IRQ_IOC_PCIA,
-                                     /* PJ5 SLOT:  19, PIN: 4 */
-                                     TX4927_IRQ_IOC_PCIB},
-        /* PJ4 SLOT:  20, PIN: 1 */ {TX4927_IRQ_IOC_PCID,
-                                     /* PJ4 SLOT:  20, PIN: 2 */
-                                     TX4927_IRQ_IOC_PCIA,
-                                     /* PJ4 SLOT:  20, PIN: 3 */
-                                     TX4927_IRQ_IOC_PCIB,
-                                     /* PJ4 SLOT:  20, PIN: 4 */
-                                     TX4927_IRQ_IOC_PCIC}
-};
-
-static int pci_get_irq(const struct pci_dev *dev, int pin)
+int __init rbtx4927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
         unsigned char irq = pin;
 
-        DBG("pci_get_irq: pin is %d\n", pin);
         /* IRQ rotation */
         irq--;                  /* 0-3 */
-        if (dev->bus->parent == NULL &&
-            PCI_SLOT(dev->devfn) == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) {
-                printk("Onboard PCI_SLOT(dev->devfn) is %d\n",
-                       PCI_SLOT(dev->devfn));
-                /* IDSEL=A23 is tx4927 onboard pci slot */
-                irq = (irq + PCI_SLOT(dev->devfn)) % 4;
-                irq++;          /* 1-4 */
-                DBG("irq is now %d\n", irq);
-
-                switch (irq) {
-                case 1:
-                        irq = TX4927_IRQ_IOC_PCIA;
-                        break;
-                case 2:
-                        irq = TX4927_IRQ_IOC_PCIB;
-                        break;
-                case 3:
-                        irq = TX4927_IRQ_IOC_PCIC;
-                        break;
-                case 4:
-                        irq = TX4927_IRQ_IOC_PCID;
-                        break;
-                }
+        if (slot == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) {
+                /* PCI CardSlot (IDSEL=A23) */
+                /* PCIA => PCIA */
+                irq = (irq + 0 + slot) % 4;
         } else {
                 /* PCI Backplane */
-                DBG("PCI Backplane PCI_SLOT(dev->devfn) is %d\n",
-                    PCI_SLOT(dev->devfn));
-                irq = backplane_pci_irq[PCI_SLOT(dev->devfn) - 17][irq];
+                if (txx9_pci_option & TXX9_PCI_OPT_PICMG)
+                        irq = (irq + 33 - slot) % 4;
+                else
+                        irq = (irq + 3 + slot) % 4;
         }
-        DBG("assigned irq %d\n", irq);
-        return irq;
-}
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        unsigned char irq;
-
-        printk("PCI Setup for pin %d \n", pin);
-
-        if (dev->device == 0x9130) /* IDE */
-                irq = 14;
-        else
-                irq = pci_get_irq(dev, pin);
+        irq++;  /* 1-4 */
 
+        switch (irq) {
+        case 1:
+                irq = RBTX4927_IRQ_IOC_PCIA;
+                break;
+        case 2:
+                irq = RBTX4927_IRQ_IOC_PCIB;
+                break;
+        case 3:
+                irq = RBTX4927_IRQ_IOC_PCIC;
+                break;
+        case 4:
+                irq = RBTX4927_IRQ_IOC_PCID;
+                break;
+        }
         return irq;
 }
-
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
diff --git a/arch/mips/pci/fixup-rbtx4938.c b/arch/mips/pci/fixup-rbtx4938.c
new file mode 100644
index 000000000000..a80579af609b
--- /dev/null
+++ b/arch/mips/pci/fixup-rbtx4938.c
@@ -0,0 +1,53 @@
+/*
+ * Toshiba rbtx4938 pci routines
+ * Copyright (C) 2000-2001 Toshiba Corporation
+ *
+ * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
+ * terms of the GNU General Public License version 2. This program is
+ * licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
+ */
+#include <linux/types.h>
+#include <asm/txx9/pci.h>
+#include <asm/txx9/rbtx4938.h>
+
+int __init rbtx4938_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        int irq = tx4938_pcic1_map_irq(dev, slot);
+
+        if (irq >= 0)
+                return irq;
+        irq = pin;
+        /* IRQ rotation */
+        irq--;  /* 0-3 */
+        if (slot == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) {
+                /* PCI CardSlot (IDSEL=A23) */
+                /* PCIA => PCIA (IDSEL=A23) */
+                irq = (irq + 0 + slot) % 4;
+        } else {
+                /* PCI Backplane */
+                if (txx9_pci_option & TXX9_PCI_OPT_PICMG)
+                        irq = (irq + 33 - slot) % 4;
+                else
+                        irq = (irq + 3 + slot) % 4;
+        }
+        irq++;  /* 1-4 */
+
+        switch (irq) {
+        case 1:
+                irq = RBTX4938_IRQ_IOC_PCIA;
+                break;
+        case 2:
+                irq = RBTX4938_IRQ_IOC_PCIB;
+                break;
+        case 3:
+                irq = RBTX4938_IRQ_IOC_PCIC;
+                break;
+        case 4:
+                irq = RBTX4938_IRQ_IOC_PCID;
+                break;
+        }
+        return irq;
+}
diff --git a/arch/mips/pci/fixup-tx4938.c b/arch/mips/pci/fixup-tx4938.c
deleted file mode 100644
index f2ba06ee0c10..000000000000
--- a/arch/mips/pci/fixup-tx4938.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Toshiba rbtx4938 pci routines
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/tx4938/rbtx4938.h>
-
-extern struct pci_controller tx4938_pci_controller[];
-
-static int pci_get_irq(const struct pci_dev *dev, int pin)
-{
-        int irq = pin;
-        u8 slot = PCI_SLOT(dev->devfn);
-        struct pci_controller *controller = (struct pci_controller *)dev->sysdata;
-
-        if (controller == &tx4938_pci_controller[1]) {
-                /* TX4938 PCIC1 */
-                switch (slot) {
-                case TX4938_PCIC_IDSEL_AD_TO_SLOT(31):
-                        if (tx4938_ccfgptr->pcfg & TX4938_PCFG_ETH0_SEL)
-                                return RBTX4938_IRQ_IRC + TX4938_IR_ETH0;
-                        break;
-                case TX4938_PCIC_IDSEL_AD_TO_SLOT(30):
-                        if (tx4938_ccfgptr->pcfg & TX4938_PCFG_ETH1_SEL)
-                                return RBTX4938_IRQ_IRC + TX4938_IR_ETH1;
-                        break;
-                }
-                return 0;
-        }
-
-        /* IRQ rotation */
-        irq--;  /* 0-3 */
-        if (dev->bus->parent == NULL &&
-            (slot == TX4938_PCIC_IDSEL_AD_TO_SLOT(23))) {
-                /* PCI CardSlot (IDSEL=A23) */
-                /* PCIA => PCIA (IDSEL=A23) */
-                irq = (irq + 0 + slot) % 4;
-        } else {
-                /* PCI Backplane */
-                irq = (irq + 33 - slot) % 4;
-        }
-        irq++;  /* 1-4 */
-
-        switch (irq) {
-        case 1:
-                irq = RBTX4938_IRQ_IOC_PCIA;
-                break;
-        case 2:
-                irq = RBTX4938_IRQ_IOC_PCIB;
-                break;
-        case 3:
-                irq = RBTX4938_IRQ_IOC_PCIC;
-                break;
-        case 4:
-                irq = RBTX4938_IRQ_IOC_PCID;
-                break;
-        }
-        return irq;
-}
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        unsigned char irq = 0;
-
-        irq = pci_get_irq(dev, pin);
-
-        printk(KERN_INFO "PCI: 0x%02x:0x%02x(0x%02x,0x%02x) IRQ=%d\n",
-               dev->bus->number, dev->devfn, PCI_SLOT(dev->devfn),
-               PCI_FUNC(dev->devfn), irq);
-
-        return irq;
-}
-
-/*
- * Do platform specific device initialization at pci_enable_device() time
- */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        return 0;
-}
-
diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c
deleted file mode 100644
index de5e5f6bbf4c..000000000000
--- a/arch/mips/pci/fixup-vr4133.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * arch/mips/pci/fixup-vr4133.c
- *
- * The NEC CMB-VR4133 Board specific PCI fixups.
- *
- * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and
- *         Alex Sapkov <asapkov@ru.mvista.com>
- *
- * 2003-2004 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Modified for support in 2.6
- * Author: Manish Lachwani (mlachwani@mvista.com)
- *
- */
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-
-#include <asm/io.h>
-#include <asm/i8259.h>
-#include <asm/vr41xx/cmbvr4133.h>
-
-extern int vr4133_rockhopper;
-extern void ali_m1535plus_init(struct pci_dev *dev);
-extern void ali_m5229_init(struct pci_dev *dev);
-
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-        /*
-         * We have to reset AMD PCnet adapter on Rockhopper since
-         * PMON leaves it enabled and generating interrupts. This leads
-         * to a lock if some PCI device driver later enables the IRQ line
-         * shared with PCnet and there is no AMD PCnet driver to catch its
-         * interrupts.
-         */
-#ifdef CONFIG_ROCKHOPPER
-        if (dev->vendor == PCI_VENDOR_ID_AMD &&
-                dev->device == PCI_DEVICE_ID_AMD_LANCE) {
-                inl(pci_resource_start(dev, 0) + 0x18);
-        }
-#endif
-
-        /*
-         * we have to open the bridges' windows down to 0 because otherwise
-         * we cannot access ISA south bridge I/O registers that get mapped from
-         * 0. for example, 8259 PIC would be unaccessible without that
-         */
-        if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) {
-                pci_write_config_byte(dev, PCI_IO_BASE, 0);
-                if(dev->bus->number == 0) {
-                        pci_write_config_word(dev, PCI_IO_BASE_UPPER16, 0);
-                } else {
-                        pci_write_config_word(dev, PCI_IO_BASE_UPPER16, 1);
-                }
-        }
-
-        return 0;
-}
-
-/*
- * M1535 IRQ mapping
- * Feel free to change this, although it shouldn't be needed
- */
-#define M1535_IRQ_INTA  7
-#define M1535_IRQ_INTB  9
-#define M1535_IRQ_INTC  10
-#define M1535_IRQ_INTD  11
-
-#define M1535_IRQ_USB   9
-#define M1535_IRQ_IDE   14
-#define M1535_IRQ_IDE2  15
-#define M1535_IRQ_PS2   12
-#define M1535_IRQ_RTC   8
-#define M1535_IRQ_FDC   6
-#define M1535_IRQ_AUDIO 5
-#define M1535_IRQ_COM1  4
-#define M1535_IRQ_COM2  4
-#define M1535_IRQ_IRDA  3
-#define M1535_IRQ_KBD   1
-#define M1535_IRQ_TMR   0
-
-/* Rockhopper "slots" assignment; this is hard-coded ... */
-#define ROCKHOPPER_M5451_SLOT  1
-#define ROCKHOPPER_M1535_SLOT  2
-#define ROCKHOPPER_M5229_SLOT  11
-#define ROCKHOPPER_M5237_SLOT  15
-#define ROCKHOPPER_PMU_SLOT    12
-/* ... and hard-wired. */
-#define ROCKHOPPER_PCI1_SLOT   3
-#define ROCKHOPPER_PCI2_SLOT   4
-#define ROCKHOPPER_PCI3_SLOT   5
-#define ROCKHOPPER_PCI4_SLOT   6
-#define ROCKHOPPER_PCNET_SLOT  1
-
-#define M1535_IRQ_MASK(n) (1 << (n))
-
-#define M1535_IRQ_EDGE  (M1535_IRQ_MASK(M1535_IRQ_TMR)  | \
-                         M1535_IRQ_MASK(M1535_IRQ_KBD)  | \
-                         M1535_IRQ_MASK(M1535_IRQ_COM1) | \
-                         M1535_IRQ_MASK(M1535_IRQ_COM2) | \
-                         M1535_IRQ_MASK(M1535_IRQ_IRDA) | \
-                         M1535_IRQ_MASK(M1535_IRQ_RTC)  | \
-                         M1535_IRQ_MASK(M1535_IRQ_FDC)  | \
-                         M1535_IRQ_MASK(M1535_IRQ_PS2))
-
-#define M1535_IRQ_LEVEL (M1535_IRQ_MASK(M1535_IRQ_IDE)  | \
-                         M1535_IRQ_MASK(M1535_IRQ_USB)  | \
-                         M1535_IRQ_MASK(M1535_IRQ_INTA) | \
-                         M1535_IRQ_MASK(M1535_IRQ_INTB) | \
-                         M1535_IRQ_MASK(M1535_IRQ_INTC) | \
-                         M1535_IRQ_MASK(M1535_IRQ_INTD))
-
-struct irq_map_entry {
-        u16 bus;
-        u8 slot;
-        u8 irq;
-};
-static struct irq_map_entry int_map[] = {
-        {1, ROCKHOPPER_M5451_SLOT, M1535_IRQ_AUDIO},    /* Audio controller */
-        {1, ROCKHOPPER_PCI1_SLOT, M1535_IRQ_INTD},      /* PCI slot #1 */
-        {1, ROCKHOPPER_PCI2_SLOT, M1535_IRQ_INTC},      /* PCI slot #2 */
-        {1, ROCKHOPPER_M5237_SLOT, M1535_IRQ_USB},      /* USB host controller */
-        {1, ROCKHOPPER_M5229_SLOT, IDE_PRIMARY_IRQ},    /* IDE controller */
-        {2, ROCKHOPPER_PCNET_SLOT, M1535_IRQ_INTD},     /* AMD Am79c973 on-board
-                                                           ethernet */
-        {2, ROCKHOPPER_PCI3_SLOT, M1535_IRQ_INTB},      /* PCI slot #3 */
-        {2, ROCKHOPPER_PCI4_SLOT, M1535_IRQ_INTC}       /* PCI slot #4 */
-};
-
-static int pci_intlines[] =
-    { M1535_IRQ_INTA, M1535_IRQ_INTB, M1535_IRQ_INTC, M1535_IRQ_INTD };
-
-/* Determine the Rockhopper IRQ line number for the PCI device */
-int rockhopper_get_irq(struct pci_dev *dev, u8 pin, u8 slot)
-{
-        struct pci_bus *bus;
-        int i;
-
-        bus = dev->bus;
-        if (bus == NULL)
-                return -1;
-
-        for (i = 0; i < ARRAY_SIZE(int_map); i++) {
-                if (int_map[i].bus == bus->number && int_map[i].slot == slot) {
-                        int line;
-                        for (line = 0; line < 4; line++)
-                                if (pci_intlines[line] == int_map[i].irq)
-                                        break;
-                        if (line < 4)
-                                return pci_intlines[(line + (pin - 1)) % 4];
-                        else
-                                return int_map[i].irq;
-                }
-        }
-        return -1;
-}
-
-#ifdef CONFIG_ROCKHOPPER
-void i8259_init(void)
-{
-        init_i8259_irqs();
-
-        outb(0x00, 0x4d0);
-        outb(0x02, 0x4d1);      /* USB IRQ9 is level */
-}
-#endif
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        extern int pci_probe_only;
-        pci_probe_only = 1;
-
-#ifdef CONFIG_ROCKHOPPER
-        if( dev->bus->number == 1 && vr4133_rockhopper )  {
-                if(slot == ROCKHOPPER_PCI1_SLOT || slot == ROCKHOPPER_PCI2_SLOT)
-                        dev->irq = CMBVR41XX_INTA_IRQ;
-                else
-                        dev->irq = rockhopper_get_irq(dev, pin, slot);
-        } else
-                dev->irq = CMBVR41XX_INTA_IRQ;
-#else
-        dev->irq = CMBVR41XX_INTA_IRQ;
-#endif
-
-        return dev->irq;
-}
-
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, ali_m1535plus_init);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229, ali_m5229_init);
-
-
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c
index e95881897ec9..1cfb5588699f 100644
--- a/arch/mips/pci/ops-mace.c
+++ b/arch/mips/pci/ops-mace.c
@@ -61,6 +61,13 @@ mace_pci_read_config(struct pci_bus *bus, unsigned int devfn,
         /* ack possible master abort */
         mace->pci.error &= ~MACEPCI_ERROR_MASTER_ABORT;
         mace->pci.control = control;
+        /*
+         * someone forgot to set the ultra bit for the onboard
+         * scsi chips; we fake it here
+         */
+        if (bus->number == 0 && reg == 0x40 && size == 4 &&
+            (devfn == (1 << 3) || devfn == (2 << 3)))
+                *val |= 0x1000;
 
         DPRINTK("read%d: reg=%08x,val=%02x\n", size * 8, reg, *val);
 
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c
index aa698bd0d5e3..8a17a39e5bf2 100644
--- a/arch/mips/pci/ops-tx3927.c
+++ b/arch/mips/pci/ops-tx3927.c
@@ -8,7 +8,7 @@
  *
  * Based on arch/mips/ddb5xxx/ddb5477/pci_ops.c
  *
- *     Define the pci_ops for JMR3927.
+ *     Define the pci_ops for TX3927.
  *
  * Much of the code is derived from the original DDB5074 port by
  * Geert Uytterhoeven <geert@sonycom.com>
@@ -39,7 +39,7 @@
 #include <linux/init.h>
 
 #include <asm/addrspace.h>
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/tx3927.h>
 
 static inline int mkaddr(unsigned char bus, unsigned char dev_fn,
         unsigned char where)
@@ -68,7 +68,7 @@ static inline int check_abort(void)
         return PCIBIOS_SUCCESSFUL;
 }
 
-static int jmr3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
+static int tx3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
         int where, int size, u32 * val)
 {
         int ret;
@@ -94,7 +94,7 @@ static int jmr3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
         return check_abort();
 }
 
-static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
+static int tx3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
         int where, int size, u32 val)
 {
         int ret;
@@ -125,7 +125,80 @@ static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
         return check_abort();
 }
 
-struct pci_ops jmr3927_pci_ops = {
-        jmr3927_pci_read_config,
-        jmr3927_pci_write_config,
+static struct pci_ops tx3927_pci_ops = {
+        .read = tx3927_pci_read_config,
+        .write = tx3927_pci_write_config,
 };
+
+void __init tx3927_pcic_setup(struct pci_controller *channel,
+                              unsigned long sdram_size, int extarb)
+{
+        unsigned long flags;
+        unsigned long io_base =
+                channel->io_resource->start + mips_io_port_base - IO_BASE;
+        unsigned long io_size =
+                channel->io_resource->end - channel->io_resource->start;
+        unsigned long io_pciaddr =
+                channel->io_resource->start - channel->io_offset;
+        unsigned long mem_base =
+                channel->mem_resource->start;
+        unsigned long mem_size =
+                channel->mem_resource->end - channel->mem_resource->start;
+        unsigned long mem_pciaddr =
+                channel->mem_resource->start - channel->mem_offset;
+
+        printk(KERN_INFO "TX3927 PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:%s",
+               tx3927_pcicptr->did, tx3927_pcicptr->vid,
+               tx3927_pcicptr->rid,
+               extarb ? "External" : "Internal");
+        channel->pci_ops = &tx3927_pci_ops;
+
+        local_irq_save(flags);
+        /* Disable External PCI Config. Access */
+        tx3927_pcicptr->lbc = TX3927_PCIC_LBC_EPCAD;
+#ifdef __BIG_ENDIAN
+        tx3927_pcicptr->lbc |= TX3927_PCIC_LBC_IBSE |
+                TX3927_PCIC_LBC_TIBSE |
+                TX3927_PCIC_LBC_TMFBSE | TX3927_PCIC_LBC_MSDSE;
+#endif
+        /* LB->PCI mappings */
+        tx3927_pcicptr->iomas = ~(io_size - 1);
+        tx3927_pcicptr->ilbioma = io_base;
+        tx3927_pcicptr->ipbioma = io_pciaddr;
+        tx3927_pcicptr->mmas = ~(mem_size - 1);
+        tx3927_pcicptr->ilbmma = mem_base;
+        tx3927_pcicptr->ipbmma = mem_pciaddr;
+        /* PCI->LB mappings */
+        tx3927_pcicptr->iobas = 0xffffffff;
+        tx3927_pcicptr->ioba = 0;
+        tx3927_pcicptr->tlbioma = 0;
+        tx3927_pcicptr->mbas = ~(sdram_size - 1);
+        tx3927_pcicptr->mba = 0;
+        tx3927_pcicptr->tlbmma = 0;
+        /* Enable Direct mapping Address Space Decoder */
+        tx3927_pcicptr->lbc |= TX3927_PCIC_LBC_ILMDE | TX3927_PCIC_LBC_ILIDE;
+
+        /* Clear All Local Bus Status */
+        tx3927_pcicptr->lbstat = TX3927_PCIC_LBIM_ALL;
+        /* Enable All Local Bus Interrupts */
+        tx3927_pcicptr->lbim = TX3927_PCIC_LBIM_ALL;
+        /* Clear All PCI Status Error */
+        tx3927_pcicptr->pcistat = TX3927_PCIC_PCISTATIM_ALL;
+        /* Enable All PCI Status Error Interrupts */
+        tx3927_pcicptr->pcistatim = TX3927_PCIC_PCISTATIM_ALL;
+
+        /* PCIC Int => IRC IRQ10 */
+        tx3927_pcicptr->il = TX3927_IR_PCI;
+        /* Target Control (per errata) */
+        tx3927_pcicptr->tc = TX3927_PCIC_TC_OF8E | TX3927_PCIC_TC_IF8E;
+
+        /* Enable Bus Arbiter */
+        if (!extarb)
+                tx3927_pcicptr->pbapmc = TX3927_PCIC_PBAPMC_PBAEN;
+
+        tx3927_pcicptr->pcicmd = PCI_COMMAND_MASTER |
+                PCI_COMMAND_MEMORY |
+                PCI_COMMAND_IO |
+                PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
+        local_irq_restore(flags);
+}
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c
index 150419c8b414..c6b49bccd274 100644
--- a/arch/mips/pci/ops-tx4927.c
+++ b/arch/mips/pci/ops-tx4927.c
@@ -1,209 +1,408 @@
 /*
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *              ahennessy@mvista.com
+ * Define the pci_ops for the PCIC on Toshiba TX4927, TX4938, etc.
  *
- * Copyright (C) 2000-2001 Toshiba Corporation
- * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
- *
- * Based on arch/mips/ddb5xxx/ddb5477/pci_ops.c
- *
- *     Define the pci_ops for the Toshiba rbtx4927
- *
- * Much of the code is derived from the original DDB5074 port by
- * Geert Uytterhoeven <geert@sonycom.com>
- *
- * Copyright 2004 MontaVista Software Inc.
- * Author: Manish Lachwani (mlachwani@mvista.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.
+ * Based on linux/arch/mips/pci/ops-tx4938.c,
+ *          linux/arch/mips/pci/fixup-rbtx4938.c,
+ *          linux/arch/mips/txx9/rbtx4938/setup.c,
+ *          and RBTX49xx patch from CELF patch archive.
  *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 2003-2005 (c) MontaVista Software, Inc.
+ * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
+ * (C) Copyright TOSHIBA CORPORATION 2000-2001, 2004-2007
  *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
  */
-#include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/addrspace.h>
-#include <asm/byteorder.h>
-#include <asm/tx4927/tx4927_pci.h>
-
-/* initialize in setup */
-struct resource pci_io_resource = {
-        .name   = "TX4927 PCI IO SPACE",
-        .start  = 0x1000,
-        .end    = (0x1000 + (TX4927_PCIIO_SIZE)) - 1,
-        .flags  = IORESOURCE_IO
-};
+#include <asm/txx9/tx4927pcic.h>
 
-/* initialize in setup */
-struct resource pci_mem_resource = {
-        .name   = "TX4927 PCI MEM SPACE",
-        .start  = TX4927_PCIMEM,
-        .end    = TX4927_PCIMEM + TX4927_PCIMEM_SIZE - 1,
-        .flags  = IORESOURCE_MEM
-};
+static struct {
+        struct pci_controller *channel;
+        struct tx4927_pcic_reg __iomem *pcicptr;
+} pcicptrs[2];  /* TX4938 has 2 pcic */
+
+static void __init set_tx4927_pcicptr(struct pci_controller *channel,
+                                      struct tx4927_pcic_reg __iomem *pcicptr)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(pcicptrs); i++) {
+                if (pcicptrs[i].channel == channel) {
+                        pcicptrs[i].pcicptr = pcicptr;
+                        return;
+                }
+        }
+        for (i = 0; i < ARRAY_SIZE(pcicptrs); i++) {
+                if (!pcicptrs[i].channel) {
+                        pcicptrs[i].channel = channel;
+                        pcicptrs[i].pcicptr = pcicptr;
+                        return;
+                }
+        }
+        BUG();
+}
 
-static int mkaddr(int bus, int dev_fn, int where, int *flagsp)
+struct tx4927_pcic_reg __iomem *get_tx4927_pcicptr(
+        struct pci_controller *channel)
 {
-        if (bus > 0) {
-                /* Type 1 configuration */
-                tx4927_pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
-                    ((dev_fn & 0xff) << 0x08) | (where & 0xfc) | 1;
-        } else {
-                if (dev_fn >= PCI_DEVFN(TX4927_PCIC_MAX_DEVNU, 0))
-                        return -1;
+        int i;
 
-                /* Type 0 configuration */
-                tx4927_pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
-                    ((dev_fn & 0xff) << 0x08) | (where & 0xfc);
+        for (i = 0; i < ARRAY_SIZE(pcicptrs); i++) {
+                if (pcicptrs[i].channel == channel)
+                        return pcicptrs[i].pcicptr;
         }
+        return NULL;
+}
+
+static int mkaddr(struct pci_bus *bus, unsigned int devfn, int where,
+                  struct tx4927_pcic_reg __iomem *pcicptr)
+{
+        if (bus->parent == NULL &&
+            devfn >= PCI_DEVFN(TX4927_PCIC_MAX_DEVNU, 0))
+                return -1;
+        __raw_writel(((bus->number & 0xff) << 0x10)
+                     | ((devfn & 0xff) << 0x08) | (where & 0xfc)
+                     | (bus->parent ? 1 : 0),
+                     &pcicptr->g2pcfgadrs);
         /* clear M_ABORT and Disable M_ABORT Int. */
-        tx4927_pcicptr->pcistatus =
-            (tx4927_pcicptr->pcistatus & 0x0000ffff) |
-            (PCI_STATUS_REC_MASTER_ABORT << 16);
-        tx4927_pcicptr->pcimask &= ~PCI_STATUS_REC_MASTER_ABORT;
+        __raw_writel((__raw_readl(&pcicptr->pcistatus) & 0x0000ffff)
+                     | (PCI_STATUS_REC_MASTER_ABORT << 16),
+                     &pcicptr->pcistatus);
         return 0;
 }
 
-static int check_abort(int flags)
+static int check_abort(struct tx4927_pcic_reg __iomem *pcicptr)
 {
         int code = PCIBIOS_SUCCESSFUL;
-        if (tx4927_pcicptr->
-            pcistatus & (PCI_STATUS_REC_MASTER_ABORT << 16)) {
-                tx4927_pcicptr->pcistatus =
-                    (tx4927_pcicptr->
-                     pcistatus & 0x0000ffff) | (PCI_STATUS_REC_MASTER_ABORT
-                                                << 16);
-                tx4927_pcicptr->pcimask |= PCI_STATUS_REC_MASTER_ABORT;
+
+        /* wait write cycle completion before checking error status */
+        while (__raw_readl(&pcicptr->pcicstatus) & TX4927_PCIC_PCICSTATUS_IWB)
+                ;
+        if (__raw_readl(&pcicptr->pcistatus)
+            & (PCI_STATUS_REC_MASTER_ABORT << 16)) {
+                __raw_writel((__raw_readl(&pcicptr->pcistatus) & 0x0000ffff)
+                             | (PCI_STATUS_REC_MASTER_ABORT << 16),
+                             &pcicptr->pcistatus);
                 code = PCIBIOS_DEVICE_NOT_FOUND;
         }
         return code;
 }
 
-static int tx4927_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, int where,
-                int size, u32 * val)
+static u8 icd_readb(int offset, struct tx4927_pcic_reg __iomem *pcicptr)
+{
+#ifdef __BIG_ENDIAN
+        offset ^= 3;
+#endif
+        return __raw_readb((void __iomem *)&pcicptr->g2pcfgdata + offset);
+}
+static u16 icd_readw(int offset, struct tx4927_pcic_reg __iomem *pcicptr)
+{
+#ifdef __BIG_ENDIAN
+        offset ^= 2;
+#endif
+        return __raw_readw((void __iomem *)&pcicptr->g2pcfgdata + offset);
+}
+static u32 icd_readl(struct tx4927_pcic_reg __iomem *pcicptr)
+{
+        return __raw_readl(&pcicptr->g2pcfgdata);
+}
+static void icd_writeb(u8 val, int offset,
+                       struct tx4927_pcic_reg __iomem *pcicptr)
+{
+#ifdef __BIG_ENDIAN
+        offset ^= 3;
+#endif
+        __raw_writeb(val, (void __iomem *)&pcicptr->g2pcfgdata + offset);
+}
+static void icd_writew(u16 val, int offset,
+                       struct tx4927_pcic_reg __iomem *pcicptr)
+{
+#ifdef __BIG_ENDIAN
+        offset ^= 2;
+#endif
+        __raw_writew(val, (void __iomem *)&pcicptr->g2pcfgdata + offset);
+}
+static void icd_writel(u32 val, struct tx4927_pcic_reg __iomem *pcicptr)
 {
-        int flags, retval, dev, busno, func;
+        __raw_writel(val, &pcicptr->g2pcfgdata);
+}
 
-        busno = bus->number;
-        dev = PCI_SLOT(devfn);
-        func = PCI_FUNC(devfn);
+static struct tx4927_pcic_reg __iomem *pci_bus_to_pcicptr(struct pci_bus *bus)
+{
+        struct pci_controller *channel = bus->sysdata;
+        return get_tx4927_pcicptr(channel);
+}
 
-        /* check if the bus is top-level */
-        if (bus->parent != NULL) {
-                busno = bus->number;
-        } else {
-                busno = 0;
-        }
+static int tx4927_pci_config_read(struct pci_bus *bus, unsigned int devfn,
+                                  int where, int size, u32 *val)
+{
+        struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(bus);
 
-        if (mkaddr(busno, devfn, where, &flags))
+        if (mkaddr(bus, devfn, where, pcicptr)) {
+                *val = 0xffffffff;
                 return -1;
-
+        }
         switch (size) {
         case 1:
-                *val = *(volatile u8 *) ((unsigned long) & tx4927_pcicptr->
-                              g2pcfgdata |
-#ifdef __LITTLE_ENDIAN
-                                                (where & 3));
-#else
-                                                ((where & 0x3) ^ 0x3));
-#endif
+                *val = icd_readb(where & 3, pcicptr);
                 break;
         case 2:
-                *val = *(volatile u16 *) ((unsigned long) & tx4927_pcicptr->
-                               g2pcfgdata |
-#ifdef __LITTLE_ENDIAN
-                                                (where & 3));
-#else
-                                                ((where & 0x3) ^ 0x2));
-#endif
-                break;
-        case 4:
-                *val = tx4927_pcicptr->g2pcfgdata;
+                *val = icd_readw(where & 3, pcicptr);
                 break;
+        default:
+                *val = icd_readl(pcicptr);
         }
+        return check_abort(pcicptr);
+}
 
-        retval = check_abort(flags);
-        if (retval == PCIBIOS_DEVICE_NOT_FOUND)
-                *val = 0xffffffff;
+static int tx4927_pci_config_write(struct pci_bus *bus, unsigned int devfn,
+                                   int where, int size, u32 val)
+{
+        struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(bus);
 
-        return retval;
+        if (mkaddr(bus, devfn, where, pcicptr))
+                return -1;
+        switch (size) {
+        case 1:
+                icd_writeb(val, where & 3, pcicptr);
+                break;
+        case 2:
+                icd_writew(val, where & 3, pcicptr);
+                break;
+        default:
+                icd_writel(val, pcicptr);
+        }
+        return check_abort(pcicptr);
 }
 
-static int tx4927_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, int where,
-                                int size, u32 val)
+static struct pci_ops tx4927_pci_ops = {
+        .read = tx4927_pci_config_read,
+        .write = tx4927_pci_config_write,
+};
+
+static struct {
+        u8 trdyto;
+        u8 retryto;
+        u16 gbwc;
+} tx4927_pci_opts __devinitdata = {
+        .trdyto = 0,
+        .retryto = 0,
+        .gbwc = 0xfe0,  /* 4064 GBUSCLK for CCFG.GTOT=0b11 */
+};
+
+void __init tx4927_pcic_setup(struct tx4927_pcic_reg __iomem *pcicptr,
+                              struct pci_controller *channel, int extarb)
 {
-        int flags, dev, busno, func;
-        busno = bus->number;
-        dev = PCI_SLOT(devfn);
-        func = PCI_FUNC(devfn);
+        int i;
+        unsigned long flags;
 
-        /* check if the bus is top-level */
-        if (bus->parent != NULL) {
-                busno = bus->number;
-        } else {
-                busno = 0;
-        }
+        set_tx4927_pcicptr(channel, pcicptr);
 
-        if (mkaddr(busno, devfn, where, &flags))
-                return -1;
+        if (!channel->pci_ops)
+                printk(KERN_INFO
+                       "PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:%s\n",
+                       __raw_readl(&pcicptr->pciid) >> 16,
+                       __raw_readl(&pcicptr->pciid) & 0xffff,
+                       __raw_readl(&pcicptr->pciccrev) & 0xff,
+                        extarb ? "External" : "Internal");
+        channel->pci_ops = &tx4927_pci_ops;
 
-        switch (size) {
-        case 1:
-                 *(volatile u8 *) ((unsigned long) & tx4927_pcicptr->
-                          g2pcfgdata |
-#ifdef __LITTLE_ENDIAN
-                                        (where & 3)) = val;
+        local_irq_save(flags);
+
+        /* Disable All Initiator Space */
+        __raw_writel(__raw_readl(&pcicptr->pciccfg)
+                     & ~(TX4927_PCIC_PCICCFG_G2PMEN(0)
+                         | TX4927_PCIC_PCICCFG_G2PMEN(1)
+                         | TX4927_PCIC_PCICCFG_G2PMEN(2)
+                         | TX4927_PCIC_PCICCFG_G2PIOEN),
+                     &pcicptr->pciccfg);
+
+        /* GB->PCI mappings */
+        __raw_writel((channel->io_resource->end - channel->io_resource->start)
+                     >> 4,
+                     &pcicptr->g2piomask);
+        ____raw_writeq((channel->io_resource->start +
+                        channel->io_map_base - IO_BASE) |
+#ifdef __BIG_ENDIAN
+                       TX4927_PCIC_G2PIOGBASE_ECHG
 #else
-                                        ((where & 0x3) ^ 0x3)) = val;
+                       TX4927_PCIC_G2PIOGBASE_BSDIS
 #endif
-                break;
-
-        case 2:
-                *(volatile u16 *) ((unsigned long) & tx4927_pcicptr->
-                           g2pcfgdata |
-#ifdef __LITTLE_ENDIAN
-                                        (where & 3)) = val;
+                       , &pcicptr->g2piogbase);
+        ____raw_writeq(channel->io_resource->start - channel->io_offset,
+                       &pcicptr->g2piopbase);
+        for (i = 0; i < 3; i++) {
+                __raw_writel(0, &pcicptr->g2pmmask[i]);
+                ____raw_writeq(0, &pcicptr->g2pmgbase[i]);
+                ____raw_writeq(0, &pcicptr->g2pmpbase[i]);
+        }
+        if (channel->mem_resource->end) {
+                __raw_writel((channel->mem_resource->end
+                              - channel->mem_resource->start) >> 4,
+                             &pcicptr->g2pmmask[0]);
+                ____raw_writeq(channel->mem_resource->start |
+#ifdef __BIG_ENDIAN
+                               TX4927_PCIC_G2PMnGBASE_ECHG
 #else
-                                        ((where & 0x3) ^ 0x2)) = val;
+                               TX4927_PCIC_G2PMnGBASE_BSDIS
 #endif
-                break;
-        case 4:
-                tx4927_pcicptr->g2pcfgdata = val;
-                break;
+                               , &pcicptr->g2pmgbase[0]);
+                ____raw_writeq(channel->mem_resource->start -
+                               channel->mem_offset,
+                               &pcicptr->g2pmpbase[0]);
+        }
+        /* PCI->GB mappings (I/O 256B) */
+        __raw_writel(0, &pcicptr->p2giopbase); /* 256B */
+        ____raw_writeq(0, &pcicptr->p2giogbase);
+        /* PCI->GB mappings (MEM 512MB (64MB on R1.x)) */
+        __raw_writel(0, &pcicptr->p2gm0plbase);
+        __raw_writel(0, &pcicptr->p2gm0pubase);
+        ____raw_writeq(TX4927_PCIC_P2GMnGBASE_TMEMEN |
+#ifdef __BIG_ENDIAN
+                       TX4927_PCIC_P2GMnGBASE_TECHG
+#else
+                       TX4927_PCIC_P2GMnGBASE_TBSDIS
+#endif
+                       , &pcicptr->p2gmgbase[0]);
+        /* PCI->GB mappings (MEM 16MB) */
+        __raw_writel(0xffffffff, &pcicptr->p2gm1plbase);
+        __raw_writel(0xffffffff, &pcicptr->p2gm1pubase);
+        ____raw_writeq(0, &pcicptr->p2gmgbase[1]);
+        /* PCI->GB mappings (MEM 1MB) */
+        __raw_writel(0xffffffff, &pcicptr->p2gm2pbase); /* 1MB */
+        ____raw_writeq(0, &pcicptr->p2gmgbase[2]);
+
+        /* Clear all (including IRBER) except for GBWC */
+        __raw_writel((tx4927_pci_opts.gbwc << 16)
+                     & TX4927_PCIC_PCICCFG_GBWC_MASK,
+                     &pcicptr->pciccfg);
+        /* Enable Initiator Memory Space */
+        if (channel->mem_resource->end)
+                __raw_writel(__raw_readl(&pcicptr->pciccfg)
+                             | TX4927_PCIC_PCICCFG_G2PMEN(0),
+                             &pcicptr->pciccfg);
+        /* Enable Initiator I/O Space */
+        if (channel->io_resource->end)
+                __raw_writel(__raw_readl(&pcicptr->pciccfg)
+                             | TX4927_PCIC_PCICCFG_G2PIOEN,
+                             &pcicptr->pciccfg);
+        /* Enable Initiator Config */
+        __raw_writel(__raw_readl(&pcicptr->pciccfg)
+                     | TX4927_PCIC_PCICCFG_ICAEN | TX4927_PCIC_PCICCFG_TCAR,
+                     &pcicptr->pciccfg);
+
+        /* Do not use MEMMUL, MEMINF: YMFPCI card causes M_ABORT. */
+        __raw_writel(0, &pcicptr->pcicfg1);
+
+        __raw_writel((__raw_readl(&pcicptr->g2ptocnt) & ~0xffff)
+                     | (tx4927_pci_opts.trdyto & 0xff)
+                     | ((tx4927_pci_opts.retryto & 0xff) << 8),
+                     &pcicptr->g2ptocnt);
+
+        /* Clear All Local Bus Status */
+        __raw_writel(TX4927_PCIC_PCICSTATUS_ALL, &pcicptr->pcicstatus);
+        /* Enable All Local Bus Interrupts */
+        __raw_writel(TX4927_PCIC_PCICSTATUS_ALL, &pcicptr->pcicmask);
+        /* Clear All Initiator Status */
+        __raw_writel(TX4927_PCIC_G2PSTATUS_ALL, &pcicptr->g2pstatus);
+        /* Enable All Initiator Interrupts */
+        __raw_writel(TX4927_PCIC_G2PSTATUS_ALL, &pcicptr->g2pmask);
+        /* Clear All PCI Status Error */
+        __raw_writel((__raw_readl(&pcicptr->pcistatus) & 0x0000ffff)
+                     | (TX4927_PCIC_PCISTATUS_ALL << 16),
+                     &pcicptr->pcistatus);
+        /* Enable All PCI Status Error Interrupts */
+        __raw_writel(TX4927_PCIC_PCISTATUS_ALL, &pcicptr->pcimask);
+
+        if (!extarb) {
+                /* Reset Bus Arbiter */
+                __raw_writel(TX4927_PCIC_PBACFG_RPBA, &pcicptr->pbacfg);
+                __raw_writel(0, &pcicptr->pbabm);
+                /* Enable Bus Arbiter */
+                __raw_writel(TX4927_PCIC_PBACFG_PBAEN, &pcicptr->pbacfg);
         }
 
-        return check_abort(flags);
+        __raw_writel(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY
+                     | PCI_COMMAND_PARITY | PCI_COMMAND_SERR,
+                     &pcicptr->pcistatus);
+        local_irq_restore(flags);
+
+        printk(KERN_DEBUG
+               "PCI: COMMAND=%04x,PCIMASK=%04x,"
+               "TRDYTO=%02x,RETRYTO=%02x,GBWC=%03x\n",
+               __raw_readl(&pcicptr->pcistatus) & 0xffff,
+               __raw_readl(&pcicptr->pcimask) & 0xffff,
+               __raw_readl(&pcicptr->g2ptocnt) & 0xff,
+               (__raw_readl(&pcicptr->g2ptocnt) & 0xff00) >> 8,
+               (__raw_readl(&pcicptr->pciccfg) >> 16) & 0xfff);
 }
 
-struct pci_ops tx4927_pci_ops = {
-        tx4927_pcibios_read_config,
-        tx4927_pcibios_write_config
-};
+static void tx4927_report_pcic_status1(struct tx4927_pcic_reg __iomem *pcicptr)
+{
+        __u16 pcistatus = (__u16)(__raw_readl(&pcicptr->pcistatus) >> 16);
+        __u32 g2pstatus = __raw_readl(&pcicptr->g2pstatus);
+        __u32 pcicstatus = __raw_readl(&pcicptr->pcicstatus);
+        static struct {
+                __u32 flag;
+                const char *str;
+        } pcistat_tbl[] = {
+                { PCI_STATUS_DETECTED_PARITY,   "DetectedParityError" },
+                { PCI_STATUS_SIG_SYSTEM_ERROR,  "SignaledSystemError" },
+                { PCI_STATUS_REC_MASTER_ABORT,  "ReceivedMasterAbort" },
+                { PCI_STATUS_REC_TARGET_ABORT,  "ReceivedTargetAbort" },
+                { PCI_STATUS_SIG_TARGET_ABORT,  "SignaledTargetAbort" },
+                { PCI_STATUS_PARITY,    "MasterParityError" },
+        }, g2pstat_tbl[] = {
+                { TX4927_PCIC_G2PSTATUS_TTOE,   "TIOE" },
+                { TX4927_PCIC_G2PSTATUS_RTOE,   "RTOE" },
+        }, pcicstat_tbl[] = {
+                { TX4927_PCIC_PCICSTATUS_PME,   "PME" },
+                { TX4927_PCIC_PCICSTATUS_TLB,   "TLB" },
+                { TX4927_PCIC_PCICSTATUS_NIB,   "NIB" },
+                { TX4927_PCIC_PCICSTATUS_ZIB,   "ZIB" },
+                { TX4927_PCIC_PCICSTATUS_PERR,  "PERR" },
+                { TX4927_PCIC_PCICSTATUS_SERR,  "SERR" },
+                { TX4927_PCIC_PCICSTATUS_GBE,   "GBE" },
+                { TX4927_PCIC_PCICSTATUS_IWB,   "IWB" },
+        };
+        int i, cont;
 
-/*
- * h/w only supports devices 0x00 to 0x14
- */
-struct pci_controller tx4927_controller = {
-        .pci_ops        = &tx4927_pci_ops,
-        .io_resource    = &pci_io_resource,
-        .mem_resource   = &pci_mem_resource,
-};
+        printk(KERN_ERR "");
+        if (pcistatus & TX4927_PCIC_PCISTATUS_ALL) {
+                printk(KERN_CONT "pcistat:%04x(", pcistatus);
+                for (i = 0, cont = 0; i < ARRAY_SIZE(pcistat_tbl); i++)
+                        if (pcistatus & pcistat_tbl[i].flag)
+                                printk(KERN_CONT "%s%s",
+                                       cont++ ? " " : "", pcistat_tbl[i].str);
+                printk(KERN_CONT ") ");
+        }
+        if (g2pstatus & TX4927_PCIC_G2PSTATUS_ALL) {
+                printk(KERN_CONT "g2pstatus:%08x(", g2pstatus);
+                for (i = 0, cont = 0; i < ARRAY_SIZE(g2pstat_tbl); i++)
+                        if (g2pstatus & g2pstat_tbl[i].flag)
+                                printk(KERN_CONT "%s%s",
+                                       cont++ ? " " : "", g2pstat_tbl[i].str);
+                printk(KERN_CONT ") ");
+        }
+        if (pcicstatus & TX4927_PCIC_PCICSTATUS_ALL) {
+                printk(KERN_CONT "pcicstatus:%08x(", pcicstatus);
+                for (i = 0, cont = 0; i < ARRAY_SIZE(pcicstat_tbl); i++)
+                        if (pcicstatus & pcicstat_tbl[i].flag)
+                                printk(KERN_CONT "%s%s",
+                                       cont++ ? " " : "", pcicstat_tbl[i].str);
+                printk(KERN_CONT ")");
+        }
+        printk(KERN_CONT "\n");
+}
+
+void tx4927_report_pcic_status(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(pcicptrs); i++) {
+                if (pcicptrs[i].pcicptr)
+                        tx4927_report_pcic_status1(pcicptrs[i].pcicptr);
+        }
+}
diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c
deleted file mode 100644
index a450c4062031..000000000000
--- a/arch/mips/pci/ops-tx4938.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Define the pci_ops for the Toshiba rbtx4938
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/addrspace.h>
-#include <asm/tx4938/rbtx4938.h>
-
-/* initialize in setup */
-struct resource pci_io_resource = {
-        .name   = "pci IO space",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_IO
-};
-
-/* initialize in setup */
-struct resource pci_mem_resource = {
-        .name   = "pci memory space",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_MEM
-};
-
-struct resource tx4938_pcic1_pci_io_resource = {
-        .name   = "PCI1 IO",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_IO
-};
-struct resource tx4938_pcic1_pci_mem_resource = {
-        .name   = "PCI1 mem",
-        .start  = 0,
-        .end    = 0,
-        .flags  = IORESOURCE_MEM
-};
-
-static int mkaddr(int bus, int dev_fn, int where,
-                  struct tx4938_pcic_reg *pcicptr)
-{
-        if (bus > 0) {
-                /* Type 1 configuration */
-                pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
-                    ((dev_fn & 0xff) << 0x08) | (where & 0xfc) | 1;
-        } else {
-                if (dev_fn >= PCI_DEVFN(TX4938_PCIC_MAX_DEVNU, 0))
-                        return -1;
-
-                /* Type 0 configuration */
-                pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
-                    ((dev_fn & 0xff) << 0x08) | (where & 0xfc);
-        }
-        /* clear M_ABORT and Disable M_ABORT Int. */
-        pcicptr->pcistatus =
-            (pcicptr->pcistatus & 0x0000ffff) |
-            (PCI_STATUS_REC_MASTER_ABORT << 16);
-        pcicptr->pcimask &= ~PCI_STATUS_REC_MASTER_ABORT;
-
-        return 0;
-}
-
-static int check_abort(struct tx4938_pcic_reg *pcicptr)
-{
-        int code = PCIBIOS_SUCCESSFUL;
-        /* wait write cycle completion before checking error status */
-        while (pcicptr->pcicstatus & TX4938_PCIC_PCICSTATUS_IWB)
-                                ;
-        if (pcicptr->pcistatus & (PCI_STATUS_REC_MASTER_ABORT << 16)) {
-                pcicptr->pcistatus =
-                    (pcicptr->
-                     pcistatus & 0x0000ffff) | (PCI_STATUS_REC_MASTER_ABORT
-                                                << 16);
-                pcicptr->pcimask |= PCI_STATUS_REC_MASTER_ABORT;
-                code = PCIBIOS_DEVICE_NOT_FOUND;
-        }
-        return code;
-}
-
-extern struct pci_controller tx4938_pci_controller[];
-extern struct tx4938_pcic_reg *get_tx4938_pcicptr(int ch);
-
-static struct tx4938_pcic_reg *pci_bus_to_pcicptr(struct pci_bus *bus)
-{
-        struct pci_controller *channel = bus->sysdata;
-        return get_tx4938_pcicptr(channel - &tx4938_pci_controller[0]);
-}
-
-static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
-                                        int where, int size, u32 * val)
-{
-        int retval, dev, busno, func;
-        struct tx4938_pcic_reg *pcicptr = pci_bus_to_pcicptr(bus);
-        void __iomem *cfgdata =
-                (void __iomem *)(unsigned long)&pcicptr->g2pcfgdata;
-
-        dev = PCI_SLOT(devfn);
-        func = PCI_FUNC(devfn);
-
-        /* check if the bus is top-level */
-        if (bus->parent != NULL)
-                busno = bus->number;
-        else {
-                busno = 0;
-        }
-
-        if (mkaddr(busno, devfn, where, pcicptr))
-                return -1;
-
-        switch (size) {
-        case 1:
-#ifdef __BIG_ENDIAN
-                cfgdata += (where & 3) ^ 3;
-#else
-                cfgdata += where & 3;
-#endif
-                *val = __raw_readb(cfgdata);
-                break;
-        case 2:
-#ifdef __BIG_ENDIAN
-                cfgdata += (where & 2) ^ 2;
-#else
-                cfgdata += where & 2;
-#endif
-                *val = __raw_readw(cfgdata);
-                break;
-        case 4:
-                *val = __raw_readl(cfgdata);
-                break;
-        }
-
-        retval = check_abort(pcicptr);
-        if (retval == PCIBIOS_DEVICE_NOT_FOUND)
-                *val = 0xffffffff;
-
-        return retval;
-}
-
-static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, int where,
-                                                int size, u32 val)
-{
-        int dev, busno, func;
-        struct tx4938_pcic_reg *pcicptr = pci_bus_to_pcicptr(bus);
-        void __iomem *cfgdata =
-                (void __iomem *)(unsigned long)&pcicptr->g2pcfgdata;
-
-        busno = bus->number;
-        dev = PCI_SLOT(devfn);
-        func = PCI_FUNC(devfn);
-
-        /* check if the bus is top-level */
-        if (bus->parent != NULL) {
-                busno = bus->number;
-        } else {
-                busno = 0;
-        }
-
-        if (mkaddr(busno, devfn, where, pcicptr))
-                return -1;
-
-        switch (size) {
-        case 1:
-#ifdef __BIG_ENDIAN
-                cfgdata += (where & 3) ^ 3;
-#else
-                cfgdata += where & 3;
-#endif
-                __raw_writeb(val, cfgdata);
-                break;
-        case 2:
-#ifdef __BIG_ENDIAN
-                cfgdata += (where & 2) ^ 2;
-#else
-                cfgdata += where & 2;
-#endif
-                __raw_writew(val, cfgdata);
-                break;
-        case 4:
-                __raw_writel(val, cfgdata);
-                break;
-        }
-
-        return check_abort(pcicptr);
-}
-
-struct pci_ops tx4938_pci_ops = {
-        tx4938_pcibios_read_config,
-        tx4938_pcibios_write_config
-};
-
-struct pci_controller tx4938_pci_controller[] = {
-        /* h/w only supports devices 0x00 to 0x14 */
-        {
-                .pci_ops        = &tx4938_pci_ops,
-                .io_resource    = &pci_io_resource,
-                .mem_resource   = &pci_mem_resource,
-        },
-        /* h/w only supports devices 0x00 to 0x14 */
-        {
-                .pci_ops        = &tx4938_pci_ops,
-                .io_resource    = &tx4938_pcic1_pci_io_resource,
-                .mem_resource   = &tx4938_pcic1_pci_mem_resource,
-        }
-};
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index 87e2c8f54e2d..a9060c771840 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -202,7 +202,6 @@ static int __init bcm1480_pcibios_init(void)
 {
         uint32_t cmdreg;
         uint64_t reg;
-        extern int pci_probe_only;
 
         /* CFE will assign PCI resources */
         pci_probe_only = 1;
@@ -254,8 +253,6 @@ static int __init bcm1480_pcibios_init(void)
                 ioremap(A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, 65536);
         bcm1480_controller.io_map_base -= bcm1480_controller.io_offset;
         set_io_port_base(bcm1480_controller.io_map_base);
-        isa_slot_offset = (unsigned long)
-                ioremap(A_BCM1480_PHYS_PCI_MEM_MATCH_BYTES, 1024*1024);
 
         register_pci_controller(&bcm1480_controller);
 
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index a18516925cdd..ce92f82b16d2 100644
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -47,7 +47,6 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid)
         static int num_bridges = 0;
         bridge_t *bridge;
         int slot;
-        extern int pci_probe_only;
 
         pci_probe_only = 1;
 
diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c
deleted file mode 100644
index cb84f4e8ccae..000000000000
--- a/arch/mips/pci/pci-jmr3927.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *              ahennessy@mvista.com
- *
- * Copyright (C) 2000-2001 Toshiba Corporation
- * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/jmr3927/jmr3927.h>
-#include <asm/debug.h>
-
-struct resource pci_io_resource = {
-        .name   = "IO MEM",
-        .start  = 0x1000,                       /* reserve regacy I/O space */
-        .end    = 0x1000 + JMR3927_PCIIO_SIZE - 1,
-        .flags  = IORESOURCE_IO
-};
-
-struct resource pci_mem_resource = {
-        .name   = "PCI MEM",
-        .start  = JMR3927_PCIMEM,
-        .end    = JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1,
-        .flags  = IORESOURCE_MEM
-};
-
-extern struct pci_ops jmr3927_pci_ops;
-
-struct pci_controller jmr3927_controller = {
-        .pci_ops        = &jmr3927_pci_ops,
-        .io_resource    = &pci_io_resource,
-        .mem_resource   = &pci_mem_resource,
-        .mem_offset     = JMR3927_PCIMEM
-};
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
index e70ae3236e0b..a98e543a514a 100644
--- a/arch/mips/pci/pci-lasat.c
+++ b/arch/mips/pci/pci-lasat.c
@@ -10,7 +10,7 @@
 #include <linux/pci.h>
 #include <linux/types.h>
 
-#include <asm/bootinfo.h>
+#include <asm/lasat/lasat.h>
 
 #include <irq.h>
 
@@ -39,16 +39,10 @@ static int __init lasat_pci_setup(void)
 {
         printk(KERN_DEBUG "PCI: starting\n");
 
-        switch (mips_machtype) {
-        case MACH_LASAT_100:
-                lasat_pci_controller.pci_ops = &gt64xxx_pci0_ops;
-                break;
-        case MACH_LASAT_200:
+        if (IS_LASAT_200())
                 lasat_pci_controller.pci_ops = &nile4_pci_ops;
-                break;
-        default:
-                panic("pcibios_init: mips_machtype incorrect");
-        }
+        else
+                lasat_pci_controller.pci_ops = &gt64xxx_pci0_ops;
 
         register_pci_controller(&lasat_pci_controller);
 
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c
index 2a09ad91ec8c..bf639590b8b2 100644
--- a/arch/mips/pci/pci-sb1250.c
+++ b/arch/mips/pci/pci-sb1250.c
@@ -210,7 +210,6 @@ static int __init sb1250_pcibios_init(void)
         void __iomem *io_map_base;
         uint32_t cmdreg;
         uint64_t reg;
-        extern int pci_probe_only;
 
         /* CFE will assign PCI resources */
         pci_probe_only = 1;
@@ -254,9 +253,6 @@ static int __init sb1250_pcibios_init(void)
          * works correctly with most of Linux's drivers.
          * XXX ehs: Should this happen in PCI Device mode?
          */
-        isa_slot_offset = (unsigned long)
-            ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024);
-
         io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024);
         sb1250_controller.io_map_base = io_map_base;
         set_io_port_base((unsigned long)io_map_base);
diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c
new file mode 100644
index 000000000000..27e86a09dd41
--- /dev/null
+++ b/arch/mips/pci/pci-tx4927.c
@@ -0,0 +1,83 @@
+/*
+ * linux/arch/mips/pci/pci-tx4927.c
+ *
+ * Based on linux/arch/mips/txx9/rbtx4938/setup.c,
+ *          and RBTX49xx patch from CELF patch archive.
+ *
+ * Copyright 2001, 2003-2005 MontaVista Software Inc.
+ * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
+ * (C) Copyright TOSHIBA CORPORATION 2000-2001, 2004-2007
+ *
+ * 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/pci.h>
+#include <linux/kernel.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/tx4927.h>
+
+int __init tx4927_report_pciclk(void)
+{
+        int pciclk = 0;
+
+        printk(KERN_INFO "PCIC --%s PCICLK:",
+               (__raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_PCI66) ?
+               " PCI66" : "");
+        if (__raw_readq(&tx4927_ccfgptr->pcfg) & TX4927_PCFG_PCICLKEN_ALL) {
+                u64 ccfg = __raw_readq(&tx4927_ccfgptr->ccfg);
+                switch ((unsigned long)ccfg &
+                        TX4927_CCFG_PCIDIVMODE_MASK) {
+                case TX4927_CCFG_PCIDIVMODE_2_5:
+                        pciclk = txx9_cpu_clock * 2 / 5; break;
+                case TX4927_CCFG_PCIDIVMODE_3:
+                        pciclk = txx9_cpu_clock / 3; break;
+                case TX4927_CCFG_PCIDIVMODE_5:
+                        pciclk = txx9_cpu_clock / 5; break;
+                case TX4927_CCFG_PCIDIVMODE_6:
+                        pciclk = txx9_cpu_clock / 6; break;
+                }
+                printk("Internal(%u.%uMHz)",
+                       (pciclk + 50000) / 1000000,
+                       ((pciclk + 50000) / 100000) % 10);
+        } else {
+                printk("External");
+                pciclk = -1;
+        }
+        printk("\n");
+        return pciclk;
+}
+
+int __init tx4927_pciclk66_setup(void)
+{
+        int pciclk;
+
+        /* Assert M66EN */
+        tx4927_ccfg_set(TX4927_CCFG_PCI66);
+        /* Double PCICLK (if possible) */
+        if (__raw_readq(&tx4927_ccfgptr->pcfg) & TX4927_PCFG_PCICLKEN_ALL) {
+                unsigned int pcidivmode = 0;
+                u64 ccfg = __raw_readq(&tx4927_ccfgptr->ccfg);
+                pcidivmode = (unsigned long)ccfg &
+                        TX4927_CCFG_PCIDIVMODE_MASK;
+                switch (pcidivmode) {
+                case TX4927_CCFG_PCIDIVMODE_5:
+                case TX4927_CCFG_PCIDIVMODE_2_5:
+                        pcidivmode = TX4927_CCFG_PCIDIVMODE_2_5;
+                        pciclk = txx9_cpu_clock * 2 / 5;
+                        break;
+                case TX4927_CCFG_PCIDIVMODE_6:
+                case TX4927_CCFG_PCIDIVMODE_3:
+                default:
+                        pcidivmode = TX4927_CCFG_PCIDIVMODE_3;
+                        pciclk = txx9_cpu_clock / 3;
+                }
+                tx4927_ccfg_change(TX4927_CCFG_PCIDIVMODE_MASK,
+                                   pcidivmode);
+                printk(KERN_DEBUG "PCICLK: ccfg:%08lx\n",
+                       (unsigned long)__raw_readq(&tx4927_ccfgptr->ccfg));
+        } else
+                pciclk = -1;
+        return pciclk;
+}
diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c
new file mode 100644
index 000000000000..e5375511c2b7
--- /dev/null
+++ b/arch/mips/pci/pci-tx4938.c
@@ -0,0 +1,134 @@
+/*
+ * linux/arch/mips/pci/pci-tx4938.c
+ *
+ * Based on linux/arch/mips/txx9/rbtx4938/setup.c,
+ *          and RBTX49xx patch from CELF patch archive.
+ *
+ * Copyright 2001, 2003-2005 MontaVista Software Inc.
+ * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
+ * (C) Copyright TOSHIBA CORPORATION 2000-2001, 2004-2007
+ *
+ * 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/pci.h>
+#include <linux/kernel.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/tx4938.h>
+
+int __init tx4938_report_pciclk(void)
+{
+        int pciclk = 0;
+
+        printk(KERN_INFO "PCIC --%s PCICLK:",
+               (__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCI66) ?
+               " PCI66" : "");
+        if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_PCICLKEN_ALL) {
+                u64 ccfg = __raw_readq(&tx4938_ccfgptr->ccfg);
+                switch ((unsigned long)ccfg &
+                        TX4938_CCFG_PCIDIVMODE_MASK) {
+                case TX4938_CCFG_PCIDIVMODE_4:
+                        pciclk = txx9_cpu_clock / 4; break;
+                case TX4938_CCFG_PCIDIVMODE_4_5:
+                        pciclk = txx9_cpu_clock * 2 / 9; break;
+                case TX4938_CCFG_PCIDIVMODE_5:
+                        pciclk = txx9_cpu_clock / 5; break;
+                case TX4938_CCFG_PCIDIVMODE_5_5:
+                        pciclk = txx9_cpu_clock * 2 / 11; break;
+                case TX4938_CCFG_PCIDIVMODE_8:
+                        pciclk = txx9_cpu_clock / 8; break;
+                case TX4938_CCFG_PCIDIVMODE_9:
+                        pciclk = txx9_cpu_clock / 9; break;
+                case TX4938_CCFG_PCIDIVMODE_10:
+                        pciclk = txx9_cpu_clock / 10; break;
+                case TX4938_CCFG_PCIDIVMODE_11:
+                        pciclk = txx9_cpu_clock / 11; break;
+                }
+                printk("Internal(%u.%uMHz)",
+                       (pciclk + 50000) / 1000000,
+                       ((pciclk + 50000) / 100000) % 10);
+        } else {
+                printk("External");
+                pciclk = -1;
+        }
+        printk("\n");
+        return pciclk;
+}
+
+void __init tx4938_report_pci1clk(void)
+{
+        __u64 ccfg = __raw_readq(&tx4938_ccfgptr->ccfg);
+        unsigned int pciclk =
+                txx9_gbus_clock / ((ccfg & TX4938_CCFG_PCI1DMD) ? 4 : 2);
+
+        printk(KERN_INFO "PCIC1 -- %sPCICLK:%u.%uMHz\n",
+               (ccfg & TX4938_CCFG_PCI1_66) ? "PCI66 " : "",
+               (pciclk + 50000) / 1000000,
+               ((pciclk + 50000) / 100000) % 10);
+}
+
+int __init tx4938_pciclk66_setup(void)
+{
+        int pciclk;
+
+        /* Assert M66EN */
+        tx4938_ccfg_set(TX4938_CCFG_PCI66);
+        /* Double PCICLK (if possible) */
+        if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_PCICLKEN_ALL) {
+                unsigned int pcidivmode = 0;
+                u64 ccfg = __raw_readq(&tx4938_ccfgptr->ccfg);
+                pcidivmode = (unsigned long)ccfg &
+                        TX4938_CCFG_PCIDIVMODE_MASK;
+                switch (pcidivmode) {
+                case TX4938_CCFG_PCIDIVMODE_8:
+                case TX4938_CCFG_PCIDIVMODE_4:
+                        pcidivmode = TX4938_CCFG_PCIDIVMODE_4;
+                        pciclk = txx9_cpu_clock / 4;
+                        break;
+                case TX4938_CCFG_PCIDIVMODE_9:
+                case TX4938_CCFG_PCIDIVMODE_4_5:
+                        pcidivmode = TX4938_CCFG_PCIDIVMODE_4_5;
+                        pciclk = txx9_cpu_clock * 2 / 9;
+                        break;
+                case TX4938_CCFG_PCIDIVMODE_10:
+                case TX4938_CCFG_PCIDIVMODE_5:
+                        pcidivmode = TX4938_CCFG_PCIDIVMODE_5;
+                        pciclk = txx9_cpu_clock / 5;
+                        break;
+                case TX4938_CCFG_PCIDIVMODE_11:
+                case TX4938_CCFG_PCIDIVMODE_5_5:
+                default:
+                        pcidivmode = TX4938_CCFG_PCIDIVMODE_5_5;
+                        pciclk = txx9_cpu_clock * 2 / 11;
+                        break;
+                }
+                tx4938_ccfg_change(TX4938_CCFG_PCIDIVMODE_MASK,
+                                   pcidivmode);
+                printk(KERN_DEBUG "PCICLK: ccfg:%08lx\n",
+                       (unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg));
+        } else
+                pciclk = -1;
+        return pciclk;
+}
+
+int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot)
+{
+        if (get_tx4927_pcicptr(dev->bus->sysdata) == tx4938_pcic1ptr) {
+                switch (slot) {
+                case TX4927_PCIC_IDSEL_AD_TO_SLOT(31):
+                        if (__raw_readq(&tx4938_ccfgptr->pcfg) &
+                            TX4938_PCFG_ETH0_SEL)
+                                return TXX9_IRQ_BASE + TX4938_IR_ETH0;
+                        break;
+                case TX4927_PCIC_IDSEL_AD_TO_SLOT(30):
+                        if (__raw_readq(&tx4938_ccfgptr->pcfg) &
+                            TX4938_PCFG_ETH1_SEL)
+                                return TXX9_IRQ_BASE + TX4938_IR_ETH1;
+                        break;
+                }
+                return 0;
+        }
+        return -1;
+}
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 358ad6210949..d7d6cb063d26 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -29,8 +29,7 @@ unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES;
  * The PCI controller list.
  */
 
-struct pci_controller *hose_head, **hose_tail = &hose_head;
-struct pci_controller *pci_isa_hose;
+static struct pci_controller *hose_head, **hose_tail = &hose_head;
 
 unsigned long PCIBIOS_MIN_IO    = 0x0000;
 unsigned long PCIBIOS_MIN_MEM   = 0;
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index 35dc435846a6..cf4c868715ac 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -64,7 +64,7 @@ static void prom_exit(void)
 #ifdef CONFIG_SMP
         if (smp_processor_id())
                 /* CPU 1 */
-                smp_call_function(prom_cpu0_exit, NULL, 1, 1);
+                smp_call_function(prom_cpu0_exit, NULL, 1);
 #endif
         prom_cpu0_exit(NULL);
 }
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c
index 3f35d6367bec..5268ac187bbd 100644
--- a/arch/mips/sgi-ip22/ip22-mc.c
+++ b/arch/mips/sgi-ip22/ip22-mc.c
@@ -208,4 +208,30 @@ void __init sgimc_init(void)
 void __init prom_meminit(void) {}
 void __init prom_free_prom_memory(void)
 {
+#ifdef CONFIG_SGI_IP28
+        u32 mconfig1;
+        unsigned long flags;
+        spinlock_t lock;
+
+        /*
+         * because ARCS accesses memory uncached we wait until ARCS
+         * isn't needed any longer, before we switch from slow to
+         * normal mode
+         */
+        spin_lock_irqsave(&lock, flags);
+        mconfig1 = sgimc->mconfig1;
+        /* map ECC register */
+        sgimc->mconfig1 = (mconfig1 & 0xffff0000) | 0x2060;
+        iob();
+        /* switch to normal mode */
+        *(unsigned long *)PHYS_TO_XKSEG_UNCACHED(0x60000000) = 0;
+        iob();
+        /* reduce WR_COL */
+        sgimc->cmacc = (sgimc->cmacc & ~0xf) | 4;
+        iob();
+        /* restore old config */
+        sgimc->mconfig1 = mconfig1;
+        iob();
+        spin_unlock_irqrestore(&lock, flags);
+#endif
 }
diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
index 28ffec8e5d1a..fc6df96305ed 100644
--- a/arch/mips/sgi-ip22/ip22-platform.c
+++ b/arch/mips/sgi-ip22/ip22-platform.c
@@ -175,3 +175,21 @@ static int __init sgiseeq_devinit(void)
 }
 
 device_initcall(sgiseeq_devinit);
+
+static int __init sgi_hal2_devinit(void)
+{
+        return IS_ERR(platform_device_register_simple("sgihal2", 0, NULL, 0));
+}
+
+device_initcall(sgi_hal2_devinit);
+
+static int __init sgi_button_devinit(void)
+{
+        if (ip22_is_fullhouse())
+                return 0; /* full house has no volume buttons */
+
+        return IS_ERR(platform_device_register_simple("sgiindybtns",
+                                                      -1, NULL, 0));
+}
+
+device_initcall(sgi_button_devinit);
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index a435b31cf031..4ad5c3393fd3 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -39,7 +39,7 @@
 #define POWERDOWN_FREQ          (HZ / 4)
 #define PANIC_FREQ              (HZ / 8)
 
-static struct timer_list power_timer, blink_timer, debounce_timer, volume_timer;
+static struct timer_list power_timer, blink_timer, debounce_timer;
 
 #define MACHINE_PANICED         1
 #define MACHINE_SHUTTING_DOWN   2
@@ -139,36 +139,6 @@ static inline void power_button(void)
         add_timer(&power_timer);
 }
 
-void (*indy_volume_button)(int) = NULL;
-
-EXPORT_SYMBOL(indy_volume_button);
-
-static inline void volume_up_button(unsigned long data)
-{
-        del_timer(&volume_timer);
-
-        if (indy_volume_button)
-                indy_volume_button(1);
-
-        if (sgint->istat1 & SGINT_ISTAT1_PWR) {
-                volume_timer.expires = jiffies + (HZ / 100);
-                add_timer(&volume_timer);
-        }
-}
-
-static inline void volume_down_button(unsigned long data)
-{
-        del_timer(&volume_timer);
-
-        if (indy_volume_button)
-                indy_volume_button(-1);
-
-        if (sgint->istat1 & SGINT_ISTAT1_PWR) {
-                volume_timer.expires = jiffies + (HZ / 100);
-                add_timer(&volume_timer);
-        }
-}
-
 static irqreturn_t panel_int(int irq, void *dev_id)
 {
         unsigned int buttons;
@@ -190,25 +160,8 @@ static irqreturn_t panel_int(int irq, void *dev_id)
          * House. Only lowest 2 bits are used. Guiness uses upper four bits
          * for volume control". This is not true, all bits are pulled high
          * on fullhouse */
-        if (ip22_is_fullhouse() || !(buttons & SGIOC_PANEL_POWERINTR)) {
+        if (!(buttons & SGIOC_PANEL_POWERINTR))
                 power_button();
-                return IRQ_HANDLED;
-        }
-        /* TODO: mute/unmute */
-        /* Volume up button was pressed */
-        if (!(buttons & SGIOC_PANEL_VOLUPINTR)) {
-                init_timer(&volume_timer);
-                volume_timer.function = volume_up_button;
-                volume_timer.expires = jiffies + (HZ / 100);
-                add_timer(&volume_timer);
-        }
-        /* Volume down button was pressed */
-        if (!(buttons & SGIOC_PANEL_VOLDNINTR)) {
-                init_timer(&volume_timer);
-                volume_timer.function = volume_down_button;
-                volume_timer.expires = jiffies + (HZ / 100);
-                add_timer(&volume_timer);
-        }
 
         return IRQ_HANDLED;
 }
diff --git a/arch/mips/sgi-ip22/ip28-berr.c b/arch/mips/sgi-ip22/ip28-berr.c
index 30e12e2ec4b5..fee7a2e0e538 100644
--- a/arch/mips/sgi-ip22/ip28-berr.c
+++ b/arch/mips/sgi-ip22/ip28-berr.c
@@ -412,7 +412,7 @@ static int ip28_be_interrupt(const struct pt_regs *regs)
          * Now we have an asynchronous bus error, speculatively or DMA caused.
          * Need to search all DMA descriptors for the error address.
          */
-        for (i = 0; i < sizeof(hpc3)/sizeof(struct hpc3_stat); ++i) {
+        for (i = 0; i < ARRAY_SIZE(hpc3); ++i) {
                 struct hpc3_stat *hp = (struct hpc3_stat *)&hpc3 + i;
                 if ((cpu_err_stat & CPU_ERRMASK) &&
                     (cpu_err_addr == hp->ndptr || cpu_err_addr == hp->cbp))
@@ -421,7 +421,7 @@ static int ip28_be_interrupt(const struct pt_regs *regs)
                     (gio_err_addr == hp->ndptr || gio_err_addr == hp->cbp))
                         break;
         }
-        if (i < sizeof(hpc3)/sizeof(struct hpc3_stat)) {
+        if (i < ARRAY_SIZE(hpc3)) {
                 struct hpc3_stat *hp = (struct hpc3_stat *)&hpc3 + i;
                 printk(KERN_ERR "at DMA addresses: HPC3 @ %08lx:"
                        " ctl %08x, ndp %08x, cbp %08x\n",
diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
index b0a25e1ee8b7..64459e7d891b 100644
--- a/arch/mips/sgi-ip27/ip27-nmi.c
+++ b/arch/mips/sgi-ip27/ip27-nmi.c
@@ -1,4 +1,3 @@
-#include <linux/kallsyms.h>
 #include <linux/kernel.h>
 #include <linux/mmzone.h>
 #include <linux/nodemask.h>
@@ -84,13 +83,10 @@ void nmi_cpu_eframe_save(nasid_t nasid, int slice)
         /*
          * Saved cp0 registers
          */
-        printk("epc   : %016lx ", nr->epc);
-        print_symbol("%s ", nr->epc);
+        printk("epc   : %016lx %pS\n", nr->epc, (void *) nr->epc);
         printk("%s\n", print_tainted());
-        printk("ErrEPC: %016lx ", nr->error_epc);
-        print_symbol("%s\n", nr->error_epc);
-        printk("ra    : %016lx ", nr->gpr[31]);
-        print_symbol("%s\n", nr->gpr[31]);
+        printk("ErrEPC: %016lx %pS\n", nr->error_epc, (void *) nr->error_epc);
+        printk("ra    : %016lx %pS\n", nr->gpr[31], (void *) nr->gpr[31]);
         printk("Status: %08lx         ", nr->sr);
 
         if (nr->sr & ST0_KX)
diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c
index 89a71f49b692..2ee401ba0b25 100644
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@ -65,6 +65,42 @@ static __init int meth_devinit(void)
 
 device_initcall(meth_devinit);
 
+static __init int sgio2audio_devinit(void)
+{
+        struct platform_device *pd;
+        int ret;
+
+        pd = platform_device_alloc("sgio2audio", -1);
+        if (!pd)
+                return -ENOMEM;
+
+        ret = platform_device_add(pd);
+        if (ret)
+                platform_device_put(pd);
+
+        return ret;
+}
+
+device_initcall(sgio2audio_devinit);
+
+static __init int sgio2btns_devinit(void)
+{
+        struct platform_device *pd;
+        int ret;
+
+        pd = platform_device_alloc("sgio2btns", -1);
+        if (!pd)
+                return -ENOMEM;
+
+        ret = platform_device_add(pd);
+        if (ret)
+                platform_device_put(pd);
+
+        return ret;
+}
+
+device_initcall(sgio2btns_devinit);
+
 MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("8250 UART probe driver for SGI IP32 aka O2");
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index 33fce826f8bf..fd9604d5555a 100644
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -74,7 +74,7 @@ static void __noreturn cfe_linux_exit(void *arg)
                 if (!reboot_smp) {
                         /* Get CPU 0 to do the cfe_exit */
                         reboot_smp = 1;
-                        smp_call_function(cfe_linux_exit, arg, 1, 0);
+                        smp_call_function(cfe_linux_exit, arg, 0);
                 }
         } else {
                 printk("Passing control back to CFE...\n");
diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c
index cf8f6b3de86c..65b1af66b674 100644
--- a/arch/mips/sibyte/sb1250/prom.c
+++ b/arch/mips/sibyte/sb1250/prom.c
@@ -66,7 +66,7 @@ static void prom_linux_exit(void)
 {
 #ifdef CONFIG_SMP
         if (smp_processor_id()) {
-                smp_call_function(prom_cpu0_exit, NULL, 1, 1);
+                smp_call_function(prom_cpu0_exit, NULL, 1);
         }
 #endif
         while(1);
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 5484e1c62054..a49272ce7ef5 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -116,7 +116,6 @@ void __init plat_mem_setup(void)
         /*
          * Setup (E)ISA I/O memory access stuff
          */
-        isa_slot_offset = CKSEG1ADDR(0xb0000000);
 #ifdef CONFIG_EISA
         EISA_bus = 1;
 #endif
diff --git a/arch/mips/tx4927/Kconfig b/arch/mips/tx4927/Kconfig
deleted file mode 100644
index 5fbbe12e0fc1..000000000000
--- a/arch/mips/tx4927/Kconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-config TOSHIBA_FPCIB0
-        bool "FPCIB0 Backplane Support"
-        depends on TOSHIBA_RBTX4927
diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile
deleted file mode 100644
index a7fe76a64964..000000000000
--- a/arch/mips/tx4927/common/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for common code for Toshiba TX4927 based systems
-#
-
-obj-y   += tx4927_prom.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/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
deleted file mode 100644
index 13f96725d772..000000000000
--- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 6d31f2a98abf..000000000000
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
- *
- * Toshiba RBTX4927 specific interrupt handlers
- *
- * Author: MontaVista Software, Inc.
- *         source@mvista.com
- *
- * Copyright 2001-2002 MontaVista Software Inc.
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation; either version 2 of the License, or (at your
- *  option) any later version.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-/*
-IRQ  Device
-00   RBTX4927-ISA/00
-01   RBTX4927-ISA/01 PS2/Keyboard
-02   RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15)
-03   RBTX4927-ISA/03
-04   RBTX4927-ISA/04
-05   RBTX4927-ISA/05
-06   RBTX4927-ISA/06
-07   RBTX4927-ISA/07
-08   RBTX4927-ISA/08
-09   RBTX4927-ISA/09
-10   RBTX4927-ISA/10
-11   RBTX4927-ISA/11
-12   RBTX4927-ISA/12 PS2/Mouse (not supported at this time)
-13   RBTX4927-ISA/13
-14   RBTX4927-ISA/14 IDE
-15   RBTX4927-ISA/15
-
-16   TX4927-CP0/00 Software 0
-17   TX4927-CP0/01 Software 1
-18   TX4927-CP0/02 Cascade TX4927-CP0
-19   TX4927-CP0/03 Multiplexed -- do not use
-20   TX4927-CP0/04 Multiplexed -- do not use
-21   TX4927-CP0/05 Multiplexed -- do not use
-22   TX4927-CP0/06 Multiplexed -- do not use
-23   TX4927-CP0/07 CPU TIMER
-
-24   TX4927-PIC/00
-25   TX4927-PIC/01
-26   TX4927-PIC/02
-27   TX4927-PIC/03 Cascade RBTX4927-IOC
-28   TX4927-PIC/04
-29   TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet
-30   TX4927-PIC/06
-31   TX4927-PIC/07
-32   TX4927-PIC/08 TX4927 SerialIO Channel 0
-33   TX4927-PIC/09 TX4927 SerialIO Channel 1
-34   TX4927-PIC/10
-35   TX4927-PIC/11
-36   TX4927-PIC/12
-37   TX4927-PIC/13
-38   TX4927-PIC/14
-39   TX4927-PIC/15
-40   TX4927-PIC/16 TX4927 PCI PCI-C
-41   TX4927-PIC/17
-42   TX4927-PIC/18
-43   TX4927-PIC/19
-44   TX4927-PIC/20
-45   TX4927-PIC/21
-46   TX4927-PIC/22 TX4927 PCI PCI-ERR
-47   TX4927-PIC/23 TX4927 PCI PCI-PMA (not used)
-48   TX4927-PIC/24
-49   TX4927-PIC/25
-50   TX4927-PIC/26
-51   TX4927-PIC/27
-52   TX4927-PIC/28
-53   TX4927-PIC/29
-54   TX4927-PIC/30
-55   TX4927-PIC/31
-
-56 RBTX4927-IOC/00 FPCIB0 PCI-D PJ4/A PJ5/B SB/C PJ6/D PJ7/A (SouthBridge/NotUsed)        [RTL-8139=PJ4]
-57 RBTX4927-IOC/01 FPCIB0 PCI-C PJ4/D PJ5/A SB/B PJ6/C PJ7/D (SouthBridge/NotUsed)        [RTL-8139=PJ5]
-58 RBTX4927-IOC/02 FPCIB0 PCI-B PJ4/C PJ5/D SB/A PJ6/B PJ7/C (SouthBridge/IDE/pin=1,INTR) [RTL-8139=NotSupported]
-59 RBTX4927-IOC/03 FPCIB0 PCI-A PJ4/B PJ5/C SB/D PJ6/A PJ7/B (SouthBridge/USB/pin=4)      [RTL-8139=PJ6]
-60 RBTX4927-IOC/04
-61 RBTX4927-IOC/05
-62 RBTX4927-IOC/06
-63 RBTX4927-IOC/07
-
-NOTES:
-SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58
-SouthBridge/ISA/pin=0 no pci irq used by this device
-SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR via ISA IRQ14
-SouthBridge/USB/pin=4 using pci irq SouthBridge/D=PCI-A=#59
-SouthBridge/PMC/pin=0 no pci irq used by this device
-SuperIO/PS2/Keyboard, using INTR via ISA IRQ1
-SuperIO/PS2/Mouse, using INTR via ISA IRQ12 (mouse not currently supported)
-JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthBridge, JP4, JP5, JP6
-*/
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/timex.h>
-#include <asm/bootinfo.h>
-#include <asm/page.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/pci.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/time.h>
-#include <asm/wbflush.h>
-#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>
-
-
-#undef TOSHIBA_RBTX4927_IRQ_DEBUG
-
-#ifdef TOSHIBA_RBTX4927_IRQ_DEBUG
-#define TOSHIBA_RBTX4927_IRQ_NONE        0x00000000
-
-#define TOSHIBA_RBTX4927_IRQ_INFO          ( 1 <<  0 )
-#define TOSHIBA_RBTX4927_IRQ_WARN          ( 1 <<  1 )
-#define TOSHIBA_RBTX4927_IRQ_EROR          ( 1 <<  2 )
-
-#define TOSHIBA_RBTX4927_IRQ_IOC_INIT      ( 1 << 10 )
-#define TOSHIBA_RBTX4927_IRQ_IOC_ENABLE    ( 1 << 13 )
-#define TOSHIBA_RBTX4927_IRQ_IOC_DISABLE   ( 1 << 14 )
-
-#define TOSHIBA_RBTX4927_SETUP_ALL         0xffffffff
-#endif
-
-
-#ifdef TOSHIBA_RBTX4927_IRQ_DEBUG
-static const u32 toshiba_rbtx4927_irq_debug_flag =
-    (TOSHIBA_RBTX4927_IRQ_NONE | TOSHIBA_RBTX4927_IRQ_INFO |
-     TOSHIBA_RBTX4927_IRQ_WARN | TOSHIBA_RBTX4927_IRQ_EROR
-//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_INIT
-//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE
-//                                                 | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE
-    );
-#endif
-
-
-#ifdef TOSHIBA_RBTX4927_IRQ_DEBUG
-#define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag,str...) \
-        if ( (toshiba_rbtx4927_irq_debug_flag) & (flag) ) \
-        { \
-           char tmp[100]; \
-           sprintf( tmp, str ); \
-           printk( "%s(%s:%u)::%s", __func__, __FILE__, __LINE__, tmp ); \
-        }
-#else
-#define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag, str...)
-#endif
-
-
-
-
-#define TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG   0
-#define TOSHIBA_RBTX4927_IRQ_IOC_RAW_END   7
-
-#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_NEST_IOC_ON_PIC TX4927_IRQ_NEST_EXT_ON_PIC
-#define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC (TOSHIBA_RBTX4927_IRQ_IOC_BEG+2)
-
-extern int tx4927_using_backplane;
-
-static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq);
-static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq);
-
-#define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
-static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
-        .name = TOSHIBA_RBTX4927_IOC_NAME,
-        .ack = toshiba_rbtx4927_irq_ioc_disable,
-        .mask = toshiba_rbtx4927_irq_ioc_disable,
-        .mask_ack = toshiba_rbtx4927_irq_ioc_disable,
-        .unmask = toshiba_rbtx4927_irq_ioc_enable,
-};
-#define TOSHIBA_RBTX4927_IOC_INTR_ENAB (void __iomem *)0xbc002000UL
-#define TOSHIBA_RBTX4927_IOC_INTR_STAT (void __iomem *)0xbc002006UL
-
-
-u32 bit2num(u32 num)
-{
-        u32 i;
-
-        for (i = 0; i < (sizeof(num) * 8); i++) {
-                if (num & (1 << i)) {
-                        return (i);
-                }
-        }
-        return (0);
-}
-
-int toshiba_rbtx4927_irq_nested(int sw_irq)
-{
-        u32 level3;
-
-        level3 = readb(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
-        if (level3) {
-                sw_irq = TOSHIBA_RBTX4927_IRQ_IOC_BEG + bit2num(level3);
-                if (sw_irq != TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC) {
-                        goto RETURN;
-                }
-        }
-#ifdef CONFIG_TOSHIBA_FPCIB0
-        if (tx4927_using_backplane) {
-                int irq = i8259_irq();
-                if (irq >= 0)
-                        sw_irq = irq;
-        }
-#endif
-
-      RETURN:
-        return (sw_irq);
-}
-
-static struct irqaction toshiba_rbtx4927_irq_ioc_action = {
-        .handler        = no_action,
-        .flags          = IRQF_SHARED,
-        .mask           = CPU_MASK_NONE,
-        .name           = TOSHIBA_RBTX4927_IOC_NAME
-};
-
-
-/**********************************************************************************/
-/* Functions for ioc                                                              */
-/**********************************************************************************/
-
-
-static void __init toshiba_rbtx4927_irq_ioc_init(void)
-{
-        int i;
-
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_INIT,
-                                     "beg=%d end=%d\n",
-                                     TOSHIBA_RBTX4927_IRQ_IOC_BEG,
-                                     TOSHIBA_RBTX4927_IRQ_IOC_END);
-
-        for (i = TOSHIBA_RBTX4927_IRQ_IOC_BEG;
-             i <= TOSHIBA_RBTX4927_IRQ_IOC_END; i++)
-                set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_ioc_type,
-                                         handle_level_irq);
-
-        setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC,
-                  &toshiba_rbtx4927_irq_ioc_action);
-}
-
-static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq)
-{
-        volatile unsigned char v;
-
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_ENABLE,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_IOC_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_IOC_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
-        v |= (1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));
-        writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);
-}
-
-
-static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq)
-{
-        volatile unsigned char v;
-
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_DISABLE,
-                                     "irq=%d\n", irq);
-
-        if (irq < TOSHIBA_RBTX4927_IRQ_IOC_BEG
-            || irq > TOSHIBA_RBTX4927_IRQ_IOC_END) {
-                TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
-                                             "bad irq=%d\n", irq);
-                panic("\n");
-        }
-
-        v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
-        v &= ~(1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));
-        writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);
-        mmiowb();
-}
-
-
-void __init arch_init_irq(void)
-{
-        extern void tx4927_irq_init(void);
-
-        tx4927_irq_init();
-        toshiba_rbtx4927_irq_ioc_init();
-#ifdef CONFIG_TOSHIBA_FPCIB0
-        if (tx4927_using_backplane)
-                init_i8259_irqs();
-#endif
-        /* Onboard 10M Ether: High Active */
-        set_irq_type(RBTX4927_RTL_8019_IRQ, IRQF_TRIGGER_HIGH);
-
-        wbflush();
-}
-
-void toshiba_rbtx4927_irq_dump(char *key)
-{
-#ifdef TOSHIBA_RBTX4927_IRQ_DEBUG
-        {
-                u32 i, j = 0;
-                for (i = 0; i < NR_IRQS; i++) {
-                        if (strcmp(irq_desc[i].chip->name, "none")
-                            == 0)
-                                continue;
-
-                        if ((i >= 1)
-                            && (irq_desc[i - 1].chip->name ==
-                                irq_desc[i].chip->name)) {
-                                j++;
-                        } else {
-                                j = 0;
-                        }
-                        TOSHIBA_RBTX4927_IRQ_DPRINTK
-                            (TOSHIBA_RBTX4927_IRQ_INFO,
-                             "%s irq=0x%02x/%3d s=0x%08x h=0x%08x a=0x%08x ah=0x%08x d=%1d n=%s/%02d\n",
-                             key, i, i, irq_desc[i].status,
-                             (u32) irq_desc[i].chip,
-                             (u32) irq_desc[i].action,
-                             (u32) (irq_desc[i].action ? irq_desc[i].
-                                    action->handler : 0),
-                             irq_desc[i].depth,
-                             irq_desc[i].chip->name, j);
-                }
-        }
-#endif
-}
-
-void toshiba_rbtx4927_irq_dump_pics(char *s)
-{
-        u32 level0_m;
-        u32 level0_s;
-        u32 level1_m;
-        u32 level1_s;
-        u32 level2;
-        u32 level2_p;
-        u32 level2_s;
-        u32 level3_m;
-        u32 level3_s;
-        u32 level4_m;
-        u32 level4_s;
-        u32 level5_m;
-        u32 level5_s;
-
-        if (s == NULL)
-                s = "null";
-
-        level0_m = (read_c0_status() & 0x0000ff00) >> 8;
-        level0_s = (read_c0_cause() & 0x0000ff00) >> 8;
-
-        level1_m = level0_m;
-        level1_s = level0_s & 0x87;
-
-        level2 = __raw_readl((void __iomem *)0xff1ff6a0UL);
-        level2_p = (((level2 & 0x10000)) ? 0 : 1);
-        level2_s = (((level2 & 0x1f) == 0x1f) ? 0 : (level2 & 0x1f));
-
-        level3_m = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB) & 0x1f;
-        level3_s = readb(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
-
-        level4_m = inb(0x21);
-        outb(0x0A, 0x20);
-        level4_s = inb(0x20);
-
-        level5_m = inb(0xa1);
-        outb(0x0A, 0xa0);
-        level5_s = inb(0xa0);
-
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO,
-                                     "dump_raw_pic() ");
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO,
-                                     "cp0:m=0x%02x/s=0x%02x ", level0_m,
-                                     level0_s);
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO,
-                                     "cp0:m=0x%02x/s=0x%02x ", level1_m,
-                                     level1_s);
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO,
-                                     "pic:e=0x%02x/s=0x%02x ", level2_p,
-                                     level2_s);
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO,
-                                     "ioc:m=0x%02x/s=0x%02x ", level3_m,
-                                     level3_s);
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO,
-                                     "sbm:m=0x%02x/s=0x%02x ", level4_m,
-                                     level4_s);
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO,
-                                     "sbs:m=0x%02x/s=0x%02x ", level5_m,
-                                     level5_s);
-        TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_INFO, "[%s]\n",
-                                     s);
-}
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
deleted file mode 100644
index f3f86857beae..000000000000
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * rbtx4927 specific prom routines
- *
- * Author: MontaVista Software, Inc.
- *         source@mvista.com
- *
- * Copyright 2001-2002 MontaVista Software Inc.
- *
- * Copyright (C) 2004 MontaVista Software Inc.
- * Author: Manish Lachwani, mlachwani@mvista.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.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/bootmem.h>
-
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
-#include <asm/cpu.h>
-#include <asm/tx4927/tx4927.h>
-
-void __init prom_init_cmdline(void)
-{
-        int argc = (int) fw_arg0;
-        char **argv = (char **) fw_arg1;
-        int i;                  /* Always ignore the "-c" at argv[0] */
-
-        /* ignore all built-in args if any f/w args given */
-        if (argc > 1) {
-                *arcs_cmdline = '\0';
-        }
-
-        for (i = 1; i < argc; i++) {
-                if (i != 1) {
-                        strcat(arcs_cmdline, " ");
-                }
-                strcat(arcs_cmdline, argv[i]);
-        }
-}
-
-void __init prom_init(void)
-{
-        extern int tx4927_get_mem_size(void);
-        extern char* toshiba_name;
-        int msize;
-
-        prom_init_cmdline();
-
-        if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) {
-                mips_machtype = MACH_TOSHIBA_RBTX4927;
-                toshiba_name  = "TX4927";
-        } else {
-                mips_machtype = MACH_TOSHIBA_RBTX4937;
-                toshiba_name  = "TX4937";
-        }
-
-        msize = tx4927_get_mem_size();
-        add_memory_region(0, msize << 20, BOOT_MEM_RAM);
-}
-
-void __init prom_free_prom_memory(void)
-{
-}
-
-const char *get_system_type(void)
-{
-        return "Toshiba RBTX4927/RBTX4937";
-}
-
-char * __init prom_getcmdline(void)
-{
-        return &(arcs_cmdline[0]);
-}
-
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
deleted file mode 100644
index 2203c77b2ce2..000000000000
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*
- * Toshiba rbtx4927 specific setup
- *
- * Author: MontaVista Software, Inc.
- *         source@mvista.com
- *
- * Copyright 2001-2002 MontaVista Software Inc.
- *
- * Copyright (C) 1996, 97, 2001, 04  Ralf Baechle (ralf@linux-mips.org)
- * Copyright (C) 2000 RidgeRun, Inc.
- * Author: RidgeRun, Inc.
- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: jsun@mvista.com or jsun@junsun.net
- *
- * Copyright 2002 MontaVista Software Inc.
- * Author: Michael Pruznick, michael_pruznick@mvista.com
- *
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * Copyright (C) 2004 MontaVista Software Inc.
- * Author: Manish Lachwani, mlachwani@mvista.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.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/pm.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/time.h>
-#include <asm/txx9tmr.h>
-#ifdef CONFIG_TOSHIBA_FPCIB0
-#include <asm/tx4927/smsc_fdc37m81x.h>
-#endif
-#include <asm/tx4927/toshiba_rbtx4927.h>
-#ifdef CONFIG_PCI
-#include <asm/tx4927/tx4927_pci.h>
-#endif
-#ifdef CONFIG_SERIAL_TXX9
-#include <linux/serial_core.h>
-#endif
-
-#undef TOSHIBA_RBTX4927_SETUP_DEBUG
-
-#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
-#define TOSHIBA_RBTX4927_SETUP_SETUP       ( 1 <<  4 )
-#define TOSHIBA_RBTX4927_SETUP_PCIBIOS     ( 1 <<  7 )
-#define TOSHIBA_RBTX4927_SETUP_PCI1        ( 1 <<  8 )
-#define TOSHIBA_RBTX4927_SETUP_PCI2        ( 1 <<  9 )
-
-#define TOSHIBA_RBTX4927_SETUP_ALL         0xffffffff
-#endif
-
-#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
-static const u32 toshiba_rbtx4927_setup_debug_flag =
-    (TOSHIBA_RBTX4927_SETUP_SETUP |
-     | TOSHIBA_RBTX4927_SETUP_PCIBIOS | TOSHIBA_RBTX4927_SETUP_PCI1 |
-     TOSHIBA_RBTX4927_SETUP_PCI2);
-#endif
-
-#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
-#define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag,str...) \
-        if ( (toshiba_rbtx4927_setup_debug_flag) & (flag) ) \
-        { \
-           char tmp[100]; \
-           sprintf( tmp, str ); \
-           printk( "%s(%s:%u)::%s", __func__, __FILE__, __LINE__, tmp ); \
-        }
-#else
-#define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag, str...)
-#endif
-
-/* These functions are used for rebooting or halting the machine*/
-extern void toshiba_rbtx4927_restart(char *command);
-extern void toshiba_rbtx4927_halt(void);
-extern void toshiba_rbtx4927_power_off(void);
-
-int tx4927_using_backplane = 0;
-
-extern void toshiba_rbtx4927_irq_setup(void);
-
-char *prom_getcmdline(void);
-
-#ifdef CONFIG_PCI
-#undef TX4927_SUPPORT_COMMAND_IO
-#undef  TX4927_SUPPORT_PCI_66
-int tx4927_cpu_clock = 100000000;       /* 100MHz */
-unsigned long mips_pci_io_base;
-unsigned long mips_pci_io_size;
-unsigned long mips_pci_mem_base;
-unsigned long mips_pci_mem_size;
-/* for legacy I/O, PCI I/O PCI Bus address must be 0 */
-unsigned long mips_pci_io_pciaddr = 0;
-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_reset_pci_pcic(void);
-int tx4927_pci66 = 0;           /* 0:auto */
-#endif
-
-char *toshiba_name = "";
-
-#ifdef CONFIG_PCI
-extern struct pci_controller tx4927_controller;
-
-static struct pci_dev *fake_pci_dev(struct pci_controller *hose,
-                                    int top_bus, int busnr, int devfn)
-{
-        static struct pci_dev dev;
-        static struct pci_bus bus;
-
-        dev.sysdata = (void *)hose;
-        dev.devfn = devfn;
-        bus.number = busnr;
-        bus.ops = hose->pci_ops;
-        bus.parent = NULL;
-        dev.bus = &bus;
-
-        return &dev;
-}
-
-#define EARLY_PCI_OP(rw, size, type)                                    \
-static int early_##rw##_config_##size(struct pci_controller *hose,      \
-        int top_bus, int bus, int devfn, int offset, type value)        \
-{                                                                       \
-        return pci_##rw##_config_##size(                                \
-                fake_pci_dev(hose, top_bus, bus, devfn),                \
-                offset, value);                                         \
-}
-
-EARLY_PCI_OP(read, byte, u8 *)
-EARLY_PCI_OP(read, dword, u32 *)
-EARLY_PCI_OP(write, byte, u8)
-EARLY_PCI_OP(write, dword, u32)
-
-static int __init tx4927_pcibios_init(void)
-{
-        unsigned int id;
-        u32 pci_devfn;
-        int devfn_start = 0;
-        int devfn_stop = 0xff;
-        int busno = 0; /* One bus on the Toshiba */
-        struct pci_controller *hose = &tx4927_controller;
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                       "-\n");
-
-        for (pci_devfn = devfn_start; pci_devfn < devfn_stop; pci_devfn++) {
-                early_read_config_dword(hose, busno, busno, pci_devfn,
-                                        PCI_VENDOR_ID, &id);
-
-                if (id == 0xffffffff) {
-                        continue;
-                }
-
-                if (id == 0x94601055) {
-                        u8 v08_64;
-                        u32 v32_b0;
-                        u8 v08_e1;
-#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
-                        char *s = " sb/isa --";
-#endif
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n",
-                             s);
-
-                        early_read_config_byte(hose, busno, busno,
-                                               pci_devfn, 0x64, &v08_64);
-                        early_read_config_dword(hose, busno, busno,
-                                                pci_devfn, 0xb0, &v32_b0);
-                        early_read_config_byte(hose, busno, busno,
-                                               pci_devfn, 0xe1, &v08_e1);
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s beg 0x64 = 0x%02x\n", s, v08_64);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s beg 0xb0 = 0x%02x\n", s, v32_b0);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s beg 0xe1 = 0x%02x\n", s, v08_e1);
-
-                        /* serial irq control */
-                        v08_64 = 0xd0;
-
-                        /* serial irq pin */
-                        v32_b0 |= 0x00010000;
-
-                        /* ide irq on isa14 */
-                        v08_e1 &= 0xf0;
-                        v08_e1 |= 0x0d;
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s mid 0x64 = 0x%02x\n", s, v08_64);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s mid 0xb0 = 0x%02x\n", s, v32_b0);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s mid 0xe1 = 0x%02x\n", s, v08_e1);
-
-                        early_write_config_byte(hose, busno, busno,
-                                                pci_devfn, 0x64, v08_64);
-                        early_write_config_dword(hose, busno, busno,
-                                                 pci_devfn, 0xb0, v32_b0);
-                        early_write_config_byte(hose, busno, busno,
-                                                pci_devfn, 0xe1, v08_e1);
-
-#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
-                        {
-                                early_read_config_byte(hose, busno, busno,
-                                                       pci_devfn, 0x64,
-                                                       &v08_64);
-                                early_read_config_dword(hose, busno, busno,
-                                                        pci_devfn, 0xb0,
-                                                        &v32_b0);
-                                early_read_config_byte(hose, busno, busno,
-                                                       pci_devfn, 0xe1,
-                                                       &v08_e1);
-
-                                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                                    (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                     ":%s end 0x64 = 0x%02x\n", s, v08_64);
-                                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                                    (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                     ":%s end 0xb0 = 0x%02x\n", s, v32_b0);
-                                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                                    (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                     ":%s end 0xe1 = 0x%02x\n", s, v08_e1);
-                        }
-#endif
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s end\n",
-                             s);
-                }
-
-                if (id == 0x91301055) {
-                        u8 v08_04;
-                        u8 v08_09;
-                        u8 v08_41;
-                        u8 v08_43;
-                        u8 v08_5c;
-#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
-                        char *s = " sb/ide --";
-#endif
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n",
-                             s);
-
-                        early_read_config_byte(hose, busno, busno,
-                                               pci_devfn, 0x04, &v08_04);
-                        early_read_config_byte(hose, busno, busno,
-                                               pci_devfn, 0x09, &v08_09);
-                        early_read_config_byte(hose, busno, busno,
-                                               pci_devfn, 0x41, &v08_41);
-                        early_read_config_byte(hose, busno, busno,
-                                               pci_devfn, 0x43, &v08_43);
-                        early_read_config_byte(hose, busno, busno,
-                                               pci_devfn, 0x5c, &v08_5c);
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s beg 0x04 = 0x%02x\n", s, v08_04);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s beg 0x09 = 0x%02x\n", s, v08_09);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s beg 0x41 = 0x%02x\n", s, v08_41);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s beg 0x43 = 0x%02x\n", s, v08_43);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s beg 0x5c = 0x%02x\n", s, v08_5c);
-
-                        /* enable ide master/io */
-                        v08_04 |= (PCI_COMMAND_MASTER | PCI_COMMAND_IO);
-
-                        /* enable ide native mode */
-                        v08_09 |= 0x05;
-
-                        /* enable primary ide */
-                        v08_41 |= 0x80;
-
-                        /* enable secondary ide */
-                        v08_43 |= 0x80;
-
-                        /*
-                         * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!!
-                         *
-                         * This line of code is intended to provide the user with a work
-                         * around solution to the anomalies cited in SMSC's anomaly sheet
-                         * entitled, "SLC90E66 Functional Rev.J_0.1 Anomalies"".
-                         *
-                         * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!!
-                         */
-                        v08_5c |= 0x01;
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s mid 0x04 = 0x%02x\n", s, v08_04);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s mid 0x09 = 0x%02x\n", s, v08_09);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s mid 0x41 = 0x%02x\n", s, v08_41);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s mid 0x43 = 0x%02x\n", s, v08_43);
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                             ":%s mid 0x5c = 0x%02x\n", s, v08_5c);
-
-                        early_write_config_byte(hose, busno, busno,
-                                                pci_devfn, 0x5c, v08_5c);
-                        early_write_config_byte(hose, busno, busno,
-                                                pci_devfn, 0x04, v08_04);
-                        early_write_config_byte(hose, busno, busno,
-                                                pci_devfn, 0x09, v08_09);
-                        early_write_config_byte(hose, busno, busno,
-                                                pci_devfn, 0x41, v08_41);
-                        early_write_config_byte(hose, busno, busno,
-                                                pci_devfn, 0x43, v08_43);
-
-#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
-                        {
-                                early_read_config_byte(hose, busno, busno,
-                                                       pci_devfn, 0x04,
-                                                       &v08_04);
-                                early_read_config_byte(hose, busno, busno,
-                                                       pci_devfn, 0x09,
-                                                       &v08_09);
-                                early_read_config_byte(hose, busno, busno,
-                                                       pci_devfn, 0x41,
-                                                       &v08_41);
-                                early_read_config_byte(hose, busno, busno,
-                                                       pci_devfn, 0x43,
-                                                       &v08_43);
-                                early_read_config_byte(hose, busno, busno,
-                                                       pci_devfn, 0x5c,
-                                                       &v08_5c);
-
-                                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                                    (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                     ":%s end 0x04 = 0x%02x\n", s, v08_04);
-                                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                                    (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                     ":%s end 0x09 = 0x%02x\n", s, v08_09);
-                                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                                    (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                     ":%s end 0x41 = 0x%02x\n", s, v08_41);
-                                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                                    (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                     ":%s end 0x43 = 0x%02x\n", s, v08_43);
-                                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                                    (TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                     ":%s end 0x5c = 0x%02x\n", s, v08_5c);
-                        }
-#endif
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s end\n",
-                             s);
-                }
-
-        }
-
-        register_pci_controller(&tx4927_controller);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCIBIOS,
-                                       "+\n");
-
-        return 0;
-}
-
-arch_initcall(tx4927_pcibios_init);
-
-extern struct resource pci_io_resource;
-extern struct resource pci_mem_resource;
-
-void __init tx4927_pci_setup(void)
-{
-        static int called = 0;
-        extern unsigned int tx4927_get_mem_size(void);
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2, "-\n");
-
-        mips_memory_upper = tx4927_get_mem_size() << 20;
-        mips_memory_upper += KSEG0;
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=mips_memory_upper\n",
-                                       mips_memory_upper);
-        mips_pci_io_base = TX4927_PCIIO;
-        mips_pci_io_size = TX4927_PCIIO_SIZE;
-        mips_pci_mem_base = TX4927_PCIMEM;
-        mips_pci_mem_size = TX4927_PCIMEM_SIZE;
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=mips_pci_io_base\n",
-                                       mips_pci_io_base);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=mips_pci_io_size\n",
-                                       mips_pci_io_size);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=mips_pci_mem_base\n",
-                                       mips_pci_mem_base);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=mips_pci_mem_size\n",
-                                       mips_pci_mem_size);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=pci_io_resource.start\n",
-                                       pci_io_resource.start);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=pci_io_resource.end\n",
-                                       pci_io_resource.end);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=pci_mem_resource.start\n",
-                                       pci_mem_resource.start);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=pci_mem_resource.end\n",
-                                       pci_mem_resource.end);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       "0x%08lx=mips_io_port_base",
-                                       mips_io_port_base);
-        if (!called) {
-                printk
-                    ("%s PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:%s\n",
-                     toshiba_name,
-                     (unsigned short) (tx4927_pcicptr->pciid >> 16),
-                     (unsigned short) (tx4927_pcicptr->pciid & 0xffff),
-                     (unsigned short) (tx4927_pcicptr->pciccrev & 0xff),
-                     (!(tx4927_ccfgptr->
-                        ccfg & TX4927_CCFG_PCIXARB)) ? "External" :
-                     "Internal");
-                called = 1;
-        }
-        printk("%s PCIC --%s PCICLK:", toshiba_name,
-               (tx4927_ccfgptr->ccfg & TX4927_CCFG_PCI66) ? " PCI66" : "");
-        if (tx4927_ccfgptr->pcfg & TX4927_PCFG_PCICLKEN_ALL) {
-                int pciclk = 0;
-                if (mips_machtype == MACH_TOSHIBA_RBTX4937)
-                        switch ((unsigned long) tx4927_ccfgptr->
-                                ccfg & TX4937_CCFG_PCIDIVMODE_MASK) {
-                        case TX4937_CCFG_PCIDIVMODE_4:
-                                pciclk = tx4927_cpu_clock / 4;
-                                break;
-                        case TX4937_CCFG_PCIDIVMODE_4_5:
-                                pciclk = tx4927_cpu_clock * 2 / 9;
-                                break;
-                        case TX4937_CCFG_PCIDIVMODE_5:
-                                pciclk = tx4927_cpu_clock / 5;
-                                break;
-                        case TX4937_CCFG_PCIDIVMODE_5_5:
-                                pciclk = tx4927_cpu_clock * 2 / 11;
-                                break;
-                        case TX4937_CCFG_PCIDIVMODE_8:
-                                pciclk = tx4927_cpu_clock / 8;
-                                break;
-                        case TX4937_CCFG_PCIDIVMODE_9:
-                                pciclk = tx4927_cpu_clock / 9;
-                                break;
-                        case TX4937_CCFG_PCIDIVMODE_10:
-                                pciclk = tx4927_cpu_clock / 10;
-                                break;
-                        case TX4937_CCFG_PCIDIVMODE_11:
-                                pciclk = tx4927_cpu_clock / 11;
-                                break;
-                        }
-
-                else
-                        switch ((unsigned long) tx4927_ccfgptr->
-                                ccfg & TX4927_CCFG_PCIDIVMODE_MASK) {
-                        case TX4927_CCFG_PCIDIVMODE_2_5:
-                                pciclk = tx4927_cpu_clock * 2 / 5;
-                                break;
-                        case TX4927_CCFG_PCIDIVMODE_3:
-                                pciclk = tx4927_cpu_clock / 3;
-                                break;
-                        case TX4927_CCFG_PCIDIVMODE_5:
-                                pciclk = tx4927_cpu_clock / 5;
-                                break;
-                        case TX4927_CCFG_PCIDIVMODE_6:
-                                pciclk = tx4927_cpu_clock / 6;
-                                break;
-                        }
-
-                printk("Internal(%dMHz)", pciclk / 1000000);
-        } else {
-                int pciclk = 0;
-                int pciclk_setting = *tx4927_pci_clk_ptr;
-                switch (pciclk_setting & TX4927_PCI_CLK_MASK) {
-                case TX4927_PCI_CLK_33:
-                        pciclk = 33333333;
-                        break;
-                case TX4927_PCI_CLK_25:
-                        pciclk = 25000000;
-                        break;
-                case TX4927_PCI_CLK_66:
-                        pciclk = 66666666;
-                        break;
-                case TX4927_PCI_CLK_50:
-                        pciclk = 50000000;
-                        break;
-                }
-                printk("External(%dMHz)", pciclk / 1000000);
-        }
-        printk("\n");
-
-
-
-        /* GB->PCI mappings */
-        tx4927_pcicptr->g2piomask = (mips_pci_io_size - 1) >> 4;
-        tx4927_pcicptr->g2piogbase = mips_pci_io_base |
-#ifdef __BIG_ENDIAN
-            TX4927_PCIC_G2PIOGBASE_ECHG
-#else
-            TX4927_PCIC_G2PIOGBASE_BSDIS
-#endif
-            ;
-
-        tx4927_pcicptr->g2piopbase = 0;
-
-        tx4927_pcicptr->g2pmmask[0] = (mips_pci_mem_size - 1) >> 4;
-        tx4927_pcicptr->g2pmgbase[0] = mips_pci_mem_base |
-#ifdef __BIG_ENDIAN
-            TX4927_PCIC_G2PMnGBASE_ECHG
-#else
-            TX4927_PCIC_G2PMnGBASE_BSDIS
-#endif
-            ;
-        tx4927_pcicptr->g2pmpbase[0] = mips_pci_mem_base;
-
-        tx4927_pcicptr->g2pmmask[1] = 0;
-        tx4927_pcicptr->g2pmgbase[1] = 0;
-        tx4927_pcicptr->g2pmpbase[1] = 0;
-        tx4927_pcicptr->g2pmmask[2] = 0;
-        tx4927_pcicptr->g2pmgbase[2] = 0;
-        tx4927_pcicptr->g2pmpbase[2] = 0;
-
-
-        /* PCI->GB mappings (I/O 256B) */
-        tx4927_pcicptr->p2giopbase = 0; /* 256B */
-
-        /* PCI->GB mappings (MEM 512MB) M0 gets all of memory */
-        tx4927_pcicptr->p2gm0plbase = 0;
-        tx4927_pcicptr->p2gm0pubase = 0;
-        tx4927_pcicptr->p2gmgbase[0] = 0 | TX4927_PCIC_P2GMnGBASE_TMEMEN |
-#ifdef __BIG_ENDIAN
-            TX4927_PCIC_P2GMnGBASE_TECHG
-#else
-            TX4927_PCIC_P2GMnGBASE_TBSDIS
-#endif
-            ;
-
-        /* PCI->GB mappings (MEM 16MB) -not used */
-        tx4927_pcicptr->p2gm1plbase = 0xffffffff;
-        tx4927_pcicptr->p2gm1pubase = 0xffffffff;
-        tx4927_pcicptr->p2gmgbase[1] = 0;
-
-        /* PCI->GB mappings (MEM 1MB) -not used */
-        tx4927_pcicptr->p2gm2pbase = 0xffffffff;
-        tx4927_pcicptr->p2gmgbase[2] = 0;
-
-
-        /* Enable Initiator Memory 0 Space, I/O Space, Config */
-        tx4927_pcicptr->pciccfg &= TX4927_PCIC_PCICCFG_LBWC_MASK;
-        tx4927_pcicptr->pciccfg |=
-            TX4927_PCIC_PCICCFG_IMSE0 | TX4927_PCIC_PCICCFG_IISE |
-            TX4927_PCIC_PCICCFG_ICAE | TX4927_PCIC_PCICCFG_ATR;
-
-
-        /* Do not use MEMMUL, MEMINF: YMFPCI card causes M_ABORT. */
-        tx4927_pcicptr->pcicfg1 = 0;
-
-        if (tx4927_pcic_trdyto >= 0) {
-                tx4927_pcicptr->g2ptocnt &= ~0xff;
-                tx4927_pcicptr->g2ptocnt |= (tx4927_pcic_trdyto & 0xff);
-        }
-
-        /* Clear All Local Bus Status */
-        tx4927_pcicptr->pcicstatus = TX4927_PCIC_PCICSTATUS_ALL;
-        /* Enable All Local Bus Interrupts */
-        tx4927_pcicptr->pcicmask = TX4927_PCIC_PCICSTATUS_ALL;
-        /* Clear All Initiator Status */
-        tx4927_pcicptr->g2pstatus = TX4927_PCIC_G2PSTATUS_ALL;
-        /* Enable All Initiator Interrupts */
-        tx4927_pcicptr->g2pmask = TX4927_PCIC_G2PSTATUS_ALL;
-        /* Clear All PCI Status Error */
-        tx4927_pcicptr->pcistatus =
-            (tx4927_pcicptr->pcistatus & 0x0000ffff) |
-            (TX4927_PCIC_PCISTATUS_ALL << 16);
-        /* Enable All PCI Status Error Interrupts */
-        tx4927_pcicptr->pcimask = TX4927_PCIC_PCISTATUS_ALL;
-
-        /* PCIC Int => IRC IRQ16 */
-        tx4927_pcicptr->pcicfg2 =
-            (tx4927_pcicptr->pcicfg2 & 0xffffff00) | TX4927_IR_PCIC;
-
-        if (!(tx4927_ccfgptr->ccfg & TX4927_CCFG_PCIXARB)) {
-                /* XXX */
-        } else {
-                /* Reset Bus Arbiter */
-                tx4927_pcicptr->pbacfg = TX4927_PCIC_PBACFG_RPBA;
-                /* Enable Bus Arbiter */
-                tx4927_pcicptr->pbacfg = TX4927_PCIC_PBACFG_PBAEN;
-        }
-
-        tx4927_pcicptr->pcistatus = PCI_COMMAND_MASTER |
-            PCI_COMMAND_MEMORY |
-            PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2,
-                                       ":pci setup complete:\n");
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI2, "+\n");
-}
-
-#endif /* CONFIG_PCI */
-
-static void __noreturn wait_forever(void)
-{
-        while (1)
-                if (cpu_wait)
-                        (*cpu_wait)();
-}
-
-void toshiba_rbtx4927_restart(char *command)
-{
-        printk(KERN_NOTICE "System Rebooting...\n");
-
-        /* enable the s/w reset register */
-        writeb(RBTX4927_SW_RESET_ENABLE_SET, RBTX4927_SW_RESET_ENABLE);
-
-        /* wait for enable to be seen */
-        while ((readb(RBTX4927_SW_RESET_ENABLE) &
-                RBTX4927_SW_RESET_ENABLE_SET) == 0x00);
-
-        /* do a s/w reset */
-        writeb(RBTX4927_SW_RESET_DO_SET, RBTX4927_SW_RESET_DO);
-
-        /* do something passive while waiting for reset */
-        local_irq_disable();
-        wait_forever();
-        /* no return */
-}
-
-
-void toshiba_rbtx4927_halt(void)
-{
-        printk(KERN_NOTICE "System Halted\n");
-        local_irq_disable();
-        wait_forever();
-        /* no return */
-}
-
-void toshiba_rbtx4927_power_off(void)
-{
-        toshiba_rbtx4927_halt();
-        /* no return */
-}
-
-void __init plat_mem_setup(void)
-{
-        int i;
-        u32 cp0_config;
-        char *argptr;
-
-        printk("CPU is %s\n", toshiba_name);
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       "-\n");
-
-        /* f/w leaves this on at startup */
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       ":Clearing STO_ERL.\n");
-        clear_c0_status(ST0_ERL);
-
-        /* enable caches -- HCP5 does this, pmon does not */
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       ":Enabling TX49_CONF_IC,TX49_CONF_DC.\n");
-        cp0_config = read_c0_config();
-        cp0_config = cp0_config & ~(TX49_CONF_IC | TX49_CONF_DC);
-        write_c0_config(cp0_config);
-
-        set_io_port_base(KSEG1 + TBTX4927_ISA_IO_OFFSET);
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       ":mips_io_port_base=0x%08lx\n",
-                                       mips_io_port_base);
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       ":Resource\n");
-        ioport_resource.end = 0xffffffff;
-        iomem_resource.end = 0xffffffff;
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       ":ResetRoutines\n");
-        _machine_restart = toshiba_rbtx4927_restart;
-        _machine_halt = toshiba_rbtx4927_halt;
-        pm_power_off = toshiba_rbtx4927_power_off;
-
-        for (i = 0; i < TX4927_NR_TMR; i++)
-                txx9_tmr_init(TX4927_TMR_REG(0) & 0xfffffffffULL);
-
-#ifdef CONFIG_PCI
-
-        /* PCIC */
-        /*
-           * ASSUMPTION: PCIDIVMODE is configured for PCI 33MHz or 66MHz.
-           *
-           * For TX4927:
-           * PCIDIVMODE[12:11]'s initial value is given by S9[4:3] (ON:0, OFF:1).
-           * CPU 166MHz: PCI 66MHz : PCIDIVMODE: 00 (1/2.5)
-           * CPU 200MHz: PCI 66MHz : PCIDIVMODE: 01 (1/3)
-           * CPU 166MHz: PCI 33MHz : PCIDIVMODE: 10 (1/5)
-           * CPU 200MHz: PCI 33MHz : PCIDIVMODE: 11 (1/6)
-           * i.e. S9[3]: ON (83MHz), OFF (100MHz)
-           *
-           * For TX4937:
-           * PCIDIVMODE[12:11]'s initial value is given by S1[5:4] (ON:0, OFF:1)
-           * PCIDIVMODE[10] is 0.
-           * CPU 266MHz: PCI 33MHz : PCIDIVMODE: 000 (1/8)
-           * CPU 266MHz: PCI 66MHz : PCIDIVMODE: 001 (1/4)
-           * CPU 300MHz: PCI 33MHz : PCIDIVMODE: 010 (1/9)
-           * CPU 300MHz: PCI 66MHz : PCIDIVMODE: 011 (1/4.5)
-           * CPU 333MHz: PCI 33MHz : PCIDIVMODE: 100 (1/10)
-           * CPU 333MHz: PCI 66MHz : PCIDIVMODE: 101 (1/5)
-           *
-         */
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI1,
-                                       "ccfg is %lx, PCIDIVMODE is %x\n",
-                                       (unsigned long) tx4927_ccfgptr->ccfg,
-                                       (unsigned long) tx4927_ccfgptr->ccfg &
-                                       (mips_machtype == MACH_TOSHIBA_RBTX4937 ?
-                                        TX4937_CCFG_PCIDIVMODE_MASK :
-                                        TX4927_CCFG_PCIDIVMODE_MASK));
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_PCI1,
-                                       "PCI66 mode is %lx, PCI mode is %lx, pci arb is %lx\n",
-                                       (unsigned long) tx4927_ccfgptr->
-                                       ccfg & TX4927_CCFG_PCI66,
-                                       (unsigned long) tx4927_ccfgptr->
-                                       ccfg & TX4927_CCFG_PCIMIDE,
-                                       (unsigned long) tx4927_ccfgptr->
-                                       ccfg & TX4927_CCFG_PCIXARB);
-
-        if (mips_machtype == MACH_TOSHIBA_RBTX4937)
-                switch ((unsigned long)tx4927_ccfgptr->
-                        ccfg & TX4937_CCFG_PCIDIVMODE_MASK) {
-                case TX4937_CCFG_PCIDIVMODE_8:
-                case TX4937_CCFG_PCIDIVMODE_4:
-                        tx4927_cpu_clock = 266666666;   /* 266MHz */
-                        break;
-                case TX4937_CCFG_PCIDIVMODE_9:
-                case TX4937_CCFG_PCIDIVMODE_4_5:
-                        tx4927_cpu_clock = 300000000;   /* 300MHz */
-                        break;
-                default:
-                        tx4927_cpu_clock = 333333333;   /* 333MHz */
-                }
-        else
-                switch ((unsigned long)tx4927_ccfgptr->
-                        ccfg & TX4927_CCFG_PCIDIVMODE_MASK) {
-                case TX4927_CCFG_PCIDIVMODE_2_5:
-                case TX4927_CCFG_PCIDIVMODE_5:
-                        tx4927_cpu_clock = 166666666;   /* 166MHz */
-                        break;
-                default:
-                        tx4927_cpu_clock = 200000000;   /* 200MHz */
-                }
-
-        /* CCFG */
-        /* do reset on watchdog */
-        tx4927_ccfgptr->ccfg |= TX4927_CCFG_WR;
-        /* enable Timeout BusError */
-        if (tx4927_ccfg_toeon)
-                tx4927_ccfgptr->ccfg |= TX4927_CCFG_TOE;
-
-        tx4927_pci_setup();
-        if (tx4927_using_backplane == 1)
-                printk("backplane board IS installed\n");
-        else
-                printk("No Backplane \n");
-
-        /* this is on ISA bus behind PCI bus, so need PCI up first */
-#ifdef CONFIG_TOSHIBA_FPCIB0
-        {
-                if (tx4927_using_backplane) {
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_SETUP,
-                             ":fpcibo=yes\n");
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_SETUP,
-                             ":smsc_fdc37m81x_init()\n");
-                        smsc_fdc37m81x_init(0x3f0);
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_SETUP,
-                             ":smsc_fdc37m81x_config_beg()\n");
-                        smsc_fdc37m81x_config_beg();
-
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_SETUP,
-                             ":smsc_fdc37m81x_config_set(KBD)\n");
-                        smsc_fdc37m81x_config_set(SMSC_FDC37M81X_DNUM,
-                                                  SMSC_FDC37M81X_KBD);
-                        smsc_fdc37m81x_config_set(SMSC_FDC37M81X_INT, 1);
-                        smsc_fdc37m81x_config_set(SMSC_FDC37M81X_INT2, 12);
-                        smsc_fdc37m81x_config_set(SMSC_FDC37M81X_ACTIVE,
-                                                  1);
-
-                        smsc_fdc37m81x_config_end();
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_SETUP,
-                             ":smsc_fdc37m81x_config_end()\n");
-                } else {
-                        TOSHIBA_RBTX4927_SETUP_DPRINTK
-                            (TOSHIBA_RBTX4927_SETUP_SETUP,
-                             ":fpcibo=not_found\n");
-                }
-        }
-#else
-        {
-                TOSHIBA_RBTX4927_SETUP_DPRINTK
-                    (TOSHIBA_RBTX4927_SETUP_SETUP, ":fpcibo=no\n");
-        }
-#endif
-
-#endif /* CONFIG_PCI */
-
-#ifdef CONFIG_SERIAL_TXX9
-        {
-                extern int early_serial_txx9_setup(struct uart_port *port);
-                struct uart_port req;
-                for(i = 0; i < 2; i++) {
-                        memset(&req, 0, sizeof(req));
-                        req.line = i;
-                        req.iotype = UPIO_MEM;
-                        req.membase = (char *)(0xff1ff300 + i * 0x100);
-                        req.mapbase = 0xff1ff300 + i * 0x100;
-                        req.irq = TX4927_IRQ_PIC_BEG + 8 + i;
-                        req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
-                        req.uartclk = 50000000;
-                        early_serial_txx9_setup(&req);
-                }
-        }
-#ifdef CONFIG_SERIAL_TXX9_CONSOLE
-        argptr = prom_getcmdline();
-        if (strstr(argptr, "console=") == NULL) {
-                strcat(argptr, " console=ttyS0,38400");
-        }
-#endif
-#endif
-
-#ifdef CONFIG_ROOT_NFS
-        argptr = prom_getcmdline();
-        if (strstr(argptr, "root=") == NULL) {
-                strcat(argptr, " root=/dev/nfs rw");
-        }
-#endif
-
-
-#ifdef CONFIG_IP_PNP
-        argptr = prom_getcmdline();
-        if (strstr(argptr, "ip=") == NULL) {
-                strcat(argptr, " ip=any");
-        }
-#endif
-
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                               "+\n");
-}
-
-void __init plat_time_init(void)
-{
-        mips_hpt_frequency = tx4927_cpu_clock / 2;
-        if (tx4927_ccfgptr->ccfg & TX4927_CCFG_TINTDIS)
-                txx9_clockevent_init(TX4927_TMR_REG(0) & 0xfffffffffULL,
-                                     TXX9_IRQ_BASE + 17,
-                                     50000000);
-}
-
-static int __init toshiba_rbtx4927_rtc_init(void)
-{
-        static struct resource __initdata res = {
-                .start  = 0x1c010000,
-                .end    = 0x1c010000 + 0x800 - 1,
-                .flags  = IORESOURCE_MEM,
-        };
-        struct platform_device *dev =
-                platform_device_register_simple("rtc-ds1742", -1, &res, 1);
-        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
-}
-device_initcall(toshiba_rbtx4927_rtc_init);
-
-static int __init rbtx4927_ne_init(void)
-{
-        static struct resource __initdata res[] = {
-                {
-                        .start  = RBTX4927_RTL_8019_BASE,
-                        .end    = RBTX4927_RTL_8019_BASE + 0x20 - 1,
-                        .flags  = IORESOURCE_IO,
-                }, {
-                        .start  = RBTX4927_RTL_8019_IRQ,
-                        .flags  = IORESOURCE_IRQ,
-                }
-        };
-        struct platform_device *dev =
-                platform_device_register_simple("ne", -1,
-                                                res, ARRAY_SIZE(res));
-        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
-}
-device_initcall(rbtx4927_ne_init);
-
-/* Watchdog support */
-
-static int __init txx9_wdt_init(unsigned long base)
-{
-        struct resource res = {
-                .start  = base,
-                .end    = base + 0x100 - 1,
-                .flags  = IORESOURCE_MEM,
-        };
-        struct platform_device *dev =
-                platform_device_register_simple("txx9wdt", -1, &res, 1);
-        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
-}
-
-static int __init rbtx4927_wdt_init(void)
-{
-        return txx9_wdt_init(TX4927_TMR_REG(2) & 0xfffffffffULL);
-}
-device_initcall(rbtx4927_wdt_init);
-
-/* Minimum CLK support */
-
-struct clk *clk_get(struct device *dev, const char *id)
-{
-        if (!strcmp(id, "imbus_clk"))
-                return (struct clk *)50000000;
-        return ERR_PTR(-ENOENT);
-}
-EXPORT_SYMBOL(clk_get);
-
-int clk_enable(struct clk *clk)
-{
-        return 0;
-}
-EXPORT_SYMBOL(clk_enable);
-
-void clk_disable(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_disable);
-
-unsigned long clk_get_rate(struct clk *clk)
-{
-        return (unsigned long)clk;
-}
-EXPORT_SYMBOL(clk_get_rate);
-
-void clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_put);
diff --git a/arch/mips/tx4938/Kconfig b/arch/mips/tx4938/Kconfig
deleted file mode 100644
index d90e9cd85138..000000000000
--- a/arch/mips/tx4938/Kconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-if TOSHIBA_RBTX4938
-
-comment "Multiplex Pin Select"
-choice
-        prompt "PIO[58:61]"
-        default TOSHIBA_RBTX4938_MPLEX_PIO58_61
-
-config TOSHIBA_RBTX4938_MPLEX_PIO58_61
-        bool "PIO"
-config TOSHIBA_RBTX4938_MPLEX_NAND
-        bool "NAND"
-config TOSHIBA_RBTX4938_MPLEX_ATA
-        bool "ATA"
-
-endchoice
-
-config TX4938_NAND_BOOT
-        depends on EXPERIMENTAL && TOSHIBA_RBTX4938_MPLEX_NAND
-        bool "NAND Boot Support (EXPERIMENTAL)"
-        help
-          This is only for Toshiba RBTX4938 reference board, which has NAND IPL.
-          Select this option if you need to use NAND boot.
-
-endif
diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile
deleted file mode 100644
index 56aa1ed1ee0c..000000000000
--- a/arch/mips/tx4938/common/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for common code for Toshiba TX4927 based systems
-#
-
-obj-y   += prom.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
deleted file mode 100644
index c059b899d120..000000000000
--- a/arch/mips/tx4938/common/irq.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * linux/arch/mips/tx4938/common/irq.c
- *
- * Common tx4938 irq handler
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/tx4938/rbtx4938.h>
-
-void __init
-tx4938_irq_init(void)
-{
-        mips_cpu_irq_init();
-        txx9_irq_init(TX4938_IRC_REG);
-        set_irq_chained_handler(TX4938_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);
-}
-
-int toshiba_rbtx4938_irq_nested(int irq);
-
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_cause() & read_c0_status();
-
-        if (pending & STATUSF_IP7)
-                do_IRQ(TX4938_IRQ_CPU_TIMER);
-        else if (pending & STATUSF_IP2) {
-                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();
-        } else if (pending & STATUSF_IP1)
-                do_IRQ(TX4938_IRQ_USER1);
-        else if (pending & STATUSF_IP0)
-                do_IRQ(TX4938_IRQ_USER0);
-}
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
deleted file mode 100644
index 1644bffa501a..000000000000
--- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * linux/arch/mips/tx4938/toshiba_rbtx4938/prom.c
- *
- * rbtx4938 specific prom routines
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
- */
-
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/bootmem.h>
-
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
-#include <asm/tx4938/tx4938.h>
-
-void __init prom_init_cmdline(void)
-{
-        int argc = (int) fw_arg0;
-        char **argv = (char **) fw_arg1;
-        int i;
-
-        /* ignore all built-in args if any f/w args given */
-        if (argc > 1) {
-                *arcs_cmdline = '\0';
-        }
-
-        for (i = 1; i < argc; i++) {
-                if (i != 1) {
-                        strcat(arcs_cmdline, " ");
-                }
-                strcat(arcs_cmdline, argv[i]);
-        }
-}
-
-void __init prom_init(void)
-{
-        extern int tx4938_get_mem_size(void);
-        int msize;
-#ifndef CONFIG_TX4938_NAND_BOOT
-        prom_init_cmdline();
-#endif
-
-        msize = tx4938_get_mem_size();
-        add_memory_region(0, msize << 20, BOOT_MEM_RAM);
-
-        return;
-}
-
-void __init prom_free_prom_memory(void)
-{
-}
-
-void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
-{
-        return;
-}
-
-const char *get_system_type(void)
-{
-        return "Toshiba RBTX4938";
-}
-
-char * __init prom_getcmdline(void)
-{
-        return &(arcs_cmdline[0]);
-}
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
deleted file mode 100644
index 3a3659e8633a..000000000000
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ /dev/null
@@ -1,1124 +0,0 @@
-/*
- * linux/arch/mips/tx4938/toshiba_rbtx4938/setup.c
- *
- * Setup pointers to hardware-dependent routines.
- * Copyright (C) 2000-2001 Toshiba Corporation
- *
- * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
- * terms of the GNU General Public License version 2. This program is
- * licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/console.h>
-#include <linux/pci.h>
-#include <linux/pm.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/gpio.h>
-
-#include <asm/reboot.h>
-#include <asm/time.h>
-#include <asm/txx9tmr.h>
-#include <asm/io.h>
-#include <asm/bootinfo.h>
-#include <asm/tx4938/rbtx4938.h>
-#ifdef CONFIG_SERIAL_TXX9
-#include <linux/serial_core.h>
-#endif
-#include <linux/spi/spi.h>
-#include <asm/tx4938/spi.h>
-#include <asm/txx9pio.h>
-
-extern char * __init prom_getcmdline(void);
-static inline void tx4938_report_pcic_status1(struct tx4938_pcic_reg *pcicptr);
-
-/* These functions are used for rebooting or halting the machine*/
-extern void rbtx4938_machine_restart(char *command);
-extern void rbtx4938_machine_halt(void);
-extern void rbtx4938_machine_power_off(void);
-
-/* clocks */
-unsigned int txx9_master_clock;
-unsigned int txx9_cpu_clock;
-unsigned int txx9_gbus_clock;
-
-unsigned long rbtx4938_ce_base[8];
-unsigned long rbtx4938_ce_size[8];
-int txboard_pci66_mode;
-static int tx4938_pcic_trdyto;  /* default: disabled */
-static int tx4938_pcic_retryto; /* default: disabled */
-static int tx4938_ccfg_toeon = 1;
-
-struct tx4938_pcic_reg *pcicptrs[4] = {
-       tx4938_pcicptr  /* default setting for TX4938 */
-};
-
-static struct {
-        unsigned long base;
-        unsigned long size;
-} phys_regions[16] __initdata;
-static int num_phys_regions  __initdata;
-
-#define PHYS_REGION_MINSIZE     0x10000
-
-void rbtx4938_machine_halt(void)
-{
-        printk(KERN_NOTICE "System Halted\n");
-        local_irq_disable();
-
-        while (1)
-                __asm__(".set\tmips3\n\t"
-                        "wait\n\t"
-                        ".set\tmips0");
-}
-
-void rbtx4938_machine_power_off(void)
-{
-        rbtx4938_machine_halt();
-        /* no return */
-}
-
-void rbtx4938_machine_restart(char *command)
-{
-        local_irq_disable();
-
-        printk("Rebooting...");
-        writeb(1, rbtx4938_softresetlock_addr);
-        writeb(1, rbtx4938_sfvol_addr);
-        writeb(1, rbtx4938_softreset_addr);
-        while(1)
-                ;
-}
-
-void __init
-txboard_add_phys_region(unsigned long base, unsigned long size)
-{
-        if (num_phys_regions >= ARRAY_SIZE(phys_regions)) {
-                printk("phys_region overflow\n");
-                return;
-        }
-        phys_regions[num_phys_regions].base = base;
-        phys_regions[num_phys_regions].size = size;
-        num_phys_regions++;
-}
-unsigned long __init
-txboard_find_free_phys_region(unsigned long begin, unsigned long end,
-                              unsigned long size)
-{
-        unsigned long base;
-        int i;
-
-        for (base = begin / size * size; base < end; base += size) {
-                for (i = 0; i < num_phys_regions; i++) {
-                        if (phys_regions[i].size &&
-                            base <= phys_regions[i].base + (phys_regions[i].size - 1) &&
-                            base + (size - 1) >= phys_regions[i].base)
-                                break;
-                }
-                if (i == num_phys_regions)
-                        return base;
-        }
-        return 0;
-}
-unsigned long __init
-txboard_find_free_phys_region_shrink(unsigned long begin, unsigned long end,
-                                     unsigned long *size)
-{
-        unsigned long sz, base;
-        for (sz = *size; sz >= PHYS_REGION_MINSIZE; sz /= 2) {
-                base = txboard_find_free_phys_region(begin, end, sz);
-                if (base) {
-                        *size = sz;
-                        return base;
-                }
-        }
-        return 0;
-}
-unsigned long __init
-txboard_request_phys_region_range(unsigned long begin, unsigned long end,
-                                  unsigned long size)
-{
-        unsigned long base;
-        base = txboard_find_free_phys_region(begin, end, size);
-        if (base)
-                txboard_add_phys_region(base, size);
-        return base;
-}
-unsigned long __init
-txboard_request_phys_region(unsigned long size)
-{
-        unsigned long base;
-        unsigned long begin = 0, end = 0x20000000;      /* search low 512MB */
-        base = txboard_find_free_phys_region(begin, end, size);
-        if (base)
-                txboard_add_phys_region(base, size);
-        return base;
-}
-unsigned long __init
-txboard_request_phys_region_shrink(unsigned long *size)
-{
-        unsigned long base;
-        unsigned long begin = 0, end = 0x20000000;      /* search low 512MB */
-        base = txboard_find_free_phys_region_shrink(begin, end, size);
-        if (base)
-                txboard_add_phys_region(base, *size);
-        return base;
-}
-
-#ifdef CONFIG_PCI
-void __init
-tx4938_pcic_setup(struct tx4938_pcic_reg *pcicptr,
-                  struct pci_controller *channel,
-                  unsigned long pci_io_base,
-                  int extarb)
-{
-        int i;
-
-        /* Disable All Initiator Space */
-        pcicptr->pciccfg &= ~(TX4938_PCIC_PCICCFG_G2PMEN(0)|
-                              TX4938_PCIC_PCICCFG_G2PMEN(1)|
-                              TX4938_PCIC_PCICCFG_G2PMEN(2)|
-                              TX4938_PCIC_PCICCFG_G2PIOEN);
-
-        /* GB->PCI mappings */
-        pcicptr->g2piomask = (channel->io_resource->end - channel->io_resource->start) >> 4;
-        pcicptr->g2piogbase = pci_io_base |
-#ifdef __BIG_ENDIAN
-                TX4938_PCIC_G2PIOGBASE_ECHG
-#else
-                TX4938_PCIC_G2PIOGBASE_BSDIS
-#endif
-                ;
-        pcicptr->g2piopbase = 0;
-        for (i = 0; i < 3; i++) {
-                pcicptr->g2pmmask[i] = 0;
-                pcicptr->g2pmgbase[i] = 0;
-                pcicptr->g2pmpbase[i] = 0;
-        }
-        if (channel->mem_resource->end) {
-                pcicptr->g2pmmask[0] = (channel->mem_resource->end - channel->mem_resource->start) >> 4;
-                pcicptr->g2pmgbase[0] = channel->mem_resource->start |
-#ifdef __BIG_ENDIAN
-                        TX4938_PCIC_G2PMnGBASE_ECHG
-#else
-                        TX4938_PCIC_G2PMnGBASE_BSDIS
-#endif
-                        ;
-                pcicptr->g2pmpbase[0] = channel->mem_resource->start;
-        }
-        /* PCI->GB mappings (I/O 256B) */
-        pcicptr->p2giopbase = 0; /* 256B */
-        pcicptr->p2giogbase = 0;
-        /* PCI->GB mappings (MEM 512MB (64MB on R1.x)) */
-        pcicptr->p2gm0plbase = 0;
-        pcicptr->p2gm0pubase = 0;
-        pcicptr->p2gmgbase[0] = 0 |
-                TX4938_PCIC_P2GMnGBASE_TMEMEN |
-#ifdef __BIG_ENDIAN
-                TX4938_PCIC_P2GMnGBASE_TECHG
-#else
-                TX4938_PCIC_P2GMnGBASE_TBSDIS
-#endif
-                ;
-        /* PCI->GB mappings (MEM 16MB) */
-        pcicptr->p2gm1plbase = 0xffffffff;
-        pcicptr->p2gm1pubase = 0xffffffff;
-        pcicptr->p2gmgbase[1] = 0;
-        /* PCI->GB mappings (MEM 1MB) */
-        pcicptr->p2gm2pbase = 0xffffffff; /* 1MB */
-        pcicptr->p2gmgbase[2] = 0;
-
-        pcicptr->pciccfg &= TX4938_PCIC_PCICCFG_GBWC_MASK;
-        /* Enable Initiator Memory Space */
-        if (channel->mem_resource->end)
-                pcicptr->pciccfg |= TX4938_PCIC_PCICCFG_G2PMEN(0);
-        /* Enable Initiator I/O Space */
-        if (channel->io_resource->end)
-                pcicptr->pciccfg |= TX4938_PCIC_PCICCFG_G2PIOEN;
-        /* Enable Initiator Config */
-        pcicptr->pciccfg |=
-                TX4938_PCIC_PCICCFG_ICAEN |
-                TX4938_PCIC_PCICCFG_TCAR;
-
-        /* Do not use MEMMUL, MEMINF: YMFPCI card causes M_ABORT. */
-        pcicptr->pcicfg1 = 0;
-
-        pcicptr->g2ptocnt &= ~0xffff;
-
-        if (tx4938_pcic_trdyto >= 0) {
-                pcicptr->g2ptocnt &= ~0xff;
-                pcicptr->g2ptocnt |= (tx4938_pcic_trdyto & 0xff);
-        }
-
-        if (tx4938_pcic_retryto >= 0) {
-                pcicptr->g2ptocnt &= ~0xff00;
-                pcicptr->g2ptocnt |= ((tx4938_pcic_retryto<<8) & 0xff00);
-        }
-
-        /* Clear All Local Bus Status */
-        pcicptr->pcicstatus = TX4938_PCIC_PCICSTATUS_ALL;
-        /* Enable All Local Bus Interrupts */
-        pcicptr->pcicmask = TX4938_PCIC_PCICSTATUS_ALL;
-        /* Clear All Initiator Status */
-        pcicptr->g2pstatus = TX4938_PCIC_G2PSTATUS_ALL;
-        /* Enable All Initiator Interrupts */
-        pcicptr->g2pmask = TX4938_PCIC_G2PSTATUS_ALL;
-        /* Clear All PCI Status Error */
-        pcicptr->pcistatus =
-                (pcicptr->pcistatus & 0x0000ffff) |
-                (TX4938_PCIC_PCISTATUS_ALL << 16);
-        /* Enable All PCI Status Error Interrupts */
-        pcicptr->pcimask = TX4938_PCIC_PCISTATUS_ALL;
-
-        if (!extarb) {
-                /* Reset Bus Arbiter */
-                pcicptr->pbacfg = TX4938_PCIC_PBACFG_RPBA;
-                pcicptr->pbabm = 0;
-                /* Enable Bus Arbiter */
-                pcicptr->pbacfg = TX4938_PCIC_PBACFG_PBAEN;
-        }
-
-      /* PCIC Int => IRC IRQ16 */
-        pcicptr->pcicfg2 =
-                    (pcicptr->pcicfg2 & 0xffffff00) | TX4938_IR_PCIC;
-
-        pcicptr->pcistatus = PCI_COMMAND_MASTER |
-                PCI_COMMAND_MEMORY |
-                PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
-}
-
-int __init
-tx4938_report_pciclk(void)
-{
-        unsigned long pcode = TX4938_REV_PCODE();
-        int pciclk = 0;
-        printk("TX%lx PCIC --%s PCICLK:",
-               pcode,
-               (tx4938_ccfgptr->ccfg & TX4938_CCFG_PCI66) ? " PCI66" : "");
-        if (tx4938_ccfgptr->pcfg & TX4938_PCFG_PCICLKEN_ALL) {
-
-                switch ((unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_PCIDIVMODE_MASK) {
-                case TX4938_CCFG_PCIDIVMODE_4:
-                        pciclk = txx9_cpu_clock / 4; break;
-                case TX4938_CCFG_PCIDIVMODE_4_5:
-                        pciclk = txx9_cpu_clock * 2 / 9; break;
-                case TX4938_CCFG_PCIDIVMODE_5:
-                        pciclk = txx9_cpu_clock / 5; break;
-                case TX4938_CCFG_PCIDIVMODE_5_5:
-                        pciclk = txx9_cpu_clock * 2 / 11; break;
-                case TX4938_CCFG_PCIDIVMODE_8:
-                        pciclk = txx9_cpu_clock / 8; break;
-                case TX4938_CCFG_PCIDIVMODE_9:
-                        pciclk = txx9_cpu_clock / 9; break;
-                case TX4938_CCFG_PCIDIVMODE_10:
-                        pciclk = txx9_cpu_clock / 10; break;
-                case TX4938_CCFG_PCIDIVMODE_11:
-                        pciclk = txx9_cpu_clock / 11; break;
-                }
-                printk("Internal(%dMHz)", pciclk / 1000000);
-        } else {
-                printk("External");
-                pciclk = -1;
-        }
-        printk("\n");
-        return pciclk;
-}
-
-void __init set_tx4938_pcicptr(int ch, struct tx4938_pcic_reg *pcicptr)
-{
-        pcicptrs[ch] = pcicptr;
-}
-
-struct tx4938_pcic_reg *get_tx4938_pcicptr(int ch)
-{
-       return pcicptrs[ch];
-}
-
-static struct pci_dev *fake_pci_dev(struct pci_controller *hose,
-                                    int top_bus, int busnr, int devfn)
-{
-        static struct pci_dev dev;
-        static struct pci_bus bus;
-
-        dev.sysdata = bus.sysdata = hose;
-        dev.devfn = devfn;
-        bus.number = busnr;
-        bus.ops = hose->pci_ops;
-        bus.parent = NULL;
-        dev.bus = &bus;
-
-        return &dev;
-}
-
-#define EARLY_PCI_OP(rw, size, type)                                    \
-static int early_##rw##_config_##size(struct pci_controller *hose,      \
-        int top_bus, int bus, int devfn, int offset, type value)        \
-{                                                                       \
-        return pci_##rw##_config_##size(                                \
-                fake_pci_dev(hose, top_bus, bus, devfn),                \
-                offset, value);                                         \
-}
-
-EARLY_PCI_OP(read, word, u16 *)
-
-int txboard_pci66_check(struct pci_controller *hose, int top_bus, int current_bus)
-{
-        u32 pci_devfn;
-        unsigned short vid;
-        int devfn_start = 0;
-        int devfn_stop = 0xff;
-        int cap66 = -1;
-        u16 stat;
-
-        printk("PCI: Checking 66MHz capabilities...\n");
-
-        for (pci_devfn=devfn_start; pci_devfn<devfn_stop; pci_devfn++) {
-                if (early_read_config_word(hose, top_bus, current_bus,
-                                           pci_devfn, PCI_VENDOR_ID,
-                                           &vid) != PCIBIOS_SUCCESSFUL)
-                        continue;
-
-                if (vid == 0xffff) continue;
-
-                /* check 66MHz capability */
-                if (cap66 < 0)
-                        cap66 = 1;
-                if (cap66) {
-                        early_read_config_word(hose, top_bus, current_bus, pci_devfn,
-                                               PCI_STATUS, &stat);
-                        if (!(stat & PCI_STATUS_66MHZ)) {
-                                printk(KERN_DEBUG "PCI: %02x:%02x not 66MHz capable.\n",
-                                       current_bus, pci_devfn);
-                                cap66 = 0;
-                                break;
-                        }
-                }
-        }
-        return cap66 > 0;
-}
-
-int __init
-tx4938_pciclk66_setup(void)
-{
-        int pciclk;
-
-        /* Assert M66EN */
-        tx4938_ccfgptr->ccfg |= TX4938_CCFG_PCI66;
-        /* Double PCICLK (if possible) */
-        if (tx4938_ccfgptr->pcfg & TX4938_PCFG_PCICLKEN_ALL) {
-                unsigned int pcidivmode =
-                        tx4938_ccfgptr->ccfg & TX4938_CCFG_PCIDIVMODE_MASK;
-                switch (pcidivmode) {
-                case TX4938_CCFG_PCIDIVMODE_8:
-                case TX4938_CCFG_PCIDIVMODE_4:
-                        pcidivmode = TX4938_CCFG_PCIDIVMODE_4;
-                        pciclk = txx9_cpu_clock / 4;
-                        break;
-                case TX4938_CCFG_PCIDIVMODE_9:
-                case TX4938_CCFG_PCIDIVMODE_4_5:
-                        pcidivmode = TX4938_CCFG_PCIDIVMODE_4_5;
-                        pciclk = txx9_cpu_clock * 2 / 9;
-                        break;
-                case TX4938_CCFG_PCIDIVMODE_10:
-                case TX4938_CCFG_PCIDIVMODE_5:
-                        pcidivmode = TX4938_CCFG_PCIDIVMODE_5;
-                        pciclk = txx9_cpu_clock / 5;
-                        break;
-                case TX4938_CCFG_PCIDIVMODE_11:
-                case TX4938_CCFG_PCIDIVMODE_5_5:
-                default:
-                        pcidivmode = TX4938_CCFG_PCIDIVMODE_5_5;
-                        pciclk = txx9_cpu_clock * 2 / 11;
-                        break;
-                }
-                tx4938_ccfgptr->ccfg =
-                        (tx4938_ccfgptr->ccfg & ~TX4938_CCFG_PCIDIVMODE_MASK)
-                        | pcidivmode;
-                printk(KERN_DEBUG "PCICLK: ccfg:%08lx\n",
-                       (unsigned long)tx4938_ccfgptr->ccfg);
-        } else {
-                pciclk = -1;
-        }
-        return pciclk;
-}
-
-extern struct pci_controller tx4938_pci_controller[];
-static int __init tx4938_pcibios_init(void)
-{
-        unsigned long mem_base[2];
-        unsigned long mem_size[2] = {TX4938_PCIMEM_SIZE_0, TX4938_PCIMEM_SIZE_1}; /* MAX 128M,64K */
-        unsigned long io_base[2];
-        unsigned long io_size[2] = {TX4938_PCIIO_SIZE_0, TX4938_PCIIO_SIZE_1}; /* MAX 16M,64K */
-        /* TX4938 PCIC1: 64K MEM/IO is enough for ETH0,ETH1 */
-        int extarb = !(tx4938_ccfgptr->ccfg & TX4938_CCFG_PCIXARB);
-
-        PCIBIOS_MIN_IO = 0x00001000UL;
-
-        mem_base[0] = txboard_request_phys_region_shrink(&mem_size[0]);
-        io_base[0] = txboard_request_phys_region_shrink(&io_size[0]);
-
-        printk("TX4938 PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:%s\n",
-               (unsigned short)(tx4938_pcicptr->pciid >> 16),
-               (unsigned short)(tx4938_pcicptr->pciid & 0xffff),
-               (unsigned short)(tx4938_pcicptr->pciccrev & 0xff),
-               extarb ? "External" : "Internal");
-
-        /* setup PCI area */
-        tx4938_pci_controller[0].io_resource->start = io_base[0];
-        tx4938_pci_controller[0].io_resource->end = (io_base[0] + io_size[0]) - 1;
-        tx4938_pci_controller[0].mem_resource->start = mem_base[0];
-        tx4938_pci_controller[0].mem_resource->end = mem_base[0] + mem_size[0] - 1;
-
-        set_tx4938_pcicptr(0, tx4938_pcicptr);
-
-        register_pci_controller(&tx4938_pci_controller[0]);
-
-        if (tx4938_ccfgptr->ccfg & TX4938_CCFG_PCI66) {
-                printk("TX4938_CCFG_PCI66 already configured\n");
-                txboard_pci66_mode = -1; /* already configured */
-        }
-
-        /* Reset PCI Bus */
-        writeb(0, rbtx4938_pcireset_addr);
-        /* Reset PCIC */
-        tx4938_ccfgptr->clkctr |= TX4938_CLKCTR_PCIRST;
-        if (txboard_pci66_mode > 0)
-                tx4938_pciclk66_setup();
-        mdelay(10);
-        /* clear PCIC reset */
-        tx4938_ccfgptr->clkctr &= ~TX4938_CLKCTR_PCIRST;
-        writeb(1, rbtx4938_pcireset_addr);
-        mmiowb();
-        tx4938_report_pcic_status1(tx4938_pcicptr);
-
-        tx4938_report_pciclk();
-        tx4938_pcic_setup(tx4938_pcicptr, &tx4938_pci_controller[0], io_base[0], extarb);
-        if (txboard_pci66_mode == 0 &&
-            txboard_pci66_check(&tx4938_pci_controller[0], 0, 0)) {
-                /* Reset PCI Bus */
-                writeb(0, rbtx4938_pcireset_addr);
-                /* Reset PCIC */
-                tx4938_ccfgptr->clkctr |= TX4938_CLKCTR_PCIRST;
-                tx4938_pciclk66_setup();
-                mdelay(10);
-                /* clear PCIC reset */
-                tx4938_ccfgptr->clkctr &= ~TX4938_CLKCTR_PCIRST;
-                writeb(1, rbtx4938_pcireset_addr);
-                mmiowb();
-                /* Reinitialize PCIC */
-                tx4938_report_pciclk();
-                tx4938_pcic_setup(tx4938_pcicptr, &tx4938_pci_controller[0], io_base[0], extarb);
-        }
-
-        mem_base[1] = txboard_request_phys_region_shrink(&mem_size[1]);
-        io_base[1] = txboard_request_phys_region_shrink(&io_size[1]);
-        /* Reset PCIC1 */
-        tx4938_ccfgptr->clkctr |= TX4938_CLKCTR_PCIC1RST;
-        /* PCI1DMD==0 => PCI1CLK==GBUSCLK/2 => PCI66 */
-        if (!(tx4938_ccfgptr->ccfg & TX4938_CCFG_PCI1DMD))
-                tx4938_ccfgptr->ccfg |= TX4938_CCFG_PCI1_66;
-        else
-                tx4938_ccfgptr->ccfg &= ~TX4938_CCFG_PCI1_66;
-        mdelay(10);
-        /* clear PCIC1 reset */
-        tx4938_ccfgptr->clkctr &= ~TX4938_CLKCTR_PCIC1RST;
-        tx4938_report_pcic_status1(tx4938_pcic1ptr);
-
-        printk("TX4938 PCIC1 -- DID:%04x VID:%04x RID:%02x",
-               (unsigned short)(tx4938_pcic1ptr->pciid >> 16),
-               (unsigned short)(tx4938_pcic1ptr->pciid & 0xffff),
-               (unsigned short)(tx4938_pcic1ptr->pciccrev & 0xff));
-        printk("%s PCICLK:%dMHz\n",
-               (tx4938_ccfgptr->ccfg & TX4938_CCFG_PCI1_66) ? " PCI66" : "",
-               txx9_gbus_clock /
-               ((tx4938_ccfgptr->ccfg & TX4938_CCFG_PCI1DMD) ? 4 : 2) /
-               1000000);
-
-        /* assumption: CPHYSADDR(mips_io_port_base) == io_base[0] */
-        tx4938_pci_controller[1].io_resource->start =
-                io_base[1] - io_base[0];
-        tx4938_pci_controller[1].io_resource->end =
-                io_base[1] - io_base[0] + io_size[1] - 1;
-        tx4938_pci_controller[1].mem_resource->start = mem_base[1];
-        tx4938_pci_controller[1].mem_resource->end =
-                mem_base[1] + mem_size[1] - 1;
-        set_tx4938_pcicptr(1, tx4938_pcic1ptr);
-
-        register_pci_controller(&tx4938_pci_controller[1]);
-
-        tx4938_pcic_setup(tx4938_pcic1ptr, &tx4938_pci_controller[1], io_base[1], extarb);
-
-        /* map ioport 0 to PCI I/O space address 0 */
-        set_io_port_base(KSEG1 + io_base[0]);
-
-        return 0;
-}
-
-arch_initcall(tx4938_pcibios_init);
-
-#endif /* CONFIG_PCI */
-
-/* SPI support */
-
-/* chip select for SPI devices */
-#define SEEPROM1_CS     7       /* PIO7 */
-#define SEEPROM2_CS     0       /* IOC */
-#define SEEPROM3_CS     1       /* IOC */
-#define SRTC_CS 2       /* IOC */
-
-#ifdef CONFIG_PCI
-static int __init rbtx4938_ethaddr_init(void)
-{
-        unsigned char dat[17];
-        unsigned char sum;
-        int i;
-
-        /* 0-3: "MAC\0", 4-9:eth0, 10-15:eth1, 16:sum */
-        if (spi_eeprom_read(SEEPROM1_CS, 0, dat, sizeof(dat))) {
-                printk(KERN_ERR "seeprom: read error.\n");
-                return -ENODEV;
-        } else {
-                if (strcmp(dat, "MAC") != 0)
-                        printk(KERN_WARNING "seeprom: bad signature.\n");
-                for (i = 0, sum = 0; i < sizeof(dat); i++)
-                        sum += dat[i];
-                if (sum)
-                        printk(KERN_WARNING "seeprom: bad checksum.\n");
-        }
-        for (i = 0; i < 2; i++) {
-                unsigned int id =
-                        TXX9_IRQ_BASE + (i ? TX4938_IR_ETH1 : TX4938_IR_ETH0);
-                struct platform_device *pdev;
-                if (!(tx4938_ccfgptr->pcfg &
-                      (i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))
-                        continue;
-                pdev = platform_device_alloc("tc35815-mac", id);
-                if (!pdev ||
-                    platform_device_add_data(pdev, &dat[4 + 6 * i], 6) ||
-                    platform_device_add(pdev))
-                        platform_device_put(pdev);
-        }
-        return 0;
-}
-device_initcall(rbtx4938_ethaddr_init);
-#endif /* CONFIG_PCI */
-
-static void __init rbtx4938_spi_setup(void)
-{
-        /* set SPI_SEL */
-        tx4938_ccfgptr->pcfg |= TX4938_PCFG_SPI_SEL;
-}
-
-static struct resource rbtx4938_fpga_resource;
-
-static char pcode_str[8];
-static struct resource tx4938_reg_resource = {
-        .start  = TX4938_REG_BASE,
-        .end    = TX4938_REG_BASE + TX4938_REG_SIZE,
-        .name   = pcode_str,
-        .flags  = IORESOURCE_MEM
-};
-
-void __init tx4938_board_setup(void)
-{
-        int i;
-        unsigned long divmode;
-        int cpuclk = 0;
-        unsigned long pcode = TX4938_REV_PCODE();
-
-        ioport_resource.start = 0x1000;
-        ioport_resource.end = 0xffffffff;
-        iomem_resource.start = 0x1000;
-        iomem_resource.end = 0xffffffff;        /* expand to 4GB */
-
-        sprintf(pcode_str, "TX%lx", pcode);
-        /* SDRAMC,EBUSC are configured by PROM */
-        for (i = 0; i < 8; i++) {
-                if (!(tx4938_ebuscptr->cr[i] & 0x8))
-                        continue;       /* disabled */
-                rbtx4938_ce_base[i] = (unsigned long)TX4938_EBUSC_BA(i);
-                txboard_add_phys_region(rbtx4938_ce_base[i], TX4938_EBUSC_SIZE(i));
-        }
-
-        /* clocks */
-        if (txx9_master_clock) {
-                /* calculate gbus_clock and cpu_clock_freq from master_clock */
-                divmode = (unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_DIVMODE_MASK;
-                switch (divmode) {
-                case TX4938_CCFG_DIVMODE_8:
-                case TX4938_CCFG_DIVMODE_10:
-                case TX4938_CCFG_DIVMODE_12:
-                case TX4938_CCFG_DIVMODE_16:
-                case TX4938_CCFG_DIVMODE_18:
-                        txx9_gbus_clock = txx9_master_clock * 4; break;
-                default:
-                        txx9_gbus_clock = txx9_master_clock;
-                }
-                switch (divmode) {
-                case TX4938_CCFG_DIVMODE_2:
-                case TX4938_CCFG_DIVMODE_8:
-                        cpuclk = txx9_gbus_clock * 2; break;
-                case TX4938_CCFG_DIVMODE_2_5:
-                case TX4938_CCFG_DIVMODE_10:
-                        cpuclk = txx9_gbus_clock * 5 / 2; break;
-                case TX4938_CCFG_DIVMODE_3:
-                case TX4938_CCFG_DIVMODE_12:
-                        cpuclk = txx9_gbus_clock * 3; break;
-                case TX4938_CCFG_DIVMODE_4:
-                case TX4938_CCFG_DIVMODE_16:
-                        cpuclk = txx9_gbus_clock * 4; break;
-                case TX4938_CCFG_DIVMODE_4_5:
-                case TX4938_CCFG_DIVMODE_18:
-                        cpuclk = txx9_gbus_clock * 9 / 2; break;
-                }
-                txx9_cpu_clock = cpuclk;
-        } else {
-                if (txx9_cpu_clock == 0) {
-                        txx9_cpu_clock = 300000000;     /* 300MHz */
-                }
-                /* calculate gbus_clock and master_clock from cpu_clock_freq */
-                cpuclk = txx9_cpu_clock;
-                divmode = (unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_DIVMODE_MASK;
-                switch (divmode) {
-                case TX4938_CCFG_DIVMODE_2:
-                case TX4938_CCFG_DIVMODE_8:
-                        txx9_gbus_clock = cpuclk / 2; break;
-                case TX4938_CCFG_DIVMODE_2_5:
-                case TX4938_CCFG_DIVMODE_10:
-                        txx9_gbus_clock = cpuclk * 2 / 5; break;
-                case TX4938_CCFG_DIVMODE_3:
-                case TX4938_CCFG_DIVMODE_12:
-                        txx9_gbus_clock = cpuclk / 3; break;
-                case TX4938_CCFG_DIVMODE_4:
-                case TX4938_CCFG_DIVMODE_16:
-                        txx9_gbus_clock = cpuclk / 4; break;
-                case TX4938_CCFG_DIVMODE_4_5:
-                case TX4938_CCFG_DIVMODE_18:
-                        txx9_gbus_clock = cpuclk * 2 / 9; break;
-                }
-                switch (divmode) {
-                case TX4938_CCFG_DIVMODE_8:
-                case TX4938_CCFG_DIVMODE_10:
-                case TX4938_CCFG_DIVMODE_12:
-                case TX4938_CCFG_DIVMODE_16:
-                case TX4938_CCFG_DIVMODE_18:
-                        txx9_master_clock = txx9_gbus_clock / 4; break;
-                default:
-                        txx9_master_clock = txx9_gbus_clock;
-                }
-        }
-        /* change default value to udelay/mdelay take reasonable time */
-        loops_per_jiffy = txx9_cpu_clock / HZ / 2;
-
-        /* CCFG */
-        /* clear WatchDogReset,BusErrorOnWrite flag (W1C) */
-        tx4938_ccfgptr->ccfg |= TX4938_CCFG_WDRST | TX4938_CCFG_BEOW;
-        /* do reset on watchdog */
-        tx4938_ccfgptr->ccfg |= TX4938_CCFG_WR;
-        /* clear PCIC1 reset */
-        if (tx4938_ccfgptr->clkctr & TX4938_CLKCTR_PCIC1RST)
-                tx4938_ccfgptr->clkctr &= ~TX4938_CLKCTR_PCIC1RST;
-
-        /* enable Timeout BusError */
-        if (tx4938_ccfg_toeon)
-                tx4938_ccfgptr->ccfg |= TX4938_CCFG_TOE;
-
-        /* DMA selection */
-        tx4938_ccfgptr->pcfg &= ~TX4938_PCFG_DMASEL_ALL;
-
-        /* Use external clock for external arbiter */
-        if (!(tx4938_ccfgptr->ccfg & TX4938_CCFG_PCIXARB))
-                tx4938_ccfgptr->pcfg &= ~TX4938_PCFG_PCICLKEN_ALL;
-
-        printk("%s -- %dMHz(M%dMHz) CRIR:%08lx CCFG:%Lx PCFG:%Lx\n",
-               pcode_str,
-               cpuclk / 1000000, txx9_master_clock / 1000000,
-               (unsigned long)tx4938_ccfgptr->crir,
-               tx4938_ccfgptr->ccfg,
-               tx4938_ccfgptr->pcfg);
-
-        printk("%s SDRAMC --", pcode_str);
-        for (i = 0; i < 4; i++) {
-                unsigned long long cr = tx4938_sdramcptr->cr[i];
-                unsigned long ram_base, ram_size;
-                if (!((unsigned long)cr & 0x00000400))
-                        continue;       /* disabled */
-                ram_base = (unsigned long)(cr >> 49) << 21;
-                ram_size = ((unsigned long)(cr >> 33) + 1) << 21;
-                if (ram_base >= 0x20000000)
-                        continue;       /* high memory (ignore) */
-                printk(" CR%d:%016Lx", i, cr);
-                txboard_add_phys_region(ram_base, ram_size);
-        }
-        printk(" TR:%09Lx\n", tx4938_sdramcptr->tr);
-
-        /* SRAM */
-        if (pcode == 0x4938 && tx4938_sramcptr->cr & 1) {
-                unsigned int size = 0x800;
-                unsigned long base =
-                        (tx4938_sramcptr->cr >> (39-11)) & ~(size - 1);
-                 txboard_add_phys_region(base, size);
-        }
-
-        /* TMR */
-        for (i = 0; i < TX4938_NR_TMR; i++)
-                txx9_tmr_init(TX4938_TMR_REG(i) & 0xfffffffffULL);
-
-        /* enable DMA */
-        for (i = 0; i < 2; i++)
-                ____raw_writeq(TX4938_DMA_MCR_MSTEN,
-                               (void __iomem *)(TX4938_DMA_REG(i) + 0x50));
-
-        /* PIO */
-        __raw_writel(0, &tx4938_pioptr->maskcpu);
-        __raw_writel(0, &tx4938_pioptr->maskext);
-
-        /* TX4938 internal registers */
-        if (request_resource(&iomem_resource, &tx4938_reg_resource))
-                printk("request resource for internal registers failed\n");
-}
-
-#ifdef CONFIG_PCI
-static inline void tx4938_report_pcic_status1(struct tx4938_pcic_reg *pcicptr)
-{
-        unsigned short pcistatus = (unsigned short)(pcicptr->pcistatus >> 16);
-        unsigned long g2pstatus = pcicptr->g2pstatus;
-        unsigned long pcicstatus = pcicptr->pcicstatus;
-        static struct {
-                unsigned long flag;
-                const char *str;
-        } pcistat_tbl[] = {
-                { PCI_STATUS_DETECTED_PARITY,   "DetectedParityError" },
-                { PCI_STATUS_SIG_SYSTEM_ERROR,  "SignaledSystemError" },
-                { PCI_STATUS_REC_MASTER_ABORT,  "ReceivedMasterAbort" },
-                { PCI_STATUS_REC_TARGET_ABORT,  "ReceivedTargetAbort" },
-                { PCI_STATUS_SIG_TARGET_ABORT,  "SignaledTargetAbort" },
-                { PCI_STATUS_PARITY,    "MasterParityError" },
-        }, g2pstat_tbl[] = {
-                { TX4938_PCIC_G2PSTATUS_TTOE,   "TIOE" },
-                { TX4938_PCIC_G2PSTATUS_RTOE,   "RTOE" },
-        }, pcicstat_tbl[] = {
-                { TX4938_PCIC_PCICSTATUS_PME,   "PME" },
-                { TX4938_PCIC_PCICSTATUS_TLB,   "TLB" },
-                { TX4938_PCIC_PCICSTATUS_NIB,   "NIB" },
-                { TX4938_PCIC_PCICSTATUS_ZIB,   "ZIB" },
-                { TX4938_PCIC_PCICSTATUS_PERR,  "PERR" },
-                { TX4938_PCIC_PCICSTATUS_SERR,  "SERR" },
-                { TX4938_PCIC_PCICSTATUS_GBE,   "GBE" },
-                { TX4938_PCIC_PCICSTATUS_IWB,   "IWB" },
-        };
-        int i;
-
-        printk("pcistat:%04x(", pcistatus);
-        for (i = 0; i < ARRAY_SIZE(pcistat_tbl); i++)
-                if (pcistatus & pcistat_tbl[i].flag)
-                        printk("%s ", pcistat_tbl[i].str);
-        printk("), g2pstatus:%08lx(", g2pstatus);
-        for (i = 0; i < ARRAY_SIZE(g2pstat_tbl); i++)
-                if (g2pstatus & g2pstat_tbl[i].flag)
-                        printk("%s ", g2pstat_tbl[i].str);
-        printk("), pcicstatus:%08lx(", pcicstatus);
-        for (i = 0; i < ARRAY_SIZE(pcicstat_tbl); i++)
-                if (pcicstatus & pcicstat_tbl[i].flag)
-                        printk("%s ", pcicstat_tbl[i].str);
-        printk(")\n");
-}
-
-void tx4938_report_pcic_status(void)
-{
-        int i;
-        struct tx4938_pcic_reg *pcicptr;
-        for (i = 0; (pcicptr = get_tx4938_pcicptr(i)) != NULL; i++)
-                tx4938_report_pcic_status1(pcicptr);
-}
-
-#endif /* CONFIG_PCI */
-
-void __init plat_time_init(void)
-{
-        mips_hpt_frequency = txx9_cpu_clock / 2;
-        if (tx4938_ccfgptr->ccfg & TX4938_CCFG_TINTDIS)
-                txx9_clockevent_init(TX4938_TMR_REG(0) & 0xfffffffffULL,
-                                     TXX9_IRQ_BASE + TX4938_IR_TMR(0),
-                                     txx9_gbus_clock / 2);
-}
-
-void __init plat_mem_setup(void)
-{
-        unsigned long long pcfg;
-        char *argptr;
-
-        iomem_resource.end = 0xffffffff;        /* 4GB */
-
-        if (txx9_master_clock == 0)
-                txx9_master_clock = 25000000; /* 25MHz */
-        tx4938_board_setup();
-#ifndef CONFIG_PCI
-        set_io_port_base(RBTX4938_ETHER_BASE);
-#endif
-
-#ifdef CONFIG_SERIAL_TXX9
-        {
-                extern int early_serial_txx9_setup(struct uart_port *port);
-                int i;
-                struct uart_port req;
-                for(i = 0; i < 2; i++) {
-                        memset(&req, 0, sizeof(req));
-                        req.line = i;
-                        req.iotype = UPIO_MEM;
-                        req.membase = (char *)(0xff1ff300 + i * 0x100);
-                        req.mapbase = 0xff1ff300 + i * 0x100;
-                        req.irq = RBTX4938_IRQ_IRC_SIO(i);
-                        req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
-                        req.uartclk = 50000000;
-                        early_serial_txx9_setup(&req);
-                }
-        }
-#ifdef CONFIG_SERIAL_TXX9_CONSOLE
-        argptr = prom_getcmdline();
-        if (strstr(argptr, "console=") == NULL) {
-                strcat(argptr, " console=ttyS0,38400");
-        }
-#endif
-#endif
-
-#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
-        printk("PIOSEL: disabling both ata and nand selection\n");
-        local_irq_disable();
-        tx4938_ccfgptr->pcfg &= ~(TX4938_PCFG_NDF_SEL | TX4938_PCFG_ATA_SEL);
-#endif
-
-#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND
-        printk("PIOSEL: enabling nand selection\n");
-        tx4938_ccfgptr->pcfg |= TX4938_PCFG_NDF_SEL;
-        tx4938_ccfgptr->pcfg &= ~TX4938_PCFG_ATA_SEL;
-#endif
-
-#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA
-        printk("PIOSEL: enabling ata selection\n");
-        tx4938_ccfgptr->pcfg |= TX4938_PCFG_ATA_SEL;
-        tx4938_ccfgptr->pcfg &= ~TX4938_PCFG_NDF_SEL;
-#endif
-
-#ifdef CONFIG_IP_PNP
-        argptr = prom_getcmdline();
-        if (strstr(argptr, "ip=") == NULL) {
-                strcat(argptr, " ip=any");
-        }
-#endif
-
-
-#ifdef CONFIG_FB
-        {
-                conswitchp = &dummy_con;
-        }
-#endif
-
-        rbtx4938_spi_setup();
-        pcfg = tx4938_ccfgptr->pcfg;    /* updated */
-        /* fixup piosel */
-        if ((pcfg & (TX4938_PCFG_ATA_SEL | TX4938_PCFG_NDF_SEL)) ==
-            TX4938_PCFG_ATA_SEL)
-                writeb((readb(rbtx4938_piosel_addr) & 0x03) | 0x04,
-                       rbtx4938_piosel_addr);
-        else if ((pcfg & (TX4938_PCFG_ATA_SEL | TX4938_PCFG_NDF_SEL)) ==
-                 TX4938_PCFG_NDF_SEL)
-                writeb((readb(rbtx4938_piosel_addr) & 0x03) | 0x08,
-                       rbtx4938_piosel_addr);
-        else
-                writeb(readb(rbtx4938_piosel_addr) & ~(0x08 | 0x04),
-                       rbtx4938_piosel_addr);
-
-        rbtx4938_fpga_resource.name = "FPGA Registers";
-        rbtx4938_fpga_resource.start = CPHYSADDR(RBTX4938_FPGA_REG_ADDR);
-        rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff;
-        rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-        if (request_resource(&iomem_resource, &rbtx4938_fpga_resource))
-                printk("request resource for fpga failed\n");
-
-        _machine_restart = rbtx4938_machine_restart;
-        _machine_halt = rbtx4938_machine_halt;
-        pm_power_off = rbtx4938_machine_power_off;
-
-        writeb(0xff, rbtx4938_led_addr);
-        printk(KERN_INFO "RBTX4938 --- FPGA(Rev %02x) DIPSW:%02x,%02x\n",
-               readb(rbtx4938_fpga_rev_addr),
-               readb(rbtx4938_dipsw_addr), readb(rbtx4938_bdipsw_addr));
-}
-
-static int __init rbtx4938_ne_init(void)
-{
-        struct resource res[] = {
-                {
-                        .start  = RBTX4938_RTL_8019_BASE,
-                        .end    = RBTX4938_RTL_8019_BASE + 0x20 - 1,
-                        .flags  = IORESOURCE_IO,
-                }, {
-                        .start  = RBTX4938_RTL_8019_IRQ,
-                        .flags  = IORESOURCE_IRQ,
-                }
-        };
-        struct platform_device *dev =
-                platform_device_register_simple("ne", -1,
-                                                res, ARRAY_SIZE(res));
-        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
-}
-device_initcall(rbtx4938_ne_init);
-
-/* GPIO support */
-
-int gpio_to_irq(unsigned gpio)
-{
-        return -EINVAL;
-}
-
-int irq_to_gpio(unsigned irq)
-{
-        return -EINVAL;
-}
-
-static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock);
-
-static void rbtx4938_spi_gpio_set(struct gpio_chip *chip, unsigned int offset,
-                                  int value)
-{
-        u8 val;
-        unsigned long flags;
-        spin_lock_irqsave(&rbtx4938_spi_gpio_lock, flags);
-        val = readb(rbtx4938_spics_addr);
-        if (value)
-                val |= 1 << offset;
-        else
-                val &= ~(1 << offset);
-        writeb(val, rbtx4938_spics_addr);
-        mmiowb();
-        spin_unlock_irqrestore(&rbtx4938_spi_gpio_lock, flags);
-}
-
-static int rbtx4938_spi_gpio_dir_out(struct gpio_chip *chip,
-                                     unsigned int offset, int value)
-{
-        rbtx4938_spi_gpio_set(chip, offset, value);
-        return 0;
-}
-
-static struct gpio_chip rbtx4938_spi_gpio_chip = {
-        .set = rbtx4938_spi_gpio_set,
-        .direction_output = rbtx4938_spi_gpio_dir_out,
-        .label = "RBTX4938-SPICS",
-        .base = 16,
-        .ngpio = 3,
-};
-
-/* SPI support */
-
-static void __init txx9_spi_init(unsigned long base, int irq)
-{
-        struct resource res[] = {
-                {
-                        .start  = base,
-                        .end    = base + 0x20 - 1,
-                        .flags  = IORESOURCE_MEM,
-                }, {
-                        .start  = irq,
-                        .flags  = IORESOURCE_IRQ,
-                },
-        };
-        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 = "rtc-rs5c348",
-                .max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */
-                .bus_num = 0,
-                .chip_select = 16 + SRTC_CS,
-                /* Mode 1 (High-Active, Shift-Then-Sample), High Avtive CS  */
-                .mode = SPI_MODE_1 | SPI_CS_HIGH,
-        };
-        spi_register_board_info(&srtc_info, 1);
-        spi_eeprom_register(SEEPROM1_CS);
-        spi_eeprom_register(16 + SEEPROM2_CS);
-        spi_eeprom_register(16 + SEEPROM3_CS);
-        gpio_request(16 + SRTC_CS, "rtc-rs5c348");
-        gpio_direction_output(16 + SRTC_CS, 0);
-        gpio_request(SEEPROM1_CS, "seeprom1");
-        gpio_direction_output(SEEPROM1_CS, 1);
-        gpio_request(16 + SEEPROM2_CS, "seeprom2");
-        gpio_direction_output(16 + SEEPROM2_CS, 1);
-        gpio_request(16 + SEEPROM3_CS, "seeprom3");
-        gpio_direction_output(16 + SEEPROM3_CS, 1);
-        txx9_spi_init(TX4938_SPI_REG & 0xfffffffffULL, RBTX4938_IRQ_IRC_SPI);
-        return 0;
-}
-
-static int __init rbtx4938_arch_init(void)
-{
-        txx9_gpio_init(TX4938_PIO_REG & 0xfffffffffULL, 0, 16);
-        gpiochip_add(&rbtx4938_spi_gpio_chip);
-        return rbtx4938_spi_init();
-}
-arch_initcall(rbtx4938_arch_init);
-
-/* Watchdog support */
-
-static int __init txx9_wdt_init(unsigned long base)
-{
-        struct resource res = {
-                .start  = base,
-                .end    = base + 0x100 - 1,
-                .flags  = IORESOURCE_MEM,
-        };
-        struct platform_device *dev =
-                platform_device_register_simple("txx9wdt", -1, &res, 1);
-        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
-}
-
-static int __init rbtx4938_wdt_init(void)
-{
-        return txx9_wdt_init(TX4938_TMR_REG(2) & 0xfffffffffULL);
-}
-device_initcall(rbtx4938_wdt_init);
-
-/* Minimum CLK support */
-
-struct clk *clk_get(struct device *dev, const char *id)
-{
-        if (!strcmp(id, "spi-baseclk"))
-                return (struct clk *)(txx9_gbus_clock / 2 / 4);
-        if (!strcmp(id, "imbus_clk"))
-                return (struct clk *)(txx9_gbus_clock / 2);
-        return ERR_PTR(-ENOENT);
-}
-EXPORT_SYMBOL(clk_get);
-
-int clk_enable(struct clk *clk)
-{
-        return 0;
-}
-EXPORT_SYMBOL(clk_enable);
-
-void clk_disable(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_disable);
-
-unsigned long clk_get_rate(struct clk *clk)
-{
-        return (unsigned long)clk;
-}
-EXPORT_SYMBOL(clk_get_rate);
-
-void clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_put);
diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
new file mode 100644
index 000000000000..b92a134ef124
--- /dev/null
+++ b/arch/mips/txx9/Kconfig
@@ -0,0 +1,115 @@
+config TOSHIBA_JMR3927
+        bool "Toshiba JMR-TX3927 board"
+        depends on MACH_TX39XX
+        select SOC_TX3927
+
+config TOSHIBA_RBTX4927
+        bool "Toshiba RBTX49[23]7 board"
+        depends on MACH_TX49XX
+        select SOC_TX4927
+        help
+          This Toshiba board is based on the TX4927 processor. Say Y here to
+          support this machine type
+
+config TOSHIBA_RBTX4938
+        bool "Toshiba RBTX4938 board"
+        depends on MACH_TX49XX
+        select SOC_TX4938
+        help
+          This Toshiba board is based on the TX4938 processor. Say Y here to
+          support this machine type
+
+config SOC_TX3927
+        bool
+        select CEVT_TXX9
+        select DMA_NONCOHERENT
+        select HAS_TXX9_SERIAL
+        select HW_HAS_PCI
+        select IRQ_TXX9
+        select SWAP_IO_SPACE
+        select SYS_HAS_CPU_TX39XX
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_BIG_ENDIAN
+        select GENERIC_HARDIRQS_NO__DO_IRQ
+        select GPIO_TXX9
+
+config SOC_TX4927
+        bool
+        select CEVT_R4K
+        select CSRC_R4K
+        select CEVT_TXX9
+        select DMA_NONCOHERENT
+        select HAS_TXX9_SERIAL
+        select HW_HAS_PCI
+        select IRQ_CPU
+        select IRQ_TXX9
+        select PCI_TX4927
+        select SWAP_IO_SPACE
+        select SYS_HAS_CPU_TX49XX
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_64BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
+        select GENERIC_HARDIRQS_NO__DO_IRQ
+        select GPIO_TXX9
+
+config SOC_TX4938
+        bool
+        select CEVT_R4K
+        select CSRC_R4K
+        select CEVT_TXX9
+        select DMA_NONCOHERENT
+        select HAS_TXX9_SERIAL
+        select HW_HAS_PCI
+        select IRQ_CPU
+        select IRQ_TXX9
+        select PCI_TX4927
+        select SWAP_IO_SPACE
+        select SYS_HAS_CPU_TX49XX
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_64BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
+        select GENERIC_HARDIRQS_NO__DO_IRQ
+        select GPIO_TXX9
+
+config TOSHIBA_FPCIB0
+        bool "FPCIB0 Backplane Support"
+        depends on PCI && (MACH_TX39XX || MACH_TX49XX)
+        select I8259
+
+config PICMG_PCI_BACKPLANE_DEFAULT
+        bool "Support for PICMG PCI Backplane"
+        depends on PCI && (MACH_TX39XX || MACH_TX49XX)
+        default y if !TOSHIBA_FPCIB0
+
+if TOSHIBA_RBTX4938
+
+comment "Multiplex Pin Select"
+choice
+        prompt "PIO[58:61]"
+        default TOSHIBA_RBTX4938_MPLEX_PIO58_61
+
+config TOSHIBA_RBTX4938_MPLEX_PIO58_61
+        bool "PIO"
+config TOSHIBA_RBTX4938_MPLEX_NAND
+        bool "NAND"
+config TOSHIBA_RBTX4938_MPLEX_ATA
+        bool "ATA"
+
+endchoice
+
+config TX4938_NAND_BOOT
+        depends on EXPERIMENTAL && TOSHIBA_RBTX4938_MPLEX_NAND
+        bool "NAND Boot Support (EXPERIMENTAL)"
+        help
+          This is only for Toshiba RBTX4938 reference board, which has NAND IPL.
+          Select this option if you need to use NAND boot.
+
+endif
+
+config PCI_TX4927
+        bool
diff --git a/arch/mips/txx9/generic/Makefile b/arch/mips/txx9/generic/Makefile
new file mode 100644
index 000000000000..668fdaad6448
--- /dev/null
+++ b/arch/mips/txx9/generic/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for common code for TXx9 based systems
+#
+
+obj-y   += setup.o
+obj-$(CONFIG_PCI)       += pci.o
+obj-$(CONFIG_SOC_TX4927)        += mem_tx4927.o irq_tx4927.o
+obj-$(CONFIG_SOC_TX4938)        += mem_tx4938.o irq_tx4938.o
+obj-$(CONFIG_TOSHIBA_FPCIB0)    += smsc_fdc37m81x.o
+obj-$(CONFIG_KGDB)      += dbgio.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/common/dbgio.c b/arch/mips/txx9/generic/dbgio.c
index 33b9c672a322..33b9c672a322 100644
--- a/arch/mips/tx4938/common/dbgio.c
+++ b/arch/mips/txx9/generic/dbgio.c
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/txx9/generic/irq_tx4927.c
index 0aabd57fdad2..6377bd8a9050 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/txx9/generic/irq_tx4927.c
@@ -26,40 +26,12 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/tx4927/tx4927.h>
-#ifdef CONFIG_TOSHIBA_RBTX4927
-#include <asm/tx4927/toshiba_rbtx4927.h>
-#endif
+#include <asm/txx9/tx4927.h>
 
 void __init tx4927_irq_init(void)
 {
         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)
-{
-        unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
-
-        if (pending & STATUSF_IP7)                      /* cpu timer */
-                do_IRQ(TX4927_IRQ_CPU_TIMER);
-        else if (pending & STATUSF_IP2) {               /* tx4927 pic */
-                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;
-                }
-                do_IRQ(irq);
-        } else if (pending & STATUSF_IP0)               /* user line 0 */
-                do_IRQ(TX4927_IRQ_USER0);
-        else if (pending & STATUSF_IP1)                 /* user line 1 */
-                do_IRQ(TX4927_IRQ_USER1);
-        else
-                spurious_interrupt();
+        set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4927_IRC_INT,
+                                handle_simple_irq);
 }
diff --git a/arch/mips/txx9/generic/irq_tx4938.c b/arch/mips/txx9/generic/irq_tx4938.c
new file mode 100644
index 000000000000..5fc86c9c9d2f
--- /dev/null
+++ b/arch/mips/txx9/generic/irq_tx4938.c
@@ -0,0 +1,25 @@
+/*
+ * linux/arch/mips/tx4938/common/irq.c
+ *
+ * Common tx4938 irq handler
+ * Copyright (C) 2000-2001 Toshiba Corporation
+ *
+ * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
+ * terms of the GNU General Public License version 2. This program is
+ * licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
+ */
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <asm/irq_cpu.h>
+#include <asm/txx9/tx4938.h>
+
+void __init tx4938_irq_init(void)
+{
+        mips_cpu_irq_init();
+        txx9_irq_init(TX4938_IRC_REG);
+        set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4938_IRC_INT,
+                                handle_simple_irq);
+}
diff --git a/arch/mips/tx4927/common/tx4927_prom.c b/arch/mips/txx9/generic/mem_tx4927.c
index 6eed53d8f386..12dfc377bf2f 100644
--- a/arch/mips/tx4927/common/tx4927_prom.c
+++ b/arch/mips/txx9/generic/mem_tx4927.c
@@ -30,13 +30,8 @@
  */
 
 #include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/bootmem.h>
-
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
-#include <asm/tx4927/tx4927.h>
+#include <linux/types.h>
+#include <linux/io.h>
 
 static unsigned int __init tx4927_process_sdccr(unsigned long addr)
 {
diff --git a/arch/mips/tx4938/common/prom.c b/arch/mips/txx9/generic/mem_tx4938.c
index 20baeaeba4cd..20baeaeba4cd 100644
--- a/arch/mips/tx4938/common/prom.c
+++ b/arch/mips/txx9/generic/mem_tx4938.c
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
new file mode 100644
index 000000000000..0b92d8c13208
--- /dev/null
+++ b/arch/mips/txx9/generic/pci.c
@@ -0,0 +1,388 @@
+/*
+ * linux/arch/mips/txx9/pci.c
+ *
+ * Based on linux/arch/mips/txx9/rbtx4927/setup.c,
+ *          linux/arch/mips/txx9/rbtx4938/setup.c,
+ *          and RBTX49xx patch from CELF patch archive.
+ *
+ * Copyright 2001-2005 MontaVista Software Inc.
+ * Copyright (C) 1996, 97, 2001, 04  Ralf Baechle (ralf@linux-mips.org)
+ * (C) Copyright TOSHIBA CORPORATION 2000-2001, 2004-2007
+ *
+ * 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/delay.h>
+#include <linux/jiffies.h>
+#include <linux/io.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/pci.h>
+#ifdef CONFIG_TOSHIBA_FPCIB0
+#include <linux/interrupt.h>
+#include <asm/i8259.h>
+#include <asm/txx9/smsc_fdc37m81x.h>
+#endif
+
+static int __init
+early_read_config_word(struct pci_controller *hose,
+                       int top_bus, int bus, int devfn, int offset, u16 *value)
+{
+        struct pci_dev fake_dev;
+        struct pci_bus fake_bus;
+
+        fake_dev.bus = &fake_bus;
+        fake_dev.sysdata = hose;
+        fake_dev.devfn = devfn;
+        fake_bus.number = bus;
+        fake_bus.sysdata = hose;
+        fake_bus.ops = hose->pci_ops;
+
+        if (bus != top_bus)
+                /* Fake a parent bus structure. */
+                fake_bus.parent = &fake_bus;
+        else
+                fake_bus.parent = NULL;
+
+        return pci_read_config_word(&fake_dev, offset, value);
+}
+
+int __init txx9_pci66_check(struct pci_controller *hose, int top_bus,
+                            int current_bus)
+{
+        u32 pci_devfn;
+        unsigned short vid;
+        int cap66 = -1;
+        u16 stat;
+
+        /* It seems SLC90E66 needs some time after PCI reset... */
+        mdelay(80);
+
+        printk(KERN_INFO "PCI: Checking 66MHz capabilities...\n");
+
+        for (pci_devfn = 0; pci_devfn < 0xff; pci_devfn++) {
+                if (PCI_FUNC(pci_devfn))
+                        continue;
+                if (early_read_config_word(hose, top_bus, current_bus,
+                                           pci_devfn, PCI_VENDOR_ID, &vid) !=
+                    PCIBIOS_SUCCESSFUL)
+                        continue;
+                if (vid == 0xffff)
+                        continue;
+
+                /* check 66MHz capability */
+                if (cap66 < 0)
+                        cap66 = 1;
+                if (cap66) {
+                        early_read_config_word(hose, top_bus, current_bus,
+                                               pci_devfn, PCI_STATUS, &stat);
+                        if (!(stat & PCI_STATUS_66MHZ)) {
+                                printk(KERN_DEBUG
+                                       "PCI: %02x:%02x not 66MHz capable.\n",
+                                       current_bus, pci_devfn);
+                                cap66 = 0;
+                                break;
+                        }
+                }
+        }
+        return cap66 > 0;
+}
+
+static struct resource primary_pci_mem_res[2] = {
+        { .name = "PCI MEM" },
+        { .name = "PCI MMIO" },
+};
+static struct resource primary_pci_io_res = { .name = "PCI IO" };
+struct pci_controller txx9_primary_pcic = {
+        .mem_resource = &primary_pci_mem_res[0],
+        .io_resource = &primary_pci_io_res,
+};
+
+#ifdef CONFIG_64BIT
+int txx9_pci_mem_high __initdata = 1;
+#else
+int txx9_pci_mem_high __initdata;
+#endif
+
+/*
+ * allocate pci_controller and resources.
+ * mem_base, io_base: physical addresss.  0 for auto assignment.
+ * mem_size and io_size means max size on auto assignment.
+ * pcic must be &txx9_primary_pcic or NULL.
+ */
+struct pci_controller *__init
+txx9_alloc_pci_controller(struct pci_controller *pcic,
+                          unsigned long mem_base, unsigned long mem_size,
+                          unsigned long io_base, unsigned long io_size)
+{
+        struct pcic {
+                struct pci_controller c;
+                struct resource r_mem[2];
+                struct resource r_io;
+        } *new = NULL;
+        int min_size = 0x10000;
+
+        if (!pcic) {
+                new = kzalloc(sizeof(*new), GFP_KERNEL);
+                if (!new)
+                        return NULL;
+                new->r_mem[0].name = "PCI mem";
+                new->r_mem[1].name = "PCI mmio";
+                new->r_io.name = "PCI io";
+                new->c.mem_resource = new->r_mem;
+                new->c.io_resource = &new->r_io;
+                pcic = &new->c;
+        } else
+                BUG_ON(pcic != &txx9_primary_pcic);
+        pcic->io_resource->flags = IORESOURCE_IO;
+
+        /*
+         * for auto assignment, first search a (big) region for PCI
+         * MEM, then search a region for PCI IO.
+         */
+        if (mem_base) {
+                pcic->mem_resource[0].start = mem_base;
+                pcic->mem_resource[0].end = mem_base + mem_size - 1;
+                if (request_resource(&iomem_resource, &pcic->mem_resource[0]))
+                        goto free_and_exit;
+        } else {
+                unsigned long min = 0, max = 0x20000000; /* low 512MB */
+                if (!mem_size) {
+                        /* default size for auto assignment */
+                        if (txx9_pci_mem_high)
+                                mem_size = 0x20000000;  /* mem:512M(max) */
+                        else
+                                mem_size = 0x08000000;  /* mem:128M(max) */
+                }
+                if (txx9_pci_mem_high) {
+                        min = 0x20000000;
+                        max = 0xe0000000;
+                }
+                /* search free region for PCI MEM */
+                for (; mem_size >= min_size; mem_size /= 2) {
+                        if (allocate_resource(&iomem_resource,
+                                              &pcic->mem_resource[0],
+                                              mem_size, min, max,
+                                              mem_size, NULL, NULL) == 0)
+                                break;
+                }
+                if (mem_size < min_size)
+                        goto free_and_exit;
+        }
+
+        pcic->mem_resource[1].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+        if (io_base) {
+                pcic->mem_resource[1].start = io_base;
+                pcic->mem_resource[1].end = io_base + io_size - 1;
+                if (request_resource(&iomem_resource, &pcic->mem_resource[1]))
+                        goto release_and_exit;
+        } else {
+                if (!io_size)
+                        /* default size for auto assignment */
+                        io_size = 0x01000000;   /* io:16M(max) */
+                /* search free region for PCI IO in low 512MB */
+                for (; io_size >= min_size; io_size /= 2) {
+                        if (allocate_resource(&iomem_resource,
+                                              &pcic->mem_resource[1],
+                                              io_size, 0, 0x20000000,
+                                              io_size, NULL, NULL) == 0)
+                                break;
+                }
+                if (io_size < min_size)
+                        goto release_and_exit;
+                io_base = pcic->mem_resource[1].start;
+        }
+
+        pcic->mem_resource[0].flags = IORESOURCE_MEM;
+        if (pcic == &txx9_primary_pcic &&
+            mips_io_port_base == (unsigned long)-1) {
+                /* map ioport 0 to PCI I/O space address 0 */
+                set_io_port_base(IO_BASE + pcic->mem_resource[1].start);
+                pcic->io_resource->start = 0;
+                pcic->io_offset = 0;    /* busaddr == ioaddr */
+                pcic->io_map_base = IO_BASE + pcic->mem_resource[1].start;
+        } else {
+                /* physaddr to ioaddr */
+                pcic->io_resource->start =
+                        io_base - (mips_io_port_base - IO_BASE);
+                pcic->io_offset = io_base - (mips_io_port_base - IO_BASE);
+                pcic->io_map_base = mips_io_port_base;
+        }
+        pcic->io_resource->end = pcic->io_resource->start + io_size - 1;
+
+        pcic->mem_offset = 0;   /* busaddr == physaddr */
+
+        printk(KERN_INFO "PCI: IO 0x%08llx-0x%08llx MEM 0x%08llx-0x%08llx\n",
+               (unsigned long long)pcic->mem_resource[1].start,
+               (unsigned long long)pcic->mem_resource[1].end,
+               (unsigned long long)pcic->mem_resource[0].start,
+               (unsigned long long)pcic->mem_resource[0].end);
+
+        /* register_pci_controller() will request MEM resource */
+        release_resource(&pcic->mem_resource[0]);
+        return pcic;
+ release_and_exit:
+        release_resource(&pcic->mem_resource[0]);
+ free_and_exit:
+        kfree(new);
+        printk(KERN_ERR "PCI: Failed to allocate resources.\n");
+        return NULL;
+}
+
+static int __init
+txx9_arch_pci_init(void)
+{
+        PCIBIOS_MIN_IO = 0x8000;        /* reseve legacy I/O space */
+        return 0;
+}
+arch_initcall(txx9_arch_pci_init);
+
+/* IRQ/IDSEL mapping */
+int txx9_pci_option =
+#ifdef CONFIG_PICMG_PCI_BACKPLANE_DEFAULT
+        TXX9_PCI_OPT_PICMG |
+#endif
+        TXX9_PCI_OPT_CLK_AUTO;
+
+enum txx9_pci_err_action txx9_pci_err_action = TXX9_PCI_ERR_REPORT;
+
+#ifdef CONFIG_TOSHIBA_FPCIB0
+static irqreturn_t i8259_interrupt(int irq, void *dev_id)
+{
+        int isairq;
+
+        isairq = i8259_irq();
+        if (unlikely(isairq <= I8259A_IRQ_BASE))
+                return IRQ_NONE;
+        generic_handle_irq(isairq);
+        return IRQ_HANDLED;
+}
+
+static int __init
+txx9_i8259_irq_setup(int irq)
+{
+        int err;
+
+        init_i8259_irqs();
+        err = request_irq(irq, &i8259_interrupt, IRQF_DISABLED|IRQF_SHARED,
+                          "cascade(i8259)", (void *)(long)irq);
+        if (!err)
+                printk(KERN_INFO "PCI-ISA bridge PIC (irq %d)\n", irq);
+        return err;
+}
+
+static void __init quirk_slc90e66_bridge(struct pci_dev *dev)
+{
+        int irq;        /* PCI/ISA Bridge interrupt */
+        u8 reg_64;
+        u32 reg_b0;
+        u8 reg_e1;
+        irq = pcibios_map_irq(dev, PCI_SLOT(dev->devfn), 1); /* INTA */
+        if (!irq)
+                return;
+        txx9_i8259_irq_setup(irq);
+        pci_read_config_byte(dev, 0x64, &reg_64);
+        pci_read_config_dword(dev, 0xb0, &reg_b0);
+        pci_read_config_byte(dev, 0xe1, &reg_e1);
+        /* serial irq control */
+        reg_64 = 0xd0;
+        /* serial irq pin */
+        reg_b0 |= 0x00010000;
+        /* ide irq on isa14 */
+        reg_e1 &= 0xf0;
+        reg_e1 |= 0x0d;
+        pci_write_config_byte(dev, 0x64, reg_64);
+        pci_write_config_dword(dev, 0xb0, reg_b0);
+        pci_write_config_byte(dev, 0xe1, reg_e1);
+
+        smsc_fdc37m81x_init(0x3f0);
+        smsc_fdc37m81x_config_beg();
+        smsc_fdc37m81x_config_set(SMSC_FDC37M81X_DNUM,
+                                  SMSC_FDC37M81X_KBD);
+        smsc_fdc37m81x_config_set(SMSC_FDC37M81X_INT, 1);
+        smsc_fdc37m81x_config_set(SMSC_FDC37M81X_INT2, 12);
+        smsc_fdc37m81x_config_set(SMSC_FDC37M81X_ACTIVE,
+                                  1);
+        smsc_fdc37m81x_config_end();
+}
+
+static void quirk_slc90e66_ide(struct pci_dev *dev)
+{
+        unsigned char dat;
+        int regs[2] = {0x41, 0x43};
+        int i;
+
+        /* SMSC SLC90E66 IDE uses irq 14, 15 (default) */
+        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 14);
+        pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &dat);
+        printk(KERN_INFO "PCI: %s: IRQ %02x", pci_name(dev), dat);
+        /* enable SMSC SLC90E66 IDE */
+        for (i = 0; i < ARRAY_SIZE(regs); i++) {
+                pci_read_config_byte(dev, regs[i], &dat);
+                pci_write_config_byte(dev, regs[i], dat | 0x80);
+                pci_read_config_byte(dev, regs[i], &dat);
+                printk(KERN_CONT " IDETIM%d %02x", i, dat);
+        }
+        pci_read_config_byte(dev, 0x5c, &dat);
+        /*
+         * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!!
+         *
+         * This line of code is intended to provide the user with a work
+         * around solution to the anomalies cited in SMSC's anomaly sheet
+         * entitled, "SLC90E66 Functional Rev.J_0.1 Anomalies"".
+         *
+         * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!!
+         */
+        dat |= 0x01;
+        pci_write_config_byte(dev, regs[i], dat);
+        pci_read_config_byte(dev, 0x5c, &dat);
+        printk(KERN_CONT " REG5C %02x", dat);
+        printk(KERN_CONT "\n");
+}
+#endif /* CONFIG_TOSHIBA_FPCIB0 */
+
+static void final_fixup(struct pci_dev *dev)
+{
+        unsigned char bist;
+
+        /* Do build-in self test */
+        if (pci_read_config_byte(dev, PCI_BIST, &bist) == PCIBIOS_SUCCESSFUL &&
+            (bist & PCI_BIST_CAPABLE)) {
+                unsigned long timeout;
+                pci_set_power_state(dev, PCI_D0);
+                printk(KERN_INFO "PCI: %s BIST...", pci_name(dev));
+                pci_write_config_byte(dev, PCI_BIST, PCI_BIST_START);
+                timeout = jiffies + HZ * 2;     /* timeout after 2 sec */
+                do {
+                        pci_read_config_byte(dev, PCI_BIST, &bist);
+                        if (time_after(jiffies, timeout))
+                                break;
+                } while (bist & PCI_BIST_START);
+                if (bist & (PCI_BIST_CODE_MASK | PCI_BIST_START))
+                        printk(KERN_CONT "failed. (0x%x)\n", bist);
+                else
+                        printk(KERN_CONT "OK.\n");
+        }
+}
+
+#ifdef CONFIG_TOSHIBA_FPCIB0
+#define PCI_DEVICE_ID_EFAR_SLC90E66_0 0x9460
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_0,
+        quirk_slc90e66_bridge);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1,
+        quirk_slc90e66_ide);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1,
+        quirk_slc90e66_ide);
+#endif
+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, final_fixup);
+DECLARE_PCI_FIXUP_RESUME(PCI_ANY_ID, PCI_ANY_ID, final_fixup);
+
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return 0;
+}
+
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        return txx9_board_vec->pci_map_irq(dev, slot, pin);
+}
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
new file mode 100644
index 000000000000..5afc5d5cab03
--- /dev/null
+++ b/arch/mips/txx9/generic/setup.c
@@ -0,0 +1,212 @@
+/*
+ * linux/arch/mips/txx9/generic/setup.c
+ *
+ * Based on linux/arch/mips/txx9/rbtx4938/setup.c,
+ *          and RBTX49xx patch from CELF patch archive.
+ *
+ * 2003-2005 (c) MontaVista Software, Inc.
+ * (C) Copyright TOSHIBA CORPORATION 2000-2001, 2004-2007
+ *
+ * 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/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/string.h>
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <asm/bootinfo.h>
+#include <asm/txx9/generic.h>
+#ifdef CONFIG_CPU_TX49XX
+#include <asm/txx9/tx4938.h>
+#endif
+
+/* EBUSC settings of TX4927, etc. */
+struct resource txx9_ce_res[8];
+static char txx9_ce_res_name[8][4];     /* "CEn" */
+
+/* pcode, internal register */
+char txx9_pcode_str[8];
+static struct resource txx9_reg_res = {
+        .name = txx9_pcode_str,
+        .flags = IORESOURCE_MEM,
+};
+void __init
+txx9_reg_res_init(unsigned int pcode, unsigned long base, unsigned long size)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(txx9_ce_res); i++) {
+                sprintf(txx9_ce_res_name[i], "CE%d", i);
+                txx9_ce_res[i].flags = IORESOURCE_MEM;
+                txx9_ce_res[i].name = txx9_ce_res_name[i];
+        }
+
+        sprintf(txx9_pcode_str, "TX%x", pcode);
+        if (base) {
+                txx9_reg_res.start = base & 0xfffffffffULL;
+                txx9_reg_res.end = (base & 0xfffffffffULL) + (size - 1);
+                request_resource(&iomem_resource, &txx9_reg_res);
+        }
+}
+
+/* clocks */
+unsigned int txx9_master_clock;
+unsigned int txx9_cpu_clock;
+unsigned int txx9_gbus_clock;
+
+
+/* Minimum CLK support */
+
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        if (!strcmp(id, "spi-baseclk"))
+                return (struct clk *)(txx9_gbus_clock / 2 / 4);
+        if (!strcmp(id, "imbus_clk"))
+                return (struct clk *)(txx9_gbus_clock / 2);
+        return ERR_PTR(-ENOENT);
+}
+EXPORT_SYMBOL(clk_get);
+
+int clk_enable(struct clk *clk)
+{
+        return 0;
+}
+EXPORT_SYMBOL(clk_enable);
+
+void clk_disable(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_disable);
+
+unsigned long clk_get_rate(struct clk *clk)
+{
+        return (unsigned long)clk;
+}
+EXPORT_SYMBOL(clk_get_rate);
+
+void clk_put(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_put);
+
+extern struct txx9_board_vec jmr3927_vec;
+extern struct txx9_board_vec rbtx4927_vec;
+extern struct txx9_board_vec rbtx4937_vec;
+extern struct txx9_board_vec rbtx4938_vec;
+
+struct txx9_board_vec *txx9_board_vec __initdata;
+static char txx9_system_type[32];
+
+void __init prom_init_cmdline(void)
+{
+        int argc = (int)fw_arg0;
+        char **argv = (char **)fw_arg1;
+        int i;                  /* Always ignore the "-c" at argv[0] */
+
+        /* ignore all built-in args if any f/w args given */
+        if (argc > 1)
+                *arcs_cmdline = '\0';
+
+        for (i = 1; i < argc; i++) {
+                if (i != 1)
+                        strcat(arcs_cmdline, " ");
+                strcat(arcs_cmdline, argv[i]);
+        }
+}
+
+void __init prom_init(void)
+{
+#ifdef CONFIG_CPU_TX39XX
+        txx9_board_vec = &jmr3927_vec;
+#endif
+#ifdef CONFIG_CPU_TX49XX
+        switch (TX4938_REV_PCODE()) {
+        case 0x4927:
+                txx9_board_vec = &rbtx4927_vec;
+                break;
+        case 0x4937:
+                txx9_board_vec = &rbtx4937_vec;
+                break;
+        case 0x4938:
+                txx9_board_vec = &rbtx4938_vec;
+                break;
+        }
+#endif
+
+        strcpy(txx9_system_type, txx9_board_vec->system);
+
+        txx9_board_vec->prom_init();
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
+
+const char *get_system_type(void)
+{
+        return txx9_system_type;
+}
+
+char * __init prom_getcmdline(void)
+{
+        return &(arcs_cmdline[0]);
+}
+
+/* wrappers */
+void __init plat_mem_setup(void)
+{
+        txx9_board_vec->mem_setup();
+}
+
+void __init arch_init_irq(void)
+{
+        txx9_board_vec->irq_setup();
+}
+
+void __init plat_time_init(void)
+{
+        txx9_board_vec->time_init();
+}
+
+static int __init _txx9_arch_init(void)
+{
+        if (txx9_board_vec->arch_init)
+                txx9_board_vec->arch_init();
+        return 0;
+}
+arch_initcall(_txx9_arch_init);
+
+static int __init _txx9_device_init(void)
+{
+        if (txx9_board_vec->device_init)
+                txx9_board_vec->device_init();
+        return 0;
+}
+device_initcall(_txx9_device_init);
+
+int (*txx9_irq_dispatch)(int pending);
+asmlinkage void plat_irq_dispatch(void)
+{
+        int pending = read_c0_status() & read_c0_cause() & ST0_IM;
+        int irq = txx9_irq_dispatch(pending);
+
+        if (likely(irq >= 0))
+                do_IRQ(irq);
+        else
+                spurious_interrupt();
+}
+
+/* see include/asm-mips/mach-tx39xx/mangle-port.h, for example. */
+#ifdef NEEDS_TXX9_SWIZZLE_ADDR_B
+static unsigned long __swizzle_addr_none(unsigned long port)
+{
+        return port;
+}
+unsigned long (*__swizzle_addr_b)(unsigned long port) = __swizzle_addr_none;
+EXPORT_SYMBOL(__swizzle_addr_b);
+#endif
diff --git a/arch/mips/tx4927/common/smsc_fdc37m81x.c b/arch/mips/txx9/generic/smsc_fdc37m81x.c
index 33f517bc9a08..69e487467fa5 100644
--- a/arch/mips/tx4927/common/smsc_fdc37m81x.c
+++ b/arch/mips/txx9/generic/smsc_fdc37m81x.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <asm/io.h>
-#include <asm/tx4927/smsc_fdc37m81x.h>
+#include <asm/txx9/smsc_fdc37m81x.h>
 
 #define DEBUG
 
diff --git a/arch/mips/jmr3927/rbhma3100/Makefile b/arch/mips/txx9/jmr3927/Makefile
index d86e30dca8f3..ba292c945669 100644
--- a/arch/mips/jmr3927/rbhma3100/Makefile
+++ b/arch/mips/txx9/jmr3927/Makefile
@@ -2,7 +2,7 @@
 # Makefile for TOSHIBA JMR-TX3927 board
 #
 
-obj-y                           += init.o irq.o setup.o
-obj-$(CONFIG_KGDB)              += kgdb_io.o
+obj-y   += prom.o irq.o setup.o
+obj-$(CONFIG_KGDB)      += kgdb_io.o
 
 EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/txx9/jmr3927/irq.c
index 3a47e8ce1196..070c9a115e57 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/txx9/jmr3927/irq.c
@@ -39,7 +39,8 @@
 #include <asm/system.h>
 
 #include <asm/processor.h>
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/jmr3927.h>
 
 #if JMR3927_IRQ_END > NR_IRQS
 #error JMR3927_IRQ_END > NR_IRQS
@@ -77,38 +78,32 @@ static void unmask_irq_ioc(unsigned int irq)
         (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
 }
 
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned long cp0_cause = read_c0_cause();
-        int irq;
-
-        if ((cp0_cause & CAUSEF_IP7) == 0)
-                return;
-        irq = (cp0_cause >> CAUSEB_IP2) & 0x0f;
-
-        do_IRQ(irq + JMR3927_IRQ_IRC);
-}
-
-static irqreturn_t jmr3927_ioc_interrupt(int irq, void *dev_id)
+static int jmr3927_ioc_irqroute(void)
 {
         unsigned char istat = jmr3927_ioc_reg_in(JMR3927_IOC_INTS2_ADDR);
         int i;
 
         for (i = 0; i < JMR3927_NR_IRQ_IOC; i++) {
-                if (istat & (1 << i)) {
-                        irq = JMR3927_IRQ_IOC + i;
-                        do_IRQ(irq);
-                }
+                if (istat & (1 << i))
+                        return JMR3927_IRQ_IOC + i;
         }
-        return IRQ_HANDLED;
+        return -1;
 }
 
-static struct irqaction ioc_action = {
-        .handler = jmr3927_ioc_interrupt,
-        .mask = CPU_MASK_NONE,
-        .name = "IOC",
-};
+static int jmr3927_irq_dispatch(int pending)
+{
+        int irq;
 
+        if ((pending & CAUSEF_IP7) == 0)
+                return -1;
+        irq = (pending >> CAUSEB_IP2) & 0x0f;
+        irq += JMR3927_IRQ_IRC;
+        if (irq == JMR3927_IRQ_IOCINT)
+                irq = jmr3927_ioc_irqroute();
+        return irq;
+}
+
+#ifdef CONFIG_PCI
 static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id)
 {
         printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq);
@@ -122,11 +117,13 @@ static struct irqaction pcierr_action = {
         .mask = CPU_MASK_NONE,
         .name = "PCI error",
 };
+#endif
 
 static void __init jmr3927_irq_init(void);
 
-void __init arch_init_irq(void)
+void __init jmr3927_irq_setup(void)
 {
+        txx9_irq_dispatch = jmr3927_irq_dispatch;
         /* Now, interrupt control disabled, */
         /* all IRC interrupts are masked, */
         /* all IRC interrupt mode are Low Active. */
@@ -144,7 +141,7 @@ void __init arch_init_irq(void)
         jmr3927_irq_init();
 
         /* setup IOC interrupt 1 (PCI, MODEM) */
-        setup_irq(JMR3927_IRQ_IOCINT, &ioc_action);
+        set_irq_chained_handler(JMR3927_IRQ_IOCINT, handle_simple_irq);
 
 #ifdef CONFIG_PCI
         setup_irq(JMR3927_IRQ_IRC_PCI, &pcierr_action);
diff --git a/arch/mips/jmr3927/rbhma3100/kgdb_io.c b/arch/mips/txx9/jmr3927/kgdb_io.c
index 342579cfdc01..5bd757e56f79 100644
--- a/arch/mips/jmr3927/rbhma3100/kgdb_io.c
+++ b/arch/mips/txx9/jmr3927/kgdb_io.c
@@ -31,7 +31,7 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/jmr3927.h>
 
 #define TIMEOUT       0xffffff
 
diff --git a/arch/mips/jmr3927/common/prom.c b/arch/mips/txx9/jmr3927/prom.c
index 5398813e50e6..2cadb423face 100644
--- a/arch/mips/jmr3927/common/prom.c
+++ b/arch/mips/txx9/jmr3927/prom.c
@@ -35,38 +35,42 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/string.h>
-
 #include <asm/bootinfo.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/jmr3927.h>
 
-char * __init prom_getcmdline(void)
-{
-        return &(arcs_cmdline[0]);
-}
+#define TIMEOUT       0xffffff
 
-void  __init prom_init_cmdline(void)
+void
+prom_putchar(char c)
 {
-        char *cp;
-        int actr;
-        int prom_argc = fw_arg0;
-        char **prom_argv = (char **) fw_arg1;
+        int i = 0;
 
-        actr = 1; /* Always ignore argv[0] */
+        do {
+            i++;
+            if (i>TIMEOUT)
+                break;
+        } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
+        tx3927_sioptr(1)->tfifo = c;
+        return;
+}
 
-        cp = &(arcs_cmdline[0]);
-        while(actr < prom_argc) {
-                strcpy(cp, prom_argv[actr]);
-                cp += strlen(prom_argv[actr]);
-                *cp++ = ' ';
-                actr++;
-        }
-        if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */
-                --cp;
-        *cp = '\0';
+void
+puts(const char *cp)
+{
+    while (*cp)
+        prom_putchar(*cp++);
+    prom_putchar('\r');
+    prom_putchar('\n');
 }
 
-void __init prom_free_prom_memory(void)
+void __init jmr3927_prom_init(void)
 {
+        /* CCFG */
+        if ((tx3927_ccfgptr->ccfg & TX3927_CCFG_TLBOFF) == 0)
+                puts("Warning: TX3927 TLB off\n");
+
+        prom_init_cmdline();
+        add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/txx9/jmr3927/setup.c
index f39c444e42d4..5e35ef73c5a5 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -30,21 +30,20 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/platform_device.h>
-#include <linux/clk.h>
 #include <linux/gpio.h>
 #ifdef CONFIG_SERIAL_TXX9
 #include <linux/serial_core.h>
 #endif
-
 #include <asm/txx9tmr.h>
 #include <asm/txx9pio.h>
 #include <asm/reboot.h>
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/pci.h>
+#include <asm/txx9/jmr3927.h>
 #include <asm/mipsregs.h>
 
 extern void puts(const char *cp);
@@ -83,7 +82,7 @@ static void jmr3927_machine_power_off(void)
         while (1);
 }
 
-void __init plat_time_init(void)
+static void __init jmr3927_time_init(void)
 {
         txx9_clockevent_init(TX3927_TMR_REG(0),
                              TXX9_IRQ_BASE + JMR3927_IRQ_IRC_TMR(0),
@@ -94,12 +93,9 @@ void __init plat_time_init(void)
 #define DO_WRITE_THROUGH
 #define DO_ENABLE_CACHE
 
-extern char * __init prom_getcmdline(void);
 static void jmr3927_board_init(void);
-extern struct resource pci_io_resource;
-extern struct resource pci_mem_resource;
 
-void __init plat_mem_setup(void)
+static void __init jmr3927_mem_setup(void)
 {
         char *argptr;
 
@@ -112,8 +108,8 @@ void __init plat_mem_setup(void)
         /*
          * IO/MEM resources.
          */
-        ioport_resource.start = pci_io_resource.start;
-        ioport_resource.end = pci_io_resource.end;
+        ioport_resource.start = 0;
+        ioport_resource.end = 0xffffffff;
         iomem_resource.start = 0;
         iomem_resource.end = 0xffffffff;
 
@@ -191,9 +187,33 @@ void __init plat_mem_setup(void)
 
 static void tx3927_setup(void);
 
+static void __init jmr3927_pci_setup(void)
+{
+#ifdef CONFIG_PCI
+        int extarb = !(tx3927_ccfgptr->ccfg & TX3927_CCFG_PCIXARB);
+        struct pci_controller *c;
+
+        c = txx9_alloc_pci_controller(&txx9_primary_pcic,
+                                      JMR3927_PCIMEM, JMR3927_PCIMEM_SIZE,
+                                      JMR3927_PCIIO, JMR3927_PCIIO_SIZE);
+        register_pci_controller(c);
+        if (!extarb) {
+                /* Reset PCI Bus */
+                jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);
+                udelay(100);
+                jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI,
+                                    JMR3927_IOC_RESET_ADDR);
+                udelay(100);
+                jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);
+        }
+        tx3927_pcic_setup(c, JMR3927_SDRAM_SIZE, extarb);
+#endif /* CONFIG_PCI */
+}
+
 static void __init jmr3927_board_init(void)
 {
         tx3927_setup();
+        jmr3927_pci_setup();
 
         /* SIO0 DTR on */
         jmr3927_ioc_reg_out(0, JMR3927_IOC_DTR_ADDR);
@@ -210,15 +230,9 @@ static void __init jmr3927_board_init(void)
 static void __init tx3927_setup(void)
 {
         int i;
-#ifdef CONFIG_PCI
-        unsigned long mips_pci_io_base = JMR3927_PCIIO;
-        unsigned long mips_pci_io_size = JMR3927_PCIIO_SIZE;
-        unsigned long mips_pci_mem_base = JMR3927_PCIMEM;
-        unsigned long mips_pci_mem_size = JMR3927_PCIMEM_SIZE;
-        /* for legacy I/O, PCI I/O PCI Bus address must be 0 */
-        unsigned long mips_pci_io_pciaddr = 0;
-#endif
 
+        txx9_cpu_clock = JMR3927_CORECLK;
+        txx9_gbus_clock = JMR3927_GBUSCLK;
         /* SDRAMC are configured by PROM */
 
         /* ROMC */
@@ -272,74 +286,6 @@ static void __init tx3927_setup(void)
         tx3927_dmaptr->mcr = TX3927_DMA_MCR_MSTEN | TX3927_DMA_MCR_LE;
 #endif
 
-#ifdef CONFIG_PCI
-        /* PCIC */
-        printk("TX3927 PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:",
-               tx3927_pcicptr->did, tx3927_pcicptr->vid,
-               tx3927_pcicptr->rid);
-        if (!(tx3927_ccfgptr->ccfg & TX3927_CCFG_PCIXARB)) {
-                printk("External\n");
-                /* XXX */
-        } else {
-                printk("Internal\n");
-
-                /* Reset PCI Bus */
-                jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);
-                udelay(100);
-                jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI,
-                                    JMR3927_IOC_RESET_ADDR);
-                udelay(100);
-                jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);
-
-
-                /* Disable External PCI Config. Access */
-                tx3927_pcicptr->lbc = TX3927_PCIC_LBC_EPCAD;
-#ifdef __BIG_ENDIAN
-                tx3927_pcicptr->lbc |= TX3927_PCIC_LBC_IBSE |
-                        TX3927_PCIC_LBC_TIBSE |
-                        TX3927_PCIC_LBC_TMFBSE | TX3927_PCIC_LBC_MSDSE;
-#endif
-                /* LB->PCI mappings */
-                tx3927_pcicptr->iomas = ~(mips_pci_io_size - 1);
-                tx3927_pcicptr->ilbioma = mips_pci_io_base;
-                tx3927_pcicptr->ipbioma = mips_pci_io_pciaddr;
-                tx3927_pcicptr->mmas = ~(mips_pci_mem_size - 1);
-                tx3927_pcicptr->ilbmma = mips_pci_mem_base;
-                tx3927_pcicptr->ipbmma = mips_pci_mem_base;
-                /* PCI->LB mappings */
-                tx3927_pcicptr->iobas = 0xffffffff;
-                tx3927_pcicptr->ioba = 0;
-                tx3927_pcicptr->tlbioma = 0;
-                tx3927_pcicptr->mbas = ~(mips_pci_mem_size - 1);
-                tx3927_pcicptr->mba = 0;
-                tx3927_pcicptr->tlbmma = 0;
-                /* Enable Direct mapping Address Space Decoder */
-                tx3927_pcicptr->lbc |= TX3927_PCIC_LBC_ILMDE | TX3927_PCIC_LBC_ILIDE;
-
-                /* Clear All Local Bus Status */
-                tx3927_pcicptr->lbstat = TX3927_PCIC_LBIM_ALL;
-                /* Enable All Local Bus Interrupts */
-                tx3927_pcicptr->lbim = TX3927_PCIC_LBIM_ALL;
-                /* Clear All PCI Status Error */
-                tx3927_pcicptr->pcistat = TX3927_PCIC_PCISTATIM_ALL;
-                /* Enable All PCI Status Error Interrupts */
-                tx3927_pcicptr->pcistatim = TX3927_PCIC_PCISTATIM_ALL;
-
-                /* PCIC Int => IRC IRQ10 */
-                tx3927_pcicptr->il = TX3927_IR_PCI;
-                /* Target Control (per errata) */
-                tx3927_pcicptr->tc = TX3927_PCIC_TC_OF8E | TX3927_PCIC_TC_IF8E;
-
-                /* Enable Bus Arbiter */
-                tx3927_pcicptr->pbapmc = TX3927_PCIC_PBAPMC_PBAEN;
-
-                tx3927_pcicptr->pcicmd = PCI_COMMAND_MASTER |
-                        PCI_COMMAND_MEMORY |
-                        PCI_COMMAND_IO |
-                        PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
-        }
-#endif /* CONFIG_PCI */
-
         /* PIO */
         /* PIO[15:12] connected to LEDs */
         __raw_writel(0x0000f000, &tx3927_pioptr->dir);
@@ -366,7 +312,7 @@ static void __init tx3927_setup(void)
 }
 
 /* This trick makes rtc-ds1742 driver usable as is. */
-unsigned long __swizzle_addr_b(unsigned long port)
+static unsigned long jmr3927_swizzle_addr_b(unsigned long port)
 {
         if ((port & 0xffff0000) != JMR3927_IOC_NVRAMB_ADDR)
                 return port;
@@ -377,7 +323,6 @@ unsigned long __swizzle_addr_b(unsigned long port)
         return port | 1;
 #endif
 }
-EXPORT_SYMBOL(__swizzle_addr_b);
 
 static int __init jmr3927_rtc_init(void)
 {
@@ -390,7 +335,6 @@ static int __init jmr3927_rtc_init(void)
         dev = platform_device_register_simple("rtc-ds1742", -1, &res, 1);
         return IS_ERR(dev) ? PTR_ERR(dev) : 0;
 }
-device_initcall(jmr3927_rtc_init);
 
 /* Watchdog support */
 
@@ -410,36 +354,22 @@ static int __init jmr3927_wdt_init(void)
 {
         return txx9_wdt_init(TX3927_TMR_REG(2));
 }
-device_initcall(jmr3927_wdt_init);
 
-/* Minimum CLK support */
-
-struct clk *clk_get(struct device *dev, const char *id)
+static void __init jmr3927_device_init(void)
 {
-        if (!strcmp(id, "imbus_clk"))
-                return (struct clk *)JMR3927_IMCLK;
-        return ERR_PTR(-ENOENT);
+        __swizzle_addr_b = jmr3927_swizzle_addr_b;
+        jmr3927_rtc_init();
+        jmr3927_wdt_init();
 }
-EXPORT_SYMBOL(clk_get);
 
-int clk_enable(struct clk *clk)
-{
-        return 0;
-}
-EXPORT_SYMBOL(clk_enable);
-
-void clk_disable(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_disable);
-
-unsigned long clk_get_rate(struct clk *clk)
-{
-        return (unsigned long)clk;
-}
-EXPORT_SYMBOL(clk_get_rate);
-
-void clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_put);
+struct txx9_board_vec jmr3927_vec __initdata = {
+        .system = "Toshiba JMR_TX3927",
+        .prom_init = jmr3927_prom_init,
+        .mem_setup = jmr3927_mem_setup,
+        .irq_setup = jmr3927_irq_setup,
+        .time_init = jmr3927_time_init,
+        .device_init = jmr3927_device_init,
+#ifdef CONFIG_PCI
+        .pci_map_irq = jmr3927_pci_map_irq,
+#endif
+};
diff --git a/arch/mips/txx9/rbtx4927/Makefile b/arch/mips/txx9/rbtx4927/Makefile
new file mode 100644
index 000000000000..f3e1f597b4f1
--- /dev/null
+++ b/arch/mips/txx9/rbtx4927/Makefile
@@ -0,0 +1,3 @@
+obj-y   += prom.o setup.o irq.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/txx9/rbtx4927/irq.c b/arch/mips/txx9/rbtx4927/irq.c
new file mode 100644
index 000000000000..70f13211bc2a
--- /dev/null
+++ b/arch/mips/txx9/rbtx4927/irq.c
@@ -0,0 +1,199 @@
+/*
+ * Toshiba RBTX4927 specific interrupt handlers
+ *
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * Copyright 2001-2002 MontaVista Software Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+IRQ  Device
+00   RBTX4927-ISA/00
+01   RBTX4927-ISA/01 PS2/Keyboard
+02   RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15)
+03   RBTX4927-ISA/03
+04   RBTX4927-ISA/04
+05   RBTX4927-ISA/05
+06   RBTX4927-ISA/06
+07   RBTX4927-ISA/07
+08   RBTX4927-ISA/08
+09   RBTX4927-ISA/09
+10   RBTX4927-ISA/10
+11   RBTX4927-ISA/11
+12   RBTX4927-ISA/12 PS2/Mouse (not supported at this time)
+13   RBTX4927-ISA/13
+14   RBTX4927-ISA/14 IDE
+15   RBTX4927-ISA/15
+
+16   TX4927-CP0/00 Software 0
+17   TX4927-CP0/01 Software 1
+18   TX4927-CP0/02 Cascade TX4927-CP0
+19   TX4927-CP0/03 Multiplexed -- do not use
+20   TX4927-CP0/04 Multiplexed -- do not use
+21   TX4927-CP0/05 Multiplexed -- do not use
+22   TX4927-CP0/06 Multiplexed -- do not use
+23   TX4927-CP0/07 CPU TIMER
+
+24   TX4927-PIC/00
+25   TX4927-PIC/01
+26   TX4927-PIC/02
+27   TX4927-PIC/03 Cascade RBTX4927-IOC
+28   TX4927-PIC/04
+29   TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet
+30   TX4927-PIC/06
+31   TX4927-PIC/07
+32   TX4927-PIC/08 TX4927 SerialIO Channel 0
+33   TX4927-PIC/09 TX4927 SerialIO Channel 1
+34   TX4927-PIC/10
+35   TX4927-PIC/11
+36   TX4927-PIC/12
+37   TX4927-PIC/13
+38   TX4927-PIC/14
+39   TX4927-PIC/15
+40   TX4927-PIC/16 TX4927 PCI PCI-C
+41   TX4927-PIC/17
+42   TX4927-PIC/18
+43   TX4927-PIC/19
+44   TX4927-PIC/20
+45   TX4927-PIC/21
+46   TX4927-PIC/22 TX4927 PCI PCI-ERR
+47   TX4927-PIC/23 TX4927 PCI PCI-PMA (not used)
+48   TX4927-PIC/24
+49   TX4927-PIC/25
+50   TX4927-PIC/26
+51   TX4927-PIC/27
+52   TX4927-PIC/28
+53   TX4927-PIC/29
+54   TX4927-PIC/30
+55   TX4927-PIC/31
+
+56 RBTX4927-IOC/00 FPCIB0 PCI-D PJ4/A PJ5/B SB/C PJ6/D PJ7/A (SouthBridge/NotUsed)        [RTL-8139=PJ4]
+57 RBTX4927-IOC/01 FPCIB0 PCI-C PJ4/D PJ5/A SB/B PJ6/C PJ7/D (SouthBridge/NotUsed)        [RTL-8139=PJ5]
+58 RBTX4927-IOC/02 FPCIB0 PCI-B PJ4/C PJ5/D SB/A PJ6/B PJ7/C (SouthBridge/IDE/pin=1,INTR) [RTL-8139=NotSupported]
+59 RBTX4927-IOC/03 FPCIB0 PCI-A PJ4/B PJ5/C SB/D PJ6/A PJ7/B (SouthBridge/USB/pin=4)      [RTL-8139=PJ6]
+60 RBTX4927-IOC/04
+61 RBTX4927-IOC/05
+62 RBTX4927-IOC/06
+63 RBTX4927-IOC/07
+
+NOTES:
+SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58
+SouthBridge/ISA/pin=0 no pci irq used by this device
+SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR via ISA IRQ14
+SouthBridge/USB/pin=4 using pci irq SouthBridge/D=PCI-A=#59
+SouthBridge/PMC/pin=0 no pci irq used by this device
+SuperIO/PS2/Keyboard, using INTR via ISA IRQ1
+SuperIO/PS2/Mouse, using INTR via ISA IRQ12 (mouse not currently supported)
+JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthBridge, JP4, JP5, JP6
+*/
+
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <asm/io.h>
+#include <asm/mipsregs.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/rbtx4927.h>
+
+static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq);
+static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq);
+
+#define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
+static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
+        .name = TOSHIBA_RBTX4927_IOC_NAME,
+        .ack = toshiba_rbtx4927_irq_ioc_disable,
+        .mask = toshiba_rbtx4927_irq_ioc_disable,
+        .mask_ack = toshiba_rbtx4927_irq_ioc_disable,
+        .unmask = toshiba_rbtx4927_irq_ioc_enable,
+};
+#define TOSHIBA_RBTX4927_IOC_INTR_ENAB (void __iomem *)0xbc002000UL
+#define TOSHIBA_RBTX4927_IOC_INTR_STAT (void __iomem *)0xbc002006UL
+
+static int toshiba_rbtx4927_irq_nested(int sw_irq)
+{
+        u8 level3;
+
+        level3 = readb(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
+        if (level3)
+                sw_irq = RBTX4927_IRQ_IOC + fls(level3) - 1;
+        return (sw_irq);
+}
+
+static void __init toshiba_rbtx4927_irq_ioc_init(void)
+{
+        int i;
+
+        for (i = RBTX4927_IRQ_IOC;
+             i < RBTX4927_IRQ_IOC + RBTX4927_NR_IRQ_IOC; i++)
+                set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_ioc_type,
+                                         handle_level_irq);
+        set_irq_chained_handler(RBTX4927_IRQ_IOCINT, handle_simple_irq);
+}
+
+static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq)
+{
+        unsigned char v;
+
+        v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
+        v |= (1 << (irq - RBTX4927_IRQ_IOC));
+        writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);
+}
+
+static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq)
+{
+        unsigned char v;
+
+        v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
+        v &= ~(1 << (irq - RBTX4927_IRQ_IOC));
+        writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);
+        mmiowb();
+}
+
+
+static int rbtx4927_irq_dispatch(int pending)
+{
+        int irq;
+
+        if (pending & STATUSF_IP7)                      /* cpu timer */
+                irq = MIPS_CPU_IRQ_BASE + 7;
+        else if (pending & STATUSF_IP2) {               /* tx4927 pic */
+                irq = txx9_irq();
+                if (irq == RBTX4927_IRQ_IOCINT)
+                        irq = toshiba_rbtx4927_irq_nested(irq);
+        } else if (pending & STATUSF_IP0)               /* user line 0 */
+                irq = MIPS_CPU_IRQ_BASE + 0;
+        else if (pending & STATUSF_IP1)                 /* user line 1 */
+                irq = MIPS_CPU_IRQ_BASE + 1;
+        else
+                irq = -1;
+        return irq;
+}
+
+void __init rbtx4927_irq_setup(void)
+{
+        txx9_irq_dispatch = rbtx4927_irq_dispatch;
+        tx4927_irq_init();
+        toshiba_rbtx4927_irq_ioc_init();
+        /* Onboard 10M Ether: High Active */
+        set_irq_type(RBTX4927_RTL_8019_IRQ, IRQF_TRIGGER_HIGH);
+}
diff --git a/arch/mips/tx4927/common/tx4927_dbgio.c b/arch/mips/txx9/rbtx4927/prom.c
index d8423e001b2d..942e627d2dc1 100644
--- a/arch/mips/tx4927/common/tx4927_dbgio.c
+++ b/arch/mips/txx9/rbtx4927/prom.c
@@ -1,13 +1,14 @@
 /*
- * linux/arch/mips/tx4927/common/tx4927_dbgio.c
- *
- * kgdb interface for gdb
+ * rbtx4927 specific prom routines
  *
  * Author: MontaVista Software, Inc.
  *         source@mvista.com
  *
  * Copyright 2001-2002 MontaVista Software Inc.
  *
+ * Copyright (C) 2004 MontaVista Software Inc.
+ * Author: Manish Lachwani, mlachwani@mvista.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
@@ -28,19 +29,17 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <linux/init.h>
+#include <asm/bootinfo.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/rbtx4927.h>
 
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-
-u8 getDebugChar(void)
+void __init rbtx4927_prom_init(void)
 {
-        extern u8 txx9_sio_kdbg_rd(void);
-        return (txx9_sio_kdbg_rd());
-}
-
+        extern int tx4927_get_mem_size(void);
+        int msize;
 
-int putDebugChar(u8 byte)
-{
-        extern int txx9_sio_kdbg_wr( u8 ch );
-        return (txx9_sio_kdbg_wr(byte));
+        prom_init_cmdline();
+        msize = tx4927_get_mem_size();
+        add_memory_region(0, msize << 20, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c
new file mode 100644
index 000000000000..1657fd935da8
--- /dev/null
+++ b/arch/mips/txx9/rbtx4927/setup.c
@@ -0,0 +1,443 @@
+/*
+ * Toshiba rbtx4927 specific setup
+ *
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * Copyright 2001-2002 MontaVista Software Inc.
+ *
+ * Copyright (C) 1996, 97, 2001, 04  Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 2000 RidgeRun, Inc.
+ * Author: RidgeRun, Inc.
+ *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com
+ *
+ * Copyright 2001 MontaVista Software Inc.
+ * Author: jsun@mvista.com or jsun@junsun.net
+ *
+ * Copyright 2002 MontaVista Software Inc.
+ * Author: Michael Pruznick, michael_pruznick@mvista.com
+ *
+ * Copyright (C) 2000-2001 Toshiba Corporation
+ *
+ * Copyright (C) 2004 MontaVista Software Inc.
+ * Author: Manish Lachwani, mlachwani@mvista.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.
+ *
+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/pm.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <asm/processor.h>
+#include <asm/reboot.h>
+#include <asm/time.h>
+#include <asm/txx9tmr.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/pci.h>
+#include <asm/txx9/rbtx4927.h>
+#include <asm/txx9/tx4938.h>    /* for TX4937 */
+#ifdef CONFIG_SERIAL_TXX9
+#include <linux/serial_core.h>
+#endif
+
+static int tx4927_ccfg_toeon = 1;
+
+#ifdef CONFIG_PCI
+static void __init tx4927_pci_setup(void)
+{
+        int extarb = !(__raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_PCIARB);
+        struct pci_controller *c = &txx9_primary_pcic;
+
+        register_pci_controller(c);
+
+        if (__raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_PCI66)
+                txx9_pci_option =
+                        (txx9_pci_option & ~TXX9_PCI_OPT_CLK_MASK) |
+                        TXX9_PCI_OPT_CLK_66; /* already configured */
+
+        /* Reset PCI Bus */
+        writeb(1, rbtx4927_pcireset_addr);
+        /* Reset PCIC */
+        txx9_set64(&tx4927_ccfgptr->clkctr, TX4927_CLKCTR_PCIRST);
+        if ((txx9_pci_option & TXX9_PCI_OPT_CLK_MASK) ==
+            TXX9_PCI_OPT_CLK_66)
+                tx4927_pciclk66_setup();
+        mdelay(10);
+        /* clear PCIC reset */
+        txx9_clear64(&tx4927_ccfgptr->clkctr, TX4927_CLKCTR_PCIRST);
+        writeb(0, rbtx4927_pcireset_addr);
+        iob();
+
+        tx4927_report_pciclk();
+        tx4927_pcic_setup(tx4927_pcicptr, c, extarb);
+        if ((txx9_pci_option & TXX9_PCI_OPT_CLK_MASK) ==
+            TXX9_PCI_OPT_CLK_AUTO &&
+            txx9_pci66_check(c, 0, 0)) {
+                /* Reset PCI Bus */
+                writeb(1, rbtx4927_pcireset_addr);
+                /* Reset PCIC */
+                txx9_set64(&tx4927_ccfgptr->clkctr, TX4927_CLKCTR_PCIRST);
+                tx4927_pciclk66_setup();
+                mdelay(10);
+                /* clear PCIC reset */
+                txx9_clear64(&tx4927_ccfgptr->clkctr, TX4927_CLKCTR_PCIRST);
+                writeb(0, rbtx4927_pcireset_addr);
+                iob();
+                /* Reinitialize PCIC */
+                tx4927_report_pciclk();
+                tx4927_pcic_setup(tx4927_pcicptr, c, extarb);
+        }
+}
+
+static void __init tx4937_pci_setup(void)
+{
+        int extarb = !(__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCIARB);
+        struct pci_controller *c = &txx9_primary_pcic;
+
+        register_pci_controller(c);
+
+        if (__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCI66)
+                txx9_pci_option =
+                        (txx9_pci_option & ~TXX9_PCI_OPT_CLK_MASK) |
+                        TXX9_PCI_OPT_CLK_66; /* already configured */
+
+        /* Reset PCI Bus */
+        writeb(1, rbtx4927_pcireset_addr);
+        /* Reset PCIC */
+        txx9_set64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
+        if ((txx9_pci_option & TXX9_PCI_OPT_CLK_MASK) ==
+            TXX9_PCI_OPT_CLK_66)
+                tx4938_pciclk66_setup();
+        mdelay(10);
+        /* clear PCIC reset */
+        txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
+        writeb(0, rbtx4927_pcireset_addr);
+        iob();
+
+        tx4938_report_pciclk();
+        tx4927_pcic_setup(tx4938_pcicptr, c, extarb);
+        if ((txx9_pci_option & TXX9_PCI_OPT_CLK_MASK) ==
+            TXX9_PCI_OPT_CLK_AUTO &&
+            txx9_pci66_check(c, 0, 0)) {
+                /* Reset PCI Bus */
+                writeb(1, rbtx4927_pcireset_addr);
+                /* Reset PCIC */
+                txx9_set64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
+                tx4938_pciclk66_setup();
+                mdelay(10);
+                /* clear PCIC reset */
+                txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
+                writeb(0, rbtx4927_pcireset_addr);
+                iob();
+                /* Reinitialize PCIC */
+                tx4938_report_pciclk();
+                tx4927_pcic_setup(tx4938_pcicptr, c, extarb);
+        }
+}
+
+static void __init rbtx4927_arch_init(void)
+{
+        tx4927_pci_setup();
+}
+
+static void __init rbtx4937_arch_init(void)
+{
+        tx4937_pci_setup();
+}
+#else
+#define rbtx4927_arch_init NULL
+#define rbtx4937_arch_init NULL
+#endif /* CONFIG_PCI */
+
+static void __noreturn wait_forever(void)
+{
+        while (1)
+                if (cpu_wait)
+                        (*cpu_wait)();
+}
+
+static void toshiba_rbtx4927_restart(char *command)
+{
+        printk(KERN_NOTICE "System Rebooting...\n");
+
+        /* enable the s/w reset register */
+        writeb(RBTX4927_SW_RESET_ENABLE_SET, RBTX4927_SW_RESET_ENABLE);
+
+        /* wait for enable to be seen */
+        while ((readb(RBTX4927_SW_RESET_ENABLE) &
+                RBTX4927_SW_RESET_ENABLE_SET) == 0x00);
+
+        /* do a s/w reset */
+        writeb(RBTX4927_SW_RESET_DO_SET, RBTX4927_SW_RESET_DO);
+
+        /* do something passive while waiting for reset */
+        local_irq_disable();
+        wait_forever();
+        /* no return */
+}
+
+static void toshiba_rbtx4927_halt(void)
+{
+        printk(KERN_NOTICE "System Halted\n");
+        local_irq_disable();
+        wait_forever();
+        /* no return */
+}
+
+static void toshiba_rbtx4927_power_off(void)
+{
+        toshiba_rbtx4927_halt();
+        /* no return */
+}
+
+static void __init rbtx4927_mem_setup(void)
+{
+        int i;
+        u32 cp0_config;
+        char *argptr;
+
+        /* f/w leaves this on at startup */
+        clear_c0_status(ST0_ERL);
+
+        /* enable caches -- HCP5 does this, pmon does not */
+        cp0_config = read_c0_config();
+        cp0_config = cp0_config & ~(TX49_CONF_IC | TX49_CONF_DC);
+        write_c0_config(cp0_config);
+
+        ioport_resource.end = 0xffffffff;
+        iomem_resource.end = 0xffffffff;
+
+        _machine_restart = toshiba_rbtx4927_restart;
+        _machine_halt = toshiba_rbtx4927_halt;
+        pm_power_off = toshiba_rbtx4927_power_off;
+
+        for (i = 0; i < TX4927_NR_TMR; i++)
+                txx9_tmr_init(TX4927_TMR_REG(0) & 0xfffffffffULL);
+
+#ifdef CONFIG_PCI
+        txx9_alloc_pci_controller(&txx9_primary_pcic,
+                                  RBTX4927_PCIMEM, RBTX4927_PCIMEM_SIZE,
+                                  RBTX4927_PCIIO, RBTX4927_PCIIO_SIZE);
+#else
+        set_io_port_base(KSEG1 + RBTX4927_ISA_IO_OFFSET);
+#endif
+
+        /* CCFG */
+        /* do reset on watchdog */
+        tx4927_ccfg_set(TX4927_CCFG_WR);
+        /* enable Timeout BusError */
+        if (tx4927_ccfg_toeon)
+                tx4927_ccfg_set(TX4927_CCFG_TOE);
+
+#ifdef CONFIG_SERIAL_TXX9
+        {
+                extern int early_serial_txx9_setup(struct uart_port *port);
+                struct uart_port req;
+                for(i = 0; i < 2; i++) {
+                        memset(&req, 0, sizeof(req));
+                        req.line = i;
+                        req.iotype = UPIO_MEM;
+                        req.membase = (char *)(0xff1ff300 + i * 0x100);
+                        req.mapbase = 0xff1ff300 + i * 0x100;
+                        req.irq = TXX9_IRQ_BASE + TX4927_IR_SIO(i);
+                        req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
+                        req.uartclk = 50000000;
+                        early_serial_txx9_setup(&req);
+                }
+        }
+#ifdef CONFIG_SERIAL_TXX9_CONSOLE
+        argptr = prom_getcmdline();
+        if (strstr(argptr, "console=") == NULL) {
+                strcat(argptr, " console=ttyS0,38400");
+        }
+#endif
+#endif
+
+#ifdef CONFIG_ROOT_NFS
+        argptr = prom_getcmdline();
+        if (strstr(argptr, "root=") == NULL) {
+                strcat(argptr, " root=/dev/nfs rw");
+        }
+#endif
+
+#ifdef CONFIG_IP_PNP
+        argptr = prom_getcmdline();
+        if (strstr(argptr, "ip=") == NULL) {
+                strcat(argptr, " ip=any");
+        }
+#endif
+}
+
+static void __init rbtx49x7_common_time_init(void)
+{
+        /* change default value to udelay/mdelay take reasonable time */
+        loops_per_jiffy = txx9_cpu_clock / HZ / 2;
+
+        mips_hpt_frequency = txx9_cpu_clock / 2;
+        if (____raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_TINTDIS)
+                txx9_clockevent_init(TX4927_TMR_REG(0) & 0xfffffffffULL,
+                                     TXX9_IRQ_BASE + 17,
+                                     50000000);
+}
+
+static void __init rbtx4927_time_init(void)
+{
+        /*
+         * ASSUMPTION: PCIDIVMODE is configured for PCI 33MHz or 66MHz.
+         *
+         * For TX4927:
+         * PCIDIVMODE[12:11]'s initial value is given by S9[4:3] (ON:0, OFF:1).
+         * CPU 166MHz: PCI 66MHz : PCIDIVMODE: 00 (1/2.5)
+         * CPU 200MHz: PCI 66MHz : PCIDIVMODE: 01 (1/3)
+         * CPU 166MHz: PCI 33MHz : PCIDIVMODE: 10 (1/5)
+         * CPU 200MHz: PCI 33MHz : PCIDIVMODE: 11 (1/6)
+         * i.e. S9[3]: ON (83MHz), OFF (100MHz)
+         */
+        switch ((unsigned long)__raw_readq(&tx4927_ccfgptr->ccfg) &
+                TX4927_CCFG_PCIDIVMODE_MASK) {
+        case TX4927_CCFG_PCIDIVMODE_2_5:
+        case TX4927_CCFG_PCIDIVMODE_5:
+                txx9_cpu_clock = 166666666;     /* 166MHz */
+                break;
+        default:
+                txx9_cpu_clock = 200000000;     /* 200MHz */
+        }
+
+        rbtx49x7_common_time_init();
+}
+
+static void __init rbtx4937_time_init(void)
+{
+        /*
+         * ASSUMPTION: PCIDIVMODE is configured for PCI 33MHz or 66MHz.
+         *
+         * For TX4937:
+         * PCIDIVMODE[12:11]'s initial value is given by S1[5:4] (ON:0, OFF:1)
+         * PCIDIVMODE[10] is 0.
+         * CPU 266MHz: PCI 33MHz : PCIDIVMODE: 000 (1/8)
+         * CPU 266MHz: PCI 66MHz : PCIDIVMODE: 001 (1/4)
+         * CPU 300MHz: PCI 33MHz : PCIDIVMODE: 010 (1/9)
+         * CPU 300MHz: PCI 66MHz : PCIDIVMODE: 011 (1/4.5)
+         * CPU 333MHz: PCI 33MHz : PCIDIVMODE: 100 (1/10)
+         * CPU 333MHz: PCI 66MHz : PCIDIVMODE: 101 (1/5)
+         */
+        switch ((unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg) &
+                TX4938_CCFG_PCIDIVMODE_MASK) {
+        case TX4938_CCFG_PCIDIVMODE_8:
+        case TX4938_CCFG_PCIDIVMODE_4:
+                txx9_cpu_clock = 266666666;     /* 266MHz */
+                break;
+        case TX4938_CCFG_PCIDIVMODE_9:
+        case TX4938_CCFG_PCIDIVMODE_4_5:
+                txx9_cpu_clock = 300000000;     /* 300MHz */
+                break;
+        default:
+                txx9_cpu_clock = 333333333;     /* 333MHz */
+        }
+
+        rbtx49x7_common_time_init();
+}
+
+static int __init toshiba_rbtx4927_rtc_init(void)
+{
+        static struct resource __initdata res = {
+                .start  = 0x1c010000,
+                .end    = 0x1c010000 + 0x800 - 1,
+                .flags  = IORESOURCE_MEM,
+        };
+        struct platform_device *dev =
+                platform_device_register_simple("rtc-ds1742", -1, &res, 1);
+        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
+}
+
+static int __init rbtx4927_ne_init(void)
+{
+        static struct resource __initdata res[] = {
+                {
+                        .start  = RBTX4927_RTL_8019_BASE,
+                        .end    = RBTX4927_RTL_8019_BASE + 0x20 - 1,
+                        .flags  = IORESOURCE_IO,
+                }, {
+                        .start  = RBTX4927_RTL_8019_IRQ,
+                        .flags  = IORESOURCE_IRQ,
+                }
+        };
+        struct platform_device *dev =
+                platform_device_register_simple("ne", -1,
+                                                res, ARRAY_SIZE(res));
+        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
+}
+
+/* Watchdog support */
+
+static int __init txx9_wdt_init(unsigned long base)
+{
+        struct resource res = {
+                .start  = base,
+                .end    = base + 0x100 - 1,
+                .flags  = IORESOURCE_MEM,
+        };
+        struct platform_device *dev =
+                platform_device_register_simple("txx9wdt", -1, &res, 1);
+        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
+}
+
+static int __init rbtx4927_wdt_init(void)
+{
+        return txx9_wdt_init(TX4927_TMR_REG(2) & 0xfffffffffULL);
+}
+
+static void __init rbtx4927_device_init(void)
+{
+        toshiba_rbtx4927_rtc_init();
+        rbtx4927_ne_init();
+        rbtx4927_wdt_init();
+}
+
+struct txx9_board_vec rbtx4927_vec __initdata = {
+        .system = "Toshiba RBTX4927",
+        .prom_init = rbtx4927_prom_init,
+        .mem_setup = rbtx4927_mem_setup,
+        .irq_setup = rbtx4927_irq_setup,
+        .time_init = rbtx4927_time_init,
+        .device_init = rbtx4927_device_init,
+        .arch_init = rbtx4927_arch_init,
+#ifdef CONFIG_PCI
+        .pci_map_irq = rbtx4927_pci_map_irq,
+#endif
+};
+struct txx9_board_vec rbtx4937_vec __initdata = {
+        .system = "Toshiba RBTX4937",
+        .prom_init = rbtx4927_prom_init,
+        .mem_setup = rbtx4927_mem_setup,
+        .irq_setup = rbtx4927_irq_setup,
+        .time_init = rbtx4937_time_init,
+        .device_init = rbtx4927_device_init,
+        .arch_init = rbtx4937_arch_init,
+#ifdef CONFIG_PCI
+        .pci_map_irq = rbtx4927_pci_map_irq,
+#endif
+};
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile b/arch/mips/txx9/rbtx4938/Makefile
index 2316dd7dd1bd..9dcc52ae5b9d 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile
+++ b/arch/mips/txx9/rbtx4938/Makefile
@@ -1,7 +1,3 @@
-#
-# Makefile for common code for Toshiba TX4927 based systems
-#
-
 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/txx9/rbtx4938/irq.c
index 4d6a8dc46c76..3971a061657a 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/txx9/rbtx4938/irq.c
@@ -1,6 +1,4 @@
 /*
- * linux/arch/mips/tx4938/toshiba_rbtx4938/irq.c
- *
  * Toshiba RBTX4938 specific interrupt handlers
  * Copyright (C) 2000-2001 Toshiba Corporation
  *
@@ -68,7 +66,9 @@ IRQ  Device
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/tx4938/rbtx4938.h>
+#include <asm/mipsregs.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/rbtx4938.h>
 
 static void toshiba_rbtx4938_irq_ioc_enable(unsigned int irq);
 static void toshiba_rbtx4938_irq_ioc_disable(unsigned int irq);
@@ -82,26 +82,17 @@ static struct irq_chip toshiba_rbtx4938_irq_ioc_type = {
         .unmask = toshiba_rbtx4938_irq_ioc_enable,
 };
 
-int
-toshiba_rbtx4938_irq_nested(int sw_irq)
+static int toshiba_rbtx4938_irq_nested(int sw_irq)
 {
         u8 level3;
 
         level3 = readb(rbtx4938_imstat_addr);
         if (level3)
                 /* must use fls so onboard ATA has priority */
-                sw_irq = TOSHIBA_RBTX4938_IRQ_IOC_BEG + fls(level3) - 1;
-
+                sw_irq = RBTX4938_IRQ_IOC + fls(level3) - 1;
         return sw_irq;
 }
 
-static struct irqaction toshiba_rbtx4938_irq_ioc_action = {
-        .handler = no_action,
-        .flags = 0,
-        .mask = CPU_MASK_NONE,
-        .name = TOSHIBA_RBTX4938_IOC_NAME,
-};
-
 /**********************************************************************************/
 /* Functions for ioc                                                              */
 /**********************************************************************************/
@@ -110,13 +101,12 @@ toshiba_rbtx4938_irq_ioc_init(void)
 {
         int i;
 
-        for (i = TOSHIBA_RBTX4938_IRQ_IOC_BEG;
-             i <= TOSHIBA_RBTX4938_IRQ_IOC_END; i++)
+        for (i = RBTX4938_IRQ_IOC;
+             i < RBTX4938_IRQ_IOC + RBTX4938_NR_IRQ_IOC; i++)
                 set_irq_chip_and_handler(i, &toshiba_rbtx4938_irq_ioc_type,
                                          handle_level_irq);
 
-        setup_irq(RBTX4938_IRQ_IOCINT,
-                  &toshiba_rbtx4938_irq_ioc_action);
+        set_irq_chained_handler(RBTX4938_IRQ_IOCINT, handle_simple_irq);
 }
 
 static void
@@ -125,7 +115,7 @@ toshiba_rbtx4938_irq_ioc_enable(unsigned int irq)
         unsigned char v;
 
         v = readb(rbtx4938_imask_addr);
-        v |= (1 << (irq - TOSHIBA_RBTX4938_IRQ_IOC_BEG));
+        v |= (1 << (irq - RBTX4938_IRQ_IOC));
         writeb(v, rbtx4938_imask_addr);
         mmiowb();
 }
@@ -136,15 +126,33 @@ toshiba_rbtx4938_irq_ioc_disable(unsigned int irq)
         unsigned char v;
 
         v = readb(rbtx4938_imask_addr);
-        v &= ~(1 << (irq - TOSHIBA_RBTX4938_IRQ_IOC_BEG));
+        v &= ~(1 << (irq - RBTX4938_IRQ_IOC));
         writeb(v, rbtx4938_imask_addr);
         mmiowb();
 }
 
-void __init arch_init_irq(void)
+static int rbtx4938_irq_dispatch(int pending)
 {
-        extern void tx4938_irq_init(void);
+        int irq;
+
+        if (pending & STATUSF_IP7)
+                irq = MIPS_CPU_IRQ_BASE + 7;
+        else if (pending & STATUSF_IP2) {
+                irq = txx9_irq();
+                if (irq == RBTX4938_IRQ_IOCINT)
+                        irq = toshiba_rbtx4938_irq_nested(irq);
+        } else if (pending & STATUSF_IP1)
+                irq = MIPS_CPU_IRQ_BASE + 0;
+        else if (pending & STATUSF_IP0)
+                irq = MIPS_CPU_IRQ_BASE + 1;
+        else
+                irq = -1;
+        return irq;
+}
 
+void __init rbtx4938_irq_setup(void)
+{
+        txx9_irq_dispatch = rbtx4938_irq_dispatch;
         /* Now, interrupt control disabled, */
         /* all IRC interrupts are masked, */
         /* all IRC interrupt mode are Low Active. */
diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c
new file mode 100644
index 000000000000..fbb37458ddb2
--- /dev/null
+++ b/arch/mips/txx9/rbtx4938/prom.c
@@ -0,0 +1,29 @@
+/*
+ * rbtx4938 specific prom routines
+ * Copyright (C) 2000-2001 Toshiba Corporation
+ *
+ * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
+ * terms of the GNU General Public License version 2. This program is
+ * licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
+ */
+
+#include <linux/init.h>
+#include <linux/bootmem.h>
+#include <asm/bootinfo.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/rbtx4938.h>
+
+void __init rbtx4938_prom_init(void)
+{
+        extern int tx4938_get_mem_size(void);
+        int msize;
+#ifndef CONFIG_TX4938_NAND_BOOT
+        prom_init_cmdline();
+#endif
+
+        msize = tx4938_get_mem_size();
+        add_memory_region(0, msize << 20, BOOT_MEM_RAM);
+}
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
new file mode 100644
index 000000000000..aaa987ae0f83
--- /dev/null
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -0,0 +1,625 @@
+/*
+ * Setup pointers to hardware-dependent routines.
+ * Copyright (C) 2000-2001 Toshiba Corporation
+ *
+ * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
+ * terms of the GNU General Public License version 2. This program is
+ * licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
+ */
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/ioport.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/console.h>
+#include <linux/pm.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+
+#include <asm/reboot.h>
+#include <asm/time.h>
+#include <asm/txx9tmr.h>
+#include <asm/io.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/pci.h>
+#include <asm/txx9/rbtx4938.h>
+#ifdef CONFIG_SERIAL_TXX9
+#include <linux/serial_core.h>
+#endif
+#include <linux/spi/spi.h>
+#include <asm/txx9/spi.h>
+#include <asm/txx9pio.h>
+
+static int tx4938_ccfg_toeon = 1;
+
+static void rbtx4938_machine_halt(void)
+{
+        printk(KERN_NOTICE "System Halted\n");
+        local_irq_disable();
+
+        while (1)
+                __asm__(".set\tmips3\n\t"
+                        "wait\n\t"
+                        ".set\tmips0");
+}
+
+static void rbtx4938_machine_power_off(void)
+{
+        rbtx4938_machine_halt();
+        /* no return */
+}
+
+static void rbtx4938_machine_restart(char *command)
+{
+        local_irq_disable();
+
+        printk("Rebooting...");
+        writeb(1, rbtx4938_softresetlock_addr);
+        writeb(1, rbtx4938_sfvol_addr);
+        writeb(1, rbtx4938_softreset_addr);
+        while(1)
+                ;
+}
+
+static void __init rbtx4938_pci_setup(void)
+{
+#ifdef CONFIG_PCI
+        int extarb = !(__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCIARB);
+        struct pci_controller *c = &txx9_primary_pcic;
+
+        register_pci_controller(c);
+
+        if (__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCI66)
+                txx9_pci_option =
+                        (txx9_pci_option & ~TXX9_PCI_OPT_CLK_MASK) |
+                        TXX9_PCI_OPT_CLK_66; /* already configured */
+
+        /* Reset PCI Bus */
+        writeb(0, rbtx4938_pcireset_addr);
+        /* Reset PCIC */
+        txx9_set64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
+        if ((txx9_pci_option & TXX9_PCI_OPT_CLK_MASK) ==
+            TXX9_PCI_OPT_CLK_66)
+                tx4938_pciclk66_setup();
+        mdelay(10);
+        /* clear PCIC reset */
+        txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
+        writeb(1, rbtx4938_pcireset_addr);
+        iob();
+
+        tx4938_report_pciclk();
+        tx4927_pcic_setup(tx4938_pcicptr, c, extarb);
+        if ((txx9_pci_option & TXX9_PCI_OPT_CLK_MASK) ==
+            TXX9_PCI_OPT_CLK_AUTO &&
+            txx9_pci66_check(c, 0, 0)) {
+                /* Reset PCI Bus */
+                writeb(0, rbtx4938_pcireset_addr);
+                /* Reset PCIC */
+                txx9_set64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
+                tx4938_pciclk66_setup();
+                mdelay(10);
+                /* clear PCIC reset */
+                txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
+                writeb(1, rbtx4938_pcireset_addr);
+                iob();
+                /* Reinitialize PCIC */
+                tx4938_report_pciclk();
+                tx4927_pcic_setup(tx4938_pcicptr, c, extarb);
+        }
+
+        if (__raw_readq(&tx4938_ccfgptr->pcfg) &
+            (TX4938_PCFG_ETH0_SEL|TX4938_PCFG_ETH1_SEL)) {
+                /* Reset PCIC1 */
+                txx9_set64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIC1RST);
+                /* PCI1DMD==0 => PCI1CLK==GBUSCLK/2 => PCI66 */
+                if (!(__raw_readq(&tx4938_ccfgptr->ccfg)
+                      & TX4938_CCFG_PCI1DMD))
+                        tx4938_ccfg_set(TX4938_CCFG_PCI1_66);
+                mdelay(10);
+                /* clear PCIC1 reset */
+                txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIC1RST);
+                tx4938_report_pci1clk();
+
+                /* mem:64K(max), io:64K(max) (enough for ETH0,ETH1) */
+                c = txx9_alloc_pci_controller(NULL, 0, 0x10000, 0, 0x10000);
+                register_pci_controller(c);
+                tx4927_pcic_setup(tx4938_pcic1ptr, c, 0);
+        }
+#endif /* CONFIG_PCI */
+}
+
+/* SPI support */
+
+/* chip select for SPI devices */
+#define SEEPROM1_CS     7       /* PIO7 */
+#define SEEPROM2_CS     0       /* IOC */
+#define SEEPROM3_CS     1       /* IOC */
+#define SRTC_CS 2       /* IOC */
+
+static int __init rbtx4938_ethaddr_init(void)
+{
+#ifdef CONFIG_PCI
+        unsigned char dat[17];
+        unsigned char sum;
+        int i;
+
+        /* 0-3: "MAC\0", 4-9:eth0, 10-15:eth1, 16:sum */
+        if (spi_eeprom_read(SEEPROM1_CS, 0, dat, sizeof(dat))) {
+                printk(KERN_ERR "seeprom: read error.\n");
+                return -ENODEV;
+        } else {
+                if (strcmp(dat, "MAC") != 0)
+                        printk(KERN_WARNING "seeprom: bad signature.\n");
+                for (i = 0, sum = 0; i < sizeof(dat); i++)
+                        sum += dat[i];
+                if (sum)
+                        printk(KERN_WARNING "seeprom: bad checksum.\n");
+        }
+        for (i = 0; i < 2; i++) {
+                unsigned int id =
+                        TXX9_IRQ_BASE + (i ? TX4938_IR_ETH1 : TX4938_IR_ETH0);
+                struct platform_device *pdev;
+                if (!(__raw_readq(&tx4938_ccfgptr->pcfg) &
+                      (i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))
+                        continue;
+                pdev = platform_device_alloc("tc35815-mac", id);
+                if (!pdev ||
+                    platform_device_add_data(pdev, &dat[4 + 6 * i], 6) ||
+                    platform_device_add(pdev))
+                        platform_device_put(pdev);
+        }
+#endif /* CONFIG_PCI */
+        return 0;
+}
+
+static void __init rbtx4938_spi_setup(void)
+{
+        /* set SPI_SEL */
+        txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_SPI_SEL);
+}
+
+static struct resource rbtx4938_fpga_resource;
+static struct resource tx4938_sdram_resource[4];
+static struct resource tx4938_sram_resource;
+
+void __init tx4938_board_setup(void)
+{
+        int i;
+        unsigned long divmode;
+        int cpuclk = 0;
+        unsigned long pcode = TX4938_REV_PCODE();
+
+        ioport_resource.start = 0;
+        ioport_resource.end = 0xffffffff;
+        iomem_resource.start = 0;
+        iomem_resource.end = 0xffffffff;        /* expand to 4GB */
+
+        txx9_reg_res_init(pcode, TX4938_REG_BASE,
+                          TX4938_REG_SIZE);
+        /* SDRAMC,EBUSC are configured by PROM */
+        for (i = 0; i < 8; i++) {
+                if (!(TX4938_EBUSC_CR(i) & 0x8))
+                        continue;       /* disabled */
+                txx9_ce_res[i].start = (unsigned long)TX4938_EBUSC_BA(i);
+                txx9_ce_res[i].end =
+                        txx9_ce_res[i].start + TX4938_EBUSC_SIZE(i) - 1;
+                request_resource(&iomem_resource, &txx9_ce_res[i]);
+        }
+
+        /* clocks */
+        if (txx9_master_clock) {
+                u64 ccfg = ____raw_readq(&tx4938_ccfgptr->ccfg);
+                /* calculate gbus_clock and cpu_clock_freq from master_clock */
+                divmode = (__u32)ccfg & TX4938_CCFG_DIVMODE_MASK;
+                switch (divmode) {
+                case TX4938_CCFG_DIVMODE_8:
+                case TX4938_CCFG_DIVMODE_10:
+                case TX4938_CCFG_DIVMODE_12:
+                case TX4938_CCFG_DIVMODE_16:
+                case TX4938_CCFG_DIVMODE_18:
+                        txx9_gbus_clock = txx9_master_clock * 4; break;
+                default:
+                        txx9_gbus_clock = txx9_master_clock;
+                }
+                switch (divmode) {
+                case TX4938_CCFG_DIVMODE_2:
+                case TX4938_CCFG_DIVMODE_8:
+                        cpuclk = txx9_gbus_clock * 2; break;
+                case TX4938_CCFG_DIVMODE_2_5:
+                case TX4938_CCFG_DIVMODE_10:
+                        cpuclk = txx9_gbus_clock * 5 / 2; break;
+                case TX4938_CCFG_DIVMODE_3:
+                case TX4938_CCFG_DIVMODE_12:
+                        cpuclk = txx9_gbus_clock * 3; break;
+                case TX4938_CCFG_DIVMODE_4:
+                case TX4938_CCFG_DIVMODE_16:
+                        cpuclk = txx9_gbus_clock * 4; break;
+                case TX4938_CCFG_DIVMODE_4_5:
+                case TX4938_CCFG_DIVMODE_18:
+                        cpuclk = txx9_gbus_clock * 9 / 2; break;
+                }
+                txx9_cpu_clock = cpuclk;
+        } else {
+                u64 ccfg = ____raw_readq(&tx4938_ccfgptr->ccfg);
+                if (txx9_cpu_clock == 0) {
+                        txx9_cpu_clock = 300000000;     /* 300MHz */
+                }
+                /* calculate gbus_clock and master_clock from cpu_clock_freq */
+                cpuclk = txx9_cpu_clock;
+                divmode = (__u32)ccfg & TX4938_CCFG_DIVMODE_MASK;
+                switch (divmode) {
+                case TX4938_CCFG_DIVMODE_2:
+                case TX4938_CCFG_DIVMODE_8:
+                        txx9_gbus_clock = cpuclk / 2; break;
+                case TX4938_CCFG_DIVMODE_2_5:
+                case TX4938_CCFG_DIVMODE_10:
+                        txx9_gbus_clock = cpuclk * 2 / 5; break;
+                case TX4938_CCFG_DIVMODE_3:
+                case TX4938_CCFG_DIVMODE_12:
+                        txx9_gbus_clock = cpuclk / 3; break;
+                case TX4938_CCFG_DIVMODE_4:
+                case TX4938_CCFG_DIVMODE_16:
+                        txx9_gbus_clock = cpuclk / 4; break;
+                case TX4938_CCFG_DIVMODE_4_5:
+                case TX4938_CCFG_DIVMODE_18:
+                        txx9_gbus_clock = cpuclk * 2 / 9; break;
+                }
+                switch (divmode) {
+                case TX4938_CCFG_DIVMODE_8:
+                case TX4938_CCFG_DIVMODE_10:
+                case TX4938_CCFG_DIVMODE_12:
+                case TX4938_CCFG_DIVMODE_16:
+                case TX4938_CCFG_DIVMODE_18:
+                        txx9_master_clock = txx9_gbus_clock / 4; break;
+                default:
+                        txx9_master_clock = txx9_gbus_clock;
+                }
+        }
+        /* change default value to udelay/mdelay take reasonable time */
+        loops_per_jiffy = txx9_cpu_clock / HZ / 2;
+
+        /* CCFG */
+        /* clear WatchDogReset,BusErrorOnWrite flag (W1C) */
+        tx4938_ccfg_set(TX4938_CCFG_WDRST | TX4938_CCFG_BEOW);
+        /* do reset on watchdog */
+        tx4938_ccfg_set(TX4938_CCFG_WR);
+        /* clear PCIC1 reset */
+        txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIC1RST);
+
+        /* enable Timeout BusError */
+        if (tx4938_ccfg_toeon)
+                tx4938_ccfg_set(TX4938_CCFG_TOE);
+
+        /* DMA selection */
+        txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_DMASEL_ALL);
+
+        /* Use external clock for external arbiter */
+        if (!(____raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCIARB))
+                txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_PCICLKEN_ALL);
+
+        printk(KERN_INFO "%s -- %dMHz(M%dMHz) CRIR:%08x CCFG:%llx PCFG:%llx\n",
+               txx9_pcode_str,
+               (cpuclk + 500000) / 1000000,
+               (txx9_master_clock + 500000) / 1000000,
+               (__u32)____raw_readq(&tx4938_ccfgptr->crir),
+               (unsigned long long)____raw_readq(&tx4938_ccfgptr->ccfg),
+               (unsigned long long)____raw_readq(&tx4938_ccfgptr->pcfg));
+
+        printk(KERN_INFO "%s SDRAMC --", txx9_pcode_str);
+        for (i = 0; i < 4; i++) {
+                unsigned long long cr = tx4938_sdramcptr->cr[i];
+                unsigned long ram_base, ram_size;
+                if (!((unsigned long)cr & 0x00000400))
+                        continue;       /* disabled */
+                ram_base = (unsigned long)(cr >> 49) << 21;
+                ram_size = ((unsigned long)(cr >> 33) + 1) << 21;
+                if (ram_base >= 0x20000000)
+                        continue;       /* high memory (ignore) */
+                printk(" CR%d:%016Lx", i, cr);
+                tx4938_sdram_resource[i].name = "SDRAM";
+                tx4938_sdram_resource[i].start = ram_base;
+                tx4938_sdram_resource[i].end = ram_base + ram_size - 1;
+                tx4938_sdram_resource[i].flags = IORESOURCE_MEM;
+                request_resource(&iomem_resource, &tx4938_sdram_resource[i]);
+        }
+        printk(" TR:%09Lx\n", tx4938_sdramcptr->tr);
+
+        /* SRAM */
+        if (tx4938_sramcptr->cr & 1) {
+                unsigned int size = 0x800;
+                unsigned long base =
+                        (tx4938_sramcptr->cr >> (39-11)) & ~(size - 1);
+                tx4938_sram_resource.name = "SRAM";
+                tx4938_sram_resource.start = base;
+                tx4938_sram_resource.end = base + size - 1;
+                tx4938_sram_resource.flags = IORESOURCE_MEM;
+                request_resource(&iomem_resource, &tx4938_sram_resource);
+        }
+
+        /* TMR */
+        for (i = 0; i < TX4938_NR_TMR; i++)
+                txx9_tmr_init(TX4938_TMR_REG(i) & 0xfffffffffULL);
+
+        /* enable DMA */
+        for (i = 0; i < 2; i++)
+                ____raw_writeq(TX4938_DMA_MCR_MSTEN,
+                               (void __iomem *)(TX4938_DMA_REG(i) + 0x50));
+
+        /* PIO */
+        __raw_writel(0, &tx4938_pioptr->maskcpu);
+        __raw_writel(0, &tx4938_pioptr->maskext);
+
+#ifdef CONFIG_PCI
+        txx9_alloc_pci_controller(&txx9_primary_pcic, 0, 0, 0, 0);
+#endif
+}
+
+static void __init rbtx4938_time_init(void)
+{
+        mips_hpt_frequency = txx9_cpu_clock / 2;
+        if (____raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_TINTDIS)
+                txx9_clockevent_init(TX4938_TMR_REG(0) & 0xfffffffffULL,
+                                     TXX9_IRQ_BASE + TX4938_IR_TMR(0),
+                                     txx9_gbus_clock / 2);
+}
+
+static void __init rbtx4938_mem_setup(void)
+{
+        unsigned long long pcfg;
+        char *argptr;
+
+        iomem_resource.end = 0xffffffff;        /* 4GB */
+
+        if (txx9_master_clock == 0)
+                txx9_master_clock = 25000000; /* 25MHz */
+        tx4938_board_setup();
+#ifndef CONFIG_PCI
+        set_io_port_base(RBTX4938_ETHER_BASE);
+#endif
+
+#ifdef CONFIG_SERIAL_TXX9
+        {
+                extern int early_serial_txx9_setup(struct uart_port *port);
+                int i;
+                struct uart_port req;
+                for(i = 0; i < 2; i++) {
+                        memset(&req, 0, sizeof(req));
+                        req.line = i;
+                        req.iotype = UPIO_MEM;
+                        req.membase = (char *)(0xff1ff300 + i * 0x100);
+                        req.mapbase = 0xff1ff300 + i * 0x100;
+                        req.irq = RBTX4938_IRQ_IRC_SIO(i);
+                        req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
+                        req.uartclk = 50000000;
+                        early_serial_txx9_setup(&req);
+                }
+        }
+#ifdef CONFIG_SERIAL_TXX9_CONSOLE
+        argptr = prom_getcmdline();
+        if (strstr(argptr, "console=") == NULL) {
+                strcat(argptr, " console=ttyS0,38400");
+        }
+#endif
+#endif
+
+#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
+        printk("PIOSEL: disabling both ata and nand selection\n");
+        local_irq_disable();
+        txx9_clear64(&tx4938_ccfgptr->pcfg,
+                     TX4938_PCFG_NDF_SEL | TX4938_PCFG_ATA_SEL);
+#endif
+
+#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND
+        printk("PIOSEL: enabling nand selection\n");
+        txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL);
+        txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL);
+#endif
+
+#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA
+        printk("PIOSEL: enabling ata selection\n");
+        txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL);
+        txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL);
+#endif
+
+#ifdef CONFIG_IP_PNP
+        argptr = prom_getcmdline();
+        if (strstr(argptr, "ip=") == NULL) {
+                strcat(argptr, " ip=any");
+        }
+#endif
+
+
+#ifdef CONFIG_FB
+        {
+                conswitchp = &dummy_con;
+        }
+#endif
+
+        rbtx4938_spi_setup();
+        pcfg = ____raw_readq(&tx4938_ccfgptr->pcfg);    /* updated */
+        /* fixup piosel */
+        if ((pcfg & (TX4938_PCFG_ATA_SEL | TX4938_PCFG_NDF_SEL)) ==
+            TX4938_PCFG_ATA_SEL)
+                writeb((readb(rbtx4938_piosel_addr) & 0x03) | 0x04,
+                       rbtx4938_piosel_addr);
+        else if ((pcfg & (TX4938_PCFG_ATA_SEL | TX4938_PCFG_NDF_SEL)) ==
+                 TX4938_PCFG_NDF_SEL)
+                writeb((readb(rbtx4938_piosel_addr) & 0x03) | 0x08,
+                       rbtx4938_piosel_addr);
+        else
+                writeb(readb(rbtx4938_piosel_addr) & ~(0x08 | 0x04),
+                       rbtx4938_piosel_addr);
+
+        rbtx4938_fpga_resource.name = "FPGA Registers";
+        rbtx4938_fpga_resource.start = CPHYSADDR(RBTX4938_FPGA_REG_ADDR);
+        rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff;
+        rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+        if (request_resource(&iomem_resource, &rbtx4938_fpga_resource))
+                printk("request resource for fpga failed\n");
+
+        _machine_restart = rbtx4938_machine_restart;
+        _machine_halt = rbtx4938_machine_halt;
+        pm_power_off = rbtx4938_machine_power_off;
+
+        writeb(0xff, rbtx4938_led_addr);
+        printk(KERN_INFO "RBTX4938 --- FPGA(Rev %02x) DIPSW:%02x,%02x\n",
+               readb(rbtx4938_fpga_rev_addr),
+               readb(rbtx4938_dipsw_addr), readb(rbtx4938_bdipsw_addr));
+}
+
+static int __init rbtx4938_ne_init(void)
+{
+        struct resource res[] = {
+                {
+                        .start  = RBTX4938_RTL_8019_BASE,
+                        .end    = RBTX4938_RTL_8019_BASE + 0x20 - 1,
+                        .flags  = IORESOURCE_IO,
+                }, {
+                        .start  = RBTX4938_RTL_8019_IRQ,
+                        .flags  = IORESOURCE_IRQ,
+                }
+        };
+        struct platform_device *dev =
+                platform_device_register_simple("ne", -1,
+                                                res, ARRAY_SIZE(res));
+        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
+}
+
+/* GPIO support */
+
+int gpio_to_irq(unsigned gpio)
+{
+        return -EINVAL;
+}
+
+int irq_to_gpio(unsigned irq)
+{
+        return -EINVAL;
+}
+
+static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock);
+
+static void rbtx4938_spi_gpio_set(struct gpio_chip *chip, unsigned int offset,
+                                  int value)
+{
+        u8 val;
+        unsigned long flags;
+        spin_lock_irqsave(&rbtx4938_spi_gpio_lock, flags);
+        val = readb(rbtx4938_spics_addr);
+        if (value)
+                val |= 1 << offset;
+        else
+                val &= ~(1 << offset);
+        writeb(val, rbtx4938_spics_addr);
+        mmiowb();
+        spin_unlock_irqrestore(&rbtx4938_spi_gpio_lock, flags);
+}
+
+static int rbtx4938_spi_gpio_dir_out(struct gpio_chip *chip,
+                                     unsigned int offset, int value)
+{
+        rbtx4938_spi_gpio_set(chip, offset, value);
+        return 0;
+}
+
+static struct gpio_chip rbtx4938_spi_gpio_chip = {
+        .set = rbtx4938_spi_gpio_set,
+        .direction_output = rbtx4938_spi_gpio_dir_out,
+        .label = "RBTX4938-SPICS",
+        .base = 16,
+        .ngpio = 3,
+};
+
+/* SPI support */
+
+static void __init txx9_spi_init(unsigned long base, int irq)
+{
+        struct resource res[] = {
+                {
+                        .start  = base,
+                        .end    = base + 0x20 - 1,
+                        .flags  = IORESOURCE_MEM,
+                }, {
+                        .start  = irq,
+                        .flags  = IORESOURCE_IRQ,
+                },
+        };
+        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 = "rtc-rs5c348",
+                .max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */
+                .bus_num = 0,
+                .chip_select = 16 + SRTC_CS,
+                /* Mode 1 (High-Active, Shift-Then-Sample), High Avtive CS  */
+                .mode = SPI_MODE_1 | SPI_CS_HIGH,
+        };
+        spi_register_board_info(&srtc_info, 1);
+        spi_eeprom_register(SEEPROM1_CS);
+        spi_eeprom_register(16 + SEEPROM2_CS);
+        spi_eeprom_register(16 + SEEPROM3_CS);
+        gpio_request(16 + SRTC_CS, "rtc-rs5c348");
+        gpio_direction_output(16 + SRTC_CS, 0);
+        gpio_request(SEEPROM1_CS, "seeprom1");
+        gpio_direction_output(SEEPROM1_CS, 1);
+        gpio_request(16 + SEEPROM2_CS, "seeprom2");
+        gpio_direction_output(16 + SEEPROM2_CS, 1);
+        gpio_request(16 + SEEPROM3_CS, "seeprom3");
+        gpio_direction_output(16 + SEEPROM3_CS, 1);
+        txx9_spi_init(TX4938_SPI_REG & 0xfffffffffULL, RBTX4938_IRQ_IRC_SPI);
+        return 0;
+}
+
+static void __init rbtx4938_arch_init(void)
+{
+        txx9_gpio_init(TX4938_PIO_REG & 0xfffffffffULL, 0, 16);
+        gpiochip_add(&rbtx4938_spi_gpio_chip);
+        rbtx4938_pci_setup();
+        rbtx4938_spi_init();
+}
+
+/* Watchdog support */
+
+static int __init txx9_wdt_init(unsigned long base)
+{
+        struct resource res = {
+                .start  = base,
+                .end    = base + 0x100 - 1,
+                .flags  = IORESOURCE_MEM,
+        };
+        struct platform_device *dev =
+                platform_device_register_simple("txx9wdt", -1, &res, 1);
+        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
+}
+
+static int __init rbtx4938_wdt_init(void)
+{
+        return txx9_wdt_init(TX4938_TMR_REG(2) & 0xfffffffffULL);
+}
+
+static void __init rbtx4938_device_init(void)
+{
+        rbtx4938_ethaddr_init();
+        rbtx4938_ne_init();
+        rbtx4938_wdt_init();
+}
+
+struct txx9_board_vec rbtx4938_vec __initdata = {
+        .system = "Toshiba RBTX4938",
+        .prom_init = rbtx4938_prom_init,
+        .mem_setup = rbtx4938_mem_setup,
+        .irq_setup = rbtx4938_irq_setup,
+        .time_init = rbtx4938_time_init,
+        .device_init = rbtx4938_device_init,
+        .arch_init = rbtx4938_arch_init,
+#ifdef CONFIG_PCI
+        .pci_map_irq = rbtx4938_pci_map_irq,
+#endif
+};
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c b/arch/mips/txx9/rbtx4938/spi_eeprom.c
index 4d6b4ade5e8c..a7ea8b041c1d 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c
+++ b/arch/mips/txx9/rbtx4938/spi_eeprom.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c
+ * spi_eeprom.c
  * Copyright (C) 2000-2001 Toshiba Corporation
  *
  * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
@@ -13,7 +13,7 @@
 #include <linux/device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
-#include <asm/tx4938/spi.h>
+#include <asm/txx9/spi.h>
 
 #define AT250X0_PAGE_SIZE       8
 
diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig
index 559acc09c819..c1be6b37fb2a 100644
--- a/arch/mips/vr41xx/Kconfig
+++ b/arch/mips/vr41xx/Kconfig
@@ -23,16 +23,6 @@ config IBM_WORKPAD
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config NEC_CMBVR4133
-        bool "NEC CMB-VR4133"
-        select CEVT_R4K
-        select CSRC_R4K
-        select DMA_NONCOHERENT
-        select IRQ_CPU
-        select HW_HAS_PCI
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-
 config TANBAC_TB022X
         bool "TANBAC VR4131 multichip module and TANBAC VR4131DIMM"
         select CEVT_R4K
@@ -73,13 +63,6 @@ config ZAO_CAPCELLA
 
 endchoice
 
-config ROCKHOPPER
-        bool "Support for Rockhopper base board"
-        depends on NEC_CMBVR4133
-        select PCI_VR41XX
-        select I8259
-        select HAVE_STD_PC_SERIAL_PORT
-
 choice
         prompt "Base board type"
         depends on TANBAC_TB022X
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/Makefile b/arch/mips/vr41xx/nec-cmbvr4133/Makefile
deleted file mode 100644
index 5835cae54aca..000000000000
--- a/arch/mips/vr41xx/nec-cmbvr4133/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the NEC-CMBVR4133
-#
-
-obj-y                           := init.o setup.o
-
-obj-$(CONFIG_PCI)               += m1535plus.o
-obj-$(CONFIG_ROCKHOPPER)        += irq.o
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/init.c b/arch/mips/vr41xx/nec-cmbvr4133/init.c
deleted file mode 100644
index 7c5e18ee2231..000000000000
--- a/arch/mips/vr41xx/nec-cmbvr4133/init.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * arch/mips/vr41xx/nec-cmbvr4133/init.c
- *
- * PROM library initialisation code for NEC CMB-VR4133 board.
- *
- * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and
- *         Jun Sun <jsun@mvista.com, or source@mvista.com> and
- *         Alex Sapkov <asapkov@ru.mvista.com>
- *
- * 2001-2004 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for NEC-CMBVR4133 in 2.6
- * Manish Lachwani (mlachwani@mvista.com)
- */
-
-#ifdef CONFIG_ROCKHOPPER
-#include <asm/io.h>
-#include <linux/pci.h>
-
-#define PCICONFDREG     0xaf000c14
-#define PCICONFAREG     0xaf000c18
-
-void disable_pcnet(void)
-{
-        u32 data;
-
-        /*
-         * Workaround for the bug in PMON on VR4133. PMON leaves
-         * AMD PCNet controller (on Rockhopper) initialized and running in
-         * bus master mode. We have do disable it before doing any
-         * further initialization. Or we get problems with PCI bus 2
-         * and random lockups and crashes.
-         */
-
-        writel((2 << 16)                |
-               (PCI_DEVFN(1, 0) << 8)   |
-               (0 & 0xfc)               |
-               1UL,
-               PCICONFAREG);
-
-        data = readl(PCICONFDREG);
-
-        writel((2 << 16)                |
-               (PCI_DEVFN(1, 0) << 8)   |
-               (4 & 0xfc)               |
-               1UL,
-               PCICONFAREG);
-
-        data = readl(PCICONFDREG);
-
-        writel((2 << 16)                |
-               (PCI_DEVFN(1, 0) << 8)   |
-               (4 & 0xfc)               |
-               1UL,
-               PCICONFAREG);
-
-        data &= ~4;
-
-        writel(data, PCICONFDREG);
-}
-#endif
-
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/irq.c b/arch/mips/vr41xx/nec-cmbvr4133/irq.c
deleted file mode 100644
index 7d2d076b0f54..000000000000
--- a/arch/mips/vr41xx/nec-cmbvr4133/irq.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * arch/mips/vr41xx/nec-cmbvr4133/irq.c
- *
- * Interrupt routines for the NEC CMB-VR4133 board.
- *
- * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and
- *         Alex Sapkov <asapkov@ru.mvista.com>
- *
- * 2003-2004 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for NEC-CMBVR4133 in 2.6
- * Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/bitops.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-
-#include <asm/io.h>
-#include <asm/i8259.h>
-#include <asm/vr41xx/cmbvr4133.h>
-
-extern int vr4133_rockhopper;
-
-static int i8259_get_irq_number(int irq)
-{
-        return i8259_irq();
-}
-
-void __init rockhopper_init_irq(void)
-{
-        int i;
-
-        if(!vr4133_rockhopper) {
-                printk(KERN_ERR "Not a Rockhopper Board \n");
-                return;
-        }
-
-        vr41xx_set_irq_trigger(CMBVR41XX_INTC_PIN, TRIGGER_LEVEL, SIGNAL_THROUGH);
-        vr41xx_set_irq_level(CMBVR41XX_INTC_PIN, LEVEL_HIGH);
-        vr41xx_cascade_irq(CMBVR41XX_INTC_IRQ, i8259_get_irq_number);
-}
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
deleted file mode 100644
index 1341f3287d04..000000000000
--- a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
- *
- * Initialize for ALi M1535+(included M5229 and M5237).
- *
- * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and
- *         Alex Sapkov <asapkov@ru.mvista.com>
- *
- * 2003-2004 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for NEC-CMBVR4133 in 2.6
- * Author: Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/serial.h>
-
-#include <asm/vr41xx/cmbvr4133.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-
-#define CONFIG_PORT(port)       ((port) ? 0x3f0 : 0x370)
-#define DATA_PORT(port)         ((port) ? 0x3f1 : 0x371)
-#define INDEX_PORT(port)        CONFIG_PORT(port)
-
-#define ENTER_CONFIG_MODE(port)                         \
-        do {                                            \
-                outb_p(0x51, CONFIG_PORT(port));        \
-                outb_p(0x23, CONFIG_PORT(port));        \
-        } while(0)
-
-#define SELECT_LOGICAL_DEVICE(port, dev_no)             \
-        do {                                            \
-                outb_p(0x07, INDEX_PORT(port));         \
-                outb_p((dev_no), DATA_PORT(port));      \
-        } while(0)
-
-#define WRITE_CONFIG_DATA(port, index, data)            \
-        do {                                            \
-                outb_p((index), INDEX_PORT(port));      \
-                outb_p((data), DATA_PORT(port));        \
-        } while(0)
-
-#define EXIT_CONFIG_MODE(port)  outb(0xbb, CONFIG_PORT(port))
-
-#define PCI_CONFIG_ADDR KSEG1ADDR(0x0f000c18)
-#define PCI_CONFIG_DATA KSEG1ADDR(0x0f000c14)
-
-#ifdef CONFIG_BLK_DEV_FD
-
-void __devinit ali_m1535plus_fdc_init(int port)
-{
-        ENTER_CONFIG_MODE(port);
-        SELECT_LOGICAL_DEVICE(port, 0);         /* FDC */
-        WRITE_CONFIG_DATA(port, 0x30, 0x01);    /* FDC: enable */
-        WRITE_CONFIG_DATA(port, 0x60, 0x03);    /* I/O port base: 0x3f0 */
-        WRITE_CONFIG_DATA(port, 0x61, 0xf0);
-        WRITE_CONFIG_DATA(port, 0x70, 0x06);    /* IRQ: 6 */
-        WRITE_CONFIG_DATA(port, 0x74, 0x02);    /* DMA: channel 2 */
-        WRITE_CONFIG_DATA(port, 0xf0, 0x08);
-        WRITE_CONFIG_DATA(port, 0xf1, 0x00);
-        WRITE_CONFIG_DATA(port, 0xf2, 0xff);
-        WRITE_CONFIG_DATA(port, 0xf4, 0x00);
-        EXIT_CONFIG_MODE(port);
-}
-
-#endif
-
-void __devinit ali_m1535plus_parport_init(int port)
-{
-        ENTER_CONFIG_MODE(port);
-        SELECT_LOGICAL_DEVICE(port, 3);         /* Parallel Port */
-        WRITE_CONFIG_DATA(port, 0x30, 0x01);
-        WRITE_CONFIG_DATA(port, 0x60, 0x03);    /* I/O port base: 0x378 */
-        WRITE_CONFIG_DATA(port, 0x61, 0x78);
-        WRITE_CONFIG_DATA(port, 0x70, 0x07);    /* IRQ: 7 */
-        WRITE_CONFIG_DATA(port, 0x74, 0x04);    /* DMA: None */
-        WRITE_CONFIG_DATA(port, 0xf0, 0x8c);    /* IRQ polarity: Active Low */
-        WRITE_CONFIG_DATA(port, 0xf1, 0xc5);
-        EXIT_CONFIG_MODE(port);
-}
-
-void __devinit ali_m1535plus_keyboard_init(int port)
-{
-        ENTER_CONFIG_MODE(port);
-        SELECT_LOGICAL_DEVICE(port, 7);         /* KEYBOARD */
-        WRITE_CONFIG_DATA(port, 0x30, 0x01);    /* KEYBOARD: eable */
-        WRITE_CONFIG_DATA(port, 0x70, 0x01);    /* IRQ: 1 */
-        WRITE_CONFIG_DATA(port, 0x72, 0x0c);    /* PS/2 Mouse IRQ: 12 */
-        WRITE_CONFIG_DATA(port, 0xf0, 0x00);
-        EXIT_CONFIG_MODE(port);
-}
-
-void __devinit ali_m1535plus_hotkey_init(int port)
-{
-        ENTER_CONFIG_MODE(port);
-        SELECT_LOGICAL_DEVICE(port, 0xc);       /* HOTKEY */
-        WRITE_CONFIG_DATA(port, 0x30, 0x00);
-        WRITE_CONFIG_DATA(port, 0xf0, 0x35);
-        WRITE_CONFIG_DATA(port, 0xf1, 0x14);
-        WRITE_CONFIG_DATA(port, 0xf2, 0x11);
-        WRITE_CONFIG_DATA(port, 0xf3, 0x71);
-        WRITE_CONFIG_DATA(port, 0xf5, 0x05);
-        EXIT_CONFIG_MODE(port);
-}
-
-void ali_m1535plus_init(struct pci_dev *dev)
-{
-        pci_write_config_byte(dev, 0x40, 0x18); /* PCI Interface Control */
-        pci_write_config_byte(dev, 0x41, 0xc0); /* PS2 keyb & mouse enable */
-        pci_write_config_byte(dev, 0x42, 0x41); /* ISA bus cycle control */
-        pci_write_config_byte(dev, 0x43, 0x00); /* ISA bus cycle control 2 */
-        pci_write_config_byte(dev, 0x44, 0x5d); /* IDE enable & IRQ 14 */
-        pci_write_config_byte(dev, 0x45, 0x0b); /* PCI int polling mode */
-        pci_write_config_byte(dev, 0x47, 0x00); /* BIOS chip select control */
-
-        /* IRQ routing */
-        pci_write_config_byte(dev, 0x48, 0x03); /* INTA IRQ10, INTB disable */
-        pci_write_config_byte(dev, 0x49, 0x00); /* INTC and INTD disable */
-        pci_write_config_byte(dev, 0x4a, 0x00); /* INTE and INTF disable */
-        pci_write_config_byte(dev, 0x4b, 0x90); /* Audio IRQ11, Modem disable */
-
-        pci_write_config_word(dev, 0x50, 0x4000); /* Parity check IDE enable */
-        pci_write_config_word(dev, 0x52, 0x0000); /* USB & RTC disable */
-        pci_write_config_word(dev, 0x54, 0x0002); /* ??? no info */
-        pci_write_config_word(dev, 0x56, 0x0002); /* PCS1J signal disable */
-
-        pci_write_config_byte(dev, 0x59, 0x00); /* PCSDS */
-        pci_write_config_byte(dev, 0x5a, 0x00);
-        pci_write_config_byte(dev, 0x5b, 0x00);
-        pci_write_config_word(dev, 0x5c, 0x0000);
-        pci_write_config_byte(dev, 0x5e, 0x00);
-        pci_write_config_byte(dev, 0x5f, 0x00);
-        pci_write_config_word(dev, 0x60, 0x0000);
-
-        pci_write_config_byte(dev, 0x6c, 0x00);
-        pci_write_config_byte(dev, 0x6d, 0x48); /* ROM address mapping */
-        pci_write_config_byte(dev, 0x6e, 0x00); /* ??? what for? */
-
-        pci_write_config_byte(dev, 0x70, 0x12); /* Serial IRQ control */
-        pci_write_config_byte(dev, 0x71, 0xEF); /* DMA channel select */
-        pci_write_config_byte(dev, 0x72, 0x03); /* USB IDSEL */
-        pci_write_config_byte(dev, 0x73, 0x00); /* ??? no info */
-
-        /*
-         * IRQ setup ALi M5237 USB Host Controller
-         * IRQ: 9
-         */
-        pci_write_config_byte(dev, 0x74, 0x01); /* USB IRQ9 */
-
-        pci_write_config_byte(dev, 0x75, 0x1f); /* IDE2 IRQ 15  */
-        pci_write_config_byte(dev, 0x76, 0x80); /* ACPI disable */
-        pci_write_config_byte(dev, 0x77, 0x40); /* Modem disable */
-        pci_write_config_dword(dev, 0x78, 0x20000000); /* Pin select 2 */
-        pci_write_config_byte(dev, 0x7c, 0x00); /* Pin select 3 */
-        pci_write_config_byte(dev, 0x81, 0x00); /* ID read/write control */
-        pci_write_config_byte(dev, 0x90, 0x00); /* PCI PM block control */
-        pci_write_config_word(dev, 0xa4, 0x0000); /* PMSCR */
-
-#ifdef CONFIG_BLK_DEV_FD
-        ali_m1535plus_fdc_init(1);
-#endif
-
-        ali_m1535plus_keyboard_init(1);
-        ali_m1535plus_hotkey_init(1);
-}
-
-static inline void ali_config_writeb(u8 reg, u8 val, int devfn)
-{
-        u32 data;
-        int shift;
-
-        writel((1 << 16) | (devfn << 8) | (reg & 0xfc) | 1UL, PCI_CONFIG_ADDR);
-        data = readl(PCI_CONFIG_DATA);
-
-        shift = (reg & 3) << 3;
-        data &= ~(0xff << shift);
-        data |= (((u32)val) << shift);
-
-        writel(data, PCI_CONFIG_DATA);
-}
-
-static inline u8 ali_config_readb(u8 reg, int devfn)
-{
-        u32 data;
-
-        writel((1 << 16) | (devfn << 8) | (reg & 0xfc) | 1UL, PCI_CONFIG_ADDR);
-        data = readl(PCI_CONFIG_DATA);
-
-        return (u8)(data >> ((reg & 3) << 3));
-}
-
-static inline u16 ali_config_readw(u8 reg, int devfn)
-{
-        u32 data;
-
-        writel((1 << 16) | (devfn << 8) | (reg & 0xfc) | 1UL, PCI_CONFIG_ADDR);
-        data = readl(PCI_CONFIG_DATA);
-
-        return (u16)(data >> ((reg & 2) << 3));
-}
-
-int vr4133_rockhopper = 0;
-void __init ali_m5229_preinit(void)
-{
-        if (ali_config_readw(PCI_VENDOR_ID, 16) == PCI_VENDOR_ID_AL &&
-            ali_config_readw(PCI_DEVICE_ID, 16) == PCI_DEVICE_ID_AL_M1533) {
-                printk(KERN_INFO "Found an NEC Rockhopper \n");
-                vr4133_rockhopper = 1;
-                /*
-                 * Enable ALi M5229 IDE Controller (both channels)
-                 * IDSEL: A27
-                 */
-                ali_config_writeb(0x58, 0x4c, 16);
-        }
-}
-
-void __init ali_m5229_init(struct pci_dev *dev)
-{
-        /*
-         * Enable Primary/Secondary Channel Cable Detect 40-Pin
-         */
-        pci_write_config_word(dev, 0x4a, 0xc023);
-
-        /*
-         * Set only the 3rd byteis for the master IDE's cycle and
-         * enable Internal IDE Function
-         */
-        pci_write_config_byte(dev, 0x50, 0x23); /* Class code attr register */
-
-        pci_write_config_byte(dev, 0x09, 0xff); /* Set native mode & stuff */
-        pci_write_config_byte(dev, 0x52, 0x00); /* use timing registers */
-        pci_write_config_byte(dev, 0x58, 0x02); /* Primary addr setup timing */
-        pci_write_config_byte(dev, 0x59, 0x22); /* Primary cmd block timing */
-        pci_write_config_byte(dev, 0x5a, 0x22); /* Pr drv 0 R/W timing */
-        pci_write_config_byte(dev, 0x5b, 0x22); /* Pr drv 1 R/W timing */
-        pci_write_config_byte(dev, 0x5c, 0x02); /* Sec addr setup timing */
-        pci_write_config_byte(dev, 0x5d, 0x22); /* Sec cmd block timing */
-        pci_write_config_byte(dev, 0x5e, 0x22); /* Sec drv 0 R/W timing */
-        pci_write_config_byte(dev, 0x5f, 0x22); /* Sec drv 1 R/W timing */
-        pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x20);
-        pci_write_config_word(dev, PCI_COMMAND,
-                                   PCI_COMMAND_PARITY | PCI_COMMAND_MASTER |
-                                   PCI_COMMAND_IO);
-}
-
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
deleted file mode 100644
index 7723d2011b08..000000000000
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * arch/mips/vr41xx/nec-cmbvr4133/setup.c
- *
- * Setup for the NEC CMB-VR4133.
- *
- * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and
- *         Alex Sapkov <asapkov@ru.mvista.com>
- *
- * 2001-2004 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Support for CMBVR4133 board in 2.6
- * Author: Manish Lachwani (mlachwani@mvista.com)
- */
-#include <linux/init.h>
-#include <linux/ide.h>
-#include <linux/ioport.h>
-
-#include <asm/reboot.h>
-#include <asm/time.h>
-#include <asm/vr41xx/cmbvr4133.h>
-#include <asm/bootinfo.h>
-
-#ifdef CONFIG_MTD
-#include <linux/mtd/physmap.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-
-static struct mtd_partition cmbvr4133_mtd_parts[] = {
-        {
-                .name =         "User FS",
-                .size =         0x1be0000,
-                .offset =       0,
-                .mask_flags =   0,
-        },
-        {
-                .name =         "PMON",
-                .size =         0x140000,
-                .offset =       MTDPART_OFS_APPEND,
-                .mask_flags =   MTD_WRITEABLE,  /* force read-only */
-        },
-        {
-                .name =         "User FS2",
-                .size =         MTDPART_SIZ_FULL,
-                .offset =       MTDPART_OFS_APPEND,
-                .mask_flags =   0,
-        }
-};
-
-#define number_partitions ARRAY_SIZE(cmbvr4133_mtd_parts)
-#endif
-
-extern void i8259_init(void);
-
-static void __init nec_cmbvr4133_setup(void)
-{
-#ifdef CONFIG_ROCKHOPPER
-        extern void disable_pcnet(void);
-
-        disable_pcnet();
-#endif
-        set_io_port_base(KSEG1ADDR(0x16000000));
-
-#ifdef CONFIG_PCI
-#ifdef CONFIG_ROCKHOPPER
-        ali_m5229_preinit();
-#endif
-#endif
-
-#ifdef CONFIG_ROCKHOPPER
-        rockhopper_init_irq();
-#endif
-
-#ifdef CONFIG_MTD
-        /* we use generic physmap mapping driver and we use partitions */
-        physmap_configure(0x1C000000, 0x02000000, 4, NULL);
-        physmap_set_partitions(cmbvr4133_mtd_parts, number_partitions);
-#endif
-
-        /* 128 MB memory support */
-        add_memory_region(0, 0x08000000, BOOT_MEM_RAM);
-
-#ifdef CONFIG_ROCKHOPPER
-        i8259_init();
-#endif
-}
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index bc7a19da6245..a7d4fd353c2b 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -199,6 +199,7 @@ endchoice
 
 config SMP
         bool "Symmetric multi-processing support"
+        select USE_GENERIC_SMP_HELPERS
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index e10d25d2d9c9..5259d8c20676 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -51,12 +51,12 @@ static struct pdc_btlb_info btlb_info __read_mostly;
 void
 flush_data_cache(void)
 {
-        on_each_cpu(flush_data_cache_local, NULL, 1, 1);
+        on_each_cpu(flush_data_cache_local, NULL, 1);
 }
 void 
 flush_instruction_cache(void)
 {
-        on_each_cpu(flush_instruction_cache_local, NULL, 1, 1);
+        on_each_cpu(flush_instruction_cache_local, NULL, 1);
 }
 #endif
 
@@ -515,7 +515,7 @@ static void cacheflush_h_tmp_function(void *dummy)
 
 void flush_cache_all(void)
 {
-        on_each_cpu(cacheflush_h_tmp_function, NULL, 1, 1);
+        on_each_cpu(cacheflush_h_tmp_function, NULL, 1);
 }
 
 void flush_cache_mm(struct mm_struct *mm)
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 85fc7754ec25..d47f3975c9c6 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -84,19 +84,11 @@ EXPORT_SYMBOL(cpu_possible_map);
 
 DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED;
 
-struct smp_call_struct {
-        void (*func) (void *info);
-        void *info;
-        long wait;
-        atomic_t unstarted_count;
-        atomic_t unfinished_count;
-};
-static volatile struct smp_call_struct *smp_call_function_data;
-
 enum ipi_message_type {
         IPI_NOP=0,
         IPI_RESCHEDULE=1,
         IPI_CALL_FUNC,
+        IPI_CALL_FUNC_SINGLE,
         IPI_CPU_START,
         IPI_CPU_STOP,
         IPI_CPU_TEST
@@ -187,33 +179,12 @@ ipi_interrupt(int irq, void *dev_id)
 
                         case IPI_CALL_FUNC:
                                 smp_debug(100, KERN_DEBUG "CPU%d IPI_CALL_FUNC\n", this_cpu);
-                                {
-                                        volatile struct smp_call_struct *data;
-                                        void (*func)(void *info);
-                                        void *info;
-                                        int wait;
-
-                                        data = smp_call_function_data;
-                                        func = data->func;
-                                        info = data->info;
-                                        wait = data->wait;
-
-                                        mb();
-                                        atomic_dec ((atomic_t *)&data->unstarted_count);
-
-                                        /* At this point, *data can't
-                                         * be relied upon.
-                                         */
-
-                                        (*func)(info);
-
-                                        /* Notify the sending CPU that the
-                                         * task is done.
-                                         */
-                                        mb();
-                                        if (wait)
-                                                atomic_dec ((atomic_t *)&data->unfinished_count);
-                                }
+                                generic_smp_call_function_interrupt();
+                                break;
+
+                        case IPI_CALL_FUNC_SINGLE:
+                                smp_debug(100, KERN_DEBUG "CPU%d IPI_CALL_FUNC_SINGLE\n", this_cpu);
+                                generic_smp_call_function_single_interrupt();
                                 break;
 
                         case IPI_CPU_START:
@@ -256,6 +227,14 @@ ipi_send(int cpu, enum ipi_message_type op)
         spin_unlock_irqrestore(lock, flags);
 }
 
+static void
+send_IPI_mask(cpumask_t mask, enum ipi_message_type op)
+{
+        int cpu;
+
+        for_each_cpu_mask(cpu, mask)
+                ipi_send(cpu, op);
+}
 
 static inline void
 send_IPI_single(int dest_cpu, enum ipi_message_type op)
@@ -295,86 +274,15 @@ smp_send_all_nop(void)
         send_IPI_allbutself(IPI_NOP);
 }
 
-
-/**
- * Run a function on all other CPUs.
- *  <func>      The function to run. This must be fast and non-blocking.
- *  <info>      An arbitrary pointer to pass to the function.
- *  <retry>     If true, keep retrying until ready.
- *  <wait>      If true, wait until function has completed on other CPUs.
- *  [RETURNS]   0 on success, else a negative status code.
- *
- * Does not return until remote CPUs are nearly ready to execute <func>
- * or have executed.
- */
-
-int
-smp_call_function (void (*func) (void *info), void *info, int retry, int wait)
+void arch_send_call_function_ipi(cpumask_t mask)
 {
-        struct smp_call_struct data;
-        unsigned long timeout;
-        static DEFINE_SPINLOCK(lock);
-        int retries = 0;
-
-        if (num_online_cpus() < 2)
-                return 0;
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        /* can also deadlock if IPIs are disabled */
-        WARN_ON((get_eiem() & (1UL<<(CPU_IRQ_MAX - IPI_IRQ))) == 0);
-
-        
-        data.func = func;
-        data.info = info;
-        data.wait = wait;
-        atomic_set(&data.unstarted_count, num_online_cpus() - 1);
-        atomic_set(&data.unfinished_count, num_online_cpus() - 1);
-
-        if (retry) {
-                spin_lock (&lock);
-                while (smp_call_function_data != 0)
-                        barrier();
-        }
-        else {
-                spin_lock (&lock);
-                if (smp_call_function_data) {
-                        spin_unlock (&lock);
-                        return -EBUSY;
-                }
-        }
-
-        smp_call_function_data = &data;
-        spin_unlock (&lock);
-        
-        /*  Send a message to all other CPUs and wait for them to respond  */
-        send_IPI_allbutself(IPI_CALL_FUNC);
-
- retry:
-        /*  Wait for response  */
-        timeout = jiffies + HZ;
-        while ( (atomic_read (&data.unstarted_count) > 0) &&
-                time_before (jiffies, timeout) )
-                barrier ();
-
-        if (atomic_read (&data.unstarted_count) > 0) {
-                printk(KERN_CRIT "SMP CALL FUNCTION TIMED OUT! (cpu=%d), try %d\n",
-                      smp_processor_id(), ++retries);
-                goto retry;
-        }
-        /* We either got one or timed out. Release the lock */
-
-        mb();
-        smp_call_function_data = NULL;
-
-        while (wait && atomic_read (&data.unfinished_count) > 0)
-                        barrier ();
-
-        return 0;
+        send_IPI_mask(mask, IPI_CALL_FUNC);
 }
 
-EXPORT_SYMBOL(smp_call_function);
+void arch_send_call_function_single_ipi(int cpu)
+{
+        send_IPI_single(cpu, IPI_CALL_FUNC_SINGLE);
+}
 
 /*
  * Flush all other CPU's tlb and then mine.  Do this with on_each_cpu()
@@ -384,7 +292,7 @@ EXPORT_SYMBOL(smp_call_function);
 void
 smp_flush_tlb_all(void)
 {
-        on_each_cpu(flush_tlb_all_local, NULL, 1, 1);
+        on_each_cpu(flush_tlb_all_local, NULL, 1);
 }
 
 /*
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index ce0da689a89d..b4d6c8777ed0 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -1053,7 +1053,7 @@ void flush_tlb_all(void)
             do_recycle++;
         }
         spin_unlock(&sid_lock);
-        on_each_cpu(flush_tlb_all_local, NULL, 1, 1);
+        on_each_cpu(flush_tlb_all_local, NULL, 1);
         if (do_recycle) {
             spin_lock(&sid_lock);
             recycle_sids(recycle_ndirty,recycle_dirty_array);
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a5e9912e2d37..20eacf2a8424 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -111,6 +111,7 @@ config PPC
         select HAVE_KPROBES
         select HAVE_KRETPROBES
         select HAVE_LMB
+        select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_OPROFILE
 
 config EARLY_PRINTK
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 704375bda73a..b732b5f8e356 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -172,7 +172,7 @@ static void kexec_prepare_cpus(void)
 {
         int my_cpu, i, notified=-1;
 
-        smp_call_function(kexec_smp_down, NULL, 0, /* wait */0);
+        smp_call_function(kexec_smp_down, NULL, /* wait */0);
         my_cpu = get_cpu();
 
         /* check the others cpus are now down (via paca hw cpu id == -1) */
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 34843c318419..647f3e8677dc 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -747,7 +747,7 @@ static int rtas_ibm_suspend_me(struct rtas_args *args)
         /* Call function on all CPUs.  One of us will make the
          * rtas call
          */
-        if (on_each_cpu(rtas_percpu_suspend_me, &data, 1, 0))
+        if (on_each_cpu(rtas_percpu_suspend_me, &data, 0))
                 data.error = -EINVAL;
 
         wait_for_completion(&done);
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 1457aa0a08f1..5191b46a611e 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -72,12 +72,8 @@ struct smp_ops_t *smp_ops;
 
 static volatile unsigned int cpu_callin_map[NR_CPUS];
 
-void smp_call_function_interrupt(void);
-
 int smt_enabled_at_boot = 1;
 
-static int ipi_fail_ok;
-
 static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
 
 #ifdef CONFIG_PPC64
@@ -99,12 +95,15 @@ void smp_message_recv(int msg)
 {
         switch(msg) {
         case PPC_MSG_CALL_FUNCTION:
-                smp_call_function_interrupt();
+                generic_smp_call_function_interrupt();
                 break;
         case PPC_MSG_RESCHEDULE:
                 /* XXX Do we have to do this? */
                 set_need_resched();
                 break;
+        case PPC_MSG_CALL_FUNC_SINGLE:
+                generic_smp_call_function_single_interrupt();
+                break;
         case PPC_MSG_DEBUGGER_BREAK:
                 if (crash_ipi_function_ptr) {
                         crash_ipi_function_ptr(get_irq_regs());
@@ -128,6 +127,19 @@ void smp_send_reschedule(int cpu)
                 smp_ops->message_pass(cpu, PPC_MSG_RESCHEDULE);
 }
 
+void arch_send_call_function_single_ipi(int cpu)
+{
+        smp_ops->message_pass(cpu, PPC_MSG_CALL_FUNC_SINGLE);
+}
+
+void arch_send_call_function_ipi(cpumask_t mask)
+{
+        unsigned int cpu;
+
+        for_each_cpu_mask(cpu, mask)
+                smp_ops->message_pass(cpu, PPC_MSG_CALL_FUNCTION);
+}
+
 #ifdef CONFIG_DEBUGGER
 void smp_send_debugger_break(int cpu)
 {
@@ -154,215 +166,9 @@ static void stop_this_cpu(void *dummy)
                 ;
 }
 
-/*
- * Structure and data for smp_call_function(). This is designed to minimise
- * static memory requirements. It also looks cleaner.
- * Stolen from the i386 version.
- */
-static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);
-
-static struct call_data_struct {
-        void (*func) (void *info);
-        void *info;
-        atomic_t started;
-        atomic_t finished;
-        int wait;
-} *call_data;
-
-/* delay of at least 8 seconds */
-#define SMP_CALL_TIMEOUT        8
-
-/*
- * These functions send a 'generic call function' IPI to other online
- * CPUS in the system.
- *
- * [SUMMARY] Run a function on other CPUs.
- * <func> The function to run. This must be fast and non-blocking.
- * <info> An arbitrary pointer to pass to the function.
- * <nonatomic> currently unused.
- * <wait> If true, wait (atomically) until function has completed on other CPUs.
- * [RETURNS] 0 on success, else a negative status code. Does not return until
- * remote CPUs are nearly ready to execute <<func>> or are or have executed.
- * <map> is a cpu map of the cpus to send IPI to.
- *
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-static int __smp_call_function_map(void (*func) (void *info), void *info,
-                                   int nonatomic, int wait, cpumask_t map)
-{
-        struct call_data_struct data;
-        int ret = -1, num_cpus;
-        int cpu;
-        u64 timeout;
-
-        if (unlikely(smp_ops == NULL))
-                return ret;
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        /* remove 'self' from the map */
-        if (cpu_isset(smp_processor_id(), map))
-                cpu_clear(smp_processor_id(), map);
-
-        /* sanity check the map, remove any non-online processors. */
-        cpus_and(map, map, cpu_online_map);
-
-        num_cpus = cpus_weight(map);
-        if (!num_cpus)
-                goto done;
-
-        call_data = &data;
-        smp_wmb();
-        /* Send a message to all CPUs in the map */
-        for_each_cpu_mask(cpu, map)
-                smp_ops->message_pass(cpu, PPC_MSG_CALL_FUNCTION);
-
-        timeout = get_tb() + (u64) SMP_CALL_TIMEOUT * tb_ticks_per_sec;
-
-        /* Wait for indication that they have received the message */
-        while (atomic_read(&data.started) != num_cpus) {
-                HMT_low();
-                if (get_tb() >= timeout) {
-                        printk("smp_call_function on cpu %d: other cpus not "
-                                "responding (%d)\n", smp_processor_id(),
-                                atomic_read(&data.started));
-                        if (!ipi_fail_ok)
-                                debugger(NULL);
-                        goto out;
-                }
-        }
-
-        /* optionally wait for the CPUs to complete */
-        if (wait) {
-                while (atomic_read(&data.finished) != num_cpus) {
-                        HMT_low();
-                        if (get_tb() >= timeout) {
-                                printk("smp_call_function on cpu %d: other "
-                                        "cpus not finishing (%d/%d)\n",
-                                        smp_processor_id(),
-                                        atomic_read(&data.finished),
-                                        atomic_read(&data.started));
-                                debugger(NULL);
-                                goto out;
-                        }
-                }
-        }
-
- done:
-        ret = 0;
-
- out:
-        call_data = NULL;
-        HMT_medium();
-        return ret;
-}
-
-static int __smp_call_function(void (*func)(void *info), void *info,
-                               int nonatomic, int wait)
-{
-        int ret;
-        spin_lock(&call_lock);
-        ret =__smp_call_function_map(func, info, nonatomic, wait,
-                                       cpu_online_map);
-        spin_unlock(&call_lock);
-        return ret;
-}
-
-int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
-                        int wait)
-{
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        return __smp_call_function(func, info, nonatomic, wait);
-}
-EXPORT_SYMBOL(smp_call_function);
-
-int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
-                             int nonatomic, int wait)
-{
-        cpumask_t map = CPU_MASK_NONE;
-        int ret = 0;
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        if (!cpu_online(cpu))
-                return -EINVAL;
-
-        cpu_set(cpu, map);
-        if (cpu != get_cpu()) {
-                spin_lock(&call_lock);
-                ret = __smp_call_function_map(func, info, nonatomic, wait, map);
-                spin_unlock(&call_lock);
-        } else {
-                local_irq_disable();
-                func(info);
-                local_irq_enable();
-        }
-        put_cpu();
-        return ret;
-}
-EXPORT_SYMBOL(smp_call_function_single);
-
 void smp_send_stop(void)
 {
-        int nolock;
-
-        /* It's OK to fail sending the IPI, since the alternative is to
-         * be stuck forever waiting on the other CPU to take the interrupt.
-         *
-         * It's better to at least continue and go through reboot, since this
-         * function is usually called at panic or reboot time in the first
-         * place.
-         */
-        ipi_fail_ok = 1;
-
-        /* Don't deadlock in case we got called through panic */
-        nolock = !spin_trylock(&call_lock);
-        __smp_call_function_map(stop_this_cpu, NULL, 1, 0, cpu_online_map);
-        if (!nolock)
-                spin_unlock(&call_lock);
-}
-
-void smp_call_function_interrupt(void)
-{
-        void (*func) (void *info);
-        void *info;
-        int wait;
-
-        /* call_data will be NULL if the sender timed out while
-         * waiting on us to receive the call.
-         */
-        if (!call_data)
-                return;
-
-        func = call_data->func;
-        info = call_data->info;
-        wait = call_data->wait;
-
-        if (!wait)
-                smp_mb__before_atomic_inc();
-
-        /*
-         * Notify initiating CPU that I've grabbed the data and am
-         * about to execute the function
-         */
-        atomic_inc(&call_data->started);
-        /*
-         * At this point the info structure may be out of scope unless wait==1
-         */
-        (*func)(info);
-        if (wait) {
-                smp_mb__before_atomic_inc();
-                atomic_inc(&call_data->finished);
-        }
+        smp_call_function(stop_this_cpu, NULL, 0);
 }
 
 extern struct gettimeofday_struct do_gtod;
@@ -596,9 +402,9 @@ int __devinit start_secondary(void *unused)
 
         secondary_cpu_time_init();
 
-        spin_lock(&call_lock);
+        ipi_call_lock();
         cpu_set(cpu, cpu_online_map);
-        spin_unlock(&call_lock);
+        ipi_call_unlock();
 
         local_irq_enable();
 
diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c
index 368a4934f7ee..c3a56d65c5a9 100644
--- a/arch/powerpc/kernel/tau_6xx.c
+++ b/arch/powerpc/kernel/tau_6xx.c
@@ -192,7 +192,7 @@ static void tau_timeout_smp(unsigned long unused)
 
         /* schedule ourselves to be run again */
         mod_timer(&tau_timer, jiffies + shrink_timer) ;
-        on_each_cpu(tau_timeout, NULL, 1, 0);
+        on_each_cpu(tau_timeout, NULL, 0);
 }
 
 /*
@@ -234,7 +234,7 @@ int __init TAU_init(void)
         tau_timer.expires = jiffies + shrink_timer;
         add_timer(&tau_timer);
 
-        on_each_cpu(TAU_init_smp, NULL, 1, 0);
+        on_each_cpu(TAU_init_smp, NULL, 0);
 
         printk("Thermal assist unit ");
 #ifdef CONFIG_TAU_INT
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 73401e83739a..f1a38a6c1e2d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -322,7 +322,7 @@ void snapshot_timebases(void)
 {
         if (!cpu_has_feature(CPU_FTR_PURR))
                 return;
-        on_each_cpu(snapshot_tb_and_purr, NULL, 0, 1);
+        on_each_cpu(snapshot_tb_and_purr, NULL, 1);
 }
 
 /*
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index ad928edafb0a..2bd12d965db1 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -218,7 +218,7 @@ static void slice_convert(struct mm_struct *mm, struct slice_mask mask, int psiz
         mb();
 
         /* XXX this is sub-optimal but will do for now */
-        on_each_cpu(slice_flush_segments, mm, 0, 1);
+        on_each_cpu(slice_flush_segments, mm, 1);
 #ifdef CONFIG_SPU_BASE
         spu_flush_all_slbs(mm);
 #endif
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index e2d867ce1c7e..69ad829a7fa3 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -66,7 +66,7 @@ static void pgtable_free_now(pgtable_free_t pgf)
 {
         pte_freelist_forced_free++;
 
-        smp_call_function(pte_free_smp_sync, NULL, 0, 1);
+        smp_call_function(pte_free_smp_sync, NULL, 1);
 
         pgtable_free(pgf);
 }
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 4908dc98f9ca..17807acb05d9 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -65,7 +65,7 @@ static int op_powerpc_setup(void)
 
         /* Configure the registers on all cpus.  If an error occurs on one
          * of the cpus, op_per_cpu_rc will be set to the error */
-        on_each_cpu(op_powerpc_cpu_setup, NULL, 0, 1);
+        on_each_cpu(op_powerpc_cpu_setup, NULL, 1);
 
 out:    if (op_per_cpu_rc) {
                 /* error on setup release the performance counter hardware */
@@ -100,7 +100,7 @@ static int op_powerpc_start(void)
         if (model->global_start)
                 return model->global_start(ctr);
         if (model->start) {
-                on_each_cpu(op_powerpc_cpu_start, NULL, 0, 1);
+                on_each_cpu(op_powerpc_cpu_start, NULL, 1);
                 return op_per_cpu_rc;
         }
         return -EIO; /* No start function is defined for this
@@ -115,7 +115,7 @@ static inline void op_powerpc_cpu_stop(void *dummy)
 static void op_powerpc_stop(void)
 {
         if (model->stop)
-                on_each_cpu(op_powerpc_cpu_stop, NULL, 0, 1);
+                on_each_cpu(op_powerpc_cpu_stop, NULL, 1);
         if (model->global_stop)
                 model->global_stop();
 }
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 5bf7df146022..2d5bb22d6c09 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -218,6 +218,7 @@ void iic_request_IPIs(void)
 {
         iic_request_ipi(PPC_MSG_CALL_FUNCTION, "IPI-call");
         iic_request_ipi(PPC_MSG_RESCHEDULE, "IPI-resched");
+        iic_request_ipi(PPC_MSG_CALL_FUNC_SINGLE, "IPI-call-single");
 #ifdef CONFIG_DEBUGGER
         iic_request_ipi(PPC_MSG_DEBUGGER_BREAK, "IPI-debug");
 #endif /* CONFIG_DEBUGGER */
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index f0b12f212363..a0927a3bacb7 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -105,9 +105,10 @@ static void __init ps3_smp_setup_cpu(int cpu)
          * to index needs to be setup.
          */
 
-        BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION  != 0);
-        BUILD_BUG_ON(PPC_MSG_RESCHEDULE     != 1);
-        BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK != 3);
+        BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION    != 0);
+        BUILD_BUG_ON(PPC_MSG_RESCHEDULE       != 1);
+        BUILD_BUG_ON(PPC_MSG_CALL_FUNC_SINGLE != 2);
+        BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK   != 3);
 
         for (i = 0; i < MSG_COUNT; i++) {
                 result = ps3_event_receive_port_setup(cpu, &virqs[i]);
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index ebebc28fe895..0fc830f576f5 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -383,13 +383,11 @@ static irqreturn_t xics_ipi_dispatch(int cpu)
                         mb();
                         smp_message_recv(PPC_MSG_RESCHEDULE);
                 }
-#if 0
-                if (test_and_clear_bit(PPC_MSG_MIGRATE_TASK,
+                if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE,
                                        &xics_ipi_message[cpu].value)) {
                         mb();
-                        smp_message_recv(PPC_MSG_MIGRATE_TASK);
+                        smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);
                 }
-#endif
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
                 if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK,
                                        &xics_ipi_message[cpu].value)) {
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 7680001676a6..6c90c95b454e 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1494,7 +1494,7 @@ void mpic_request_ipis(void)
         static char *ipi_names[] = {
                 "IPI0 (call function)",
                 "IPI1 (reschedule)",
-                "IPI2 (unused)",
+                "IPI2 (call function single)",
                 "IPI3 (debugger break)",
         };
         BUG_ON(mpic == NULL);
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c
index 055998575cb4..bcab0d210e30 100644
--- a/arch/ppc/kernel/smp.c
+++ b/arch/ppc/kernel/smp.c
@@ -152,7 +152,7 @@ static void stop_this_cpu(void *dummy)
 
 void smp_send_stop(void)
 {
-        smp_call_function(stop_this_cpu, NULL, 1, 0);
+        smp_call_function(stop_this_cpu, NULL, 0);
 }
 
 /*
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 9cb3d92447a3..a7f8979fb925 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -203,7 +203,7 @@ __appldata_vtimer_setup(int cmd)
                         per_cpu(appldata_timer, i).expires = per_cpu_interval;
                         smp_call_function_single(i, add_virt_timer_periodic,
                                                  &per_cpu(appldata_timer, i),
-                                                 0, 1);
+                                                 1);
                 }
                 appldata_timer_active = 1;
                 break;
@@ -228,7 +228,7 @@ __appldata_vtimer_setup(int cmd)
                         args.timer = &per_cpu(appldata_timer, i);
                         args.expires = per_cpu_interval;
                         smp_call_function_single(i, __appldata_mod_vtimer_wrap,
-                                                 &args, 0, 1);
+                                                 &args, 1);
                 }
         }
 }
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 5d4fa4b1c74c..b6781030cfbd 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -109,7 +109,7 @@ static void do_call_function(void)
 }
 
 static void __smp_call_function_map(void (*func) (void *info), void *info,
-                                    int nonatomic, int wait, cpumask_t map)
+                                    int wait, cpumask_t map)
 {
         struct call_data_struct data;
         int cpu, local = 0;
@@ -162,7 +162,6 @@ out:
  * smp_call_function:
  * @func: the function to run; this must be fast and non-blocking
  * @info: an arbitrary pointer to pass to the function
- * @nonatomic: unused
  * @wait: if true, wait (atomically) until function has completed on other CPUs
  *
  * Run a function on all other CPUs.
@@ -170,15 +169,14 @@ out:
  * You must not call this function with disabled interrupts, from a
  * hardware interrupt handler or from a bottom half.
  */
-int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
-                      int wait)
+int smp_call_function(void (*func) (void *info), void *info, int wait)
 {
         cpumask_t map;
 
         spin_lock(&call_lock);
         map = cpu_online_map;
         cpu_clear(smp_processor_id(), map);
-        __smp_call_function_map(func, info, nonatomic, wait, map);
+        __smp_call_function_map(func, info, wait, map);
         spin_unlock(&call_lock);
         return 0;
 }
@@ -189,7 +187,6 @@ EXPORT_SYMBOL(smp_call_function);
  * @cpu: the CPU where func should run
  * @func: the function to run; this must be fast and non-blocking
  * @info: an arbitrary pointer to pass to the function
- * @nonatomic: unused
  * @wait: if true, wait (atomically) until function has completed on other CPUs
  *
  * Run a function on one processor.
@@ -198,11 +195,10 @@ EXPORT_SYMBOL(smp_call_function);
  * hardware interrupt handler or from a bottom half.
  */
 int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
-                             int nonatomic, int wait)
+                             int wait)
 {
         spin_lock(&call_lock);
-        __smp_call_function_map(func, info, nonatomic, wait,
-                                cpumask_of_cpu(cpu));
+        __smp_call_function_map(func, info, wait, cpumask_of_cpu(cpu));
         spin_unlock(&call_lock);
         return 0;
 }
@@ -228,7 +224,7 @@ int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info,
 {
         spin_lock(&call_lock);
         cpu_clear(smp_processor_id(), mask);
-        __smp_call_function_map(func, info, 0, wait, mask);
+        __smp_call_function_map(func, info, wait, mask);
         spin_unlock(&call_lock);
         return 0;
 }
@@ -303,7 +299,7 @@ static void smp_ptlb_callback(void *info)
 
 void smp_ptlb_all(void)
 {
-        on_each_cpu(smp_ptlb_callback, NULL, 0, 1);
+        on_each_cpu(smp_ptlb_callback, NULL, 1);
 }
 EXPORT_SYMBOL(smp_ptlb_all);
 #endif /* ! CONFIG_64BIT */
@@ -351,7 +347,7 @@ void smp_ctl_set_bit(int cr, int bit)
         memset(&parms.orvals, 0, sizeof(parms.orvals));
         memset(&parms.andvals, 0xff, sizeof(parms.andvals));
         parms.orvals[cr] = 1 << bit;
-        on_each_cpu(smp_ctl_bit_callback, &parms, 0, 1);
+        on_each_cpu(smp_ctl_bit_callback, &parms, 1);
 }
 EXPORT_SYMBOL(smp_ctl_set_bit);
 
@@ -365,7 +361,7 @@ void smp_ctl_clear_bit(int cr, int bit)
         memset(&parms.orvals, 0, sizeof(parms.orvals));
         memset(&parms.andvals, 0xff, sizeof(parms.andvals));
         parms.andvals[cr] = ~(1L << bit);
-        on_each_cpu(smp_ctl_bit_callback, &parms, 0, 1);
+        on_each_cpu(smp_ctl_bit_callback, &parms, 1);
 }
 EXPORT_SYMBOL(smp_ctl_clear_bit);
 
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 7418bebb547f..f2cede3947b2 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -707,7 +707,7 @@ static int etr_sync_clock(struct etr_aib *aib, int port)
          */
         memset(&etr_sync, 0, sizeof(etr_sync));
         preempt_disable();
-        smp_call_function(clock_sync_cpu_start, &etr_sync, 0, 0);
+        smp_call_function(clock_sync_cpu_start, &etr_sync, 0);
         local_irq_disable();
         enable_sync_clock();
 
@@ -746,7 +746,7 @@ static int etr_sync_clock(struct etr_aib *aib, int port)
                 rc = -EAGAIN;
         }
         local_irq_enable();
-        smp_call_function(clock_sync_cpu_end, NULL, 0, 0);
+        smp_call_function(clock_sync_cpu_end, NULL, 0);
         preempt_enable();
         return rc;
 }
@@ -926,7 +926,7 @@ static void etr_work_fn(struct work_struct *work)
         if (!eacr.ea) {
                 /* Both ports offline. Reset everything. */
                 eacr.dp = eacr.es = eacr.sl = 0;
-                on_each_cpu(disable_sync_clock, NULL, 0, 1);
+                on_each_cpu(disable_sync_clock, NULL, 1);
                 del_timer_sync(&etr_timer);
                 etr_update_eacr(eacr);
                 clear_bit(CLOCK_SYNC_ETR, &clock_sync_flags);
@@ -1432,7 +1432,7 @@ static void stp_work_fn(struct work_struct *work)
          */
         memset(&stp_sync, 0, sizeof(stp_sync));
         preempt_disable();
-        smp_call_function(clock_sync_cpu_start, &stp_sync, 0, 0);
+        smp_call_function(clock_sync_cpu_start, &stp_sync, 0);
         local_irq_disable();
         enable_sync_clock();
 
@@ -1465,7 +1465,7 @@ static void stp_work_fn(struct work_struct *work)
                 stp_sync.in_sync = 1;
 
         local_irq_enable();
-        smp_call_function(clock_sync_cpu_end, NULL, 0, 0);
+        smp_call_function(clock_sync_cpu_end, NULL, 0);
         preempt_enable();
 }
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 9a854c8e5274..3e7384f4619c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -688,6 +688,7 @@ config CRASH_DUMP
 config SMP
         bool "Symmetric multi-processing support"
         depends on SYS_SUPPORTS_SMP
+        select USE_GENERIC_SMP_HELPERS
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 5d039d168f57..60c50841143e 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -36,13 +36,6 @@ EXPORT_SYMBOL(cpu_possible_map);
 cpumask_t cpu_online_map;
 EXPORT_SYMBOL(cpu_online_map);
 
-static atomic_t cpus_booted = ATOMIC_INIT(0);
-
-/*
- * Run specified function on a particular processor.
- */
-void __smp_call_function(unsigned int cpu);
-
 static inline void __init smp_store_cpu_info(unsigned int cpu)
 {
         struct sh_cpuinfo *c = cpu_data + cpu;
@@ -175,45 +168,20 @@ static void stop_this_cpu(void *unused)
 
 void smp_send_stop(void)
 {
-        smp_call_function(stop_this_cpu, 0, 1, 0);
+        smp_call_function(stop_this_cpu, 0, 0);
 }
 
-struct smp_fn_call_struct smp_fn_call = {
-        .lock           = __SPIN_LOCK_UNLOCKED(smp_fn_call.lock),
-        .finished       = ATOMIC_INIT(0),
-};
-
-/*
- * The caller of this wants the passed function to run on every cpu.  If wait
- * is set, wait until all cpus have finished the function before returning.
- * The lock is here to protect the call structure.
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-int smp_call_function(void (*func)(void *info), void *info, int retry, int wait)
+void arch_send_call_function_ipi(cpumask_t mask)
 {
-        unsigned int nr_cpus = atomic_read(&cpus_booted);
-        int i;
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        spin_lock(&smp_fn_call.lock);
-
-        atomic_set(&smp_fn_call.finished, 0);
-        smp_fn_call.fn = func;
-        smp_fn_call.data = info;
-
-        for (i = 0; i < nr_cpus; i++)
-                if (i != smp_processor_id())
-                        plat_send_ipi(i, SMP_MSG_FUNCTION);
-
-        if (wait)
-                while (atomic_read(&smp_fn_call.finished) != (nr_cpus - 1));
+        int cpu;
 
-        spin_unlock(&smp_fn_call.lock);
+        for_each_cpu_mask(cpu, mask)
+                plat_send_ipi(cpu, SMP_MSG_FUNCTION);
+}
 
-        return 0;
+void arch_send_call_function_single_ipi(int cpu)
+{
+        plat_send_ipi(cpu, SMP_MSG_FUNCTION_SINGLE);
 }
 
 /* Not really SMP stuff ... */
@@ -229,7 +197,7 @@ static void flush_tlb_all_ipi(void *info)
 
 void flush_tlb_all(void)
 {
-        on_each_cpu(flush_tlb_all_ipi, 0, 1, 1);
+        on_each_cpu(flush_tlb_all_ipi, 0, 1);
 }
 
 static void flush_tlb_mm_ipi(void *mm)
@@ -255,7 +223,7 @@ void flush_tlb_mm(struct mm_struct *mm)
         preempt_disable();
 
         if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) {
-                smp_call_function(flush_tlb_mm_ipi, (void *)mm, 1, 1);
+                smp_call_function(flush_tlb_mm_ipi, (void *)mm, 1);
         } else {
                 int i;
                 for (i = 0; i < num_online_cpus(); i++)
@@ -292,7 +260,7 @@ void flush_tlb_range(struct vm_area_struct *vma,
                 fd.vma = vma;
                 fd.addr1 = start;
                 fd.addr2 = end;
-                smp_call_function(flush_tlb_range_ipi, (void *)&fd, 1, 1);
+                smp_call_function(flush_tlb_range_ipi, (void *)&fd, 1);
         } else {
                 int i;
                 for (i = 0; i < num_online_cpus(); i++)
@@ -316,7 +284,7 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end)
 
         fd.addr1 = start;
         fd.addr2 = end;
-        on_each_cpu(flush_tlb_kernel_range_ipi, (void *)&fd, 1, 1);
+        on_each_cpu(flush_tlb_kernel_range_ipi, (void *)&fd, 1);
 }
 
 static void flush_tlb_page_ipi(void *info)
@@ -335,7 +303,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 
                 fd.vma = vma;
                 fd.addr1 = page;
-                smp_call_function(flush_tlb_page_ipi, (void *)&fd, 1, 1);
+                smp_call_function(flush_tlb_page_ipi, (void *)&fd, 1);
         } else {
                 int i;
                 for (i = 0; i < num_online_cpus(); i++)
@@ -359,6 +327,6 @@ void flush_tlb_one(unsigned long asid, unsigned long vaddr)
         fd.addr1 = asid;
         fd.addr2 = vaddr;
 
-        smp_call_function(flush_tlb_one_ipi, (void *)&fd, 1, 1);
+        smp_call_function(flush_tlb_one_ipi, (void *)&fd, 1);
         local_flush_tlb_one(asid, vaddr);
 }
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index fa63c68a1819..c099d96f1239 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -807,7 +807,6 @@ extern unsigned long xcall_call_function;
  * smp_call_function(): Run a function on all other CPUs.
  * @func: The function to run. This must be fast and non-blocking.
  * @info: An arbitrary pointer to pass to the function.
- * @nonatomic: currently unused.
  * @wait: If true, wait (atomically) until function has completed on other CPUs.
  *
  * Returns 0 on success, else a negative status code. Does not return until
@@ -816,8 +815,8 @@ extern unsigned long xcall_call_function;
  * You must not call this function with disabled interrupts or from a
  * hardware interrupt handler or from a bottom half handler.
  */
-static int smp_call_function_mask(void (*func)(void *info), void *info,
-                                  int nonatomic, int wait, cpumask_t mask)
+static int sparc64_smp_call_function_mask(void (*func)(void *info), void *info,
+                                          int wait, cpumask_t mask)
 {
         struct call_data_struct data;
         int cpus;
@@ -852,11 +851,9 @@ out_unlock:
         return 0;
 }
 
-int smp_call_function(void (*func)(void *info), void *info,
-                      int nonatomic, int wait)
+int smp_call_function(void (*func)(void *info), void *info, int wait)
 {
-        return smp_call_function_mask(func, info, nonatomic, wait,
-                                      cpu_online_map);
+        return sparc64_smp_call_function_mask(func, info, wait, cpu_online_map);
 }
 
 void smp_call_function_client(int irq, struct pt_regs *regs)
@@ -893,7 +890,7 @@ static void tsb_sync(void *info)
 
 void smp_tsb_sync(struct mm_struct *mm)
 {
-        smp_call_function_mask(tsb_sync, mm, 0, 1, mm->cpu_vm_mask);
+        sparc64_smp_call_function_mask(tsb_sync, mm, 1, mm->cpu_vm_mask);
 }
 
 extern unsigned long xcall_flush_tlb_mm;
diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c
index 6cfab2e4d340..ebefd2a14375 100644
--- a/arch/sparc64/mm/hugetlbpage.c
+++ b/arch/sparc64/mm/hugetlbpage.c
@@ -344,7 +344,7 @@ void hugetlb_prefault_arch_hook(struct mm_struct *mm)
                          * also executing in this address space.
                          */
                         mm->context.sparc64_ctx_val = ctx;
-                        on_each_cpu(context_reload, mm, 0, 0);
+                        on_each_cpu(context_reload, mm, 0);
                 }
                 spin_unlock(&ctx_alloc_lock);
         }
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index e1062ec36d40..be2d50c3aa95 100644
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -214,8 +214,7 @@ void smp_call_function_slave(int cpu)
         atomic_inc(&scf_finished);
 }
 
-int smp_call_function(void (*_func)(void *info), void *_info, int nonatomic,
-                      int wait)
+int smp_call_function(void (*_func)(void *info), void *_info, int wait)
 {
         int cpus = num_online_cpus() - 1;
         int i;
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 2642b4bf41b9..96e0c2ebc388 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -170,6 +170,7 @@ config GENERIC_PENDING_IRQ
 config X86_SMP
         bool
         depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
+        select USE_GENERIC_SMP_HELPERS
         default y
 
 config X86_32_SMP
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 3e58b676d23b..a437d027f20b 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1340,6 +1340,10 @@ void __init smp_intr_init(void)
 
         /* IPI for generic function call */
         alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);
+
+        /* IPI for single call function */
+        set_intr_gate(CALL_FUNCTION_SINGLE_VECTOR,
+                                call_function_single_interrupt);
 }
 #endif
 
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index 987410745182..c4a7ec31394c 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -364,7 +364,7 @@ static void mcheck_check_cpu(void *info)
 
 static void mcheck_timer(struct work_struct *work)
 {
-        on_each_cpu(mcheck_check_cpu, NULL, 1, 1);
+        on_each_cpu(mcheck_check_cpu, NULL, 1);
 
         /*
          * Alert userspace if needed.  If we logged an MCE, reduce the
@@ -621,7 +621,7 @@ static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize,
          * Collect entries that were still getting written before the
          * synchronize.
          */
-        on_each_cpu(collect_tscs, cpu_tsc, 1, 1);
+        on_each_cpu(collect_tscs, cpu_tsc, 1);
         for (i = next; i < MCE_LOG_LEN; i++) {
                 if (mcelog.entry[i].finished &&
                     mcelog.entry[i].tsc < cpu_tsc[mcelog.entry[i].cpu]) {
@@ -746,7 +746,7 @@ static void mce_restart(void)
         if (next_interval)
                 cancel_delayed_work(&mcheck_work);
         /* Timer race is harmless here */
-        on_each_cpu(mce_init, NULL, 1, 1);
+        on_each_cpu(mce_init, NULL, 1);
         next_interval = check_interval * HZ;
         if (next_interval)
                 schedule_delayed_work(&mcheck_work,
diff --git a/arch/x86/kernel/cpu/mcheck/non-fatal.c b/arch/x86/kernel/cpu/mcheck/non-fatal.c
index 00ccb6c14ec2..cc1fccdd31e0 100644
--- a/arch/x86/kernel/cpu/mcheck/non-fatal.c
+++ b/arch/x86/kernel/cpu/mcheck/non-fatal.c
@@ -59,7 +59,7 @@ static DECLARE_DELAYED_WORK(mce_work, mce_work_fn);
 
 static void mce_work_fn(struct work_struct *work)
 {
-        on_each_cpu(mce_checkregs, NULL, 1, 1);
+        on_each_cpu(mce_checkregs, NULL, 1);
         schedule_delayed_work(&mce_work, round_jiffies_relative(MCE_RATE));
 }
 
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 105afe12beb0..6f23969c8faf 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -223,7 +223,7 @@ static void set_mtrr(unsigned int reg, unsigned long base,
         atomic_set(&data.gate,0);
 
         /*  Start the ball rolling on other CPUs  */
-        if (smp_call_function(ipi_handler, &data, 1, 0) != 0)
+        if (smp_call_function(ipi_handler, &data, 0) != 0)
                 panic("mtrr: timed out waiting for other CPUs\n");
 
         local_irq_save(flags);
@@ -1682,7 +1682,7 @@ void mtrr_ap_init(void)
  */
 void mtrr_save_state(void)
 {
-        smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
+        smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1);
 }
 
 static int __init mtrr_init_finialize(void)
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 2e9bef6e3aa3..6d4bdc02388a 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -189,7 +189,7 @@ void disable_lapic_nmi_watchdog(void)
         if (atomic_read(&nmi_active) <= 0)
                 return;
 
-        on_each_cpu(stop_apic_nmi_watchdog, NULL, 0, 1);
+        on_each_cpu(stop_apic_nmi_watchdog, NULL, 1);
 
         if (wd_ops)
                 wd_ops->unreserve();
@@ -213,7 +213,7 @@ void enable_lapic_nmi_watchdog(void)
                 return;
         }
 
-        on_each_cpu(setup_apic_nmi_watchdog, NULL, 0, 1);
+        on_each_cpu(setup_apic_nmi_watchdog, NULL, 1);
         touch_nmi_watchdog();
 }
 
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 71f1c2654bec..2de5fa2bbf77 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -96,7 +96,7 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,
         for (; count; count -= 16) {
                 cmd.eax = pos;
                 cmd.ecx = pos >> 32;
-                smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1, 1);
+                smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1);
                 if (copy_to_user(tmp, &cmd, 16))
                         return -EFAULT;
                 tmp += 16;
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index ba41bf42748d..ae63e584c340 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -816,6 +816,9 @@ END(invalidate_interrupt\num)
 ENTRY(call_function_interrupt)
         apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt
 END(call_function_interrupt)
+ENTRY(call_function_single_interrupt)
+        apicinterrupt CALL_FUNCTION_SINGLE_VECTOR,smp_call_function_single_interrupt
+END(call_function_single_interrupt)
 ENTRY(irq_move_cleanup_interrupt)
         apicinterrupt IRQ_MOVE_CLEANUP_VECTOR,smp_irq_move_cleanup_interrupt
 END(irq_move_cleanup_interrupt)
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index 603261a5885c..558abf4c796a 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -1569,7 +1569,7 @@ void /*__init*/ print_local_APIC(void *dummy)
 
 void print_all_local_APICs(void)
 {
-        on_each_cpu(print_local_APIC, NULL, 1, 1);
+        on_each_cpu(print_local_APIC, NULL, 1);
 }
 
 void /*__init*/ print_PIC(void)
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index b16ef029cf88..6510cde36b35 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1160,7 +1160,7 @@ void __apicdebuginit print_local_APIC(void * dummy)
 
 void print_all_local_APICs (void)
 {
-        on_each_cpu(print_local_APIC, NULL, 1, 1);
+        on_each_cpu(print_local_APIC, NULL, 1);
 }
 
 void __apicdebuginit print_PIC(void)
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c
index 31f49e8f46a7..0373e88de95a 100644
--- a/arch/x86/kernel/irqinit_64.c
+++ b/arch/x86/kernel/irqinit_64.c
@@ -199,6 +199,10 @@ void __init native_init_IRQ(void)
         /* IPI for generic function call */
         alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);
 
+        /* IPI for generic single function call */
+        alloc_intr_gate(CALL_FUNCTION_SINGLE_VECTOR,
+                        call_function_single_interrupt);
+
         /* Low priority IPI to cleanup after moving an irq */
         set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);
 #endif
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
index 21f2bae98c15..a8449571858a 100644
--- a/arch/x86/kernel/ldt.c
+++ b/arch/x86/kernel/ldt.c
@@ -68,7 +68,7 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
                 load_LDT(pc);
                 mask = cpumask_of_cpu(smp_processor_id());
                 if (!cpus_equal(current->mm->cpu_vm_mask, mask))
-                        smp_call_function(flush_ldt, current->mm, 1, 1);
+                        smp_call_function(flush_ldt, current->mm, 1);
                 preempt_enable();
 #else
                 load_LDT(pc);
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 716b89284be0..ec024b3baad0 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -130,7 +130,7 @@ int __init check_nmi_watchdog(void)
 
 #ifdef CONFIG_SMP
         if (nmi_watchdog == NMI_LOCAL_APIC)
-                smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
+                smp_call_function(nmi_cpu_busy, (void *)&endflag, 0);
 #endif
 
         for_each_possible_cpu(cpu)
@@ -272,7 +272,7 @@ static void __acpi_nmi_enable(void *__unused)
 void acpi_nmi_enable(void)
 {
         if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC)
-                on_each_cpu(__acpi_nmi_enable, NULL, 0, 1);
+                on_each_cpu(__acpi_nmi_enable, NULL, 1);
 }
 
 static void __acpi_nmi_disable(void *__unused)
@@ -286,7 +286,7 @@ static void __acpi_nmi_disable(void *__unused)
 void acpi_nmi_disable(void)
 {
         if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC)
-                on_each_cpu(__acpi_nmi_disable, NULL, 0, 1);
+                on_each_cpu(__acpi_nmi_disable, NULL, 1);
 }
 
 void setup_apic_nmi_watchdog(void *unused)
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 4061d63aabe7..7dceea947232 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -132,7 +132,7 @@ void cpu_idle_wait(void)
 {
         smp_mb();
         /* kick all the CPUs so that they exit out of pm_idle */
-        smp_call_function(do_nothing, NULL, 0, 1);
+        smp_call_function(do_nothing, NULL, 1);
 }
 EXPORT_SYMBOL_GPL(cpu_idle_wait);
 
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index 0cb7aadc87cd..361b7a4c640c 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -121,132 +121,23 @@ static void native_smp_send_reschedule(int cpu)
         send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
 }
 
-/*
- * Structure and data for smp_call_function(). This is designed to minimise
- * static memory requirements. It also looks cleaner.
- */
-static DEFINE_SPINLOCK(call_lock);
-
-struct call_data_struct {
-        void (*func) (void *info);
-        void *info;
-        atomic_t started;
-        atomic_t finished;
-        int wait;
-};
-
-void lock_ipi_call_lock(void)
+void native_send_call_func_single_ipi(int cpu)
 {
-        spin_lock_irq(&call_lock);
-}
-
-void unlock_ipi_call_lock(void)
-{
-        spin_unlock_irq(&call_lock);
-}
-
-static struct call_data_struct *call_data;
-
-static void __smp_call_function(void (*func) (void *info), void *info,
-                                int nonatomic, int wait)
-{
-        struct call_data_struct data;
-        int cpus = num_online_cpus() - 1;
-
-        if (!cpus)
-                return;
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        call_data = &data;
-        mb();
-
-        /* Send a message to all other CPUs and wait for them to respond */
-        send_IPI_allbutself(CALL_FUNCTION_VECTOR);
-
-        /* Wait for response */
-        while (atomic_read(&data.started) != cpus)
-                cpu_relax();
-
-        if (wait)
-                while (atomic_read(&data.finished) != cpus)
-                        cpu_relax();
+        send_IPI_mask(cpumask_of_cpu(cpu), CALL_FUNCTION_SINGLE_VECTOR);
 }
 
-
-/**
- * smp_call_function_mask(): Run a function on a set of other CPUs.
- * @mask: The set of cpus to run on.  Must not include the current cpu.
- * @func: The function to run. This must be fast and non-blocking.
- * @info: An arbitrary pointer to pass to the function.
- * @wait: If true, wait (atomically) until function has completed on other CPUs.
- *
-  * Returns 0 on success, else a negative status code.
- *
- * If @wait is true, then returns once @func has returned; otherwise
- * it returns just before the target cpu calls @func.
- *
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-static int
-native_smp_call_function_mask(cpumask_t mask,
-                              void (*func)(void *), void *info,
-                              int wait)
+void native_send_call_func_ipi(cpumask_t mask)
 {
-        struct call_data_struct data;
         cpumask_t allbutself;
-        int cpus;
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        /* Holding any lock stops cpus from going down. */
-        spin_lock(&call_lock);
 
         allbutself = cpu_online_map;
         cpu_clear(smp_processor_id(), allbutself);
 
-        cpus_and(mask, mask, allbutself);
-        cpus = cpus_weight(mask);
-
-        if (!cpus) {
-                spin_unlock(&call_lock);
-                return 0;
-        }
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        call_data = &data;
-        wmb();
-
-        /* Send a message to other CPUs */
         if (cpus_equal(mask, allbutself) &&
             cpus_equal(cpu_online_map, cpu_callout_map))
                 send_IPI_allbutself(CALL_FUNCTION_VECTOR);
         else
                 send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
-
-        /* Wait for response */
-        while (atomic_read(&data.started) != cpus)
-                cpu_relax();
-
-        if (wait)
-                while (atomic_read(&data.finished) != cpus)
-                        cpu_relax();
-        spin_unlock(&call_lock);
-
-        return 0;
 }
 
 static void stop_this_cpu(void *dummy)
@@ -268,18 +159,13 @@ static void stop_this_cpu(void *dummy)
 
 static void native_smp_send_stop(void)
 {
-        int nolock;
         unsigned long flags;
 
         if (reboot_force)
                 return;
 
-        /* Don't deadlock on the call lock in panic */
-        nolock = !spin_trylock(&call_lock);
+        smp_call_function(stop_this_cpu, NULL, 0);
         local_irq_save(flags);
-        __smp_call_function(stop_this_cpu, NULL, 0, 0);
-        if (!nolock)
-                spin_unlock(&call_lock);
         disable_local_APIC();
         local_irq_restore(flags);
 }
@@ -301,33 +187,28 @@ void smp_reschedule_interrupt(struct pt_regs *regs)
 
 void smp_call_function_interrupt(struct pt_regs *regs)
 {
-        void (*func) (void *info) = call_data->func;
-        void *info = call_data->info;
-        int wait = call_data->wait;
-
         ack_APIC_irq();
-        /*
-         * Notify initiating CPU that I've grabbed the data and am
-         * about to execute the function
-         */
-        mb();
-        atomic_inc(&call_data->started);
-        /*
-         * At this point the info structure may be out of scope unless wait==1
-         */
         irq_enter();
-        (*func)(info);
+        generic_smp_call_function_interrupt();
 #ifdef CONFIG_X86_32
         __get_cpu_var(irq_stat).irq_call_count++;
 #else
         add_pda(irq_call_count, 1);
 #endif
         irq_exit();
+}
 
-        if (wait) {
-                mb();
-                atomic_inc(&call_data->finished);
-        }
+void smp_call_function_single_interrupt(struct pt_regs *regs)
+{
+        ack_APIC_irq();
+        irq_enter();
+        generic_smp_call_function_single_interrupt();
+#ifdef CONFIG_X86_32
+        __get_cpu_var(irq_stat).irq_call_count++;
+#else
+        add_pda(irq_call_count, 1);
+#endif
+        irq_exit();
 }
 
 struct smp_ops smp_ops = {
@@ -338,7 +219,8 @@ struct smp_ops smp_ops = {
 
         .smp_send_stop = native_smp_send_stop,
         .smp_send_reschedule = native_smp_send_reschedule,
-        .smp_call_function_mask = native_smp_call_function_mask,
+
+        .send_call_func_ipi = native_send_call_func_ipi,
+        .send_call_func_single_ipi = native_send_call_func_single_ipi,
 };
 EXPORT_SYMBOL_GPL(smp_ops);
-
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index f35c2d8016ac..687376ab07e8 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -327,12 +327,12 @@ static void __cpuinit start_secondary(void *unused)
          * lock helps us to not include this cpu in a currently in progress
          * smp_call_function().
          */
-        lock_ipi_call_lock();
+        ipi_call_lock_irq();
 #ifdef CONFIG_X86_IO_APIC
         setup_vector_irq(smp_processor_id());
 #endif
         cpu_set(smp_processor_id(), cpu_online_map);
-        unlock_ipi_call_lock();
+        ipi_call_unlock_irq();
         per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
 
         setup_secondary_clock();
diff --git a/arch/x86/kernel/smpcommon.c b/arch/x86/kernel/smpcommon.c
index 3449064d141a..99941b37eca0 100644
--- a/arch/x86/kernel/smpcommon.c
+++ b/arch/x86/kernel/smpcommon.c
@@ -25,59 +25,3 @@ __cpuinit void init_gdt(int cpu)
         per_cpu(cpu_number, cpu) = cpu;
 }
 #endif
-
-/**
- * smp_call_function(): Run a function on all other CPUs.
- * @func: The function to run. This must be fast and non-blocking.
- * @info: An arbitrary pointer to pass to the function.
- * @nonatomic: Unused.
- * @wait: If true, wait (atomically) until function has completed on other CPUs.
- *
- * Returns 0 on success, else a negative status code.
- *
- * If @wait is true, then returns once @func has returned; otherwise
- * it returns just before the target cpu calls @func.
- *
- * You must not call this function with disabled interrupts or from a
- * hardware interrupt handler or from a bottom half handler.
- */
-int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
-                      int wait)
-{
-        return smp_call_function_mask(cpu_online_map, func, info, wait);
-}
-EXPORT_SYMBOL(smp_call_function);
-
-/**
- * smp_call_function_single - Run a function on a specific CPU
- * @cpu: The target CPU.  Cannot be the calling CPU.
- * @func: The function to run. This must be fast and non-blocking.
- * @info: An arbitrary pointer to pass to the function.
- * @nonatomic: Unused.
- * @wait: If true, wait until function has completed on other CPUs.
- *
- * Returns 0 on success, else a negative status code.
- *
- * If @wait is true, then returns once @func has returned; otherwise
- * it returns just before the target cpu calls @func.
- */
-int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
-                             int nonatomic, int wait)
-{
-        /* prevent preemption and reschedule on another processor */
-        int ret;
-        int me = get_cpu();
-        if (cpu == me) {
-                local_irq_disable();
-                func(info);
-                local_irq_enable();
-                put_cpu();
-                return 0;
-        }
-
-        ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait);
-
-        put_cpu();
-        return ret;
-}
-EXPORT_SYMBOL(smp_call_function_single);
diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
index 9bb2363851af..fec1ecedc9b7 100644
--- a/arch/x86/kernel/tlb_32.c
+++ b/arch/x86/kernel/tlb_32.c
@@ -238,6 +238,6 @@ static void do_flush_tlb_all(void *info)
 
 void flush_tlb_all(void)
 {
-        on_each_cpu(do_flush_tlb_all, NULL, 1, 1);
+        on_each_cpu(do_flush_tlb_all, NULL, 1);
 }
 
diff --git a/arch/x86/kernel/tlb_64.c b/arch/x86/kernel/tlb_64.c
index 5039d0f097a2..dcbf7a1159ea 100644
--- a/arch/x86/kernel/tlb_64.c
+++ b/arch/x86/kernel/tlb_64.c
@@ -275,5 +275,5 @@ static void do_flush_tlb_all(void *info)
 
 void flush_tlb_all(void)
 {
-        on_each_cpu(do_flush_tlb_all, NULL, 1, 1);
+        on_each_cpu(do_flush_tlb_all, NULL, 1);
 }
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index e50740d32314..0b8b6690a86d 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -279,7 +279,7 @@ cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
 {
         long cpu = (long)arg;
         if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN)
-                smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
+                smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 1);
         return NOTIFY_DONE;
 }
 
@@ -302,7 +302,7 @@ static int __init vsyscall_init(void)
 #ifdef CONFIG_SYSCTL
         register_sysctl_table(kernel_root_table2);
 #endif
-        on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
+        on_each_cpu(cpu_vsyscall_init, NULL, 1);
         hotcpu_notifier(cpu_vsyscall_notifier, 0);
         return 0;
 }
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 540e95179074..10ce6ee4c491 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -335,7 +335,7 @@ static void vcpu_clear(struct vcpu_vmx *vmx)
 {
         if (vmx->vcpu.cpu == -1)
                 return;
-        smp_call_function_single(vmx->vcpu.cpu, __vcpu_clear, vmx, 0, 1);
+        smp_call_function_single(vmx->vcpu.cpu, __vcpu_clear, vmx, 1);
         vmx->launched = 0;
 }
 
@@ -2968,7 +2968,7 @@ static void vmx_free_vmcs(struct kvm_vcpu *vcpu)
         struct vcpu_vmx *vmx = to_vmx(vcpu);
 
         if (vmx->vmcs) {
-                on_each_cpu(__vcpu_clear, vmx, 0, 1);
+                on_each_cpu(__vcpu_clear, vmx, 1);
                 free_vmcs(vmx->vmcs);
                 vmx->vmcs = NULL;
         }
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 63a77caa59f1..0faa2546b1cd 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4044,6 +4044,6 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
          * So need not to call smp_call_function_single() in that case.
          */
         if (vcpu->guest_mode && vcpu->cpu != cpu)
-                smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0, 0);
+                smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0);
         put_cpu();
 }
diff --git a/arch/x86/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c
index 57d043fa893e..d5a2b39f882b 100644
--- a/arch/x86/lib/msr-on-cpu.c
+++ b/arch/x86/lib/msr-on-cpu.c
@@ -30,10 +30,10 @@ static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe)
 
         rv.msr_no = msr_no;
         if (safe) {
-                smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 0, 1);
+                smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 1);
                 err = rv.err;
         } else {
-                smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 0, 1);
+                smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1);
         }
         *l = rv.l;
         *h = rv.h;
@@ -64,10 +64,10 @@ static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe)
         rv.l = l;
         rv.h = h;
         if (safe) {
-                smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 0, 1);
+                smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 1);
                 err = rv.err;
         } else {
-                smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 0, 1);
+                smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1);
         }
 
         return err;
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index 8dedd01e909f..ee0fba092157 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -950,94 +950,24 @@ static void smp_stop_cpu_function(void *dummy)
                 halt();
 }
 
-static DEFINE_SPINLOCK(call_lock);
-
-struct call_data_struct {
-        void (*func) (void *info);
-        void *info;
-        volatile unsigned long started;
-        volatile unsigned long finished;
-        int wait;
-};
-
-static struct call_data_struct *call_data;
-
 /* execute a thread on a new CPU.  The function to be called must be
  * previously set up.  This is used to schedule a function for
  * execution on all CPUs - set up the function then broadcast a
  * function_interrupt CPI to come here on each CPU */
 static void smp_call_function_interrupt(void)
 {
-        void (*func) (void *info) = call_data->func;
-        void *info = call_data->info;
-        /* must take copy of wait because call_data may be replaced
-         * unless the function is waiting for us to finish */
-        int wait = call_data->wait;
-        __u8 cpu = smp_processor_id();
-
-        /*
-         * Notify initiating CPU that I've grabbed the data and am
-         * about to execute the function
-         */
-        mb();
-        if (!test_and_clear_bit(cpu, &call_data->started)) {
-                /* If the bit wasn't set, this could be a replay */
-                printk(KERN_WARNING "VOYAGER SMP: CPU %d received call funtion"
-                       " with no call pending\n", cpu);
-                return;
-        }
-        /*
-         * At this point the info structure may be out of scope unless wait==1
-         */
         irq_enter();
-        (*func) (info);
+        generic_smp_call_function_interrupt();
         __get_cpu_var(irq_stat).irq_call_count++;
         irq_exit();
-        if (wait) {
-                mb();
-                clear_bit(cpu, &call_data->finished);
-        }
 }
 
-static int
-voyager_smp_call_function_mask(cpumask_t cpumask,
-                               void (*func) (void *info), void *info, int wait)
+static void smp_call_function_single_interrupt(void)
 {
-        struct call_data_struct data;
-        u32 mask = cpus_addr(cpumask)[0];
-
-        mask &= ~(1 << smp_processor_id());
-
-        if (!mask)
-                return 0;
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        data.func = func;
-        data.info = info;
-        data.started = mask;
-        data.wait = wait;
-        if (wait)
-                data.finished = mask;
-
-        spin_lock(&call_lock);
-        call_data = &data;
-        wmb();
-        /* Send a message to all other CPUs and wait for them to respond */
-        send_CPI(mask, VIC_CALL_FUNCTION_CPI);
-
-        /* Wait for response */
-        while (data.started)
-                barrier();
-
-        if (wait)
-                while (data.finished)
-                        barrier();
-
-        spin_unlock(&call_lock);
-
-        return 0;
+        irq_enter();
+        generic_smp_call_function_single_interrupt();
+        __get_cpu_var(irq_stat).irq_call_count++;
+        irq_exit();
 }
 
 /* Sorry about the name.  In an APIC based system, the APICs
@@ -1094,6 +1024,12 @@ void smp_qic_call_function_interrupt(struct pt_regs *regs)
         smp_call_function_interrupt();
 }
 
+void smp_qic_call_function_single_interrupt(struct pt_regs *regs)
+{
+        ack_QIC_CPI(QIC_CALL_FUNCTION_SINGLE_CPI);
+        smp_call_function_single_interrupt();
+}
+
 void smp_vic_cpi_interrupt(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
@@ -1114,6 +1050,8 @@ void smp_vic_cpi_interrupt(struct pt_regs *regs)
                 smp_enable_irq_interrupt();
         if (test_and_clear_bit(VIC_CALL_FUNCTION_CPI, &vic_cpi_mailbox[cpu]))
                 smp_call_function_interrupt();
+        if (test_and_clear_bit(VIC_CALL_FUNCTION_SINGLE_CPI, &vic_cpi_mailbox[cpu]))
+                smp_call_function_single_interrupt();
         set_irq_regs(old_regs);
 }
 
@@ -1129,7 +1067,7 @@ static void do_flush_tlb_all(void *info)
 /* flush the TLB of every active CPU in the system */
 void flush_tlb_all(void)
 {
-        on_each_cpu(do_flush_tlb_all, 0, 1, 1);
+        on_each_cpu(do_flush_tlb_all, 0, 1);
 }
 
 /* send a reschedule CPI to one CPU by physical CPU number*/
@@ -1161,7 +1099,7 @@ int safe_smp_processor_id(void)
 /* broadcast a halt to all other CPUs */
 static void voyager_smp_send_stop(void)
 {
-        smp_call_function(smp_stop_cpu_function, NULL, 1, 1);
+        smp_call_function(smp_stop_cpu_function, NULL, 1);
 }
 
 /* this function is triggered in time.c when a clock tick fires
@@ -1848,5 +1786,7 @@ struct smp_ops smp_ops = {
 
         .smp_send_stop = voyager_smp_send_stop,
         .smp_send_reschedule = voyager_smp_send_reschedule,
-        .smp_call_function_mask = voyager_smp_call_function_mask,
+
+        .send_call_func_ipi = native_send_call_func_ipi,
+        .send_call_func_single_ipi = native_send_call_func_single_ipi,
 };
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 47f4e2e4a096..65c6e46bf059 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -141,7 +141,7 @@ static void cpa_flush_all(unsigned long cache)
 {
         BUG_ON(irqs_disabled());
 
-        on_each_cpu(__cpa_flush_all, (void *) cache, 1, 1);
+        on_each_cpu(__cpa_flush_all, (void *) cache, 1);
 }
 
 static void __cpa_flush_range(void *arg)
@@ -162,7 +162,7 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache)
         BUG_ON(irqs_disabled());
         WARN_ON(PAGE_ALIGN(start) != start);
 
-        on_each_cpu(__cpa_flush_range, NULL, 1, 1);
+        on_each_cpu(__cpa_flush_range, NULL, 1);
 
         if (!cache)
                 return;
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 2b6ad5b9f9d5..7f3329b55d2e 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -218,8 +218,8 @@ static int nmi_setup(void)
                 }
 
         }
-        on_each_cpu(nmi_save_registers, NULL, 0, 1);
-        on_each_cpu(nmi_cpu_setup, NULL, 0, 1);
+        on_each_cpu(nmi_save_registers, NULL, 1);
+        on_each_cpu(nmi_cpu_setup, NULL, 1);
         nmi_enabled = 1;
         return 0;
 }
@@ -271,7 +271,7 @@ static void nmi_shutdown(void)
 {
         struct op_msrs *msrs = &get_cpu_var(cpu_msrs);
         nmi_enabled = 0;
-        on_each_cpu(nmi_cpu_shutdown, NULL, 0, 1);
+        on_each_cpu(nmi_cpu_shutdown, NULL, 1);
         unregister_die_notifier(&profile_exceptions_nb);
         model->shutdown(msrs);
         free_msrs();
@@ -286,7 +286,7 @@ static void nmi_cpu_start(void *dummy)
 
 static int nmi_start(void)
 {
-        on_each_cpu(nmi_cpu_start, NULL, 0, 1);
+        on_each_cpu(nmi_cpu_start, NULL, 1);
         return 0;
 }
 
@@ -298,7 +298,7 @@ static void nmi_cpu_stop(void *dummy)
 
 static void nmi_stop(void)
 {
-        on_each_cpu(nmi_cpu_stop, NULL, 0, 1);
+        on_each_cpu(nmi_cpu_stop, NULL, 1);
 }
 
 struct op_counter_config counter_config[OP_MAX_COUNTER];
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index a18141ae3f02..dbf532369711 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -578,7 +578,7 @@ static int __init enable_pci_io_ecs(void)
         /* assume all cpus from fam10h have IO ECS */
         if (boot_cpu_data.x86 < 0x10)
                 return 0;
-        on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1, 1);
+        on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1);
         pci_probe |= PCI_HAS_IO_ECS;
         return 0;
 }
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index dcd4e51f2f16..bb508456ef52 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1214,7 +1214,9 @@ static const struct smp_ops xen_smp_ops __initdata = {
 
         .smp_send_stop = xen_smp_send_stop,
         .smp_send_reschedule = xen_smp_send_reschedule,
-        .smp_call_function_mask = xen_smp_call_function_mask,
+
+        .send_call_func_ipi = xen_smp_send_call_function_ipi,
+        .send_call_func_single_ipi = xen_smp_send_call_function_single_ipi,
 };
 #endif  /* CONFIG_SMP */
 
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 42b3b9ed641d..ff0aa74afaa1 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -796,7 +796,7 @@ static void drop_mm_ref(struct mm_struct *mm)
         }
 
         if (!cpus_empty(mask))
-                xen_smp_call_function_mask(mask, drop_other_mm_ref, mm, 1);
+                smp_call_function_mask(mask, drop_other_mm_ref, mm, 1);
 }
 #else
 static void drop_mm_ref(struct mm_struct *mm)
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index d2e3c20127d7..233156f39b7f 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -36,27 +36,14 @@
 #include "mmu.h"
 
 cpumask_t xen_cpu_initialized_map;
-static DEFINE_PER_CPU(int, resched_irq) = -1;
-static DEFINE_PER_CPU(int, callfunc_irq) = -1;
-static DEFINE_PER_CPU(int, debug_irq) = -1;
-
-/*
- * Structure and data for smp_call_function(). This is designed to minimise
- * static memory requirements. It also looks cleaner.
- */
-static DEFINE_SPINLOCK(call_lock);
 
-struct call_data_struct {
-        void (*func) (void *info);
-        void *info;
-        atomic_t started;
-        atomic_t finished;
-        int wait;
-};
+static DEFINE_PER_CPU(int, resched_irq);
+static DEFINE_PER_CPU(int, callfunc_irq);
+static DEFINE_PER_CPU(int, callfuncsingle_irq);
+static DEFINE_PER_CPU(int, debug_irq) = -1;
 
 static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id);
-
-static struct call_data_struct *call_data;
+static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id);
 
 /*
  * Reschedule call back. Nothing to do,
@@ -128,6 +115,17 @@ static int xen_smp_intr_init(unsigned int cpu)
                 goto fail;
         per_cpu(debug_irq, cpu) = rc;
 
+        callfunc_name = kasprintf(GFP_KERNEL, "callfuncsingle%d", cpu);
+        rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR,
+                                    cpu,
+                                    xen_call_function_single_interrupt,
+                                    IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
+                                    callfunc_name,
+                                    NULL);
+        if (rc < 0)
+                goto fail;
+        per_cpu(callfuncsingle_irq, cpu) = rc;
+
         return 0;
 
  fail:
@@ -137,6 +135,9 @@ static int xen_smp_intr_init(unsigned int cpu)
                 unbind_from_irqhandler(per_cpu(callfunc_irq, cpu), NULL);
         if (per_cpu(debug_irq, cpu) >= 0)
                 unbind_from_irqhandler(per_cpu(debug_irq, cpu), NULL);
+        if (per_cpu(callfuncsingle_irq, cpu) >= 0)
+                unbind_from_irqhandler(per_cpu(callfuncsingle_irq, cpu), NULL);
+
         return rc;
 }
 
@@ -336,7 +337,7 @@ static void stop_self(void *v)
 
 void xen_smp_send_stop(void)
 {
-        smp_call_function(stop_self, NULL, 0, 0);
+        smp_call_function(stop_self, NULL, 0);
 }
 
 void xen_smp_send_reschedule(int cpu)
@@ -344,7 +345,6 @@ void xen_smp_send_reschedule(int cpu)
         xen_send_IPI_one(cpu, XEN_RESCHEDULE_VECTOR);
 }
 
-
 static void xen_send_IPI_mask(cpumask_t mask, enum ipi_vector vector)
 {
         unsigned cpu;
@@ -355,83 +355,42 @@ static void xen_send_IPI_mask(cpumask_t mask, enum ipi_vector vector)
                 xen_send_IPI_one(cpu, vector);
 }
 
+void xen_smp_send_call_function_ipi(cpumask_t mask)
+{
+        int cpu;
+
+        xen_send_IPI_mask(mask, XEN_CALL_FUNCTION_VECTOR);
+
+        /* Make sure other vcpus get a chance to run if they need to. */
+        for_each_cpu_mask(cpu, mask) {
+                if (xen_vcpu_stolen(cpu)) {
+                        HYPERVISOR_sched_op(SCHEDOP_yield, 0);
+                        break;
+                }
+        }
+}
+
+void xen_smp_send_call_function_single_ipi(int cpu)
+{
+        xen_send_IPI_mask(cpumask_of_cpu(cpu), XEN_CALL_FUNCTION_SINGLE_VECTOR);
+}
+
 static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id)
 {
-        void (*func) (void *info) = call_data->func;
-        void *info = call_data->info;
-        int wait = call_data->wait;
-
-        /*
-         * Notify initiating CPU that I've grabbed the data and am
-         * about to execute the function
-         */
-        mb();
-        atomic_inc(&call_data->started);
-        /*
-         * At this point the info structure may be out of scope unless wait==1
-         */
         irq_enter();
-        (*func)(info);
+        generic_smp_call_function_interrupt();
         __get_cpu_var(irq_stat).irq_call_count++;
         irq_exit();
 
-        if (wait) {
-                mb();           /* commit everything before setting finished */
-                atomic_inc(&call_data->finished);
-        }
-
         return IRQ_HANDLED;
 }
 
-int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *),
-                               void *info, int wait)
+static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id)
 {
-        struct call_data_struct data;
-        int cpus, cpu;
-        bool yield;
-
-        /* Holding any lock stops cpus from going down. */
-        spin_lock(&call_lock);
-
-        cpu_clear(smp_processor_id(), mask);
-
-        cpus = cpus_weight(mask);
-        if (!cpus) {
-                spin_unlock(&call_lock);
-                return 0;
-        }
-
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        call_data = &data;
-        mb();                   /* write everything before IPI */
-
-        /* Send a message to other CPUs and wait for them to respond */
-        xen_send_IPI_mask(mask, XEN_CALL_FUNCTION_VECTOR);
-
-        /* Make sure other vcpus get a chance to run if they need to. */
-        yield = false;
-        for_each_cpu_mask(cpu, mask)
-                if (xen_vcpu_stolen(cpu))
-                        yield = true;
-
-        if (yield)
-                HYPERVISOR_sched_op(SCHEDOP_yield, 0);
-
-        /* Wait for response */
-        while (atomic_read(&data.started) != cpus ||
-               (wait && atomic_read(&data.finished) != cpus))
-                cpu_relax();
-
-        spin_unlock(&call_lock);
+        irq_enter();
+        generic_smp_call_function_single_interrupt();
+        __get_cpu_var(irq_stat).irq_call_count++;
+        irq_exit();
 
-        return 0;
+        return IRQ_HANDLED;
 }
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index d852ddbb3448..6f4b1045c1c2 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -55,13 +55,8 @@ void xen_smp_cpus_done(unsigned int max_cpus);
 
 void xen_smp_send_stop(void);
 void xen_smp_send_reschedule(int cpu);
-int xen_smp_call_function (void (*func) (void *info), void *info, int nonatomic,
-                           int wait);
-int xen_smp_call_function_single(int cpu, void (*func) (void *info), void *info,
-                                 int nonatomic, int wait);
-
-int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *),
-                               void *info, int wait);
+void xen_smp_send_call_function_ipi(cpumask_t mask);
+void xen_smp_send_call_function_single_ipi(int cpu);
 
 extern cpumask_t xen_cpu_initialized_map;
 
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c
index c6e772fc5ccd..095c798d3170 100644
--- a/crypto/async_tx/async_tx.c
+++ b/crypto/async_tx/async_tx.c
@@ -23,6 +23,7 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
+#include <linux/rculist.h>
 #include <linux/kernel.h>
 #include <linux/async_tx.h>
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 556ee1585192..4976e5db2b3f 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1339,7 +1339,7 @@ static void smp_callback(void *v)
 static int acpi_processor_latency_notify(struct notifier_block *b,
                 unsigned long l, void *v)
 {
-        smp_call_function(smp_callback, NULL, 0, 1);
+        smp_call_function(smp_callback, NULL, 1);
         return NOTIFY_OK;
 }
 
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 564daaa6c7d0..eaa1a355bb32 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -1249,7 +1249,7 @@ static void ipi_handler(void *null)
 
 void global_cache_flush(void)
 {
-        if (on_each_cpu(ipi_handler, NULL, 1, 1) != 0)
+        if (on_each_cpu(ipi_handler, NULL, 1) != 0)
                 panic(PFX "timed out waiting for the other CPUs!\n");
 }
 EXPORT_SYMBOL(global_cache_flush);
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index dbce1263bdff..8fdfe9c871e3 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -215,7 +215,7 @@ static void showacpu(void *dummy)
 
 static void sysrq_showregs_othercpus(struct work_struct *dummy)
 {
-        smp_call_function(showacpu, NULL, 0, 0);
+        smp_call_function(showacpu, NULL, 0);
 }
 
 static DECLARE_WORK(sysrq_showallcpus, sysrq_showregs_othercpus);
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 23554b676d6e..5405769020a1 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -340,7 +340,7 @@ static void smp_callback(void *v)
 static int cpuidle_latency_notify(struct notifier_block *b,
                 unsigned long l, void *v)
 {
-        smp_call_function(smp_callback, NULL, 0, 1);
+        smp_call_function(smp_callback, NULL, 1);
         return NOTIFY_OK;
 }
 
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 5b4c0d9f5173..da873d795aad 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -16,12 +16,15 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <linux/module.h>
-#include <linux/errno.h>
+#include <linux/completion.h>
+#include <linux/crc-itu-t.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/kref.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
-#include <linux/crc-itu-t.h>
+
 #include "fw-transaction.h"
 #include "fw-topology.h"
 #include "fw-device.h"
@@ -396,14 +399,16 @@ fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
 {
         static atomic_t index = ATOMIC_INIT(-1);
 
-        atomic_set(&card->device_count, 0);
         card->index = atomic_inc_return(&index);
         card->driver = driver;
         card->device = device;
         card->current_tlabel = 0;
         card->tlabel_mask = 0;
         card->color = 0;
+        card->broadcast_channel = BROADCAST_CHANNEL_INITIAL;
 
+        kref_init(&card->kref);
+        init_completion(&card->done);
         INIT_LIST_HEAD(&card->transaction_list);
         spin_lock_init(&card->lock);
         setup_timer(&card->flush_timer,
@@ -496,7 +501,6 @@ dummy_enable_phys_dma(struct fw_card *card,
 }
 
 static struct fw_card_driver dummy_driver = {
-        .name            = "dummy",
         .enable          = dummy_enable,
         .update_phy_reg  = dummy_update_phy_reg,
         .set_config_rom  = dummy_set_config_rom,
@@ -507,6 +511,14 @@ static struct fw_card_driver dummy_driver = {
 };
 
 void
+fw_card_release(struct kref *kref)
+{
+        struct fw_card *card = container_of(kref, struct fw_card, kref);
+
+        complete(&card->done);
+}
+
+void
 fw_core_remove_card(struct fw_card *card)
 {
         card->driver->update_phy_reg(card, 4,
@@ -521,12 +533,10 @@ fw_core_remove_card(struct fw_card *card)
         card->driver = &dummy_driver;
 
         fw_destroy_nodes(card);
-        /*
-         * Wait for all device workqueue jobs to finish.  Otherwise the
-         * firewire-core module could be unloaded before the jobs ran.
-         */
-        while (atomic_read(&card->device_count) > 0)
-                msleep(100);
+
+        /* Wait for all users, especially device workqueue jobs, to finish. */
+        fw_card_put(card);
+        wait_for_completion(&card->done);
 
         cancel_delayed_work_sync(&card->work);
         fw_flush_transactions(card);
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index d9c8daf7ae7d..0855fb5568e8 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -168,7 +168,7 @@ static void fw_device_release(struct device *dev)
         fw_node_put(device->node);
         kfree(device->config_rom);
         kfree(device);
-        atomic_dec(&card->device_count);
+        fw_card_put(card);
 }
 
 int fw_device_enable_phys_dma(struct fw_device *device)
@@ -946,8 +946,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
                  */
                 device_initialize(&device->device);
                 atomic_set(&device->state, FW_DEVICE_INITIALIZING);
-                atomic_inc(&card->device_count);
-                device->card = card;
+                device->card = fw_card_get(card);
                 device->node = fw_node_get(node);
                 device->node_id = node->node_id;
                 device->generation = card->generation;
diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 5f131f5129da..42305bbac72f 100644
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -62,7 +62,6 @@ struct fw_device {
         bool cmc;
         struct fw_card *card;
         struct device device;
-        struct list_head link;
         struct list_head client_list;
         u32 *config_rom;
         size_t config_rom_length;
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 0b66306af479..333b12544dd1 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -2292,7 +2292,6 @@ ohci_queue_iso(struct fw_iso_context *base,
 }
 
 static const struct fw_card_driver ohci_driver = {
-        .name                   = ohci_driver_name,
         .enable                 = ohci_enable,
         .update_phy_reg         = ohci_update_phy_reg,
         .set_config_rom         = ohci_set_config_rom,
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 227d2e036cd8..53fc5a641e6d 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -86,6 +86,11 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device "
  * - delay inquiry
  *   Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry.
  *
+ * - power condition
+ *   Set the power condition field in the START STOP UNIT commands sent by
+ *   sd_mod on suspend, resume, and shutdown (if manage_start_stop is on).
+ *   Some disks need this to spin down or to resume properly.
+ *
  * - override internal blacklist
  *   Instead of adding to the built-in blacklist, use only the workarounds
  *   specified in the module load parameter.
@@ -97,6 +102,7 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device "
 #define SBP2_WORKAROUND_FIX_CAPACITY    0x8
 #define SBP2_WORKAROUND_DELAY_INQUIRY   0x10
 #define SBP2_INQUIRY_DELAY              12
+#define SBP2_WORKAROUND_POWER_CONDITION 0x20
 #define SBP2_WORKAROUND_OVERRIDE        0x100
 
 static int sbp2_param_workarounds;
@@ -107,6 +113,8 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0"
         ", skip mode page 8 = "   __stringify(SBP2_WORKAROUND_MODE_SENSE_8)
         ", fix capacity = "       __stringify(SBP2_WORKAROUND_FIX_CAPACITY)
         ", delay inquiry = "      __stringify(SBP2_WORKAROUND_DELAY_INQUIRY)
+        ", set power condition in start stop unit = "
+                                  __stringify(SBP2_WORKAROUND_POWER_CONDITION)
         ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
         ", or a combination)");
 
@@ -310,18 +318,25 @@ static const struct {
                 .firmware_revision      = 0x002800,
                 .model                  = 0x001010,
                 .workarounds            = SBP2_WORKAROUND_INQUIRY_36 |
-                                          SBP2_WORKAROUND_MODE_SENSE_8,
+                                          SBP2_WORKAROUND_MODE_SENSE_8 |
+                                          SBP2_WORKAROUND_POWER_CONDITION,
         },
         /* DViCO Momobay FX-3A with TSB42AA9A bridge */ {
                 .firmware_revision      = 0x002800,
                 .model                  = 0x000000,
-                .workarounds            = SBP2_WORKAROUND_DELAY_INQUIRY,
+                .workarounds            = SBP2_WORKAROUND_DELAY_INQUIRY |
+                                          SBP2_WORKAROUND_POWER_CONDITION,
         },
         /* Initio bridges, actually only needed for some older ones */ {
                 .firmware_revision      = 0x000200,
                 .model                  = ~0,
                 .workarounds            = SBP2_WORKAROUND_INQUIRY_36,
         },
+        /* PL-3507 bridge with Prolific firmware */ {
+                .firmware_revision      = 0x012800,
+                .model                  = ~0,
+                .workarounds            = SBP2_WORKAROUND_POWER_CONDITION,
+        },
         /* Symbios bridge */ {
                 .firmware_revision      = 0xa0b800,
                 .model                  = ~0,
@@ -1530,6 +1545,9 @@ static int sbp2_scsi_slave_configure(struct scsi_device *sdev)
 
         sdev->use_10_for_rw = 1;
 
+        if (sbp2_param_exclusive_login)
+                sdev->manage_start_stop = 1;
+
         if (sdev->type == TYPE_ROM)
                 sdev->use_10_for_ms = 1;
 
@@ -1540,6 +1558,9 @@ static int sbp2_scsi_slave_configure(struct scsi_device *sdev)
         if (lu->tgt->workarounds & SBP2_WORKAROUND_FIX_CAPACITY)
                 sdev->fix_capacity = 1;
 
+        if (lu->tgt->workarounds & SBP2_WORKAROUND_POWER_CONDITION)
+                sdev->start_stop_pwr_cond = 1;
+
         if (lu->tgt->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
                 blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
 
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 03ae8a77c479..40db80752272 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -55,6 +55,9 @@
 #define HEADER_GET_DATA_LENGTH(q)       (((q) >> 16) & 0xffff)
 #define HEADER_GET_EXTENDED_TCODE(q)    (((q) >> 0) & 0xffff)
 
+#define HEADER_DESTINATION_IS_BROADCAST(q) \
+        (((q) & HEADER_DESTINATION(0x3f)) == HEADER_DESTINATION(0x3f))
+
 #define PHY_CONFIG_GAP_COUNT(gap_count) (((gap_count) << 16) | (1 << 22))
 #define PHY_CONFIG_ROOT_ID(node_id)     ((((node_id) & 0x3f) << 24) | (1 << 23))
 #define PHY_IDENTIFIER(id)              ((id) << 30)
@@ -624,12 +627,9 @@ allocate_request(struct fw_packet *p)
 void
 fw_send_response(struct fw_card *card, struct fw_request *request, int rcode)
 {
-        /*
-         * Broadcast packets are reported as ACK_COMPLETE, so this
-         * check is sufficient to ensure we don't send response to
-         * broadcast packets or posted writes.
-         */
-        if (request->ack != ACK_PENDING) {
+        /* unified transaction or broadcast transaction: don't respond */
+        if (request->ack != ACK_PENDING ||
+            HEADER_DESTINATION_IS_BROADCAST(request->request_header[0])) {
                 kfree(request);
                 return;
         }
@@ -817,12 +817,13 @@ handle_registers(struct fw_card *card, struct fw_request *request,
         int reg = offset & ~CSR_REGISTER_BASE;
         unsigned long long bus_time;
         __be32 *data = payload;
+        int rcode = RCODE_COMPLETE;
 
         switch (reg) {
         case CSR_CYCLE_TIME:
         case CSR_BUS_TIME:
                 if (!TCODE_IS_READ_REQUEST(tcode) || length != 4) {
-                        fw_send_response(card, request, RCODE_TYPE_ERROR);
+                        rcode = RCODE_TYPE_ERROR;
                         break;
                 }
 
@@ -831,7 +832,17 @@ handle_registers(struct fw_card *card, struct fw_request *request,
                         *data = cpu_to_be32(bus_time);
                 else
                         *data = cpu_to_be32(bus_time >> 25);
-                fw_send_response(card, request, RCODE_COMPLETE);
+                break;
+
+        case CSR_BROADCAST_CHANNEL:
+                if (tcode == TCODE_READ_QUADLET_REQUEST)
+                        *data = cpu_to_be32(card->broadcast_channel);
+                else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
+                        card->broadcast_channel =
+                            (be32_to_cpu(*data) & BROADCAST_CHANNEL_VALID) |
+                            BROADCAST_CHANNEL_INITIAL;
+                else
+                        rcode = RCODE_TYPE_ERROR;
                 break;
 
         case CSR_BUS_MANAGER_ID:
@@ -850,10 +861,13 @@ handle_registers(struct fw_card *card, struct fw_request *request,
 
         case CSR_BUSY_TIMEOUT:
                 /* FIXME: Implement this. */
+
         default:
-                fw_send_response(card, request, RCODE_ADDRESS_ERROR);
+                rcode = RCODE_ADDRESS_ERROR;
                 break;
         }
+
+        fw_send_response(card, request, rcode);
 }
 
 static struct fw_address_handler registers = {
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 04d3854f6560..2ae1b0d6cb7b 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -19,14 +19,15 @@
 #ifndef __fw_transaction_h
 #define __fw_transaction_h
 
+#include <linux/completion.h>
 #include <linux/device.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/fs.h>
 #include <linux/dma-mapping.h>
 #include <linux/firewire-constants.h>
-#include <asm/atomic.h>
+#include <linux/kref.h>
+#include <linux/list.h>
+#include <linux/spinlock_types.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
 
 #define TCODE_IS_READ_REQUEST(tcode)    (((tcode) & ~1) == 4)
 #define TCODE_IS_BLOCK_PACKET(tcode)    (((tcode) &  1) != 0)
@@ -80,6 +81,9 @@
 #define CSR_SPEED_MAP                   0x2000
 #define CSR_SPEED_MAP_END               0x3000
 
+#define BROADCAST_CHANNEL_INITIAL       (1 << 31 | 31)
+#define BROADCAST_CHANNEL_VALID         (1 << 30)
+
 #define fw_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, ## args)
 #define fw_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
 
@@ -216,7 +220,8 @@ extern struct bus_type fw_bus_type;
 struct fw_card {
         const struct fw_card_driver *driver;
         struct device *device;
-        atomic_t device_count;
+        struct kref kref;
+        struct completion done;
 
         int node_id;
         int generation;
@@ -236,6 +241,7 @@ struct fw_card {
          */
         int self_id_count;
         u32 topology_map[252 + 3];
+        u32 broadcast_channel;
 
         spinlock_t lock; /* Take this lock when handling the lists in
                           * this struct. */
@@ -256,6 +262,20 @@ struct fw_card {
         int bm_generation;
 };
 
+static inline struct fw_card *fw_card_get(struct fw_card *card)
+{
+        kref_get(&card->kref);
+
+        return card;
+}
+
+void fw_card_release(struct kref *kref);
+
+static inline void fw_card_put(struct fw_card *card)
+{
+        kref_put(&card->kref, fw_card_release);
+}
+
 /*
  * The iso packet format allows for an immediate header/payload part
  * stored in 'header' immediately after the packet info plus an
@@ -348,8 +368,6 @@ int
 fw_iso_context_stop(struct fw_iso_context *ctx);
 
 struct fw_card_driver {
-        const char *name;
-
         /*
          * Enable the given card with the given initial config rom.
          * This function is expected to activate the card, and either
diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index e8122def164d..9f95337139e3 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -1049,6 +1049,24 @@ int csr1212_read(struct csr1212_csr *csr, u32 offset, void *buffer, u32 len)
         return -ENOENT;
 }
 
+/*
+ * Apparently there are many different wrong implementations of the CRC
+ * algorithm.  We don't fail, we just warn... approximately once per GUID.
+ */
+static void
+csr1212_check_crc(const u32 *buffer, size_t length, u16 crc, __be32 *guid)
+{
+        static u64 last_bad_eui64;
+        u64 eui64 = ((u64)be32_to_cpu(guid[0]) << 32) | be32_to_cpu(guid[1]);
+
+        if (csr1212_crc16(buffer, length) == crc ||
+            csr1212_msft_crc16(buffer, length) == crc ||
+            eui64 == last_bad_eui64)
+                return;
+
+        printk(KERN_DEBUG "ieee1394: config ROM CRC error\n");
+        last_bad_eui64 = eui64;
+}
 
 /* Parse a chunk of data as a Config ROM */
 
@@ -1092,11 +1110,8 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr)
                         return ret;
         }
 
-        /* Apparently there are many different wrong implementations of the CRC
-         * algorithm.  We don't fail, we just warn. */
-        if ((csr1212_crc16(bi->data, bi->crc_length) != bi->crc) &&
-            (csr1212_msft_crc16(bi->data, bi->crc_length) != bi->crc))
-                printk(KERN_DEBUG "IEEE 1394 device has ROM CRC error\n");
+        csr1212_check_crc(bi->data, bi->crc_length, bi->crc,
+                          &csr->bus_info_data[3]);
 
         cr = CSR1212_MALLOC(sizeof(*cr));
         if (!cr)
@@ -1205,11 +1220,8 @@ int csr1212_parse_keyval(struct csr1212_keyval *kv,
                 &cache->data[bytes_to_quads(kv->offset - cache->offset)];
         kvi_len = be16_to_cpu(kvi->length);
 
-        /* Apparently there are many different wrong implementations of the CRC
-         * algorithm.  We don't fail, we just warn. */
-        if ((csr1212_crc16(kvi->data, kvi_len) != kvi->crc) &&
-            (csr1212_msft_crc16(kvi->data, kvi_len) != kvi->crc))
-                printk(KERN_DEBUG "IEEE 1394 device has ROM CRC error\n");
+        /* GUID is wrong in here in case of extended ROM.  We don't care. */
+        csr1212_check_crc(kvi->data, kvi_len, kvi->crc, &cache->data[3]);
 
         switch (kv->key.type) {
         case CSR1212_KV_TYPE_DIRECTORY:
diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c
index 73685e7dc7e4..1aba8c13fe8f 100644
--- a/drivers/ieee1394/dma.c
+++ b/drivers/ieee1394/dma.c
@@ -274,7 +274,7 @@ int dma_region_mmap(struct dma_region *dma, struct file *file,
         vma->vm_ops = &dma_region_vm_ops;
         vma->vm_private_data = dma;
         vma->vm_file = file;
-        vma->vm_flags |= VM_RESERVED;
+        vma->vm_flags |= VM_RESERVED | VM_ALWAYSDUMP;
 
         return 0;
 }
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index fa2bfec0fca2..918ffc4fc8ac 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -228,10 +228,8 @@ void hpsb_register_highlevel(struct hpsb_highlevel *hl)
 {
         unsigned long flags;
 
+        hpsb_init_highlevel(hl);
         INIT_LIST_HEAD(&hl->addr_list);
-        INIT_LIST_HEAD(&hl->host_info_list);
-
-        rwlock_init(&hl->host_info_lock);
 
         down_write(&hl_drivers_sem);
         list_add_tail(&hl->hl_list, &hl_drivers);
diff --git a/drivers/ieee1394/highlevel.h b/drivers/ieee1394/highlevel.h
index eb9fe321e09a..bc5d0854c17e 100644
--- a/drivers/ieee1394/highlevel.h
+++ b/drivers/ieee1394/highlevel.h
@@ -2,7 +2,7 @@
 #define IEEE1394_HIGHLEVEL_H
 
 #include <linux/list.h>
-#include <linux/spinlock_types.h>
+#include <linux/spinlock.h>
 #include <linux/types.h>
 
 struct module;
@@ -103,6 +103,17 @@ int highlevel_lock64(struct hpsb_host *host, int nodeid, octlet_t *store,
 void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction,
                            void *data, size_t length);
 
+/**
+ * hpsb_init_highlevel - initialize a struct hpsb_highlevel
+ *
+ * This is only necessary if hpsb_get_hostinfo_bykey can be called
+ * before hpsb_register_highlevel.
+ */
+static inline void hpsb_init_highlevel(struct hpsb_highlevel *hl)
+{
+        rwlock_init(&hl->host_info_lock);
+        INIT_LIST_HEAD(&hl->host_info_list);
+}
 void hpsb_register_highlevel(struct hpsb_highlevel *hl);
 void hpsb_unregister_highlevel(struct hpsb_highlevel *hl);
 
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index ec2a0adbedb2..96f2847b0405 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -2549,8 +2549,8 @@ static int raw1394_mmap(struct file *file, struct vm_area_struct *vma)
 }
 
 /* ioctl is only used for rawiso operations */
-static int raw1394_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg)
+static long do_raw1394_ioctl(struct file *file, unsigned int cmd,
+                                                        unsigned long arg)
 {
         struct file_info *fi = file->private_data;
         void __user *argp = (void __user *)arg;
@@ -2656,6 +2656,16 @@ static int raw1394_ioctl(struct inode *inode, struct file *file,
         return -EINVAL;
 }
 
+static long raw1394_ioctl(struct file *file, unsigned int cmd,
+                                                        unsigned long arg)
+{
+        long ret;
+        lock_kernel();
+        ret = do_raw1394_ioctl(file, cmd, arg);
+        unlock_kernel();
+        return ret;
+}
+
 #ifdef CONFIG_COMPAT
 struct raw1394_iso_packets32 {
         __u32 n_packets;
@@ -2690,7 +2700,7 @@ static long raw1394_iso_xmit_recv_packets32(struct file *file, unsigned int cmd,
             !copy_from_user(&infos32, &arg->infos, sizeof infos32)) {
                 infos = compat_ptr(infos32);
                 if (!copy_to_user(&dst->infos, &infos, sizeof infos))
-                        err = raw1394_ioctl(NULL, file, cmd, (unsigned long)dst);
+                        err = do_raw1394_ioctl(file, cmd, (unsigned long)dst);
         }
         return err;
 }
@@ -2731,7 +2741,7 @@ static long raw1394_compat_ioctl(struct file *file,
         case RAW1394_IOC_ISO_GET_STATUS:
         case RAW1394_IOC_ISO_SHUTDOWN:
         case RAW1394_IOC_ISO_QUEUE_ACTIVITY:
-                err = raw1394_ioctl(NULL, file, cmd, arg);
+                err = do_raw1394_ioctl(file, cmd, arg);
                 break;
         /* These request have different format. */
         case RAW1394_IOC_ISO_RECV_PACKETS32:
@@ -2984,7 +2994,7 @@ static const struct file_operations raw1394_fops = {
         .read = raw1394_read,
         .write = raw1394_write,
         .mmap = raw1394_mmap,
-        .ioctl = raw1394_ioctl,
+        .unlocked_ioctl = raw1394_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = raw1394_compat_ioctl,
 #endif
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index a5ceff287a28..9cbf3154d243 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -186,6 +186,11 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device "
  * - delay inquiry
  *   Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry.
  *
+ * - power condition
+ *   Set the power condition field in the START STOP UNIT commands sent by
+ *   sd_mod on suspend, resume, and shutdown (if manage_start_stop is on).
+ *   Some disks need this to spin down or to resume properly.
+ *
  * - override internal blacklist
  *   Instead of adding to the built-in blacklist, use only the workarounds
  *   specified in the module load parameter.
@@ -199,6 +204,8 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0"
         ", skip mode page 8 = "   __stringify(SBP2_WORKAROUND_MODE_SENSE_8)
         ", fix capacity = "       __stringify(SBP2_WORKAROUND_FIX_CAPACITY)
         ", delay inquiry = "      __stringify(SBP2_WORKAROUND_DELAY_INQUIRY)
+        ", set power condition in start stop unit = "
+                                  __stringify(SBP2_WORKAROUND_POWER_CONDITION)
         ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
         ", or a combination)");
 
@@ -359,18 +366,25 @@ static const struct {
                 .firmware_revision      = 0x002800,
                 .model_id               = 0x001010,
                 .workarounds            = SBP2_WORKAROUND_INQUIRY_36 |
-                                          SBP2_WORKAROUND_MODE_SENSE_8,
+                                          SBP2_WORKAROUND_MODE_SENSE_8 |
+                                          SBP2_WORKAROUND_POWER_CONDITION,
         },
         /* DViCO Momobay FX-3A with TSB42AA9A bridge */ {
                 .firmware_revision      = 0x002800,
                 .model_id               = 0x000000,
-                .workarounds            = SBP2_WORKAROUND_DELAY_INQUIRY,
+                .workarounds            = SBP2_WORKAROUND_DELAY_INQUIRY |
+                                          SBP2_WORKAROUND_POWER_CONDITION,
         },
         /* Initio bridges, actually only needed for some older ones */ {
                 .firmware_revision      = 0x000200,
                 .model_id               = SBP2_ROM_VALUE_WILDCARD,
                 .workarounds            = SBP2_WORKAROUND_INQUIRY_36,
         },
+        /* PL-3507 bridge with Prolific firmware */ {
+                .firmware_revision      = 0x012800,
+                .model_id               = SBP2_ROM_VALUE_WILDCARD,
+                .workarounds            = SBP2_WORKAROUND_POWER_CONDITION,
+        },
         /* Symbios bridge */ {
                 .firmware_revision      = 0xa0b800,
                 .model_id               = SBP2_ROM_VALUE_WILDCARD,
@@ -1995,6 +2009,8 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev)
 
         sdev->use_10_for_rw = 1;
 
+        if (sbp2_exclusive_login)
+                sdev->manage_start_stop = 1;
         if (sdev->type == TYPE_ROM)
                 sdev->use_10_for_ms = 1;
         if (sdev->type == TYPE_DISK &&
@@ -2002,6 +2018,8 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev)
                 sdev->skip_ms_page_8 = 1;
         if (lu->workarounds & SBP2_WORKAROUND_FIX_CAPACITY)
                 sdev->fix_capacity = 1;
+        if (lu->workarounds & SBP2_WORKAROUND_POWER_CONDITION)
+                sdev->start_stop_pwr_cond = 1;
         if (lu->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
                 blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
         return 0;
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index 80d8e097b065..875428bc8d29 100644
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -345,6 +345,7 @@ enum sbp2lu_state_types {
 #define SBP2_WORKAROUND_FIX_CAPACITY    0x8
 #define SBP2_WORKAROUND_DELAY_INQUIRY   0x10
 #define SBP2_INQUIRY_DELAY              12
+#define SBP2_WORKAROUND_POWER_CONDITION 0x20
 #define SBP2_WORKAROUND_OVERRIDE        0x100
 
 #endif /* SBP2_H */
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index e24772d336e1..069b9f6bf16d 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1503,6 +1503,8 @@ static int __init video1394_init_module (void)
 {
         int ret;
 
+        hpsb_init_highlevel(&video1394_highlevel);
+
         cdev_init(&video1394_cdev, &video1394_fops);
         video1394_cdev.owner = THIS_MODULE;
         ret = cdev_add(&video1394_cdev, IEEE1394_VIDEO1394_DEV, 16);
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 9e23ab0b51a1..55c718828826 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -35,6 +35,7 @@
 #include <rdma/ib_user_verbs.h>
 #include <linux/io.h>
 #include <linux/utsname.h>
+#include <linux/rculist.h>
 
 #include "ipath_kernel.h"
 #include "ipath_verbs.h"
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
index 9e5abf9c309d..d73e32232879 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
@@ -31,8 +31,7 @@
  * SOFTWARE.
  */
 
-#include <linux/list.h>
-#include <linux/rcupdate.h>
+#include <linux/rculist.h>
 
 #include "ipath_verbs.h"
 
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index 2e554a4ab337..95dfda52b4f9 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -478,7 +478,7 @@ void __init lguest_arch_host_init(void)
                 cpu_had_pge = 1;
                 /* adjust_pge is a helper function which sets or unsets the PGE
                  * bit on its CPU, depending on the argument (0 == unset). */
-                on_each_cpu(adjust_pge, (void *)0, 0, 1);
+                on_each_cpu(adjust_pge, (void *)0, 1);
                 /* Turn off the feature in the global feature set. */
                 clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability);
         }
@@ -493,7 +493,7 @@ void __exit lguest_arch_host_fini(void)
         if (cpu_had_pge) {
                 set_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability);
                 /* adjust_pge's argument "1" means set PGE. */
-                on_each_cpu(adjust_pge, (void *)1, 0, 1);
+                on_each_cpu(adjust_pge, (void *)1, 1);
         }
         put_online_cpus();
 }
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 17bc87a43ff4..d2fbc2964523 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -258,13 +258,6 @@ config MTD_ALCHEMY
         help
           Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
 
-config MTD_MTX1
-        tristate "4G Systems MTX-1 Flash device"
-        depends on MIPS_MTX1 && MTD_CFI
-        help
-          Flash memory access on 4G Systems MTX-1 Board. If you have one of
-          these boards and would like to use the flash chips on it, say 'Y'.
-
 config MTD_DILNETPC
         tristate "CFI Flash device mapped on DIL/Net PC"
         depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 957fb5f70f5e..c6ce8673dab2 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -65,5 +65,4 @@ obj-$(CONFIG_MTD_DMV182)	+= dmv182.o
 obj-$(CONFIG_MTD_SHARP_SL)      += sharpsl-flash.o
 obj-$(CONFIG_MTD_PLATRAM)       += plat-ram.o
 obj-$(CONFIG_MTD_OMAP_NOR)      += omap_nor.o
-obj-$(CONFIG_MTD_MTX1)          += mtx-1_flash.o
 obj-$(CONFIG_MTD_INTEL_VR_NOR)  += intel_vr_nor.o
diff --git a/drivers/mtd/maps/mtx-1_flash.c b/drivers/mtd/maps/mtx-1_flash.c
deleted file mode 100644
index 2a8fde9b92f0..000000000000
--- a/drivers/mtd/maps/mtx-1_flash.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Flash memory access on 4G Systems MTX-1 boards
- *
- * $Id: mtx-1_flash.c,v 1.2 2005/11/07 11:14:27 gleixner Exp $
- *
- * (C) 2005 Bruno Randolf <bruno.randolf@4g-systems.biz>
- * (C) 2005 Joern Engel <joern@wohnheim.fh-wedel.de>
- *
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-
-#include <asm/io.h>
-
-static struct map_info mtx1_map = {
-        .name = "MTX-1 flash",
-        .bankwidth = 4,
-        .size = 0x2000000,
-        .phys = 0x1E000000,
-};
-
-static struct mtd_partition mtx1_partitions[] = {
-        {
-                .name = "filesystem",
-                .size = 0x01C00000,
-                .offset = 0,
-        },{
-                .name = "yamon",
-                .size = 0x00100000,
-                .offset = MTDPART_OFS_APPEND,
-                .mask_flags = MTD_WRITEABLE,
-        },{
-                .name = "kernel",
-                .size = 0x002c0000,
-                .offset = MTDPART_OFS_APPEND,
-        },{
-                .name = "yamon env",
-                .size = 0x00040000,
-                .offset = MTDPART_OFS_APPEND,
-        }
-};
-
-static struct mtd_info *mtx1_mtd;
-
-int __init mtx1_mtd_init(void)
-{
-        int ret = -ENXIO;
-
-        simple_map_init(&mtx1_map);
-
-        mtx1_map.virt = ioremap(mtx1_map.phys, mtx1_map.size);
-        if (!mtx1_map.virt)
-                return -EIO;
-
-        mtx1_mtd = do_map_probe("cfi_probe", &mtx1_map);
-        if (!mtx1_mtd)
-                goto err;
-
-        mtx1_mtd->owner = THIS_MODULE;
-
-        ret = add_mtd_partitions(mtx1_mtd, mtx1_partitions,
-                        ARRAY_SIZE(mtx1_partitions));
-        if (ret)
-                goto err;
-
-        return 0;
-
-err:
-       iounmap(mtx1_map.virt);
-       return ret;
-}
-
-static void __exit mtx1_mtd_cleanup(void)
-{
-        if (mtx1_mtd) {
-                del_mtd_partitions(mtx1_mtd);
-                map_destroy(mtx1_mtd);
-        }
-        if (mtx1_map.virt)
-                iounmap(mtx1_map.virt);
-}
-
-module_init(mtx1_mtd_init);
-module_exit(mtx1_mtd_cleanup);
-
-MODULE_AUTHOR("Bruno Randolf <bruno.randolf@4g-systems.biz>");
-MODULE_DESCRIPTION("MTX-1 flash map");
-MODULE_LICENSE("GPL");
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index c36a03ae9bfb..860d75d81f82 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -20,7 +20,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/list.h>
+#include <linux/rculist.h>
 #include <linux/notifier.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index ced3eebe252c..84bb61628372 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -389,7 +389,7 @@ static u8 orc_load_firmware(struct orc_host * host)
 
         outb(PRGMRST | DOWNLOAD, host->base + ORC_RISCCTL);     /* Enable SRAM programming */
         data32_ptr = (u8 *) & data32;
-        data32 = 0;             /* Initial FW address to 0 */
+        data32 = cpu_to_le32(0);                /* Initial FW address to 0 */
         outw(0x0010, host->base + ORC_EBIOSADR0);
         *data32_ptr = inb(host->base + ORC_EBIOSDATA);          /* Read from BIOS */
         outw(0x0011, host->base + ORC_EBIOSADR0);
@@ -397,18 +397,19 @@ static u8 orc_load_firmware(struct orc_host * host)
         outw(0x0012, host->base + ORC_EBIOSADR0);
         *(data32_ptr + 2) = inb(host->base + ORC_EBIOSDATA);    /* Read from BIOS */
         outw(*(data32_ptr + 2), host->base + ORC_EBIOSADR2);
-        outl(data32, host->base + ORC_FWBASEADR);               /* Write FW address */
+        outl(le32_to_cpu(data32), host->base + ORC_FWBASEADR);          /* Write FW address */
 
         /* Copy the code from the BIOS to the SRAM */
 
-        bios_addr = (u16) data32;       /* FW code locate at BIOS address + ? */
+        udelay(500);    /* Required on Sun Ultra 5 ... 350 -> failures */
+        bios_addr = (u16) le32_to_cpu(data32);  /* FW code locate at BIOS address + ? */
         for (i = 0, data32_ptr = (u8 *) & data32;       /* Download the code    */
              i < 0x1000;        /* Firmware code size = 4K      */
              i++, bios_addr++) {
                 outw(bios_addr, host->base + ORC_EBIOSADR0);
                 *data32_ptr++ = inb(host->base + ORC_EBIOSDATA);        /* Read from BIOS */
                 if ((i % 4) == 3) {
-                        outl(data32, host->base + ORC_RISCRAM); /* Write every 4 bytes */
+                        outl(le32_to_cpu(data32), host->base + ORC_RISCRAM);    /* Write every 4 bytes */
                         data32_ptr = (u8 *) & data32;
                 }
         }
@@ -423,7 +424,7 @@ static u8 orc_load_firmware(struct orc_host * host)
                 outw(bios_addr, host->base + ORC_EBIOSADR0);
                 *data32_ptr++ = inb(host->base + ORC_EBIOSDATA);        /* Read from BIOS */
                 if ((i % 4) == 3) {
-                        if (inl(host->base + ORC_RISCRAM) != data32) {
+                        if (inl(host->base + ORC_RISCRAM) != le32_to_cpu(data32)) {
                                 outb(PRGMRST, host->base + ORC_RISCCTL);        /* Reset program to 0 */
                                 outb(data, host->base + ORC_GCFG);      /*Disable EEPROM programming */
                                 return 0;
@@ -459,8 +460,8 @@ static void setup_SCBs(struct orc_host * host)
 
         for (i = 0; i < ORC_MAXQUEUE; i++) {
                 escb_phys = (host->escb_phys + (sizeof(struct orc_extended_scb) * i));
-                scb->sg_addr = (u32) escb_phys;
-                scb->sense_addr = (u32) escb_phys;
+                scb->sg_addr = cpu_to_le32((u32) escb_phys);
+                scb->sense_addr = cpu_to_le32((u32) escb_phys);
                 scb->escb = escb;
                 scb->scbidx = i;
                 scb++;
@@ -642,8 +643,8 @@ static int orc_device_reset(struct orc_host * host, struct scsi_cmnd *cmd, unsig
         scb->link = 0xFF;
         scb->reserved0 = 0;
         scb->reserved1 = 0;
-        scb->xferlen = 0;
-        scb->sg_len = 0;
+        scb->xferlen = cpu_to_le32(0);
+        scb->sg_len = cpu_to_le32(0);
 
         escb->srb = NULL;
         escb->srb = cmd;
@@ -839,7 +840,7 @@ static irqreturn_t orc_interrupt(struct orc_host * host)
  *      Build a host adapter control block from the SCSI mid layer command
  */
 
-static void inia100_build_scb(struct orc_host * host, struct orc_scb * scb, struct scsi_cmnd * cmd)
+static int inia100_build_scb(struct orc_host * host, struct orc_scb * scb, struct scsi_cmnd * cmd)
 {                               /* Create corresponding SCB     */
         struct scatterlist *sg;
         struct orc_sgent *sgent;                /* Pointer to SG list           */
@@ -858,28 +859,30 @@ static void inia100_build_scb(struct orc_host * host, struct orc_scb * scb, stru
         scb->lun = cmd->device->lun;
         scb->reserved0 = 0;
         scb->reserved1 = 0;
-        scb->sg_len = 0;
+        scb->sg_len = cpu_to_le32(0);
 
-        scb->xferlen = (u32) scsi_bufflen(cmd);
+        scb->xferlen = cpu_to_le32((u32) scsi_bufflen(cmd));
         sgent = (struct orc_sgent *) & escb->sglist[0];
 
         count_sg = scsi_dma_map(cmd);
-        BUG_ON(count_sg < 0);
+        if (count_sg < 0)
+                return count_sg;
+        BUG_ON(count_sg > TOTAL_SG_ENTRY);
 
         /* Build the scatter gather lists */
         if (count_sg) {
-                scb->sg_len = (u32) (count_sg * 8);
+                scb->sg_len = cpu_to_le32((u32) (count_sg * 8));
                 scsi_for_each_sg(cmd, sg, count_sg, i) {
-                        sgent->base = (u32) sg_dma_address(sg);
-                        sgent->length = (u32) sg_dma_len(sg);
+                        sgent->base = cpu_to_le32((u32) sg_dma_address(sg));
+                        sgent->length = cpu_to_le32((u32) sg_dma_len(sg));
                         sgent++;
                 }
         } else {
-                scb->sg_len = 0;
-                sgent->base = 0;
-                sgent->length = 0;
+                scb->sg_len = cpu_to_le32(0);
+                sgent->base = cpu_to_le32(0);
+                sgent->length = cpu_to_le32(0);
         }
-        scb->sg_addr = (u32) scb->sense_addr;
+        scb->sg_addr = (u32) scb->sense_addr;   /* sense_addr is already little endian */
         scb->hastat = 0;
         scb->tastat = 0;
         scb->link = 0xFF;
@@ -896,6 +899,7 @@ static void inia100_build_scb(struct orc_host * host, struct orc_scb * scb, stru
                 scb->tag_msg = 0;       /* No tag support               */
         }
         memcpy(scb->cdb, cmd->cmnd, scb->cdb_len);
+        return 0;
 }
 
 /**
@@ -919,7 +923,10 @@ static int inia100_queue(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd
         if ((scb = orc_alloc_scb(host)) == NULL)
                 return SCSI_MLQUEUE_HOST_BUSY;
 
-        inia100_build_scb(host, scb, cmd);
+        if (inia100_build_scb(host, scb, cmd)) {
+                orc_release_scb(host, scb);
+                return SCSI_MLQUEUE_HOST_BUSY;
+        }
         orc_exec_scb(host, scb);        /* Start execute SCB            */
         return 0;
 }
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 01cefbb2d539..d53312c42547 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1124,6 +1124,8 @@ sd_spinup_disk(struct scsi_disk *sdkp)
                                 cmd[1] = 1;     /* Return immediately */
                                 memset((void *) &cmd[2], 0, 8);
                                 cmd[4] = 1;     /* Start spin cycle */
+                                if (sdkp->device->start_stop_pwr_cond)
+                                        cmd[4] |= 1 << 4;
                                 scsi_execute_req(sdkp->device, cmd, DMA_NONE,
                                                  NULL, 0, &sshdr,
                                                  SD_TIMEOUT, SD_MAX_RETRIES);
@@ -1790,6 +1792,9 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
         if (start)
                 cmd[4] |= 1;    /* START */
 
+        if (sdp->start_stop_pwr_cond)
+                cmd[4] |= start ? 1 << 4 : 3 << 4;      /* Active or Standby */
+
         if (!scsi_device_online(sdp))
                 return -ENODEV;
 
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index c1ba0db48501..770824458d45 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -55,7 +55,7 @@ static void __booke_wdt_ping(void *data)
 
 static void booke_wdt_ping(void)
 {
-        on_each_cpu(__booke_wdt_ping, NULL, 0, 0);
+        on_each_cpu(__booke_wdt_ping, NULL, 0);
 }
 
 static void __booke_wdt_enable(void *data)
@@ -131,7 +131,7 @@ static int booke_wdt_open(struct inode *inode, struct file *file)
         spin_lock(&booke_wdt_lock);
         if (booke_wdt_enabled == 0) {
                 booke_wdt_enabled = 1;
-                on_each_cpu(__booke_wdt_enable, NULL, 0, 0);
+                on_each_cpu(__booke_wdt_enable, NULL, 0);
                 printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled "
                                 "(wdt_period=%d)\n", booke_wdt_period);
         }
@@ -177,7 +177,7 @@ static int __init booke_wdt_init(void)
         if (booke_wdt_enabled == 1) {
                 printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled "
                                 "(wdt_period=%d)\n", booke_wdt_period);
-                on_each_cpu(__booke_wdt_enable, NULL, 0, 0);
+                on_each_cpu(__booke_wdt_enable, NULL, 0);
         }
         spin_unlock(&booke_wdt_lock);
 
diff --git a/fs/buffer.c b/fs/buffer.c
index 5fa1512cd9a2..d48caee12e2a 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1464,7 +1464,7 @@ static void invalidate_bh_lru(void *arg)
         
 void invalidate_bh_lrus(void)
 {
-        on_each_cpu(invalidate_bh_lru, NULL, 1, 1);
+        on_each_cpu(invalidate_bh_lru, NULL, 1);
 }
 EXPORT_SYMBOL_GPL(invalidate_bh_lrus);
 
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h
index 286e1d844f63..544c69af8168 100644
--- a/include/asm-alpha/smp.h
+++ b/include/asm-alpha/smp.h
@@ -47,12 +47,13 @@ extern struct cpuinfo_alpha cpu_data[NR_CPUS];
 extern int smp_num_cpus;
 #define cpu_possible_map        cpu_present_map
 
-int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, int wait, cpumask_t cpu);
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi(cpumask_t mask);
 
 #else /* CONFIG_SMP */
 
 #define hard_smp_processor_id()         0
-#define smp_call_function_on_cpu(func,info,retry,wait,cpu)    ({ 0; })
+#define smp_call_function_on_cpu(func,info,wait,cpu)    ({ 0; })
 
 #endif /* CONFIG_SMP */
 
diff --git a/include/asm-arm/smp.h b/include/asm-arm/smp.h
index af99636db400..7fffa2404b8e 100644
--- a/include/asm-arm/smp.h
+++ b/include/asm-arm/smp.h
@@ -101,6 +101,9 @@ extern void platform_cpu_die(unsigned int cpu);
 extern int platform_cpu_kill(unsigned int cpu);
 extern void platform_cpu_enable(unsigned int cpu);
 
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi(cpumask_t mask);
+
 /*
  * Local timer interrupt handling function (can be IPI'ed).
  */
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 4fce3db2cecc..ef87f889ef62 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -195,7 +195,6 @@ static inline int pmd_none_or_clear_bad(pmd_t *pmd)
         }
         return 0;
 }
-#endif /* CONFIG_MMU */
 
 static inline pte_t __ptep_modify_prot_start(struct mm_struct *mm,
                                              unsigned long addr,
@@ -253,6 +252,7 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm,
         __ptep_modify_prot_commit(mm, addr, ptep, pte);
 }
 #endif /* __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION */
+#endif /* CONFIG_MMU */
 
 /*
  * A facility to provide lazy MMU batching.  This allows PTE updates and
diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index ec5f355fb7e3..27731e032ee9 100644
--- a/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@ -38,9 +38,6 @@ ia64_get_lid (void)
         return lid.f.id << 8 | lid.f.eid;
 }
 
-extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),
-                                  void *info, int wait);
-
 #define hard_smp_processor_id()         ia64_get_lid()
 
 #ifdef CONFIG_SMP
@@ -124,11 +121,12 @@ extern void __init init_smp_config (void);
 extern void smp_do_timer (struct pt_regs *regs);
 
 extern void smp_send_reschedule (int cpu);
-extern void lock_ipi_calllock(void);
-extern void unlock_ipi_calllock(void);
 extern void identify_siblings (struct cpuinfo_ia64 *);
 extern int is_multithreading_enabled(void);
 
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi(cpumask_t mask);
+
 #else /* CONFIG_SMP */
 
 #define cpu_logical_id(i)               0
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h
index 078e1a51a042..c5dd66916692 100644
--- a/include/asm-m32r/smp.h
+++ b/include/asm-m32r/smp.h
@@ -89,6 +89,9 @@ static __inline__ unsigned int num_booting_cpus(void)
 extern void smp_send_timer(void);
 extern unsigned long send_IPI_mask_phys(cpumask_t, int, int);
 
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi(cpumask_t mask);
+
 #endif  /* not __ASSEMBLY__ */
 
 #define NO_PROC_ID (0xff)       /* No processor magic marker */
@@ -104,6 +107,7 @@ extern unsigned long send_IPI_mask_phys(cpumask_t, int, int);
 #define LOCAL_TIMER_IPI         (M32R_IRQ_IPI3-M32R_IRQ_IPI0)
 #define INVALIDATE_CACHE_IPI    (M32R_IRQ_IPI4-M32R_IRQ_IPI0)
 #define CPU_BOOT_IPI            (M32R_IRQ_IPI5-M32R_IRQ_IPI0)
+#define CALL_FUNC_SINGLE_IPI    (M32R_IRQ_IPI6-M32R_IRQ_IPI0)
 
 #define IPI_SHIFT       (0)
 #define NR_IPIS         (8)
diff --git a/include/asm-mips/barrier.h b/include/asm-mips/barrier.h
index 9d8cfbb5e796..8e9ac313ca3b 100644
--- a/include/asm-mips/barrier.h
+++ b/include/asm-mips/barrier.h
@@ -92,11 +92,25 @@
 #define fast_wmb()      __sync()
 #define fast_rmb()      __sync()
 #define fast_mb()       __sync()
+#ifdef CONFIG_SGI_IP28
+#define fast_iob()                              \
+        __asm__ __volatile__(                   \
+                ".set   push\n\t"               \
+                ".set   noreorder\n\t"          \
+                "lw     $0,%0\n\t"              \
+                "sync\n\t"                      \
+                "lw     $0,%0\n\t"              \
+                ".set   pop"                    \
+                : /* no output */               \
+                : "m" (*(int *)CKSEG1ADDR(0x1fa00004)) \
+                : "memory")
+#else
 #define fast_iob()                              \
         do {                                    \
                 __sync();                       \
                 __fast_iob();                   \
         } while (0)
+#endif
 
 #ifdef CONFIG_CPU_HAS_WB
 
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h
index 642724734eba..9a7274ba6a0b 100644
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
@@ -82,7 +82,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
                 "2:     b       1b                                      \n"
                 "       .previous                                       \n"
                 : "=&r" (temp), "=m" (*m)
-                : "ir" (bit), "m" (*m), "r" (~0));
+                : "i" (bit), "m" (*m), "r" (~0));
 #endif /* CONFIG_CPU_MIPSR2 */
         } else if (cpu_has_llsc) {
                 __asm__ __volatile__(
@@ -147,7 +147,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)
                 "2:     b       1b                                      \n"
                 "       .previous                                       \n"
                 : "=&r" (temp), "=m" (*m)
-                : "ir" (bit), "m" (*m));
+                : "i" (bit), "m" (*m));
 #endif /* CONFIG_CPU_MIPSR2 */
         } else if (cpu_has_llsc) {
                 __asm__ __volatile__(
@@ -428,7 +428,7 @@ static inline int test_and_clear_bit(unsigned long nr,
                 "2:     b       1b                                      \n"
                 "       .previous                                       \n"
                 : "=&r" (temp), "=m" (*m), "=&r" (res)
-                : "ri" (bit), "m" (*m)
+                : "i" (bit), "m" (*m)
                 : "memory");
 #endif
         } else if (cpu_has_llsc) {
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index e031bdff9920..d39e143b4a3c 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -26,13 +26,6 @@
 #define  MACH_UNKNOWN           0       /* whatever...                  */
 
 /*
- * Valid machtype values for group JAZZ
- */
-#define  MACH_ACER_PICA_61      0       /* Acer PICA-61 (PICA1)         */
-#define  MACH_MIPS_MAGNUM_4000  1       /* Mips Magnum 4000 "RC4030"    */
-#define  MACH_OLIVETTI_M700     2       /* Olivetti M700-10 (-15 ??)    */
-
-/*
  * Valid machtype for group DEC
  */
 #define  MACH_DSUNKNOWN         0
@@ -48,42 +41,6 @@
 #define  MACH_DS5900            10      /* DECsystem 5900               */
 
 /*
- * Valid machtype for group SNI_RM
- */
-#define  MACH_SNI_RM200_PCI     0       /* RM200/RM300/RM400 PCI series */
-
-/*
- * Valid machtype for group SGI
- */
-#define  MACH_SGI_IP22          0       /* Indy, Indigo2, Challenge S   */
-#define  MACH_SGI_IP27          1       /* Origin 200, Origin 2000, Onyx 2 */
-#define  MACH_SGI_IP28          2       /* Indigo2 Impact               */
-#define  MACH_SGI_IP32          3       /* O2                           */
-#define  MACH_SGI_IP30          4       /* Octane, Octane2              */
-
-/*
- * Valid machtypes for group Toshiba
- */
-#define  MACH_PALLAS            0
-#define  MACH_TOPAS             1
-#define  MACH_JMR               2
-#define  MACH_TOSHIBA_JMR3927   3       /* JMR-TX3927 CPU/IO board */
-#define  MACH_TOSHIBA_RBTX4927  4
-#define  MACH_TOSHIBA_RBTX4937  5
-#define  MACH_TOSHIBA_RBTX4938  6
-
-/*
- * Valid machtype for group LASAT
- */
-#define  MACH_LASAT_100         0       /* Masquerade II/SP100/SP50/SP25 */
-#define  MACH_LASAT_200         1       /* Masquerade PRO/SP200 */
-
-/*
- * Valid machtype for group NEC EMMA2RH
- */
-#define  MACH_NEC_MARKEINS      0       /* NEC EMMA2RH Mark-eins        */
-
-/*
  * Valid machtype for group PMC-MSP
  */
 #define MACH_MSP4200_EVAL       0       /* PMC-Sierra MSP4200 Evaluation */
diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
index 1c35cac6f35b..229a786101d9 100644
--- a/include/asm-mips/cpu.h
+++ b/include/asm-mips/cpu.h
@@ -66,8 +66,10 @@
 #define PRID_IMP_RM7000         0x2700
 #define PRID_IMP_NEVADA         0x2800          /* RM5260 ??? */
 #define PRID_IMP_RM9000         0x3400
+#define PRID_IMP_LOONGSON1      0x4200
 #define PRID_IMP_R5432          0x5400
 #define PRID_IMP_R5500          0x5500
+#define PRID_IMP_LOONGSON2      0x6300
 
 #define PRID_IMP_UNKNOWN        0xff00
 
@@ -90,8 +92,6 @@
 #define PRID_IMP_24KE           0x9600
 #define PRID_IMP_74K            0x9700
 #define PRID_IMP_1004K          0x9900
-#define PRID_IMP_LOONGSON1      0x4200
-#define PRID_IMP_LOONGSON2      0x6300
 
 /*
  * These are the PRID's for when 23:16 == PRID_COMP_SIBYTE
diff --git a/include/asm-mips/dec/kn05.h b/include/asm-mips/dec/kn05.h
index 15fe8f881e60..56d22dc8803a 100644
--- a/include/asm-mips/dec/kn05.h
+++ b/include/asm-mips/dec/kn05.h
@@ -6,7 +6,7 @@
  *      KN04-CA) and DECsystem 5900/260 (KN05) R4k CPU card MB ASIC
  *      definitions.
  *
- *      Copyright (C) 2002, 2003, 2005  Maciej W. Rozycki
+ *      Copyright (C) 2002, 2003, 2005, 2008  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
@@ -54,11 +54,11 @@
  */
 #define KN4K_MB_INT_TC          (1<<0)          /* TURBOchannel? */
 #define KN4K_MB_INT_RTC         (1<<1)          /* RTC? */
-#define KN4K_MB_INT_MT          (1<<3)          /* ??? */
+#define KN4K_MB_INT_MT          (1<<3)          /* I/O ASIC cascade */
 
 /*
  * Bits for the MB control & status register.
- * Set to 0x00bf8001 on my system by the ROM.
+ * Set to 0x00bf8001 for KN05 and to 0x003f8000 for KN04 by the firmware.
  */
 #define KN4K_MB_CSR_PF          (1<<0)          /* PreFetching enable? */
 #define KN4K_MB_CSR_F           (1<<1)          /* ??? */
@@ -69,7 +69,8 @@
 #define KN4K_MB_CSR_IM          (1<<13)         /* ??? */
 #define KN4K_MB_CSR_NC          (1<<14)         /* ??? */
 #define KN4K_MB_CSR_EE          (1<<15)         /* (bus) Exception Enable? */
-#define KN4K_MB_CSR_MSK         (0x1f<<16)      /* ??? */
+#define KN4K_MB_CSR_MSK         (0x1f<<16)      /* CPU Int[4:0] mask */
 #define KN4K_MB_CSR_FW          (1<<21)         /* ??? */
+#define KN4K_MB_CSR_W           (1<<31)         /* ??? */
 
 #endif /* __ASM_MIPS_DEC_KN05_H */
diff --git a/include/asm-mips/inventory.h b/include/asm-mips/inventory.h
deleted file mode 100644
index cc88aed23f0f..000000000000
--- a/include/asm-mips/inventory.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Miguel de Icaza
- */
-#ifndef __ASM_INVENTORY_H
-#define __ASM_INVENTORY_H
-
-#include <linux/compiler.h>
-
-typedef struct inventory_s {
-        struct inventory_s *inv_next;
-        int    inv_class;
-        int    inv_type;
-        int    inv_controller;
-        int    inv_unit;
-        int    inv_state;
-} inventory_t;
-
-extern int inventory_items;
-
-extern void add_to_inventory(int class, int type, int controller, int unit, int state);
-extern int dump_inventory_to_user(void __user *userbuf, int size);
-extern int __init init_inventory(void);
-
-#endif /* __ASM_INVENTORY_H */
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index f18d2816cbec..501a40b9f18d 100644
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -161,13 +161,6 @@ static inline void * isa_bus_to_virt(unsigned long address)
 #define bus_to_virt phys_to_virt
 
 /*
- * isa_slot_offset is the address where E(ISA) busaddress 0 is mapped
- * for the processor.  This implies the assumption that there is only
- * one of these busses.
- */
-extern unsigned long isa_slot_offset;
-
-/*
  * Change "struct page" to physical address.
  */
 #define page_to_phys(page)      ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)
@@ -528,16 +521,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int
 }
 
 /*
- * ISA space is 'always mapped' on currently supported MIPS systems, no need
- * to explicitly ioremap() it. The fact that the ISA IO space is mapped
- * to PAGE_OFFSET is pure coincidence - it does not mean ISA values
- * are physical addresses. The following constant pointer can be
- * used as the IO-area pointer (it can be iounmapped as well, so the
- * analogy with PCI is quite large):
- */
-#define __ISA_IO_base ((char *)(isa_slot_offset))
-
-/*
  * The caches on some architectures aren't dma-coherent and have need to
  * handle this in software.  There are three types of operations that
  * can be applied to dma buffers.
diff --git a/include/asm-mips/lasat/lasat.h b/include/asm-mips/lasat/lasat.h
index ea04d9262edc..caeba1e302a2 100644
--- a/include/asm-mips/lasat/lasat.h
+++ b/include/asm-mips/lasat/lasat.h
@@ -240,6 +240,8 @@ static inline void lasat_ndelay(unsigned int ns)
         __delay(ns / lasat_ndelay_divider);
 }
 
+#define IS_LASAT_200()     (current_cpu_data.cputype == CPU_R5000)
+
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
 #define LASAT_SERVICEMODE_MAGIC_1     0xdeadbeef
diff --git a/include/asm-mips/mach-atlas/mc146818rtc.h b/include/asm-mips/mach-atlas/mc146818rtc.h
deleted file mode 100644
index 51d337e1bbd1..000000000000
--- a/include/asm-mips/mach-atlas/mc146818rtc.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 1999, 2000, 2005  MIPS Technologies, Inc.
- *      All rights reserved.
- *      Authors: Carsten Langgaard <carstenl@mips.com>
- *               Maciej W. Rozycki <macro@mips.com>
- * Copyright (C) 2003, 05 Ralf Baechle (ralf@linux-mips.org)
- *
- * 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.
- */
-#ifndef __ASM_MACH_ATLAS_MC146818RTC_H
-#define __ASM_MACH_ATLAS_MC146818RTC_H
-
-#include <linux/types.h>
-
-#include <asm/addrspace.h>
-
-#include <asm/mips-boards/atlas.h>
-#include <asm/mips-boards/atlasint.h>
-
-#define ARCH_RTC_LOCATION
-
-#define RTC_PORT(x)     (ATLAS_RTC_ADR_REG + (x) * 8)
-#define RTC_IO_EXTENT   0x100
-#define RTC_IOMAPPED    0
-#define RTC_IRQ         ATLAS_INT_RTC
-
-static inline unsigned char CMOS_READ(unsigned long addr)
-{
-        volatile u32 *ireg = (void *)CKSEG1ADDR(RTC_PORT(0));
-        volatile u32 *dreg = (void *)CKSEG1ADDR(RTC_PORT(1));
-
-        *ireg = addr;
-        return *dreg;
-}
-
-static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
-{
-        volatile u32 *ireg = (void *)CKSEG1ADDR(RTC_PORT(0));
-        volatile u32 *dreg = (void *)CKSEG1ADDR(RTC_PORT(1));
-
-        *ireg = addr;
-        *dreg = data;
-}
-
-#define RTC_ALWAYS_BCD  0
-
-#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
-
-#endif /* __ASM_MACH_ATLAS_MC146818RTC_H */
diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/include/asm-mips/mach-db1x00/db1x00.h
index 612ae90dbcb8..1a515b8c870f 100644
--- a/include/asm-mips/mach-db1x00/db1x00.h
+++ b/include/asm-mips/mach-db1x00/db1x00.h
@@ -146,51 +146,6 @@ typedef volatile struct
         ((((VCC) << 2) | ((VPP) << 0)) << ((SLOT) * 8))
 
 /*
- * SD controller macros
- */
-
-/* Detect card. */
-#define mmc_card_inserted(_n_, _res_) \
-        do { \
-                BCSR * const bcsr = (BCSR *)0xAE000000; \
-                unsigned long mmc_wp, board_specific; \
-                if ((_n_)) { \
-                        mmc_wp = BCSR_BOARD_SD1_WP; \
-                } else { \
-                        mmc_wp = BCSR_BOARD_SD0_WP; \
-                } \
-                board_specific = au_readl((unsigned long)(&bcsr->specific)); \
-                if (!(board_specific & mmc_wp)) {/* low means card present */ \
-                        *(int *)(_res_) = 1; \
-                } else { \
-                        *(int *)(_res_) = 0; \
-                } \
-        } while (0)
-
-/*
- * Apply power to card slot(s).
- */
-#define mmc_power_on(_n_) \
-        do { \
-                BCSR * const bcsr = (BCSR *)0xAE000000; \
-                unsigned long mmc_pwr, mmc_wp, board_specific; \
-                if ((_n_)) { \
-                        mmc_pwr = BCSR_BOARD_SD1_PWR; \
-                        mmc_wp  = BCSR_BOARD_SD1_WP; \
-                } else { \
-                        mmc_pwr = BCSR_BOARD_SD0_PWR; \
-                        mmc_wp  = BCSR_BOARD_SD0_WP; \
-                } \
-                board_specific = au_readl((unsigned long)(&bcsr->specific)); \
-                if (!(board_specific & mmc_wp)) {/* low means card present */ \
-                        board_specific |= mmc_pwr; \
-                        au_writel(board_specific, (int)(&bcsr->specific)); \
-                        au_sync(); \
-                } \
-        } while (0)
-
-
-/*
  * NAND defines
  *
  * Timing values as described in databook, * ns value stripped of the
diff --git a/include/asm-mips/mach-mips/cpu-feature-overrides.h b/include/asm-mips/mach-malta/cpu-feature-overrides.h
index 7f3e3f9bd23a..7f3e3f9bd23a 100644
--- a/include/asm-mips/mach-mips/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-malta/cpu-feature-overrides.h
diff --git a/include/asm-mips/mach-mips/irq.h b/include/asm-mips/mach-malta/irq.h
index 9b9da26683c2..9b9da26683c2 100644
--- a/include/asm-mips/mach-mips/irq.h
+++ b/include/asm-mips/mach-malta/irq.h
diff --git a/include/asm-mips/mach-mips/kernel-entry-init.h b/include/asm-mips/mach-malta/kernel-entry-init.h
index 0b793e7bf67e..0b793e7bf67e 100644
--- a/include/asm-mips/mach-mips/kernel-entry-init.h
+++ b/include/asm-mips/mach-malta/kernel-entry-init.h
diff --git a/include/asm-mips/mach-mips/mach-gt64120.h b/include/asm-mips/mach-malta/mach-gt64120.h
index 0f863148f3b6..0f863148f3b6 100644
--- a/include/asm-mips/mach-mips/mach-gt64120.h
+++ b/include/asm-mips/mach-malta/mach-gt64120.h
diff --git a/include/asm-mips/mach-mips/mc146818rtc.h b/include/asm-mips/mach-malta/mc146818rtc.h
index ea612f37f614..ea612f37f614 100644
--- a/include/asm-mips/mach-mips/mc146818rtc.h
+++ b/include/asm-mips/mach-malta/mc146818rtc.h
diff --git a/include/asm-mips/mach-mips/war.h b/include/asm-mips/mach-malta/war.h
index 7c6931d5f45f..7c6931d5f45f 100644
--- a/include/asm-mips/mach-mips/war.h
+++ b/include/asm-mips/mach-malta/war.h
diff --git a/include/asm-mips/mach-jmr3927/ioremap.h b/include/asm-mips/mach-tx39xx/ioremap.h
index 29989ff10d66..93c6c04ffda3 100644
--- a/include/asm-mips/mach-jmr3927/ioremap.h
+++ b/include/asm-mips/mach-tx39xx/ioremap.h
@@ -1,13 +1,13 @@
 /*
- *      include/asm-mips/mach-jmr3927/ioremap.h
+ *      include/asm-mips/mach-tx39xx/ioremap.h
  *
  *      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_MACH_JMR3927_IOREMAP_H
-#define __ASM_MACH_JMR3927_IOREMAP_H
+#ifndef __ASM_MACH_TX39XX_IOREMAP_H
+#define __ASM_MACH_TX39XX_IOREMAP_H
 
 #include <linux/types.h>
 
@@ -35,4 +35,4 @@ static inline int plat_iounmap(const volatile void __iomem *addr)
         return (unsigned long)addr >= TXX9_DIRECTMAP_BASE;
 }
 
-#endif /* __ASM_MACH_JMR3927_IOREMAP_H */
+#endif /* __ASM_MACH_TX39XX_IOREMAP_H */
diff --git a/include/asm-mips/mach-jmr3927/mangle-port.h b/include/asm-mips/mach-tx39xx/mangle-port.h
index 11bffcd1043b..ef0b502fd8b7 100644
--- a/include/asm-mips/mach-jmr3927/mangle-port.h
+++ b/include/asm-mips/mach-tx39xx/mangle-port.h
@@ -1,7 +1,12 @@
-#ifndef __ASM_MACH_JMR3927_MANGLE_PORT_H
-#define __ASM_MACH_JMR3927_MANGLE_PORT_H
+#ifndef __ASM_MACH_TX39XX_MANGLE_PORT_H
+#define __ASM_MACH_TX39XX_MANGLE_PORT_H
 
-extern unsigned long __swizzle_addr_b(unsigned long port);
+#if defined(CONFIG_TOSHIBA_JMR3927)
+extern unsigned long (*__swizzle_addr_b)(unsigned long port);
+#define NEEDS_TXX9_SWIZZLE_ADDR_B
+#else
+#define __swizzle_addr_b(port)  (port)
+#endif
 #define __swizzle_addr_w(port)  (port)
 #define __swizzle_addr_l(port)  (port)
 #define __swizzle_addr_q(port)  (port)
@@ -15,4 +20,4 @@ extern unsigned long __swizzle_addr_b(unsigned long port);
 #define ioswabq(a, x)           le64_to_cpu(x)
 #define __mem_ioswabq(a, x)     (x)
 
-#endif /* __ASM_MACH_JMR3927_MANGLE_PORT_H */
+#endif /* __ASM_MACH_TX39XX_MANGLE_PORT_H */
diff --git a/include/asm-mips/mach-jmr3927/war.h b/include/asm-mips/mach-tx39xx/war.h
index 1ff55fb3fbcb..433814616359 100644
--- a/include/asm-mips/mach-jmr3927/war.h
+++ b/include/asm-mips/mach-tx39xx/war.h
@@ -5,8 +5,8 @@
  *
  * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
  */
-#ifndef __ASM_MIPS_MACH_JMR3927_WAR_H
-#define __ASM_MIPS_MACH_JMR3927_WAR_H
+#ifndef __ASM_MIPS_MACH_TX39XX_WAR_H
+#define __ASM_MIPS_MACH_TX39XX_WAR_H
 
 #define R4600_V1_INDEX_ICACHEOP_WAR     0
 #define R4600_V1_HIT_CACHEOP_WAR        0
@@ -22,4 +22,4 @@
 #define R10000_LLSC_WAR                 0
 #define MIPS34K_MISSED_ITLB_WAR         0
 
-#endif /* __ASM_MIPS_MACH_JMR3927_WAR_H */
+#endif /* __ASM_MIPS_MACH_TX39XX_WAR_H */
diff --git a/include/asm-mips/mach-vr41xx/irq.h b/include/asm-mips/mach-vr41xx/irq.h
index 848812296052..862058d3f81b 100644
--- a/include/asm-mips/mach-vr41xx/irq.h
+++ b/include/asm-mips/mach-vr41xx/irq.h
@@ -2,9 +2,6 @@
 #define __ASM_MACH_VR41XX_IRQ_H
 
 #include <asm/vr41xx/irq.h> /* for MIPS_CPU_IRQ_BASE */
-#ifdef CONFIG_NEC_CMBVR4133
-#include <asm/vr41xx/cmbvr4133.h> /* for I8259A_IRQ_BASE */
-#endif
 
 #include_next <irq.h>
 
diff --git a/include/asm-mips/mips-boards/generic.h b/include/asm-mips/mips-boards/generic.h
index 33407bee4e73..7f0b034dd9a5 100644
--- a/include/asm-mips/mips-boards/generic.h
+++ b/include/asm-mips/mips-boards/generic.h
@@ -27,12 +27,8 @@
 /*
  * Display register base.
  */
-#ifdef CONFIG_MIPS_SEAD
-#define ASCII_DISPLAY_POS_BASE     0x1f0005c0
-#else
 #define ASCII_DISPLAY_WORD_BASE    0x1f000410
 #define ASCII_DISPLAY_POS_BASE     0x1f000418
-#endif
 
 
 /*
@@ -44,13 +40,8 @@
 /*
  * Reset register.
  */
-#ifdef CONFIG_MIPS_SEAD
-#define SOFTRES_REG       0x1e800050
-#define GORESET           0x4d
-#else
 #define SOFTRES_REG       0x1f000500
 #define GORESET           0x42
-#endif
 
 /*
  * Revision register.
diff --git a/include/asm-mips/namei.h b/include/asm-mips/namei.h
index c94d12d1f868..a6605a752469 100644
--- a/include/asm-mips/namei.h
+++ b/include/asm-mips/namei.h
@@ -1,26 +1,11 @@
 #ifndef _ASM_NAMEI_H
 #define _ASM_NAMEI_H
 
-#include <linux/personality.h>
-#include <linux/stddef.h>
+/*
+ * This dummy routine maybe changed to something useful
+ * for /usr/gnemul/ emulation stuff.
+ */
 
-#define IRIX_EMUL       "/usr/gnemul/irix/"
-#define RISCOS_EMUL     "/usr/gnemul/riscos/"
-
-static inline char *__emul_prefix(void)
-{
-        switch (current->personality) {
-        case PER_IRIX32:
-        case PER_IRIXN32:
-        case PER_IRIX64:
-                return IRIX_EMUL;
-
-        case PER_RISCOS:
-                return RISCOS_EMUL;
-
-        default:
-                return NULL;
-        }
-}
+#define __emul_prefix() NULL
 
 #endif /* _ASM_NAMEI_H */
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 301ff2f28012..d3be83436070 100644
--- a/include/asm-mips/pci.h
+++ b/include/asm-mips/pci.h
@@ -172,4 +172,7 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
         return channel ? 15 : 14;
 }
 
+extern int pci_probe_only;
+extern unsigned int pcibios_max_latency;
+
 #endif /* _ASM_PCI_H */
diff --git a/include/asm-mips/prctl.h b/include/asm-mips/prctl.h
deleted file mode 100644
index 8121a9a75bfd..000000000000
--- a/include/asm-mips/prctl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * IRIX prctl interface
- *
- * The IRIX kernel maps a page at PRDA_ADDRESS with the
- * contents of prda and fills it the bits on prda_sys.
- */
-
-#ifndef __PRCTL_H__
-#define __PRCTL_H__
-
-#define PRDA_ADDRESS 0x200000L
-#define PRDA ((struct prda *) PRDA_ADDRESS)
-
-struct prda_sys {
-        pid_t t_pid;
-        u32   t_hint;
-        u32   t_dlactseq;
-        u32   t_fpflags;
-        u32   t_prid;           /* processor type, $prid CP0 register */
-        u32   t_dlendseq;
-        u64   t_unused1[5];
-        pid_t t_rpid;
-        s32   t_resched;
-        u32   t_unused[8];
-        u32   t_cpu;            /* current/last cpu */
-
-        /* FIXME: The signal information, not supported by Linux now */
-        u32   t_flags;          /* if true, then the sigprocmask is in userspace */
-        u32   t_sigprocmask [1]; /* the sigprocmask */
-};
-
-struct prda {
-        char fill [0xe00];
-        struct prda_sys prda_sys;
-};
-
-#define t_sys           prda_sys
-
-ptrdiff_t prctl(int op, int v1, int v2);
-
-#endif
diff --git a/include/asm-mips/setup.h b/include/asm-mips/setup.h
index 70009a902639..883f59bfa097 100644
--- a/include/asm-mips/setup.h
+++ b/include/asm-mips/setup.h
@@ -3,4 +3,6 @@
 
 #define COMMAND_LINE_SIZE       256
 
+extern void setup_early_printk(void);
+
 #endif /* __SETUP_H */
diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h
index 7a28989f7ee3..bee5153aca48 100644
--- a/include/asm-mips/signal.h
+++ b/include/asm-mips/signal.h
@@ -119,9 +119,6 @@ struct sigaction {
 
 struct k_sigaction {
         struct sigaction sa;
-#ifdef CONFIG_BINFMT_IRIX
-        void            (*sa_restorer)(void);
-#endif
 };
 
 /* IRIX compatible stack_t  */
diff --git a/include/asm-mips/smp.h b/include/asm-mips/smp.h
index 84fef1aeec0c..0ff5b523ea77 100644
--- a/include/asm-mips/smp.h
+++ b/include/asm-mips/smp.h
@@ -35,16 +35,6 @@ extern int __cpu_logical_map[NR_CPUS];
 
 #define NO_PROC_ID      (-1)
 
-struct call_data_struct {
-        void            (*func)(void *);
-        void            *info;
-        atomic_t        started;
-        atomic_t        finished;
-        int             wait;
-};
-
-extern struct call_data_struct *call_data;
-
 #define SMP_RESCHEDULE_YOURSELF 0x1     /* XXX braindead */
 #define SMP_CALL_FUNCTION       0x2
 
@@ -67,4 +57,7 @@ static inline void smp_send_reschedule(int cpu)
 
 extern asmlinkage void smp_call_function_interrupt(void);
 
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi(cpumask_t mask);
+
 #endif /* __ASM_SMP_H */
diff --git a/include/asm-mips/traps.h b/include/asm-mips/traps.h
index e5dbde625ec2..90ff2f497c50 100644
--- a/include/asm-mips/traps.h
+++ b/include/asm-mips/traps.h
@@ -24,6 +24,5 @@ extern int (*board_be_handler)(struct pt_regs *regs, int is_fixup);
 extern void (*board_nmi_handler_setup)(void);
 extern void (*board_ejtag_handler_setup)(void);
 extern void (*board_bind_eic_interrupt)(int irq, int regset);
-extern void (*board_watchpoint_handler)(struct pt_regs *regs);
 
 #endif /* _ASM_TRAPS_H */
diff --git a/include/asm-mips/tx4927/tx4927.h b/include/asm-mips/tx4927/tx4927.h
deleted file mode 100644
index 193e80a17c12..000000000000
--- a/include/asm-mips/tx4927/tx4927.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Author: MontaVista Software, Inc.
- *         source@mvista.com
- *
- * Copyright 2001-2006 MontaVista Software Inc.
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation; either version 2 of the License, or (at your
- *  option) any later version.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __ASM_TX4927_TX4927_H
-#define __ASM_TX4927_TX4927_H
-
-#include <asm/txx9irq.h>
-
-#define TX4927_IRQ_CP0_BEG  MIPS_CPU_IRQ_BASE
-#define TX4927_IRQ_CP0_END  (MIPS_CPU_IRQ_BASE + 8 - 1)
-
-#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)
-#define TX4927_IRQ_USER1            (TX4927_IRQ_CP0_BEG+1)
-#define TX4927_IRQ_NEST_PIC_ON_CP0  (TX4927_IRQ_CP0_BEG+2)
-#define TX4927_IRQ_CPU_TIMER        (TX4927_IRQ_CP0_BEG+7)
-
-#define TX4927_IRQ_NEST_EXT_ON_PIC  (TX4927_IRQ_PIC_BEG+3)
-
-#endif /* __ASM_TX4927_TX4927_H */
diff --git a/include/asm-mips/tx4927/tx4927_pci.h b/include/asm-mips/tx4927/tx4927_pci.h
deleted file mode 100644
index 0be77df70f2b..000000000000
--- a/include/asm-mips/tx4927/tx4927_pci.h
+++ /dev/null
@@ -1,268 +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) 2000-2001 Toshiba Corporation
- */
-#ifndef __ASM_TX4927_TX4927_PCI_H
-#define __ASM_TX4927_TX4927_PCI_H
-
-#define TX4927_CCFG_TOE 0x00004000
-#define TX4927_CCFG_WR  0x00008000
-#define TX4927_CCFG_TINTDIS     0x01000000
-
-#define TX4927_PCIMEM      0x08000000
-#define TX4927_PCIMEM_SIZE 0x08000000
-#define TX4927_PCIIO       0x16000000
-#define TX4927_PCIIO_SIZE  0x01000000
-
-#define TX4927_SDRAMC_REG       0xff1f8000
-#define TX4927_EBUSC_REG        0xff1f9000
-#define TX4927_PCIC_REG         0xff1fd000
-#define TX4927_CCFG_REG         0xff1fe000
-#define TX4927_IRC_REG          0xff1ff600
-#define TX4927_NR_TMR   3
-#define TX4927_TMR_REG(ch)      (0xff1ff000 + (ch) * 0x100)
-#define TX4927_CE3      0x17f00000      /* 1M */
-#define TX4927_PCIRESET_ADDR    0xbc00f006
-#define TX4927_PCI_CLK_ADDR     (KSEG1 + TX4927_CE3 + 0x00040020)
-
-#define TX4927_IMSTAT_ADDR(n)   (KSEG1 + TX4927_CE3 + 0x0004001a + (n))
-#define tx4927_imstat_ptr(n)    \
-        ((volatile unsigned char *)TX4927_IMSTAT_ADDR(n))
-
-/* bits for ISTAT3/IMASK3/IMSTAT3 */
-#define TX4927_INT3B_PCID       0
-#define TX4927_INT3B_PCIC       1
-#define TX4927_INT3B_PCIB       2
-#define TX4927_INT3B_PCIA       3
-#define TX4927_INT3F_PCID       (1 << TX4927_INT3B_PCID)
-#define TX4927_INT3F_PCIC       (1 << TX4927_INT3B_PCIC)
-#define TX4927_INT3F_PCIB       (1 << TX4927_INT3B_PCIB)
-#define TX4927_INT3F_PCIA       (1 << TX4927_INT3B_PCIA)
-
-/* bits for PCI_CLK (S6) */
-#define TX4927_PCI_CLK_HOST     0x80
-#define TX4927_PCI_CLK_MASK     (0x0f << 3)
-#define TX4927_PCI_CLK_33       (0x01 << 3)
-#define TX4927_PCI_CLK_25       (0x04 << 3)
-#define TX4927_PCI_CLK_66       (0x09 << 3)
-#define TX4927_PCI_CLK_50       (0x0c << 3)
-#define TX4927_PCI_CLK_ACK      0x04
-#define TX4927_PCI_CLK_ACE      0x02
-#define TX4927_PCI_CLK_ENDIAN   0x01
-#define TX4927_NR_IRQ_LOCAL     TX4927_IRQ_PIC_BEG
-#define TX4927_NR_IRQ_IRC       32      /* On-Chip IRC */
-
-#define TX4927_IR_PCIC          16
-#define TX4927_IR_PCIERR        22
-#define TX4927_IR_PCIPMA        23
-#define TX4927_IRQ_IRC_PCIC     (TX4927_NR_IRQ_LOCAL + TX4927_IR_PCIC)
-#define TX4927_IRQ_IRC_PCIERR   (TX4927_NR_IRQ_LOCAL + TX4927_IR_PCIERR)
-#define TX4927_IRQ_IOC1         (TX4927_NR_IRQ_LOCAL + TX4927_NR_IRQ_IRC)
-#define TX4927_IRQ_IOC_PCID     (TX4927_IRQ_IOC1 + TX4927_INT3B_PCID)
-#define TX4927_IRQ_IOC_PCIC     (TX4927_IRQ_IOC1 + TX4927_INT3B_PCIC)
-#define TX4927_IRQ_IOC_PCIB     (TX4927_IRQ_IOC1 + TX4927_INT3B_PCIB)
-#define TX4927_IRQ_IOC_PCIA     (TX4927_IRQ_IOC1 + TX4927_INT3B_PCIA)
-
-#ifdef _LANGUAGE_ASSEMBLY
-#define _CONST64(c)     c
-#else
-#define _CONST64(c)     c##ull
-
-#include <asm/byteorder.h>
-
-#define tx4927_pcireset_ptr     \
-        ((volatile unsigned char *)TX4927_PCIRESET_ADDR)
-#define tx4927_pci_clk_ptr      \
-        ((volatile unsigned char *)TX4927_PCI_CLK_ADDR)
-
-struct tx4927_sdramc_reg {
-        volatile unsigned long long cr[4];
-        volatile unsigned long long unused0[4];
-        volatile unsigned long long tr;
-        volatile unsigned long long unused1[2];
-        volatile unsigned long long cmd;
-};
-
-struct tx4927_ebusc_reg {
-        volatile unsigned long long cr[8];
-};
-
-struct tx4927_ccfg_reg {
-        volatile unsigned long long ccfg;
-        volatile unsigned long long crir;
-        volatile unsigned long long pcfg;
-        volatile unsigned long long tear;
-        volatile unsigned long long clkctr;
-        volatile unsigned long long unused0;
-        volatile unsigned long long garbc;
-        volatile unsigned long long unused1;
-        volatile unsigned long long unused2;
-        volatile unsigned long long ramp;
-};
-
-struct tx4927_pcic_reg {
-        volatile unsigned long pciid;
-        volatile unsigned long pcistatus;
-        volatile unsigned long pciccrev;
-        volatile unsigned long pcicfg1;
-        volatile unsigned long p2gm0plbase;             /* +10 */
-        volatile unsigned long p2gm0pubase;
-        volatile unsigned long p2gm1plbase;
-        volatile unsigned long p2gm1pubase;
-        volatile unsigned long p2gm2pbase;              /* +20 */
-        volatile unsigned long p2giopbase;
-        volatile unsigned long unused0;
-        volatile unsigned long pcisid;
-        volatile unsigned long unused1;         /* +30 */
-        volatile unsigned long pcicapptr;
-        volatile unsigned long unused2;
-        volatile unsigned long pcicfg2;
-        volatile unsigned long g2ptocnt;                /* +40 */
-        volatile unsigned long unused3[15];
-        volatile unsigned long g2pstatus;               /* +80 */
-        volatile unsigned long g2pmask;
-        volatile unsigned long pcisstatus;
-        volatile unsigned long pcimask;
-        volatile unsigned long p2gcfg;          /* +90 */
-        volatile unsigned long p2gstatus;
-        volatile unsigned long p2gmask;
-        volatile unsigned long p2gccmd;
-        volatile unsigned long unused4[24];             /* +a0 */
-        volatile unsigned long pbareqport;              /* +100 */
-        volatile unsigned long pbacfg;
-        volatile unsigned long pbastatus;
-        volatile unsigned long pbamask;
-        volatile unsigned long pbabm;           /* +110 */
-        volatile unsigned long pbacreq;
-        volatile unsigned long pbacgnt;
-        volatile unsigned long pbacstate;
-        volatile unsigned long long g2pmgbase[3];               /* +120 */
-        volatile unsigned long long g2piogbase;
-        volatile unsigned long g2pmmask[3];             /* +140 */
-        volatile unsigned long g2piomask;
-        volatile unsigned long long g2pmpbase[3];               /* +150 */
-        volatile unsigned long long g2piopbase;
-        volatile unsigned long pciccfg;         /* +170 */
-        volatile unsigned long pcicstatus;
-        volatile unsigned long pcicmask;
-        volatile unsigned long unused5;
-        volatile unsigned long long p2gmgbase[3];               /* +180 */
-        volatile unsigned long long p2giogbase;
-        volatile unsigned long g2pcfgadrs;              /* +1a0 */
-        volatile unsigned long g2pcfgdata;
-        volatile unsigned long unused6[8];
-        volatile unsigned long g2pintack;
-        volatile unsigned long g2pspc;
-        volatile unsigned long unused7[12];             /* +1d0 */
-        volatile unsigned long long pdmca;              /* +200 */
-        volatile unsigned long long pdmga;
-        volatile unsigned long long pdmpa;
-        volatile unsigned long long pdmcut;
-        volatile unsigned long long pdmcnt;             /* +220 */
-        volatile unsigned long long pdmsts;
-        volatile unsigned long long unused8[2];
-        volatile unsigned long long pdmdb[4];           /* +240 */
-        volatile unsigned long long pdmtdh;             /* +260 */
-        volatile unsigned long long pdmdms;
-};
-
-#endif /* _LANGUAGE_ASSEMBLY */
-
-/*
- * PCIC
- */
-
-/* bits for G2PSTATUS/G2PMASK */
-#define TX4927_PCIC_G2PSTATUS_ALL       0x00000003
-#define TX4927_PCIC_G2PSTATUS_TTOE      0x00000002
-#define TX4927_PCIC_G2PSTATUS_RTOE      0x00000001
-
-/* bits for PCIMASK (see also PCI_STATUS_XXX in linux/pci.h */
-#define TX4927_PCIC_PCISTATUS_ALL       0x0000f900
-
-/* bits for PBACFG */
-#define TX4927_PCIC_PBACFG_RPBA 0x00000004
-#define TX4927_PCIC_PBACFG_PBAEN        0x00000002
-#define TX4927_PCIC_PBACFG_BMCEN        0x00000001
-
-/* bits for G2PMnGBASE */
-#define TX4927_PCIC_G2PMnGBASE_BSDIS    _CONST64(0x0000002000000000)
-#define TX4927_PCIC_G2PMnGBASE_ECHG     _CONST64(0x0000001000000000)
-
-/* bits for G2PIOGBASE */
-#define TX4927_PCIC_G2PIOGBASE_BSDIS    _CONST64(0x0000002000000000)
-#define TX4927_PCIC_G2PIOGBASE_ECHG     _CONST64(0x0000001000000000)
-
-/* bits for PCICSTATUS/PCICMASK */
-#define TX4927_PCIC_PCICSTATUS_ALL      0x000007dc
-
-/* bits for PCICCFG */
-#define TX4927_PCIC_PCICCFG_LBWC_MASK   0x0fff0000
-#define TX4927_PCIC_PCICCFG_HRST        0x00000800
-#define TX4927_PCIC_PCICCFG_SRST        0x00000400
-#define TX4927_PCIC_PCICCFG_IRBER       0x00000200
-#define TX4927_PCIC_PCICCFG_IMSE0       0x00000100
-#define TX4927_PCIC_PCICCFG_IMSE1       0x00000080
-#define TX4927_PCIC_PCICCFG_IMSE2       0x00000040
-#define TX4927_PCIC_PCICCFG_IISE        0x00000020
-#define TX4927_PCIC_PCICCFG_ATR 0x00000010
-#define TX4927_PCIC_PCICCFG_ICAE        0x00000008
-
-/* bits for P2GMnGBASE */
-#define TX4927_PCIC_P2GMnGBASE_TMEMEN   _CONST64(0x0000004000000000)
-#define TX4927_PCIC_P2GMnGBASE_TBSDIS   _CONST64(0x0000002000000000)
-#define TX4927_PCIC_P2GMnGBASE_TECHG    _CONST64(0x0000001000000000)
-
-/* bits for P2GIOGBASE */
-#define TX4927_PCIC_P2GIOGBASE_TIOEN    _CONST64(0x0000004000000000)
-#define TX4927_PCIC_P2GIOGBASE_TBSDIS   _CONST64(0x0000002000000000)
-#define TX4927_PCIC_P2GIOGBASE_TECHG    _CONST64(0x0000001000000000)
-
-#define TX4927_PCIC_IDSEL_AD_TO_SLOT(ad)        ((ad) - 11)
-#define TX4927_PCIC_MAX_DEVNU   TX4927_PCIC_IDSEL_AD_TO_SLOT(32)
-
-/*
- * CCFG
- */
-/* CCFG : Chip Configuration */
-#define TX4927_CCFG_PCI66       0x00800000
-#define TX4927_CCFG_PCIMIDE     0x00400000
-#define TX4927_CCFG_PCIXARB     0x00002000
-#define TX4927_CCFG_PCIDIVMODE_MASK     0x00001800
-#define TX4927_CCFG_PCIDIVMODE_2_5      0x00000000
-#define TX4927_CCFG_PCIDIVMODE_3        0x00000800
-#define TX4927_CCFG_PCIDIVMODE_5        0x00001000
-#define TX4927_CCFG_PCIDIVMODE_6        0x00001800
-
-#define TX4937_CCFG_PCIDIVMODE_MASK     0x00001c00
-#define TX4937_CCFG_PCIDIVMODE_8        0x00000000
-#define TX4937_CCFG_PCIDIVMODE_4        0x00000400
-#define TX4937_CCFG_PCIDIVMODE_9        0x00000800
-#define TX4937_CCFG_PCIDIVMODE_4_5      0x00000c00
-#define TX4937_CCFG_PCIDIVMODE_10       0x00001000
-#define TX4937_CCFG_PCIDIVMODE_5        0x00001400
-#define TX4937_CCFG_PCIDIVMODE_11       0x00001800
-#define TX4937_CCFG_PCIDIVMODE_5_5      0x00001c00
-
-/* PCFG : Pin Configuration */
-#define TX4927_PCFG_PCICLKEN_ALL        0x003f0000
-#define TX4927_PCFG_PCICLKEN(ch)        (0x00010000<<(ch))
-
-/* CLKCTR : Clock Control */
-#define TX4927_CLKCTR_PCICKD    0x00400000
-#define TX4927_CLKCTR_PCIRST    0x00000040
-
-
-#ifndef _LANGUAGE_ASSEMBLY
-
-#define tx4927_sdramcptr        ((struct tx4927_sdramc_reg *)TX4927_SDRAMC_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)
-
-#endif /* _LANGUAGE_ASSEMBLY */
-
-#endif /* __ASM_TX4927_TX4927_PCI_H */
diff --git a/include/asm-mips/txx9/generic.h b/include/asm-mips/txx9/generic.h
new file mode 100644
index 000000000000..d8756660523d
--- /dev/null
+++ b/include/asm-mips/txx9/generic.h
@@ -0,0 +1,41 @@
+/*
+ * linux/include/asm-mips/txx9/generic.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.
+ */
+#ifndef __ASM_TXX9_GENERIC_H
+#define __ASM_TXX9_GENERIC_H
+
+#include <linux/init.h>
+#include <linux/ioport.h>       /* for struct resource */
+
+extern struct resource txx9_ce_res[];
+extern char txx9_pcode_str[8];
+void txx9_reg_res_init(unsigned int pcode, unsigned long base,
+                       unsigned long size);
+
+extern unsigned int txx9_master_clock;
+extern unsigned int txx9_cpu_clock;
+extern unsigned int txx9_gbus_clock;
+
+struct pci_dev;
+struct txx9_board_vec {
+        const char *system;
+        void (*prom_init)(void);
+        void (*mem_setup)(void);
+        void (*irq_setup)(void);
+        void (*time_init)(void);
+        void (*arch_init)(void);
+        void (*device_init)(void);
+#ifdef CONFIG_PCI
+        int (*pci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
+#endif
+};
+extern struct txx9_board_vec *txx9_board_vec;
+extern int (*txx9_irq_dispatch)(int pending);
+void prom_init_cmdline(void);
+char *prom_getcmdline(void);
+
+#endif /* __ASM_TXX9_GENERIC_H */
diff --git a/include/asm-mips/jmr3927/jmr3927.h b/include/asm-mips/txx9/jmr3927.h
index a162268f17df..d6eb1b6a54eb 100644
--- a/include/asm-mips/jmr3927/jmr3927.h
+++ b/include/asm-mips/txx9/jmr3927.h
@@ -7,10 +7,10 @@
  *
  * Copyright (C) 2000-2001 Toshiba Corporation
  */
-#ifndef __ASM_TX3927_JMR3927_H
-#define __ASM_TX3927_JMR3927_H
+#ifndef __ASM_TXX9_JMR3927_H
+#define __ASM_TXX9_JMR3927_H
 
-#include <asm/jmr3927/tx3927.h>
+#include <asm/txx9/tx3927.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
 #include <asm/txx9irq.h>
@@ -174,4 +174,9 @@
  *      INT[3:0]
  */
 
-#endif /* __ASM_TX3927_JMR3927_H */
+void jmr3927_prom_init(void);
+void jmr3927_irq_setup(void);
+struct pci_dev;
+int jmr3927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
+
+#endif /* __ASM_TXX9_JMR3927_H */
diff --git a/include/asm-mips/txx9/pci.h b/include/asm-mips/txx9/pci.h
new file mode 100644
index 000000000000..d89a45091e24
--- /dev/null
+++ b/include/asm-mips/txx9/pci.h
@@ -0,0 +1,36 @@
+/*
+ * 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_TXX9_PCI_H
+#define __ASM_TXX9_PCI_H
+
+#include <linux/pci.h>
+
+extern struct pci_controller txx9_primary_pcic;
+struct pci_controller *
+txx9_alloc_pci_controller(struct pci_controller *pcic,
+                          unsigned long mem_base, unsigned long mem_size,
+                          unsigned long io_base, unsigned long io_size);
+
+int txx9_pci66_check(struct pci_controller *hose, int top_bus,
+                        int current_bus);
+extern int txx9_pci_mem_high __initdata;
+
+extern int txx9_pci_option;
+#define TXX9_PCI_OPT_PICMG      0x0002
+#define TXX9_PCI_OPT_CLK_33     0x0008
+#define TXX9_PCI_OPT_CLK_66     0x0010
+#define TXX9_PCI_OPT_CLK_MASK   \
+        (TXX9_PCI_OPT_CLK_33 | TXX9_PCI_OPT_CLK_66)
+#define TXX9_PCI_OPT_CLK_AUTO   TXX9_PCI_OPT_CLK_MASK
+
+enum txx9_pci_err_action {
+        TXX9_PCI_ERR_REPORT,
+        TXX9_PCI_ERR_IGNORE,
+        TXX9_PCI_ERR_PANIC,
+};
+extern enum txx9_pci_err_action txx9_pci_err_action;
+
+#endif /* __ASM_TXX9_PCI_H */
diff --git a/include/asm-mips/tx4927/toshiba_rbtx4927.h b/include/asm-mips/txx9/rbtx4927.h
index b188a659ce02..bf194589216f 100644
--- a/include/asm-mips/tx4927/toshiba_rbtx4927.h
+++ b/include/asm-mips/txx9/rbtx4927.h
@@ -24,18 +24,42 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __ASM_TX4927_TOSHIBA_RBTX4927_H
-#define __ASM_TX4927_TOSHIBA_RBTX4927_H
+#ifndef __ASM_TXX9_RBTX4927_H
+#define __ASM_TXX9_RBTX4927_H
 
-#include <asm/tx4927/tx4927.h>
-#ifdef CONFIG_PCI
-#include <asm/tx4927/tx4927_pci.h>
-#endif
+#include <asm/txx9/tx4927.h>
+
+#define RBTX4927_PCIMEM         0x08000000
+#define RBTX4927_PCIMEM_SIZE    0x08000000
+#define RBTX4927_PCIIO          0x16000000
+#define RBTX4927_PCIIO_SIZE     0x01000000
+
+#define rbtx4927_pcireset_addr  ((__u8 __iomem *)0xbc00f006UL)
+
+/* bits for ISTAT/IMASK/IMSTAT */
+#define RBTX4927_INTB_PCID      0
+#define RBTX4927_INTB_PCIC      1
+#define RBTX4927_INTB_PCIB      2
+#define RBTX4927_INTB_PCIA      3
+#define RBTX4927_INTF_PCID      (1 << RBTX4927_INTB_PCID)
+#define RBTX4927_INTF_PCIC      (1 << RBTX4927_INTB_PCIC)
+#define RBTX4927_INTF_PCIB      (1 << RBTX4927_INTB_PCIB)
+#define RBTX4927_INTF_PCIA      (1 << RBTX4927_INTB_PCIA)
+
+#define RBTX4927_NR_IRQ_IOC     8       /* IOC */
+
+#define RBTX4927_IRQ_IOC        (TXX9_IRQ_BASE + TX4927_NUM_IR)
+#define RBTX4927_IRQ_IOC_PCID   (RBTX4927_IRQ_IOC + RBTX4927_INTB_PCID)
+#define RBTX4927_IRQ_IOC_PCIC   (RBTX4927_IRQ_IOC + RBTX4927_INTB_PCIC)
+#define RBTX4927_IRQ_IOC_PCIB   (RBTX4927_IRQ_IOC + RBTX4927_INTB_PCIB)
+#define RBTX4927_IRQ_IOC_PCIA   (RBTX4927_IRQ_IOC + RBTX4927_INTB_PCIA)
+
+#define RBTX4927_IRQ_IOCINT     (TXX9_IRQ_BASE + TX4927_IR_INT(1))
 
 #ifdef CONFIG_PCI
-#define TBTX4927_ISA_IO_OFFSET TX4927_PCIIO
+#define RBTX4927_ISA_IO_OFFSET RBTX4927_PCIIO
 #else
-#define TBTX4927_ISA_IO_OFFSET 0
+#define RBTX4927_ISA_IO_OFFSET 0
 #endif
 
 #define RBTX4927_SW_RESET_DO         (void __iomem *)0xbc00f000UL
@@ -44,10 +68,12 @@
 #define RBTX4927_SW_RESET_ENABLE     (void __iomem *)0xbc00f002UL
 #define RBTX4927_SW_RESET_ENABLE_SET            0x01
 
+#define RBTX4927_RTL_8019_BASE (0x1c020280 - RBTX4927_ISA_IO_OFFSET)
+#define RBTX4927_RTL_8019_IRQ  (TXX9_IRQ_BASE + TX4927_IR_INT(3))
 
-#define RBTX4927_RTL_8019_BASE (0x1c020280-TBTX4927_ISA_IO_OFFSET)
-#define RBTX4927_RTL_8019_IRQ  (TX4927_IRQ_PIC_BEG + 5)
-
-int toshiba_rbtx4927_irq_nested(int sw_irq);
+void rbtx4927_prom_init(void);
+void rbtx4927_irq_setup(void);
+struct pci_dev;
+int rbtx4927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
 
-#endif /* __ASM_TX4927_TOSHIBA_RBTX4927_H */
+#endif /* __ASM_TXX9_RBTX4927_H */
diff --git a/include/asm-mips/tx4938/rbtx4938.h b/include/asm-mips/txx9/rbtx4938.h
index dfed7beb533f..2f5d5e705a41 100644
--- a/include/asm-mips/tx4938/rbtx4938.h
+++ b/include/asm-mips/txx9/rbtx4938.h
@@ -1,5 +1,4 @@
 /*
- * linux/include/asm-mips/tx4938/rbtx4938.h
  * Definitions for TX4937/TX4938
  *
  * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
@@ -9,12 +8,12 @@
  *
  * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
  */
-#ifndef __ASM_TX_BOARDS_RBTX4938_H
-#define __ASM_TX_BOARDS_RBTX4938_H
+#ifndef __ASM_TXX9_RBTX4938_H
+#define __ASM_TXX9_RBTX4938_H
 
 #include <asm/addrspace.h>
-#include <asm/tx4938/tx4938.h>
 #include <asm/txx9irq.h>
+#include <asm/txx9/tx4938.h>
 
 /* CS */
 #define RBTX4938_CE0    0x1c000000      /* 64M */
@@ -102,35 +101,12 @@
  * that particular IRQ on an RBTX4938 machine.  Add new 'spaces' as new
  * IRQ hardware is supported.
  */
-#define RBTX4938_NR_IRQ_LOCAL   8
-#define RBTX4938_NR_IRQ_IRC     32      /* On-Chip IRC */
 #define RBTX4938_NR_IRQ_IOC     8
 
-#define TX4938_IRQ_CP0_BEG  MIPS_CPU_IRQ_BASE
-#define TX4938_IRQ_CP0_END  (MIPS_CPU_IRQ_BASE + 8 - 1)
-
-#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)
-#define TX4938_IRQ_USER1            (TX4938_IRQ_CP0_BEG+1)
-#define TX4938_IRQ_CPU_TIMER        (TX4938_IRQ_CP0_BEG+7)
-
-#define TOSHIBA_RBTX4938_IRQ_IOC_RAW_BEG   0
-#define TOSHIBA_RBTX4938_IRQ_IOC_RAW_END   7
-
-#define TOSHIBA_RBTX4938_IRQ_IOC_BEG  ((TX4938_IRQ_PIC_END+1)+TOSHIBA_RBTX4938_IRQ_IOC_RAW_BEG) /* 56 */
-#define TOSHIBA_RBTX4938_IRQ_IOC_END  ((TX4938_IRQ_PIC_END+1)+TOSHIBA_RBTX4938_IRQ_IOC_RAW_END) /* 63 */
-#define RBTX4938_IRQ_LOCAL      TX4938_IRQ_CP0_BEG
-#define RBTX4938_IRQ_IRC        (RBTX4938_IRQ_LOCAL + RBTX4938_NR_IRQ_LOCAL)
-#define RBTX4938_IRQ_IOC        (RBTX4938_IRQ_IRC + RBTX4938_NR_IRQ_IRC)
+#define RBTX4938_IRQ_IRC        TXX9_IRQ_BASE
+#define RBTX4938_IRQ_IOC        (TXX9_IRQ_BASE + TX4938_NUM_IR)
 #define RBTX4938_IRQ_END        (RBTX4938_IRQ_IOC + RBTX4938_NR_IRQ_IOC)
 
-#define RBTX4938_IRQ_LOCAL_SOFT0        (RBTX4938_IRQ_LOCAL + RBTX4938_SOFT_INT0)
-#define RBTX4938_IRQ_LOCAL_SOFT1        (RBTX4938_IRQ_LOCAL + RBTX4938_SOFT_INT1)
-#define RBTX4938_IRQ_LOCAL_IRC  (RBTX4938_IRQ_LOCAL + RBTX4938_IRC_INT)
-#define RBTX4938_IRQ_LOCAL_TIMER        (RBTX4938_IRQ_LOCAL + RBTX4938_TIMER_INT)
 #define RBTX4938_IRQ_IRC_ECCERR (RBTX4938_IRQ_IRC + TX4938_IR_ECCERR)
 #define RBTX4938_IRQ_IRC_WTOERR (RBTX4938_IRQ_IRC + TX4938_IR_WTOERR)
 #define RBTX4938_IRQ_IRC_INT(n) (RBTX4938_IRQ_IRC + TX4938_IR_INT(n))
@@ -158,11 +134,16 @@
 
 
 /* IOC (PCI, etc) */
-#define RBTX4938_IRQ_IOCINT     (TX4938_IRQ_NEST_EXT_ON_PIC)
+#define RBTX4938_IRQ_IOCINT     (TXX9_IRQ_BASE + TX4938_IR_INT(0))
 /* Onboard 10M Ether */
-#define RBTX4938_IRQ_ETHER      (TX4938_IRQ_NEST_EXT_ON_PIC + 1)
+#define RBTX4938_IRQ_ETHER      (TXX9_IRQ_BASE + TX4938_IR_INT(1))
 
 #define RBTX4938_RTL_8019_BASE (RBTX4938_ETHER_ADDR - mips_io_port_base)
 #define RBTX4938_RTL_8019_IRQ  (RBTX4938_IRQ_ETHER)
 
-#endif /* __ASM_TX_BOARDS_RBTX4938_H */
+void rbtx4938_prom_init(void);
+void rbtx4938_irq_setup(void);
+struct pci_dev;
+int rbtx4938_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
+
+#endif /* __ASM_TXX9_RBTX4938_H */
diff --git a/include/asm-mips/tx4927/smsc_fdc37m81x.h b/include/asm-mips/txx9/smsc_fdc37m81x.h
index 5d93bab51254..9375e4fc2289 100644
--- a/include/asm-mips/tx4927/smsc_fdc37m81x.h
+++ b/include/asm-mips/txx9/smsc_fdc37m81x.h
@@ -1,6 +1,4 @@
 /*
- * linux/include/asm-mips/tx4927/smsc_fdc37m81x.h
- *
  * Interface for smsc fdc48m81x Super IO chip
  *
  * Author: MontaVista Software, Inc. source@mvista.com
diff --git a/include/asm-mips/tx4938/spi.h b/include/asm-mips/txx9/spi.h
index 6a60c83e152b..ddfb2a0dc432 100644
--- a/include/asm-mips/tx4938/spi.h
+++ b/include/asm-mips/txx9/spi.h
@@ -1,5 +1,4 @@
 /*
- * linux/include/asm-mips/tx4938/spi.h
  * Definitions for TX4937/TX4938 SPI
  *
  * Copyright (C) 2000-2001 Toshiba Corporation
@@ -11,10 +10,10 @@
  *
  * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
  */
-#ifndef __ASM_TX_BOARDS_TX4938_SPI_H
-#define __ASM_TX_BOARDS_TX4938_SPI_H
+#ifndef __ASM_TXX9_SPI_H
+#define __ASM_TXX9_SPI_H
 
 extern int spi_eeprom_register(int chipid);
 extern int spi_eeprom_read(int chipid, int address, unsigned char *buf, int len);
 
-#endif /* __ASM_TX_BOARDS_TX4938_SPI_H */
+#endif /* __ASM_TXX9_SPI_H */
diff --git a/include/asm-mips/jmr3927/tx3927.h b/include/asm-mips/txx9/tx3927.h
index fb580333c102..ca414c7624e1 100644
--- a/include/asm-mips/jmr3927/tx3927.h
+++ b/include/asm-mips/txx9/tx3927.h
@@ -5,10 +5,10 @@
  *
  * Copyright (C) 2000 Toshiba Corporation
  */
-#ifndef __ASM_TX3927_H
-#define __ASM_TX3927_H
+#ifndef __ASM_TXX9_TX3927_H
+#define __ASM_TXX9_TX3927_H
 
-#include <asm/jmr3927/txx927.h>
+#include <asm/txx9/txx927.h>
 
 #define TX3927_SDRAMC_REG       0xfffe8000
 #define TX3927_ROMC_REG         0xfffe9000
@@ -316,4 +316,8 @@ struct tx3927_ccfg_reg {
 #define tx3927_sioptr(ch)       ((struct txx927_sio_reg *)TX3927_SIO_REG(ch))
 #define tx3927_pioptr           ((struct txx9_pio_reg __iomem *)TX3927_PIO_REG)
 
-#endif /* __ASM_TX3927_H */
+struct pci_controller;
+void __init tx3927_pcic_setup(struct pci_controller *channel,
+                              unsigned long sdram_size, int extarb);
+
+#endif /* __ASM_TXX9_TX3927_H */
diff --git a/include/asm-mips/txx9/tx4927.h b/include/asm-mips/txx9/tx4927.h
new file mode 100644
index 000000000000..46d60afc038b
--- /dev/null
+++ b/include/asm-mips/txx9/tx4927.h
@@ -0,0 +1,219 @@
+/*
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * Copyright 2001-2006 MontaVista Software Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __ASM_TXX9_TX4927_H
+#define __ASM_TXX9_TX4927_H
+
+#include <linux/types.h>
+#include <linux/io.h>
+#include <asm/txx9irq.h>
+#include <asm/txx9/tx4927pcic.h>
+
+#define TX4927_SDRAMC_REG       0xff1f8000
+#define TX4927_EBUSC_REG        0xff1f9000
+#define TX4927_PCIC_REG         0xff1fd000
+#define TX4927_CCFG_REG         0xff1fe000
+#define TX4927_IRC_REG          0xff1ff600
+#define TX4927_NR_TMR   3
+#define TX4927_TMR_REG(ch)      (0xff1ff000 + (ch) * 0x100)
+
+#define TX4927_IR_INT(n)        (2 + (n))
+#define TX4927_IR_SIO(n)        (8 + (n))
+#define TX4927_IR_PCIC          16
+#define TX4927_IR_PCIERR        22
+#define TX4927_NUM_IR   32
+
+#define TX4927_IRC_INT  2       /* IP[2] in Status register */
+
+struct tx4927_sdramc_reg {
+        volatile unsigned long long cr[4];
+        volatile unsigned long long unused0[4];
+        volatile unsigned long long tr;
+        volatile unsigned long long unused1[2];
+        volatile unsigned long long cmd;
+};
+
+struct tx4927_ebusc_reg {
+        volatile unsigned long long cr[8];
+};
+
+struct tx4927_ccfg_reg {
+        u64 ccfg;
+        u64 crir;
+        u64 pcfg;
+        u64 toea;
+        u64 clkctr;
+        u64 unused0;
+        u64 garbc;
+        u64 unused1;
+        u64 unused2;
+        u64 ramp;
+};
+
+/*
+ * CCFG
+ */
+/* CCFG : Chip Configuration */
+#define TX4927_CCFG_WDRST       0x0000020000000000ULL
+#define TX4927_CCFG_WDREXEN     0x0000010000000000ULL
+#define TX4927_CCFG_BCFG_MASK   0x000000ff00000000ULL
+#define TX4927_CCFG_TINTDIS     0x01000000
+#define TX4927_CCFG_PCI66       0x00800000
+#define TX4927_CCFG_PCIMODE     0x00400000
+#define TX4927_CCFG_DIVMODE_MASK        0x000e0000
+#define TX4927_CCFG_DIVMODE_8   (0x0 << 17)
+#define TX4927_CCFG_DIVMODE_12  (0x1 << 17)
+#define TX4927_CCFG_DIVMODE_16  (0x2 << 17)
+#define TX4927_CCFG_DIVMODE_10  (0x3 << 17)
+#define TX4927_CCFG_DIVMODE_2   (0x4 << 17)
+#define TX4927_CCFG_DIVMODE_3   (0x5 << 17)
+#define TX4927_CCFG_DIVMODE_4   (0x6 << 17)
+#define TX4927_CCFG_DIVMODE_2_5 (0x7 << 17)
+#define TX4927_CCFG_BEOW        0x00010000
+#define TX4927_CCFG_WR  0x00008000
+#define TX4927_CCFG_TOE 0x00004000
+#define TX4927_CCFG_PCIARB      0x00002000
+#define TX4927_CCFG_PCIDIVMODE_MASK     0x00001800
+#define TX4927_CCFG_PCIDIVMODE_2_5      0x00000000
+#define TX4927_CCFG_PCIDIVMODE_3        0x00000800
+#define TX4927_CCFG_PCIDIVMODE_5        0x00001000
+#define TX4927_CCFG_PCIDIVMODE_6        0x00001800
+#define TX4927_CCFG_SYSSP_MASK  0x000000c0
+#define TX4927_CCFG_ENDIAN      0x00000004
+#define TX4927_CCFG_HALT        0x00000002
+#define TX4927_CCFG_ACEHOLD     0x00000001
+#define TX4927_CCFG_W1CBITS     (TX4927_CCFG_WDRST | TX4927_CCFG_BEOW)
+
+/* PCFG : Pin Configuration */
+#define TX4927_PCFG_SDCLKDLY_MASK       0x30000000
+#define TX4927_PCFG_SDCLKDLY(d) ((d)<<28)
+#define TX4927_PCFG_SYSCLKEN    0x08000000
+#define TX4927_PCFG_SDCLKEN_ALL 0x07800000
+#define TX4927_PCFG_SDCLKEN(ch) (0x00800000<<(ch))
+#define TX4927_PCFG_PCICLKEN_ALL        0x003f0000
+#define TX4927_PCFG_PCICLKEN(ch)        (0x00010000<<(ch))
+#define TX4927_PCFG_SEL2        0x00000200
+#define TX4927_PCFG_SEL1        0x00000100
+#define TX4927_PCFG_DMASEL_ALL  0x000000ff
+#define TX4927_PCFG_DMASEL0_MASK        0x00000003
+#define TX4927_PCFG_DMASEL1_MASK        0x0000000c
+#define TX4927_PCFG_DMASEL2_MASK        0x00000030
+#define TX4927_PCFG_DMASEL3_MASK        0x000000c0
+#define TX4927_PCFG_DMASEL0_DRQ0        0x00000000
+#define TX4927_PCFG_DMASEL0_SIO1        0x00000001
+#define TX4927_PCFG_DMASEL0_ACL0        0x00000002
+#define TX4927_PCFG_DMASEL0_ACL2        0x00000003
+#define TX4927_PCFG_DMASEL1_DRQ1        0x00000000
+#define TX4927_PCFG_DMASEL1_SIO1        0x00000004
+#define TX4927_PCFG_DMASEL1_ACL1        0x00000008
+#define TX4927_PCFG_DMASEL1_ACL3        0x0000000c
+#define TX4927_PCFG_DMASEL2_DRQ2        0x00000000      /* SEL2=0 */
+#define TX4927_PCFG_DMASEL2_SIO0        0x00000010      /* SEL2=0 */
+#define TX4927_PCFG_DMASEL2_ACL1        0x00000000      /* SEL2=1 */
+#define TX4927_PCFG_DMASEL2_ACL2        0x00000020      /* SEL2=1 */
+#define TX4927_PCFG_DMASEL2_ACL0        0x00000030      /* SEL2=1 */
+#define TX4927_PCFG_DMASEL3_DRQ3        0x00000000
+#define TX4927_PCFG_DMASEL3_SIO0        0x00000040
+#define TX4927_PCFG_DMASEL3_ACL3        0x00000080
+#define TX4927_PCFG_DMASEL3_ACL1        0x000000c0
+
+/* CLKCTR : Clock Control */
+#define TX4927_CLKCTR_ACLCKD    0x02000000
+#define TX4927_CLKCTR_PIOCKD    0x01000000
+#define TX4927_CLKCTR_DMACKD    0x00800000
+#define TX4927_CLKCTR_PCICKD    0x00400000
+#define TX4927_CLKCTR_TM0CKD    0x00100000
+#define TX4927_CLKCTR_TM1CKD    0x00080000
+#define TX4927_CLKCTR_TM2CKD    0x00040000
+#define TX4927_CLKCTR_SIO0CKD   0x00020000
+#define TX4927_CLKCTR_SIO1CKD   0x00010000
+#define TX4927_CLKCTR_ACLRST    0x00000200
+#define TX4927_CLKCTR_PIORST    0x00000100
+#define TX4927_CLKCTR_DMARST    0x00000080
+#define TX4927_CLKCTR_PCIRST    0x00000040
+#define TX4927_CLKCTR_TM0RST    0x00000010
+#define TX4927_CLKCTR_TM1RST    0x00000008
+#define TX4927_CLKCTR_TM2RST    0x00000004
+#define TX4927_CLKCTR_SIO0RST   0x00000002
+#define TX4927_CLKCTR_SIO1RST   0x00000001
+
+#define tx4927_sdramcptr        ((struct tx4927_sdramc_reg *)TX4927_SDRAMC_REG)
+#define tx4927_pcicptr \
+                ((struct tx4927_pcic_reg __iomem *)TX4927_PCIC_REG)
+#define tx4927_ccfgptr \
+                ((struct tx4927_ccfg_reg __iomem *)TX4927_CCFG_REG)
+#define tx4927_ebuscptr         ((struct tx4927_ebusc_reg *)TX4927_EBUSC_REG)
+
+/* utilities */
+static inline void txx9_clear64(__u64 __iomem *adr, __u64 bits)
+{
+#ifdef CONFIG_32BIT
+        unsigned long flags;
+        local_irq_save(flags);
+#endif
+        ____raw_writeq(____raw_readq(adr) & ~bits, adr);
+#ifdef CONFIG_32BIT
+        local_irq_restore(flags);
+#endif
+}
+static inline void txx9_set64(__u64 __iomem *adr, __u64 bits)
+{
+#ifdef CONFIG_32BIT
+        unsigned long flags;
+        local_irq_save(flags);
+#endif
+        ____raw_writeq(____raw_readq(adr) | bits, adr);
+#ifdef CONFIG_32BIT
+        local_irq_restore(flags);
+#endif
+}
+
+/* These functions are not interrupt safe. */
+static inline void tx4927_ccfg_clear(__u64 bits)
+{
+        ____raw_writeq(____raw_readq(&tx4927_ccfgptr->ccfg)
+                       & ~(TX4927_CCFG_W1CBITS | bits),
+                       &tx4927_ccfgptr->ccfg);
+}
+static inline void tx4927_ccfg_set(__u64 bits)
+{
+        ____raw_writeq((____raw_readq(&tx4927_ccfgptr->ccfg)
+                        & ~TX4927_CCFG_W1CBITS) | bits,
+                       &tx4927_ccfgptr->ccfg);
+}
+static inline void tx4927_ccfg_change(__u64 change, __u64 new)
+{
+        ____raw_writeq((____raw_readq(&tx4927_ccfgptr->ccfg)
+                        & ~(TX4927_CCFG_W1CBITS | change)) |
+                       new,
+                       &tx4927_ccfgptr->ccfg);
+}
+
+int tx4927_report_pciclk(void);
+int tx4927_pciclk66_setup(void);
+void tx4927_irq_init(void);
+
+#endif /* __ASM_TXX9_TX4927_H */
diff --git a/include/asm-mips/txx9/tx4927pcic.h b/include/asm-mips/txx9/tx4927pcic.h
new file mode 100644
index 000000000000..d61c3d09c4a2
--- /dev/null
+++ b/include/asm-mips/txx9/tx4927pcic.h
@@ -0,0 +1,199 @@
+/*
+ * include/asm-mips/txx9/tx4927pcic.h
+ * TX4927 PCI 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_TXX9_TX4927PCIC_H
+#define __ASM_TXX9_TX4927PCIC_H
+
+#include <linux/pci.h>
+
+struct tx4927_pcic_reg {
+        u32 pciid;
+        u32 pcistatus;
+        u32 pciccrev;
+        u32 pcicfg1;
+        u32 p2gm0plbase;                /* +10 */
+        u32 p2gm0pubase;
+        u32 p2gm1plbase;
+        u32 p2gm1pubase;
+        u32 p2gm2pbase;         /* +20 */
+        u32 p2giopbase;
+        u32 unused0;
+        u32 pcisid;
+        u32 unused1;            /* +30 */
+        u32 pcicapptr;
+        u32 unused2;
+        u32 pcicfg2;
+        u32 g2ptocnt;           /* +40 */
+        u32 unused3[15];
+        u32 g2pstatus;          /* +80 */
+        u32 g2pmask;
+        u32 pcisstatus;
+        u32 pcimask;
+        u32 p2gcfg;             /* +90 */
+        u32 p2gstatus;
+        u32 p2gmask;
+        u32 p2gccmd;
+        u32 unused4[24];                /* +a0 */
+        u32 pbareqport;         /* +100 */
+        u32 pbacfg;
+        u32 pbastatus;
+        u32 pbamask;
+        u32 pbabm;              /* +110 */
+        u32 pbacreq;
+        u32 pbacgnt;
+        u32 pbacstate;
+        u64 g2pmgbase[3];               /* +120 */
+        u64 g2piogbase;
+        u32 g2pmmask[3];                /* +140 */
+        u32 g2piomask;
+        u64 g2pmpbase[3];               /* +150 */
+        u64 g2piopbase;
+        u32 pciccfg;            /* +170 */
+        u32 pcicstatus;
+        u32 pcicmask;
+        u32 unused5;
+        u64 p2gmgbase[3];               /* +180 */
+        u64 p2giogbase;
+        u32 g2pcfgadrs;         /* +1a0 */
+        u32 g2pcfgdata;
+        u32 unused6[8];
+        u32 g2pintack;
+        u32 g2pspc;
+        u32 unused7[12];                /* +1d0 */
+        u64 pdmca;              /* +200 */
+        u64 pdmga;
+        u64 pdmpa;
+        u64 pdmctr;
+        u64 pdmcfg;             /* +220 */
+        u64 pdmsts;
+};
+
+/* bits for PCICMD */
+/* see PCI_COMMAND_XXX in linux/pci_regs.h */
+
+/* bits for PCISTAT */
+/* see PCI_STATUS_XXX in linux/pci_regs.h */
+
+/* bits for IOBA/MBA */
+/* see PCI_BASE_ADDRESS_XXX in linux/pci_regs.h */
+
+/* bits for G2PSTATUS/G2PMASK */
+#define TX4927_PCIC_G2PSTATUS_ALL       0x00000003
+#define TX4927_PCIC_G2PSTATUS_TTOE      0x00000002
+#define TX4927_PCIC_G2PSTATUS_RTOE      0x00000001
+
+/* bits for PCIMASK (see also PCI_STATUS_XXX in linux/pci_regs.h */
+#define TX4927_PCIC_PCISTATUS_ALL       0x0000f900
+
+/* bits for PBACFG */
+#define TX4927_PCIC_PBACFG_FIXPA        0x00000008
+#define TX4927_PCIC_PBACFG_RPBA 0x00000004
+#define TX4927_PCIC_PBACFG_PBAEN        0x00000002
+#define TX4927_PCIC_PBACFG_BMCEN        0x00000001
+
+/* bits for PBASTATUS/PBAMASK */
+#define TX4927_PCIC_PBASTATUS_ALL       0x00000001
+#define TX4927_PCIC_PBASTATUS_BM        0x00000001
+
+/* bits for G2PMnGBASE */
+#define TX4927_PCIC_G2PMnGBASE_BSDIS    0x0000002000000000ULL
+#define TX4927_PCIC_G2PMnGBASE_ECHG     0x0000001000000000ULL
+
+/* bits for G2PIOGBASE */
+#define TX4927_PCIC_G2PIOGBASE_BSDIS    0x0000002000000000ULL
+#define TX4927_PCIC_G2PIOGBASE_ECHG     0x0000001000000000ULL
+
+/* bits for PCICSTATUS/PCICMASK */
+#define TX4927_PCIC_PCICSTATUS_ALL      0x000007b8
+#define TX4927_PCIC_PCICSTATUS_PME      0x00000400
+#define TX4927_PCIC_PCICSTATUS_TLB      0x00000200
+#define TX4927_PCIC_PCICSTATUS_NIB      0x00000100
+#define TX4927_PCIC_PCICSTATUS_ZIB      0x00000080
+#define TX4927_PCIC_PCICSTATUS_PERR     0x00000020
+#define TX4927_PCIC_PCICSTATUS_SERR     0x00000010
+#define TX4927_PCIC_PCICSTATUS_GBE      0x00000008
+#define TX4927_PCIC_PCICSTATUS_IWB      0x00000002
+#define TX4927_PCIC_PCICSTATUS_E2PDONE  0x00000001
+
+/* bits for PCICCFG */
+#define TX4927_PCIC_PCICCFG_GBWC_MASK   0x0fff0000
+#define TX4927_PCIC_PCICCFG_HRST        0x00000800
+#define TX4927_PCIC_PCICCFG_SRST        0x00000400
+#define TX4927_PCIC_PCICCFG_IRBER       0x00000200
+#define TX4927_PCIC_PCICCFG_G2PMEN(ch)  (0x00000100>>(ch))
+#define TX4927_PCIC_PCICCFG_G2PM0EN     0x00000100
+#define TX4927_PCIC_PCICCFG_G2PM1EN     0x00000080
+#define TX4927_PCIC_PCICCFG_G2PM2EN     0x00000040
+#define TX4927_PCIC_PCICCFG_G2PIOEN     0x00000020
+#define TX4927_PCIC_PCICCFG_TCAR        0x00000010
+#define TX4927_PCIC_PCICCFG_ICAEN       0x00000008
+
+/* bits for P2GMnGBASE */
+#define TX4927_PCIC_P2GMnGBASE_TMEMEN   0x0000004000000000ULL
+#define TX4927_PCIC_P2GMnGBASE_TBSDIS   0x0000002000000000ULL
+#define TX4927_PCIC_P2GMnGBASE_TECHG    0x0000001000000000ULL
+
+/* bits for P2GIOGBASE */
+#define TX4927_PCIC_P2GIOGBASE_TIOEN    0x0000004000000000ULL
+#define TX4927_PCIC_P2GIOGBASE_TBSDIS   0x0000002000000000ULL
+#define TX4927_PCIC_P2GIOGBASE_TECHG    0x0000001000000000ULL
+
+#define TX4927_PCIC_IDSEL_AD_TO_SLOT(ad)        ((ad) - 11)
+#define TX4927_PCIC_MAX_DEVNU   TX4927_PCIC_IDSEL_AD_TO_SLOT(32)
+
+/* bits for PDMCFG */
+#define TX4927_PCIC_PDMCFG_RSTFIFO      0x00200000
+#define TX4927_PCIC_PDMCFG_EXFER        0x00100000
+#define TX4927_PCIC_PDMCFG_REQDLY_MASK  0x00003800
+#define TX4927_PCIC_PDMCFG_REQDLY_NONE  (0 << 11)
+#define TX4927_PCIC_PDMCFG_REQDLY_16    (1 << 11)
+#define TX4927_PCIC_PDMCFG_REQDLY_32    (2 << 11)
+#define TX4927_PCIC_PDMCFG_REQDLY_64    (3 << 11)
+#define TX4927_PCIC_PDMCFG_REQDLY_128   (4 << 11)
+#define TX4927_PCIC_PDMCFG_REQDLY_256   (5 << 11)
+#define TX4927_PCIC_PDMCFG_REQDLY_512   (6 << 11)
+#define TX4927_PCIC_PDMCFG_REQDLY_1024  (7 << 11)
+#define TX4927_PCIC_PDMCFG_ERRIE        0x00000400
+#define TX4927_PCIC_PDMCFG_NCCMPIE      0x00000200
+#define TX4927_PCIC_PDMCFG_NTCMPIE      0x00000100
+#define TX4927_PCIC_PDMCFG_CHNEN        0x00000080
+#define TX4927_PCIC_PDMCFG_XFRACT       0x00000040
+#define TX4927_PCIC_PDMCFG_BSWAP        0x00000020
+#define TX4927_PCIC_PDMCFG_XFRSIZE_MASK 0x0000000c
+#define TX4927_PCIC_PDMCFG_XFRSIZE_1DW  0x00000000
+#define TX4927_PCIC_PDMCFG_XFRSIZE_1QW  0x00000004
+#define TX4927_PCIC_PDMCFG_XFRSIZE_4QW  0x00000008
+#define TX4927_PCIC_PDMCFG_XFRDIRC      0x00000002
+#define TX4927_PCIC_PDMCFG_CHRST        0x00000001
+
+/* bits for PDMSTS */
+#define TX4927_PCIC_PDMSTS_REQCNT_MASK  0x3f000000
+#define TX4927_PCIC_PDMSTS_FIFOCNT_MASK 0x00f00000
+#define TX4927_PCIC_PDMSTS_FIFOWP_MASK  0x000c0000
+#define TX4927_PCIC_PDMSTS_FIFORP_MASK  0x00030000
+#define TX4927_PCIC_PDMSTS_ERRINT       0x00000800
+#define TX4927_PCIC_PDMSTS_DONEINT      0x00000400
+#define TX4927_PCIC_PDMSTS_CHNEN        0x00000200
+#define TX4927_PCIC_PDMSTS_XFRACT       0x00000100
+#define TX4927_PCIC_PDMSTS_ACCMP        0x00000080
+#define TX4927_PCIC_PDMSTS_NCCMP        0x00000040
+#define TX4927_PCIC_PDMSTS_NTCMP        0x00000020
+#define TX4927_PCIC_PDMSTS_CFGERR       0x00000008
+#define TX4927_PCIC_PDMSTS_PCIERR       0x00000004
+#define TX4927_PCIC_PDMSTS_CHNERR       0x00000002
+#define TX4927_PCIC_PDMSTS_DATAERR      0x00000001
+#define TX4927_PCIC_PDMSTS_ALL_CMP      0x000000e0
+#define TX4927_PCIC_PDMSTS_ALL_ERR      0x0000000f
+
+struct tx4927_pcic_reg __iomem *get_tx4927_pcicptr(
+        struct pci_controller *channel);
+void __init tx4927_pcic_setup(struct tx4927_pcic_reg __iomem *pcicptr,
+                              struct pci_controller *channel, int extarb);
+void tx4927_report_pcic_status(void);
+
+#endif /* __ASM_TXX9_TX4927PCIC_H */
diff --git a/include/asm-mips/tx4938/tx4938.h b/include/asm-mips/txx9/tx4938.h
index e8807f5c61e9..12de68a4c10a 100644
--- a/include/asm-mips/tx4938/tx4938.h
+++ b/include/asm-mips/txx9/tx4938.h
@@ -1,5 +1,4 @@
 /*
- * linux/include/asm-mips/tx4938/tx4938.h
  * Definitions for TX4937/TX4938
  * Copyright (C) 2000-2001 Toshiba Corporation
  *
@@ -10,17 +9,15 @@
  *
  * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
  */
-#ifndef __ASM_TX_BOARDS_TX4938_H
-#define __ASM_TX_BOARDS_TX4938_H
+#ifndef __ASM_TXX9_TX4938_H
+#define __ASM_TXX9_TX4938_H
+
+/* some controllers are compatible with 4927 */
+#include <asm/txx9/tx4927.h>
 
 #define tx4938_read_nfmc(addr) (*(volatile unsigned int *)(addr))
 #define tx4938_write_nfmc(b, addr) (*(volatile unsigned int *)(addr)) = (b)
 
-#define TX4938_NR_IRQ_LOCAL     TX4938_IRQ_PIC_BEG
-
-#define TX4938_IRQ_IRC_PCIC     (TX4938_NR_IRQ_LOCAL + TX4938_IR_PCIC)
-#define TX4938_IRQ_IRC_PCIERR   (TX4938_NR_IRQ_LOCAL + TX4938_IR_PCIERR)
-
 #define TX4938_PCIIO_0 0x10000000
 #define TX4938_PCIIO_1 0x01010000
 #define TX4938_PCIMEM_0 0x08000000
@@ -52,9 +49,6 @@
 #define TX4938_ACLC_REG         (TX4938_REG_BASE + 0xf700)
 #define TX4938_SPI_REG          (TX4938_REG_BASE + 0xf800)
 
-#ifdef __ASSEMBLY__
-#define _CONST64(c)     c
-#else
 #define _CONST64(c)     c##ull
 
 #include <asm/byteorder.h>
@@ -114,68 +108,6 @@ struct tx4938_dma_reg {
         endian_def_l2(unused0, mcr);
 };
 
-struct tx4938_pcic_reg {
-        volatile unsigned long pciid;
-        volatile unsigned long pcistatus;
-        volatile unsigned long pciccrev;
-        volatile unsigned long pcicfg1;
-        volatile unsigned long p2gm0plbase;             /* +10 */
-        volatile unsigned long p2gm0pubase;
-        volatile unsigned long p2gm1plbase;
-        volatile unsigned long p2gm1pubase;
-        volatile unsigned long p2gm2pbase;              /* +20 */
-        volatile unsigned long p2giopbase;
-        volatile unsigned long unused0;
-        volatile unsigned long pcisid;
-        volatile unsigned long unused1;         /* +30 */
-        volatile unsigned long pcicapptr;
-        volatile unsigned long unused2;
-        volatile unsigned long pcicfg2;
-        volatile unsigned long g2ptocnt;                /* +40 */
-        volatile unsigned long unused3[15];
-        volatile unsigned long g2pstatus;               /* +80 */
-        volatile unsigned long g2pmask;
-        volatile unsigned long pcisstatus;
-        volatile unsigned long pcimask;
-        volatile unsigned long p2gcfg;          /* +90 */
-        volatile unsigned long p2gstatus;
-        volatile unsigned long p2gmask;
-        volatile unsigned long p2gccmd;
-        volatile unsigned long unused4[24];             /* +a0 */
-        volatile unsigned long pbareqport;              /* +100 */
-        volatile unsigned long pbacfg;
-        volatile unsigned long pbastatus;
-        volatile unsigned long pbamask;
-        volatile unsigned long pbabm;           /* +110 */
-        volatile unsigned long pbacreq;
-        volatile unsigned long pbacgnt;
-        volatile unsigned long pbacstate;
-        volatile unsigned long long g2pmgbase[3];               /* +120 */
-        volatile unsigned long long g2piogbase;
-        volatile unsigned long g2pmmask[3];             /* +140 */
-        volatile unsigned long g2piomask;
-        volatile unsigned long long g2pmpbase[3];               /* +150 */
-        volatile unsigned long long g2piopbase;
-        volatile unsigned long pciccfg;         /* +170 */
-        volatile unsigned long pcicstatus;
-        volatile unsigned long pcicmask;
-        volatile unsigned long unused5;
-        volatile unsigned long long p2gmgbase[3];               /* +180 */
-        volatile unsigned long long p2giogbase;
-        volatile unsigned long g2pcfgadrs;              /* +1a0 */
-        volatile unsigned long g2pcfgdata;
-        volatile unsigned long unused6[8];
-        volatile unsigned long g2pintack;
-        volatile unsigned long g2pspc;
-        volatile unsigned long unused7[12];             /* +1d0 */
-        volatile unsigned long long pdmca;              /* +200 */
-        volatile unsigned long long pdmga;
-        volatile unsigned long long pdmpa;
-        volatile unsigned long long pdmctr;
-        volatile unsigned long long pdmcfg;             /* +220 */
-        volatile unsigned long long pdmsts;
-};
-
 struct tx4938_aclc_reg {
         volatile unsigned long acctlen;
         volatile unsigned long acctldis;
@@ -263,18 +195,18 @@ struct tx4938_sramc_reg {
 };
 
 struct tx4938_ccfg_reg {
-        volatile unsigned long long ccfg;
-        volatile unsigned long long crir;
-        volatile unsigned long long pcfg;
-        volatile unsigned long long tear;
-        volatile unsigned long long clkctr;
-        volatile unsigned long long unused0;
-        volatile unsigned long long garbc;
-        volatile unsigned long long unused1;
-        volatile unsigned long long unused2;
-        volatile unsigned long long ramp;
-        volatile unsigned long long unused3;
-        volatile unsigned long long jmpadr;
+        u64 ccfg;
+        u64 crir;
+        u64 pcfg;
+        u64 toea;
+        u64 clkctr;
+        u64 unused0;
+        u64 garbc;
+        u64 unused1;
+        u64 unused2;
+        u64 ramp;
+        u64 unused3;
+        u64 jmpadr;
 };
 
 #undef endian_def_l2
@@ -283,8 +215,6 @@ struct tx4938_ccfg_reg {
 #undef endian_def_b2s
 #undef endian_def_b4
 
-#endif /* __ASSEMBLY__ */
-
 /*
  * NDFMC
  */
@@ -336,6 +266,8 @@ struct tx4938_ccfg_reg {
 #define TX4938_IR_ETH0  TX4938_IR_INT(4)
 #define TX4938_IR_ETH1  TX4938_IR_INT(3)
 
+#define TX4938_IRC_INT  2       /* IP[2] in Status register */
+
 /*
  * CCFG
  */
@@ -361,7 +293,7 @@ struct tx4938_ccfg_reg {
 #define TX4938_CCFG_BEOW        0x00010000
 #define TX4938_CCFG_WR  0x00008000
 #define TX4938_CCFG_TOE 0x00004000
-#define TX4938_CCFG_PCIXARB     0x00002000
+#define TX4938_CCFG_PCIARB      0x00002000
 #define TX4938_CCFG_PCIDIVMODE_MASK     0x00001c00
 #define TX4938_CCFG_PCIDIVMODE_4        (0x1 << 10)
 #define TX4938_CCFG_PCIDIVMODE_4_5      (0x3 << 10)
@@ -437,110 +369,6 @@ struct tx4938_ccfg_reg {
 #define TX4938_CLKCTR_SIO0RST   0x00000002
 #define TX4938_CLKCTR_SIO1RST   0x00000001
 
-/* bits for G2PSTATUS/G2PMASK */
-#define TX4938_PCIC_G2PSTATUS_ALL       0x00000003
-#define TX4938_PCIC_G2PSTATUS_TTOE      0x00000002
-#define TX4938_PCIC_G2PSTATUS_RTOE      0x00000001
-
-/* bits for PCIMASK (see also PCI_STATUS_XXX in linux/pci.h */
-#define TX4938_PCIC_PCISTATUS_ALL       0x0000f900
-
-/* bits for PBACFG */
-#define TX4938_PCIC_PBACFG_FIXPA        0x00000008
-#define TX4938_PCIC_PBACFG_RPBA 0x00000004
-#define TX4938_PCIC_PBACFG_PBAEN        0x00000002
-#define TX4938_PCIC_PBACFG_BMCEN        0x00000001
-
-/* bits for G2PMnGBASE */
-#define TX4938_PCIC_G2PMnGBASE_BSDIS    _CONST64(0x0000002000000000)
-#define TX4938_PCIC_G2PMnGBASE_ECHG     _CONST64(0x0000001000000000)
-
-/* bits for G2PIOGBASE */
-#define TX4938_PCIC_G2PIOGBASE_BSDIS    _CONST64(0x0000002000000000)
-#define TX4938_PCIC_G2PIOGBASE_ECHG     _CONST64(0x0000001000000000)
-
-/* bits for PCICSTATUS/PCICMASK */
-#define TX4938_PCIC_PCICSTATUS_ALL      0x000007b8
-#define TX4938_PCIC_PCICSTATUS_PME      0x00000400
-#define TX4938_PCIC_PCICSTATUS_TLB      0x00000200
-#define TX4938_PCIC_PCICSTATUS_NIB      0x00000100
-#define TX4938_PCIC_PCICSTATUS_ZIB      0x00000080
-#define TX4938_PCIC_PCICSTATUS_PERR     0x00000020
-#define TX4938_PCIC_PCICSTATUS_SERR     0x00000010
-#define TX4938_PCIC_PCICSTATUS_GBE      0x00000008
-#define TX4938_PCIC_PCICSTATUS_IWB      0x00000002
-#define TX4938_PCIC_PCICSTATUS_E2PDONE  0x00000001
-
-/* bits for PCICCFG */
-#define TX4938_PCIC_PCICCFG_GBWC_MASK   0x0fff0000
-#define TX4938_PCIC_PCICCFG_HRST        0x00000800
-#define TX4938_PCIC_PCICCFG_SRST        0x00000400
-#define TX4938_PCIC_PCICCFG_IRBER       0x00000200
-#define TX4938_PCIC_PCICCFG_G2PMEN(ch)  (0x00000100>>(ch))
-#define TX4938_PCIC_PCICCFG_G2PM0EN     0x00000100
-#define TX4938_PCIC_PCICCFG_G2PM1EN     0x00000080
-#define TX4938_PCIC_PCICCFG_G2PM2EN     0x00000040
-#define TX4938_PCIC_PCICCFG_G2PIOEN     0x00000020
-#define TX4938_PCIC_PCICCFG_TCAR        0x00000010
-#define TX4938_PCIC_PCICCFG_ICAEN       0x00000008
-
-/* bits for P2GMnGBASE */
-#define TX4938_PCIC_P2GMnGBASE_TMEMEN   _CONST64(0x0000004000000000)
-#define TX4938_PCIC_P2GMnGBASE_TBSDIS   _CONST64(0x0000002000000000)
-#define TX4938_PCIC_P2GMnGBASE_TECHG    _CONST64(0x0000001000000000)
-
-/* bits for P2GIOGBASE */
-#define TX4938_PCIC_P2GIOGBASE_TIOEN    _CONST64(0x0000004000000000)
-#define TX4938_PCIC_P2GIOGBASE_TBSDIS   _CONST64(0x0000002000000000)
-#define TX4938_PCIC_P2GIOGBASE_TECHG    _CONST64(0x0000001000000000)
-
-#define TX4938_PCIC_IDSEL_AD_TO_SLOT(ad)        ((ad) - 11)
-#define TX4938_PCIC_MAX_DEVNU   TX4938_PCIC_IDSEL_AD_TO_SLOT(32)
-
-/* bits for PDMCFG */
-#define TX4938_PCIC_PDMCFG_RSTFIFO      0x00200000
-#define TX4938_PCIC_PDMCFG_EXFER        0x00100000
-#define TX4938_PCIC_PDMCFG_REQDLY_MASK  0x00003800
-#define TX4938_PCIC_PDMCFG_REQDLY_NONE  (0 << 11)
-#define TX4938_PCIC_PDMCFG_REQDLY_16    (1 << 11)
-#define TX4938_PCIC_PDMCFG_REQDLY_32    (2 << 11)
-#define TX4938_PCIC_PDMCFG_REQDLY_64    (3 << 11)
-#define TX4938_PCIC_PDMCFG_REQDLY_128   (4 << 11)
-#define TX4938_PCIC_PDMCFG_REQDLY_256   (5 << 11)
-#define TX4938_PCIC_PDMCFG_REQDLY_512   (6 << 11)
-#define TX4938_PCIC_PDMCFG_REQDLY_1024  (7 << 11)
-#define TX4938_PCIC_PDMCFG_ERRIE        0x00000400
-#define TX4938_PCIC_PDMCFG_NCCMPIE      0x00000200
-#define TX4938_PCIC_PDMCFG_NTCMPIE      0x00000100
-#define TX4938_PCIC_PDMCFG_CHNEN        0x00000080
-#define TX4938_PCIC_PDMCFG_XFRACT       0x00000040
-#define TX4938_PCIC_PDMCFG_BSWAP        0x00000020
-#define TX4938_PCIC_PDMCFG_XFRSIZE_MASK 0x0000000c
-#define TX4938_PCIC_PDMCFG_XFRSIZE_1DW  0x00000000
-#define TX4938_PCIC_PDMCFG_XFRSIZE_1QW  0x00000004
-#define TX4938_PCIC_PDMCFG_XFRSIZE_4QW  0x00000008
-#define TX4938_PCIC_PDMCFG_XFRDIRC      0x00000002
-#define TX4938_PCIC_PDMCFG_CHRST        0x00000001
-
-/* bits for PDMSTS */
-#define TX4938_PCIC_PDMSTS_REQCNT_MASK  0x3f000000
-#define TX4938_PCIC_PDMSTS_FIFOCNT_MASK 0x00f00000
-#define TX4938_PCIC_PDMSTS_FIFOWP_MASK  0x000c0000
-#define TX4938_PCIC_PDMSTS_FIFORP_MASK  0x00030000
-#define TX4938_PCIC_PDMSTS_ERRINT       0x00000800
-#define TX4938_PCIC_PDMSTS_DONEINT      0x00000400
-#define TX4938_PCIC_PDMSTS_CHNEN        0x00000200
-#define TX4938_PCIC_PDMSTS_XFRACT       0x00000100
-#define TX4938_PCIC_PDMSTS_ACCMP        0x00000080
-#define TX4938_PCIC_PDMSTS_NCCMP        0x00000040
-#define TX4938_PCIC_PDMSTS_NTCMP        0x00000020
-#define TX4938_PCIC_PDMSTS_CFGERR       0x00000008
-#define TX4938_PCIC_PDMSTS_PCIERR       0x00000004
-#define TX4938_PCIC_PDMSTS_CHNERR       0x00000002
-#define TX4938_PCIC_PDMSTS_DATAERR      0x00000001
-#define TX4938_PCIC_PDMSTS_ALL_CMP      0x000000e0
-#define TX4938_PCIC_PDMSTS_ALL_ERR      0x0000000f
-
 /*
  * DMA
  */
@@ -596,15 +424,15 @@ struct tx4938_ccfg_reg {
 #define TX4938_DMA_CSR_DESERR   0x00000002
 #define TX4938_DMA_CSR_SORERR   0x00000001
 
-#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_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)
+#define tx4938_pcicptr          tx4927_pcicptr
+#define tx4938_pcic1ptr \
+                ((struct tx4927_pcic_reg __iomem *)TX4938_PCIC1_REG)
+#define tx4938_ccfgptr \
+                ((struct tx4938_ccfg_reg __iomem *)TX4938_CCFG_REG)
 #define tx4938_sioptr(ch)       ((struct tx4938_sio_reg *)TX4938_SIO_REG(ch))
 #define tx4938_pioptr           ((struct txx9_pio_reg __iomem *)TX4938_PIO_REG)
 #define tx4938_aclcptr          ((struct tx4938_aclc_reg *)TX4938_ACLC_REG)
@@ -612,17 +440,26 @@ struct tx4938_ccfg_reg {
 #define tx4938_sramcptr         ((struct tx4938_sramc_reg *)TX4938_SRAMC_REG)
 
 
-#define TX4938_REV_MAJ_MIN()    ((unsigned long)tx4938_ccfgptr->crir & 0x00ff)
-#define TX4938_REV_PCODE()      ((unsigned long)tx4938_ccfgptr->crir >> 16)
+#define TX4938_REV_PCODE()      \
+        ((__u32)__raw_readq(&tx4938_ccfgptr->crir) >> 16)
+
+#define tx4938_ccfg_clear(bits) tx4927_ccfg_clear(bits)
+#define tx4938_ccfg_set(bits)   tx4927_ccfg_set(bits)
+#define tx4938_ccfg_change(change, new) tx4927_ccfg_change(change, new)
 
 #define TX4938_SDRAMC_BA(ch)    ((tx4938_sdramcptr->cr[ch] >> 49) << 21)
 #define TX4938_SDRAMC_SIZE(ch)  (((tx4938_sdramcptr->cr[ch] >> 33) + 1) << 21)
 
+#define TX4938_EBUSC_CR(ch)     __raw_readq(&tx4938_ebuscptr->cr[(ch)])
 #define TX4938_EBUSC_BA(ch)     ((tx4938_ebuscptr->cr[ch] >> 48) << 20)
 #define TX4938_EBUSC_SIZE(ch)   \
         (0x00100000 << ((unsigned long)(tx4938_ebuscptr->cr[ch] >> 8) & 0xf))
 
-
-#endif /* !__ASSEMBLY__ */
+int tx4938_report_pciclk(void);
+void tx4938_report_pci1clk(void);
+int tx4938_pciclk66_setup(void);
+struct pci_dev;
+int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot);
+void tx4938_irq_init(void);
 
 #endif
diff --git a/include/asm-mips/jmr3927/txx927.h b/include/asm-mips/txx9/txx927.h
index 25dcf2feb095..97dd7ad1a890 100644
--- a/include/asm-mips/jmr3927/txx927.h
+++ b/include/asm-mips/txx9/txx927.h
@@ -7,8 +7,8 @@
  *
  * Copyright (C) 2000 Toshiba Corporation
  */
-#ifndef __ASM_TXX927_H
-#define __ASM_TXX927_H
+#ifndef __ASM_TXX9_TXX927_H
+#define __ASM_TXX9_TXX927_H
 
 struct txx927_sio_reg {
         volatile unsigned long lcr;
@@ -118,4 +118,4 @@ struct txx927_sio_reg {
  * PIO
  */
 
-#endif /* __ASM_TXX927_H */
+#endif /* __ASM_TXX9_TXX927_H */
diff --git a/include/asm-mips/vr41xx/cmbvr4133.h b/include/asm-mips/vr41xx/cmbvr4133.h
deleted file mode 100644
index 42300037d593..000000000000
--- a/include/asm-mips/vr41xx/cmbvr4133.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * include/asm-mips/vr41xx/cmbvr4133.h
- *
- * Include file for NEC CMB-VR4133.
- *
- * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> and
- *         Jun Sun <jsun@mvista.com, or source@mvista.com> and
- *         Alex Sapkov <asapkov@ru.mvista.com>
- *
- * 2002-2004 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#ifndef __NEC_CMBVR4133_H
-#define __NEC_CMBVR4133_H
-
-#include <asm/vr41xx/irq.h>
-
-/*
- * General-Purpose I/O Pin Number
- */
-#define CMBVR41XX_INTA_PIN              1
-#define CMBVR41XX_INTB_PIN              1
-#define CMBVR41XX_INTC_PIN              3
-#define CMBVR41XX_INTD_PIN              1
-#define CMBVR41XX_INTE_PIN              1
-
-/*
- * Interrupt Number
- */
-#define CMBVR41XX_INTA_IRQ              GIU_IRQ(CMBVR41XX_INTA_PIN)
-#define CMBVR41XX_INTB_IRQ              GIU_IRQ(CMBVR41XX_INTB_PIN)
-#define CMBVR41XX_INTC_IRQ              GIU_IRQ(CMBVR41XX_INTC_PIN)
-#define CMBVR41XX_INTD_IRQ              GIU_IRQ(CMBVR41XX_INTD_PIN)
-#define CMBVR41XX_INTE_IRQ              GIU_IRQ(CMBVR41XX_INTE_PIN)
-
-#define I8259A_IRQ_BASE                 72
-#define I8259_IRQ(x)                    (I8259A_IRQ_BASE + (x))
-#define TIMER_IRQ                       I8259_IRQ(0)
-#define KEYBOARD_IRQ                    I8259_IRQ(1)
-#define I8259_SLAVE_IRQ                 I8259_IRQ(2)
-#define UART3_IRQ                       I8259_IRQ(3)
-#define UART1_IRQ                       I8259_IRQ(4)
-#define UART2_IRQ                       I8259_IRQ(5)
-#define FDC_IRQ                         I8259_IRQ(6)
-#define PARPORT_IRQ                     I8259_IRQ(7)
-#define RTC_IRQ                         I8259_IRQ(8)
-#define USB_IRQ                         I8259_IRQ(9)
-#define I8259_INTA_IRQ                  I8259_IRQ(10)
-#define AUDIO_IRQ                       I8259_IRQ(11)
-#define AUX_IRQ                         I8259_IRQ(12)
-#define IDE_PRIMARY_IRQ                 I8259_IRQ(14)
-#define IDE_SECONDARY_IRQ               I8259_IRQ(15)
-
-#endif /* __NEC_CMBVR4133_H */
diff --git a/include/asm-parisc/smp.h b/include/asm-parisc/smp.h
index 306f4950e32e..398cdbaf4e54 100644
--- a/include/asm-parisc/smp.h
+++ b/include/asm-parisc/smp.h
@@ -30,6 +30,9 @@ extern cpumask_t cpu_online_map;
 extern void smp_send_reschedule(int cpu);
 extern void smp_send_all_nop(void);
 
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi(cpumask_t mask);
+
 #endif /* !ASSEMBLY */
 
 /*
diff --git a/include/asm-powerpc/smp.h b/include/asm-powerpc/smp.h
index 505f35bacaa9..c663a1fa77c5 100644
--- a/include/asm-powerpc/smp.h
+++ b/include/asm-powerpc/smp.h
@@ -67,10 +67,7 @@ DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
  * in /proc/interrupts will be wrong!!! --Troy */
 #define PPC_MSG_CALL_FUNCTION   0
 #define PPC_MSG_RESCHEDULE      1
-/* This is unused now */
-#if 0
-#define PPC_MSG_MIGRATE_TASK    2
-#endif
+#define PPC_MSG_CALL_FUNC_SINGLE        2
 #define PPC_MSG_DEBUGGER_BREAK  3
 
 void smp_init_iSeries(void);
@@ -117,6 +114,9 @@ extern void smp_generic_take_timebase(void);
 
 extern struct smp_ops_t *smp_ops;
 
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi(cpumask_t mask);
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff --git a/include/asm-sh/smp.h b/include/asm-sh/smp.h
index 9c8d34b07ebf..593343cd26ee 100644
--- a/include/asm-sh/smp.h
+++ b/include/asm-sh/smp.h
@@ -26,18 +26,10 @@ extern int __cpu_logical_map[NR_CPUS];
 
 #define NO_PROC_ID      (-1)
 
-struct smp_fn_call_struct {
-        spinlock_t lock;
-        atomic_t   finished;
-        void (*fn)(void *);
-        void *data;
-};
-
-extern struct smp_fn_call_struct smp_fn_call;
-
 #define SMP_MSG_FUNCTION        0
 #define SMP_MSG_RESCHEDULE      1
-#define SMP_MSG_NR              2
+#define SMP_MSG_FUNCTION_SINGLE 2
+#define SMP_MSG_NR              3
 
 void plat_smp_setup(void);
 void plat_prepare_cpus(unsigned int max_cpus);
@@ -46,6 +38,8 @@ void plat_start_cpu(unsigned int cpu, unsigned long entry_point);
 void plat_send_ipi(unsigned int cpu, unsigned int message);
 int plat_register_ipi_handler(unsigned int message,
                               void (*handler)(void *), void *arg);
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi(cpumask_t mask);
 
 #else
 
diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h
index e6d561599726..b61e74bea06a 100644
--- a/include/asm-sparc/smp.h
+++ b/include/asm-sparc/smp.h
@@ -72,7 +72,7 @@ static inline void xc5(smpfunc_t func, unsigned long arg1, unsigned long arg2,
                            unsigned long arg3, unsigned long arg4, unsigned long arg5)
 { smp_cross_call(func, arg1, arg2, arg3, arg4, arg5); }
 
-static inline int smp_call_function(void (*func)(void *info), void *info, int nonatomic, int wait)
+static inline int smp_call_function(void (*func)(void *info), void *info, int wait)
 {
         xc1((smpfunc_t)func, (unsigned long)info);
         return 0;
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h
index 18f067c310f7..77ba51df5668 100644
--- a/include/asm-x86/hw_irq.h
+++ b/include/asm-x86/hw_irq.h
@@ -48,6 +48,7 @@ extern void irq_move_cleanup_interrupt(void);
 extern void threshold_interrupt(void);
 
 extern void call_function_interrupt(void);
+extern void call_function_single_interrupt(void);
 
 /* PIC specific functions */
 extern void disable_8259A_irq(unsigned int irq);
diff --git a/include/asm-x86/irq_vectors.h b/include/asm-x86/irq_vectors.h
index 0ac864ef3cd4..90b1d1f12f08 100644
--- a/include/asm-x86/irq_vectors.h
+++ b/include/asm-x86/irq_vectors.h
@@ -64,6 +64,7 @@
 # define INVALIDATE_TLB_VECTOR          0xfd
 # define RESCHEDULE_VECTOR              0xfc
 # define CALL_FUNCTION_VECTOR           0xfb
+# define CALL_FUNCTION_SINGLE_VECTOR    0xfa
 # define THERMAL_APIC_VECTOR            0xf0
 
 #else
@@ -72,6 +73,7 @@
 #define ERROR_APIC_VECTOR               0xfe
 #define RESCHEDULE_VECTOR               0xfd
 #define CALL_FUNCTION_VECTOR            0xfc
+#define CALL_FUNCTION_SINGLE_VECTOR     0xfb
 #define THERMAL_APIC_VECTOR             0xfa
 #define THRESHOLD_APIC_VECTOR           0xf9
 #define INVALIDATE_TLB_VECTOR_END       0xf7
@@ -143,6 +145,7 @@
 #define VIC_RESCHEDULE_CPI              4
 #define VIC_ENABLE_IRQ_CPI              5
 #define VIC_CALL_FUNCTION_CPI           6
+#define VIC_CALL_FUNCTION_SINGLE_CPI    7
 
 /* Now the QIC CPIs:  Since we don't need the two initial levels,
  * these are 2 less than the VIC CPIs */
@@ -152,9 +155,10 @@
 #define QIC_RESCHEDULE_CPI              (VIC_RESCHEDULE_CPI - QIC_CPI_OFFSET)
 #define QIC_ENABLE_IRQ_CPI              (VIC_ENABLE_IRQ_CPI - QIC_CPI_OFFSET)
 #define QIC_CALL_FUNCTION_CPI           (VIC_CALL_FUNCTION_CPI - QIC_CPI_OFFSET)
+#define QIC_CALL_FUNCTION_SINGLE_CPI    (VIC_CALL_FUNCTION_SINGLE_CPI - QIC_CPI_OFFSET)
 
 #define VIC_START_FAKE_CPI              VIC_TIMER_CPI
-#define VIC_END_FAKE_CPI                VIC_CALL_FUNCTION_CPI
+#define VIC_END_FAKE_CPI                VIC_CALL_FUNCTION_SINGLE_CPI
 
 /* this is the SYS_INT CPI. */
 #define VIC_SYS_INT                     8
diff --git a/include/asm-x86/mach-default/entry_arch.h b/include/asm-x86/mach-default/entry_arch.h
index bc861469bdba..9283b60a1dd2 100644
--- a/include/asm-x86/mach-default/entry_arch.h
+++ b/include/asm-x86/mach-default/entry_arch.h
@@ -13,6 +13,7 @@
 BUILD_INTERRUPT(reschedule_interrupt,RESCHEDULE_VECTOR)
 BUILD_INTERRUPT(invalidate_interrupt,INVALIDATE_TLB_VECTOR)
 BUILD_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR)
+BUILD_INTERRUPT(call_function_single_interrupt,CALL_FUNCTION_SINGLE_VECTOR)
 #endif
 
 /*
diff --git a/include/asm-x86/mach-visws/entry_arch.h b/include/asm-x86/mach-visws/entry_arch.h
index b183fa6d83d9..86be554342d4 100644
--- a/include/asm-x86/mach-visws/entry_arch.h
+++ b/include/asm-x86/mach-visws/entry_arch.h
@@ -1,23 +1,5 @@
 /*
- * The following vectors are part of the Linux architecture, there
- * is no hardware IRQ pin equivalent for them, they are triggered
- * through the ICC by us (IPIs)
+ * VISWS uses the standard Linux entry points:
  */
-#ifdef CONFIG_X86_SMP
-BUILD_INTERRUPT(reschedule_interrupt,RESCHEDULE_VECTOR)
-BUILD_INTERRUPT(invalidate_interrupt,INVALIDATE_TLB_VECTOR)
-BUILD_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR)
-#endif
 
-/*
- * every pentium local APIC has two 'local interrupts', with a
- * soft-definable vector attached to both interrupts, one of
- * which is a timer interrupt, the other one is error counter
- * overflow. Linux uses the local APIC timer interrupt to get
- * a much simpler SMP time architecture:
- */
-#ifdef CONFIG_X86_LOCAL_APIC
-BUILD_INTERRUPT(apic_timer_interrupt,LOCAL_TIMER_VECTOR)
-BUILD_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)
-BUILD_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
-#endif
+#include "../mach-default/entry_arch.h"
diff --git a/include/asm-x86/mach-voyager/entry_arch.h b/include/asm-x86/mach-voyager/entry_arch.h
index 4a1e1e8c10b6..ae52624b5937 100644
--- a/include/asm-x86/mach-voyager/entry_arch.h
+++ b/include/asm-x86/mach-voyager/entry_arch.h
@@ -23,4 +23,4 @@ BUILD_INTERRUPT(qic_invalidate_interrupt, QIC_INVALIDATE_CPI);
 BUILD_INTERRUPT(qic_reschedule_interrupt, QIC_RESCHEDULE_CPI);
 BUILD_INTERRUPT(qic_enable_irq_interrupt, QIC_ENABLE_IRQ_CPI);
 BUILD_INTERRUPT(qic_call_function_interrupt, QIC_CALL_FUNCTION_CPI);
-
+BUILD_INTERRUPT(qic_call_function_single_interrupt, QIC_CALL_FUNCTION_SINGLE_CPI);
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 2e221f1ce0b2..c2784b3e0b77 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -50,9 +50,9 @@ struct smp_ops {
 
         void (*smp_send_stop)(void);
         void (*smp_send_reschedule)(int cpu);
-        int (*smp_call_function_mask)(cpumask_t mask,
-                                      void (*func)(void *info), void *info,
-                                      int wait);
+
+        void (*send_call_func_ipi)(cpumask_t mask);
+        void (*send_call_func_single_ipi)(int cpu);
 };
 
 /* Globals due to paravirt */
@@ -94,17 +94,22 @@ static inline void smp_send_reschedule(int cpu)
         smp_ops.smp_send_reschedule(cpu);
 }
 
-static inline int smp_call_function_mask(cpumask_t mask,
-                                         void (*func) (void *info), void *info,
-                                         int wait)
+static inline void arch_send_call_function_single_ipi(int cpu)
+{
+        smp_ops.send_call_func_single_ipi(cpu);
+}
+
+static inline void arch_send_call_function_ipi(cpumask_t mask)
 {
-        return smp_ops.smp_call_function_mask(mask, func, info, wait);
+        smp_ops.send_call_func_ipi(mask);
 }
 
 void native_smp_prepare_boot_cpu(void);
 void native_smp_prepare_cpus(unsigned int max_cpus);
 void native_smp_cpus_done(unsigned int max_cpus);
 int native_cpu_up(unsigned int cpunum);
+void native_send_call_func_ipi(cpumask_t mask);
+void native_send_call_func_single_ipi(int cpu);
 
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
@@ -197,7 +202,5 @@ static inline int hard_smp_processor_id(void)
 extern void cpu_uninit(void);
 #endif
 
-extern void lock_ipi_call_lock(void);
-extern void unlock_ipi_call_lock(void);
 #endif /* __ASSEMBLY__ */
 #endif
diff --git a/include/asm-x86/xen/events.h b/include/asm-x86/xen/events.h
index 596312a7bfc9..f8d57ea1f05f 100644
--- a/include/asm-x86/xen/events.h
+++ b/include/asm-x86/xen/events.h
@@ -4,6 +4,7 @@
 enum ipi_vector {
         XEN_RESCHEDULE_VECTOR,
         XEN_CALL_FUNCTION_VECTOR,
+        XEN_CALL_FUNCTION_SINGLE_VECTOR,
 
         XEN_NR_IPIS,
 };
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index d982eb89c77d..98202c672fde 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -3,6 +3,7 @@
 
 #include <asm/atomic.h>
 #include <linux/list.h>
+#include <linux/rculist.h>
 #include <linux/spinlock.h>
 #include <linux/cache.h>
 #include <linux/rcupdate.h>
diff --git a/include/linux/list.h b/include/linux/list.h
index 08cf4f651889..139ec41d9c2e 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -85,65 +85,6 @@ static inline void list_add_tail(struct list_head *new, struct list_head *head)
 }
 
 /*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add_rcu(struct list_head * new,
-                struct list_head * prev, struct list_head * next)
-{
-        new->next = next;
-        new->prev = prev;
-        smp_wmb();
-        next->prev = new;
-        prev->next = new;
-}
-
-/**
- * list_add_rcu - add a new entry to rcu-protected list
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as list_add_rcu()
- * or list_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * list_for_each_entry_rcu().
- */
-static inline void list_add_rcu(struct list_head *new, struct list_head *head)
-{
-        __list_add_rcu(new, head, head->next);
-}
-
-/**
- * list_add_tail_rcu - add a new entry to rcu-protected list
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as list_add_tail_rcu()
- * or list_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * list_for_each_entry_rcu().
- */
-static inline void list_add_tail_rcu(struct list_head *new,
-                                        struct list_head *head)
-{
-        __list_add_rcu(new, head->prev, head);
-}
-
-/*
  * Delete a list entry by making the prev/next entries
  * point to each other.
  *
@@ -174,36 +115,6 @@ extern void list_del(struct list_head *entry);
 #endif
 
 /**
- * list_del_rcu - deletes entry from list without re-initialization
- * @entry: the element to delete from the list.
- *
- * Note: list_empty() on entry does not return true after this,
- * the entry is in an undefined state. It is useful for RCU based
- * lockfree traversal.
- *
- * In particular, it means that we can not poison the forward
- * pointers that may still be used for walking the list.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as list_del_rcu()
- * or list_add_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * list_for_each_entry_rcu().
- *
- * Note that the caller is not permitted to immediately free
- * the newly deleted entry.  Instead, either synchronize_rcu()
- * or call_rcu() must be used to defer freeing until an RCU
- * grace period has elapsed.
- */
-static inline void list_del_rcu(struct list_head *entry)
-{
-        __list_del(entry->prev, entry->next);
-        entry->prev = LIST_POISON2;
-}
-
-/**
  * list_replace - replace old entry by new one
  * @old : the element to be replaced
  * @new : the new element to insert
@@ -227,25 +138,6 @@ static inline void list_replace_init(struct list_head *old,
 }
 
 /**
- * list_replace_rcu - replace old entry by new one
- * @old : the element to be replaced
- * @new : the new element to insert
- *
- * The @old entry will be replaced with the @new entry atomically.
- * Note: @old should not be empty.
- */
-static inline void list_replace_rcu(struct list_head *old,
-                                struct list_head *new)
-{
-        new->next = old->next;
-        new->prev = old->prev;
-        smp_wmb();
-        new->next->prev = new;
-        new->prev->next = new;
-        old->prev = LIST_POISON2;
-}
-
-/**
  * list_del_init - deletes entry from list and reinitialize it.
  * @entry: the element to delete from the list.
  */
@@ -369,62 +261,6 @@ static inline void list_splice_init(struct list_head *list,
 }
 
 /**
- * list_splice_init_rcu - splice an RCU-protected list into an existing list.
- * @list:       the RCU-protected list to splice
- * @head:       the place in the list to splice the first list into
- * @sync:       function to sync: synchronize_rcu(), synchronize_sched(), ...
- *
- * @head can be RCU-read traversed concurrently with this function.
- *
- * Note that this function blocks.
- *
- * Important note: the caller must take whatever action is necessary to
- *      prevent any other updates to @head.  In principle, it is possible
- *      to modify the list as soon as sync() begins execution.
- *      If this sort of thing becomes necessary, an alternative version
- *      based on call_rcu() could be created.  But only if -really-
- *      needed -- there is no shortage of RCU API members.
- */
-static inline void list_splice_init_rcu(struct list_head *list,
-                                        struct list_head *head,
-                                        void (*sync)(void))
-{
-        struct list_head *first = list->next;
-        struct list_head *last = list->prev;
-        struct list_head *at = head->next;
-
-        if (list_empty(head))
-                return;
-
-        /* "first" and "last" tracking list, so initialize it. */
-
-        INIT_LIST_HEAD(list);
-
-        /*
-         * At this point, the list body still points to the source list.
-         * Wait for any readers to finish using the list before splicing
-         * the list body into the new list.  Any new readers will see
-         * an empty list.
-         */
-
-        sync();
-
-        /*
-         * Readers are finished with the source list, so perform splice.
-         * The order is important if the new list is global and accessible
-         * to concurrent RCU readers.  Note that RCU readers are not
-         * permitted to traverse the prev pointers without excluding
-         * this function.
-         */
-
-        last->next = at;
-        smp_wmb();
-        head->next = first;
-        first->prev = head;
-        at->prev = last;
-}
-
-/**
  * list_entry - get the struct for this entry
  * @ptr:        the &struct list_head pointer.
  * @type:       the type of the struct this is embedded in.
@@ -629,57 +465,6 @@ static inline void list_splice_init_rcu(struct list_head *list,
              &pos->member != (head);                                    \
              pos = n, n = list_entry(n->member.prev, typeof(*n), member))
 
-/**
- * list_for_each_rcu    -       iterate over an rcu-protected list
- * @pos:        the &struct list_head to use as a loop cursor.
- * @head:       the head for your list.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as list_add_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define list_for_each_rcu(pos, head) \
-        for (pos = rcu_dereference((head)->next); \
-                prefetch(pos->next), pos != (head); \
-                pos = rcu_dereference(pos->next))
-
-#define __list_for_each_rcu(pos, head) \
-        for (pos = rcu_dereference((head)->next); \
-                pos != (head); \
-                pos = rcu_dereference(pos->next))
-
-/**
- * list_for_each_entry_rcu      -       iterate over rcu list of given type
- * @pos:        the type * to use as a loop cursor.
- * @head:       the head for your list.
- * @member:     the name of the list_struct within the struct.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as list_add_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define list_for_each_entry_rcu(pos, head, member) \
-        for (pos = list_entry(rcu_dereference((head)->next), typeof(*pos), member); \
-                prefetch(pos->member.next), &pos->member != (head); \
-                pos = list_entry(rcu_dereference(pos->member.next), typeof(*pos), member))
-
-
-/**
- * list_for_each_continue_rcu
- * @pos:        the &struct list_head to use as a loop cursor.
- * @head:       the head for your list.
- *
- * Iterate over an rcu-protected list, continuing after current point.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as list_add_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define list_for_each_continue_rcu(pos, head) \
-        for ((pos) = rcu_dereference((pos)->next); \
-                prefetch((pos)->next), (pos) != (head); \
-                (pos) = rcu_dereference((pos)->next))
-
 /*
  * Double linked lists with a single pointer list head.
  * Mostly useful for hash tables where the two pointer list head is
@@ -730,31 +515,6 @@ static inline void hlist_del(struct hlist_node *n)
         n->pprev = LIST_POISON2;
 }
 
-/**
- * hlist_del_rcu - deletes entry from hash list without re-initialization
- * @n: the element to delete from the hash list.
- *
- * Note: list_unhashed() on entry does not return true after this,
- * the entry is in an undefined state. It is useful for RCU based
- * lockfree traversal.
- *
- * In particular, it means that we can not poison the forward
- * pointers that may still be used for walking the hash list.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as hlist_add_head_rcu()
- * or hlist_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * hlist_for_each_entry().
- */
-static inline void hlist_del_rcu(struct hlist_node *n)
-{
-        __hlist_del(n);
-        n->pprev = LIST_POISON2;
-}
-
 static inline void hlist_del_init(struct hlist_node *n)
 {
         if (!hlist_unhashed(n)) {
@@ -763,27 +523,6 @@ static inline void hlist_del_init(struct hlist_node *n)
         }
 }
 
-/**
- * hlist_replace_rcu - replace old entry by new one
- * @old : the element to be replaced
- * @new : the new element to insert
- *
- * The @old entry will be replaced with the @new entry atomically.
- */
-static inline void hlist_replace_rcu(struct hlist_node *old,
-                                        struct hlist_node *new)
-{
-        struct hlist_node *next = old->next;
-
-        new->next = next;
-        new->pprev = old->pprev;
-        smp_wmb();
-        if (next)
-                new->next->pprev = &new->next;
-        *new->pprev = new;
-        old->pprev = LIST_POISON2;
-}
-
 static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
         struct hlist_node *first = h->first;
@@ -794,38 +533,6 @@ static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
         n->pprev = &h->first;
 }
 
-
-/**
- * hlist_add_head_rcu
- * @n: the element to add to the hash list.
- * @h: the list to add to.
- *
- * Description:
- * Adds the specified element to the specified hlist,
- * while permitting racing traversals.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as hlist_add_head_rcu()
- * or hlist_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * hlist_for_each_entry_rcu(), used to prevent memory-consistency
- * problems on Alpha CPUs.  Regardless of the type of CPU, the
- * list-traversal primitive must be guarded by rcu_read_lock().
- */
-static inline void hlist_add_head_rcu(struct hlist_node *n,
-                                        struct hlist_head *h)
-{
-        struct hlist_node *first = h->first;
-        n->next = first;
-        n->pprev = &h->first;
-        smp_wmb();
-        if (first)
-                first->pprev = &n->next;
-        h->first = n;
-}
-
 /* next must be != NULL */
 static inline void hlist_add_before(struct hlist_node *n,
                                         struct hlist_node *next)
@@ -847,63 +554,6 @@ static inline void hlist_add_after(struct hlist_node *n,
                 next->next->pprev  = &next->next;
 }
 
-/**
- * hlist_add_before_rcu
- * @n: the new element to add to the hash list.
- * @next: the existing element to add the new element before.
- *
- * Description:
- * Adds the specified element to the specified hlist
- * before the specified node while permitting racing traversals.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as hlist_add_head_rcu()
- * or hlist_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * hlist_for_each_entry_rcu(), used to prevent memory-consistency
- * problems on Alpha CPUs.
- */
-static inline void hlist_add_before_rcu(struct hlist_node *n,
-                                        struct hlist_node *next)
-{
-        n->pprev = next->pprev;
-        n->next = next;
-        smp_wmb();
-        next->pprev = &n->next;
-        *(n->pprev) = n;
-}
-
-/**
- * hlist_add_after_rcu
- * @prev: the existing element to add the new element after.
- * @n: the new element to add to the hash list.
- *
- * Description:
- * Adds the specified element to the specified hlist
- * after the specified node while permitting racing traversals.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as hlist_add_head_rcu()
- * or hlist_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * hlist_for_each_entry_rcu(), used to prevent memory-consistency
- * problems on Alpha CPUs.
- */
-static inline void hlist_add_after_rcu(struct hlist_node *prev,
-                                       struct hlist_node *n)
-{
-        n->next = prev->next;
-        n->pprev = &prev->next;
-        smp_wmb();
-        prev->next = n;
-        if (n->next)
-                n->next->pprev = &n->next;
-}
-
 #define hlist_entry(ptr, type, member) container_of(ptr,type,member)
 
 #define hlist_for_each(pos, head) \
@@ -964,21 +614,4 @@ static inline void hlist_add_after_rcu(struct hlist_node *prev,
                 ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
              pos = n)
 
-/**
- * hlist_for_each_entry_rcu - iterate over rcu list of given type
- * @tpos:       the type * to use as a loop cursor.
- * @pos:        the &struct hlist_node to use as a loop cursor.
- * @head:       the head for your list.
- * @member:     the name of the hlist_node within the struct.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as hlist_add_head_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define hlist_for_each_entry_rcu(tpos, pos, head, member)                \
-        for (pos = rcu_dereference((head)->first);                       \
-                pos && ({ prefetch(pos->next); 1;}) &&                   \
-                ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-             pos = rcu_dereference(pos->next))
-
 #endif
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h
index b3aa05baab8a..8c774905dcfe 100644
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
@@ -151,7 +151,10 @@ extern struct lockdep_map rcu_lock_map;
 
 #define __synchronize_sched() synchronize_rcu()
 
+#define call_rcu_sched(head, func) call_rcu(head, func)
+
 extern void __rcu_init(void);
+#define rcu_init_sched()        do { } while (0)
 extern void rcu_check_callbacks(int cpu, int user);
 extern void rcu_restart_cpu(int cpu);
 
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index bde4586f4382..b0f39be08b6c 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -1,6 +1,373 @@
 #ifndef _LINUX_RCULIST_H
 #define _LINUX_RCULIST_H
 
+#ifdef __KERNEL__
+
+/*
+ * RCU-protected list version
+ */
 #include <linux/list.h>
+#include <linux/rcupdate.h>
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_add_rcu(struct list_head *new,
+                struct list_head *prev, struct list_head *next)
+{
+        new->next = next;
+        new->prev = prev;
+        rcu_assign_pointer(prev->next, new);
+        next->prev = new;
+}
+
+/**
+ * list_add_rcu - add a new entry to rcu-protected list
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as list_add_rcu()
+ * or list_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * list_for_each_entry_rcu().
+ */
+static inline void list_add_rcu(struct list_head *new, struct list_head *head)
+{
+        __list_add_rcu(new, head, head->next);
+}
+
+/**
+ * list_add_tail_rcu - add a new entry to rcu-protected list
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as list_add_tail_rcu()
+ * or list_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * list_for_each_entry_rcu().
+ */
+static inline void list_add_tail_rcu(struct list_head *new,
+                                        struct list_head *head)
+{
+        __list_add_rcu(new, head->prev, head);
+}
+
+/**
+ * list_del_rcu - deletes entry from list without re-initialization
+ * @entry: the element to delete from the list.
+ *
+ * Note: list_empty() on entry does not return true after this,
+ * the entry is in an undefined state. It is useful for RCU based
+ * lockfree traversal.
+ *
+ * In particular, it means that we can not poison the forward
+ * pointers that may still be used for walking the list.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as list_del_rcu()
+ * or list_add_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * list_for_each_entry_rcu().
+ *
+ * Note that the caller is not permitted to immediately free
+ * the newly deleted entry.  Instead, either synchronize_rcu()
+ * or call_rcu() must be used to defer freeing until an RCU
+ * grace period has elapsed.
+ */
+static inline void list_del_rcu(struct list_head *entry)
+{
+        __list_del(entry->prev, entry->next);
+        entry->prev = LIST_POISON2;
+}
+
+/**
+ * list_replace_rcu - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * The @old entry will be replaced with the @new entry atomically.
+ * Note: @old should not be empty.
+ */
+static inline void list_replace_rcu(struct list_head *old,
+                                struct list_head *new)
+{
+        new->next = old->next;
+        new->prev = old->prev;
+        rcu_assign_pointer(new->prev->next, new);
+        new->next->prev = new;
+        old->prev = LIST_POISON2;
+}
+
+/**
+ * list_splice_init_rcu - splice an RCU-protected list into an existing list.
+ * @list:       the RCU-protected list to splice
+ * @head:       the place in the list to splice the first list into
+ * @sync:       function to sync: synchronize_rcu(), synchronize_sched(), ...
+ *
+ * @head can be RCU-read traversed concurrently with this function.
+ *
+ * Note that this function blocks.
+ *
+ * Important note: the caller must take whatever action is necessary to
+ *      prevent any other updates to @head.  In principle, it is possible
+ *      to modify the list as soon as sync() begins execution.
+ *      If this sort of thing becomes necessary, an alternative version
+ *      based on call_rcu() could be created.  But only if -really-
+ *      needed -- there is no shortage of RCU API members.
+ */
+static inline void list_splice_init_rcu(struct list_head *list,
+                                        struct list_head *head,
+                                        void (*sync)(void))
+{
+        struct list_head *first = list->next;
+        struct list_head *last = list->prev;
+        struct list_head *at = head->next;
+
+        if (list_empty(head))
+                return;
+
+        /* "first" and "last" tracking list, so initialize it. */
+
+        INIT_LIST_HEAD(list);
+
+        /*
+         * At this point, the list body still points to the source list.
+         * Wait for any readers to finish using the list before splicing
+         * the list body into the new list.  Any new readers will see
+         * an empty list.
+         */
+
+        sync();
+
+        /*
+         * Readers are finished with the source list, so perform splice.
+         * The order is important if the new list is global and accessible
+         * to concurrent RCU readers.  Note that RCU readers are not
+         * permitted to traverse the prev pointers without excluding
+         * this function.
+         */
+
+        last->next = at;
+        rcu_assign_pointer(head->next, first);
+        first->prev = head;
+        at->prev = last;
+}
+
+/**
+ * list_for_each_rcu    -       iterate over an rcu-protected list
+ * @pos:        the &struct list_head to use as a loop cursor.
+ * @head:       the head for your list.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as list_add_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define list_for_each_rcu(pos, head) \
+        for (pos = rcu_dereference((head)->next); \
+                prefetch(pos->next), pos != (head); \
+                pos = rcu_dereference(pos->next))
+
+#define __list_for_each_rcu(pos, head) \
+        for (pos = rcu_dereference((head)->next); \
+                pos != (head); \
+                pos = rcu_dereference(pos->next))
+
+/**
+ * list_for_each_entry_rcu      -       iterate over rcu list of given type
+ * @pos:        the type * to use as a loop cursor.
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as list_add_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define list_for_each_entry_rcu(pos, head, member) \
+        for (pos = list_entry(rcu_dereference((head)->next), typeof(*pos), member); \
+                prefetch(pos->member.next), &pos->member != (head); \
+                pos = list_entry(rcu_dereference(pos->member.next), typeof(*pos), member))
+
+
+/**
+ * list_for_each_continue_rcu
+ * @pos:        the &struct list_head to use as a loop cursor.
+ * @head:       the head for your list.
+ *
+ * Iterate over an rcu-protected list, continuing after current point.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as list_add_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define list_for_each_continue_rcu(pos, head) \
+        for ((pos) = rcu_dereference((pos)->next); \
+                prefetch((pos)->next), (pos) != (head); \
+                (pos) = rcu_dereference((pos)->next))
+
+/**
+ * hlist_del_rcu - deletes entry from hash list without re-initialization
+ * @n: the element to delete from the hash list.
+ *
+ * Note: list_unhashed() on entry does not return true after this,
+ * the entry is in an undefined state. It is useful for RCU based
+ * lockfree traversal.
+ *
+ * In particular, it means that we can not poison the forward
+ * pointers that may still be used for walking the hash list.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_add_head_rcu()
+ * or hlist_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_for_each_entry().
+ */
+static inline void hlist_del_rcu(struct hlist_node *n)
+{
+        __hlist_del(n);
+        n->pprev = LIST_POISON2;
+}
+
+/**
+ * hlist_replace_rcu - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * The @old entry will be replaced with the @new entry atomically.
+ */
+static inline void hlist_replace_rcu(struct hlist_node *old,
+                                        struct hlist_node *new)
+{
+        struct hlist_node *next = old->next;
+
+        new->next = next;
+        new->pprev = old->pprev;
+        rcu_assign_pointer(*new->pprev, new);
+        if (next)
+                new->next->pprev = &new->next;
+        old->pprev = LIST_POISON2;
+}
+
+/**
+ * hlist_add_head_rcu
+ * @n: the element to add to the hash list.
+ * @h: the list to add to.
+ *
+ * Description:
+ * Adds the specified element to the specified hlist,
+ * while permitting racing traversals.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_add_head_rcu()
+ * or hlist_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_for_each_entry_rcu(), used to prevent memory-consistency
+ * problems on Alpha CPUs.  Regardless of the type of CPU, the
+ * list-traversal primitive must be guarded by rcu_read_lock().
+ */
+static inline void hlist_add_head_rcu(struct hlist_node *n,
+                                        struct hlist_head *h)
+{
+        struct hlist_node *first = h->first;
+
+        n->next = first;
+        n->pprev = &h->first;
+        rcu_assign_pointer(h->first, n);
+        if (first)
+                first->pprev = &n->next;
+}
+
+/**
+ * hlist_add_before_rcu
+ * @n: the new element to add to the hash list.
+ * @next: the existing element to add the new element before.
+ *
+ * Description:
+ * Adds the specified element to the specified hlist
+ * before the specified node while permitting racing traversals.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_add_head_rcu()
+ * or hlist_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_for_each_entry_rcu(), used to prevent memory-consistency
+ * problems on Alpha CPUs.
+ */
+static inline void hlist_add_before_rcu(struct hlist_node *n,
+                                        struct hlist_node *next)
+{
+        n->pprev = next->pprev;
+        n->next = next;
+        rcu_assign_pointer(*(n->pprev), n);
+        next->pprev = &n->next;
+}
+
+/**
+ * hlist_add_after_rcu
+ * @prev: the existing element to add the new element after.
+ * @n: the new element to add to the hash list.
+ *
+ * Description:
+ * Adds the specified element to the specified hlist
+ * after the specified node while permitting racing traversals.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_add_head_rcu()
+ * or hlist_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_for_each_entry_rcu(), used to prevent memory-consistency
+ * problems on Alpha CPUs.
+ */
+static inline void hlist_add_after_rcu(struct hlist_node *prev,
+                                       struct hlist_node *n)
+{
+        n->next = prev->next;
+        n->pprev = &prev->next;
+        rcu_assign_pointer(prev->next, n);
+        if (n->next)
+                n->next->pprev = &n->next;
+}
+
+/**
+ * hlist_for_each_entry_rcu - iterate over rcu list of given type
+ * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the &struct hlist_node to use as a loop cursor.
+ * @head:       the head for your list.
+ * @member:     the name of the hlist_node within the struct.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as hlist_add_head_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define hlist_for_each_entry_rcu(tpos, pos, head, member)                \
+        for (pos = rcu_dereference((head)->first);                       \
+                pos && ({ prefetch(pos->next); 1; }) &&                  \
+                ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1; }); \
+                pos = rcu_dereference(pos->next))
 
-#endif  /* _LINUX_RCULIST_H */
+#endif  /* __KERNEL__ */
+#endif
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index d42dbec06083..e8b4039cfb2f 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -40,6 +40,7 @@
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
 #include <linux/lockdep.h>
+#include <linux/completion.h>
 
 /**
  * struct rcu_head - callback structure for use with RCU
@@ -168,6 +169,27 @@ struct rcu_head {
                 (p) = (v); \
         })
 
+/* Infrastructure to implement the synchronize_() primitives. */
+
+struct rcu_synchronize {
+        struct rcu_head head;
+        struct completion completion;
+};
+
+extern void wakeme_after_rcu(struct rcu_head  *head);
+
+#define synchronize_rcu_xxx(name, func) \
+void name(void) \
+{ \
+        struct rcu_synchronize rcu; \
+        \
+        init_completion(&rcu.completion); \
+        /* Will wake me after RCU finished. */ \
+        func(&rcu.head, wakeme_after_rcu); \
+        /* Wait for it. */ \
+        wait_for_completion(&rcu.completion); \
+}
+
 /**
  * synchronize_sched - block until all CPUs have exited any non-preemptive
  * kernel code sequences.
@@ -224,8 +246,8 @@ extern void call_rcu_bh(struct rcu_head *head,
 /* Exported common interfaces */
 extern void synchronize_rcu(void);
 extern void rcu_barrier(void);
-extern long rcu_batches_completed(void);
-extern long rcu_batches_completed_bh(void);
+extern void rcu_barrier_bh(void);
+extern void rcu_barrier_sched(void);
 
 /* Internal to kernel */
 extern void rcu_init(void);
diff --git a/include/linux/rcupreempt.h b/include/linux/rcupreempt.h
index 8a05c7e20bc4..f04b64eca636 100644
--- a/include/linux/rcupreempt.h
+++ b/include/linux/rcupreempt.h
@@ -40,10 +40,39 @@
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
 
-#define rcu_qsctr_inc(cpu)
+struct rcu_dyntick_sched {
+        int dynticks;
+        int dynticks_snap;
+        int sched_qs;
+        int sched_qs_snap;
+        int sched_dynticks_snap;
+};
+
+DECLARE_PER_CPU(struct rcu_dyntick_sched, rcu_dyntick_sched);
+
+static inline void rcu_qsctr_inc(int cpu)
+{
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
+
+        rdssp->sched_qs++;
+}
 #define rcu_bh_qsctr_inc(cpu)
 #define call_rcu_bh(head, rcu) call_rcu(head, rcu)
 
+/**
+ * call_rcu_sched - Queue RCU callback for invocation after sched grace period.
+ * @head: structure to be used for queueing the RCU updates.
+ * @func: actual update function to be invoked after the grace period
+ *
+ * The update function will be invoked some time after a full
+ * synchronize_sched()-style grace period elapses, in other words after
+ * all currently executing preempt-disabled sections of code (including
+ * hardirq handlers, NMI handlers, and local_irq_save() blocks) have
+ * completed.
+ */
+extern void call_rcu_sched(struct rcu_head *head,
+                           void (*func)(struct rcu_head *head));
+
 extern void __rcu_read_lock(void)       __acquires(RCU);
 extern void __rcu_read_unlock(void)     __releases(RCU);
 extern int rcu_pending(int cpu);
@@ -55,6 +84,7 @@ extern int rcu_needs_cpu(int cpu);
 extern void __synchronize_sched(void);
 
 extern void __rcu_init(void);
+extern void rcu_init_sched(void);
 extern void rcu_check_callbacks(int cpu, int user);
 extern void rcu_restart_cpu(int cpu);
 extern long rcu_batches_completed(void);
@@ -81,20 +111,20 @@ extern struct rcupreempt_trace *rcupreempt_trace_cpu(int cpu);
 struct softirq_action;
 
 #ifdef CONFIG_NO_HZ
-DECLARE_PER_CPU(long, dynticks_progress_counter);
+DECLARE_PER_CPU(struct rcu_dyntick_sched, rcu_dyntick_sched);
 
 static inline void rcu_enter_nohz(void)
 {
         smp_mb(); /* CPUs seeing ++ must see prior RCU read-side crit sects */
-        __get_cpu_var(dynticks_progress_counter)++;
-        WARN_ON(__get_cpu_var(dynticks_progress_counter) & 0x1);
+        __get_cpu_var(rcu_dyntick_sched).dynticks++;
+        WARN_ON(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1);
 }
 
 static inline void rcu_exit_nohz(void)
 {
-        __get_cpu_var(dynticks_progress_counter)++;
         smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */
-        WARN_ON(!(__get_cpu_var(dynticks_progress_counter) & 0x1));
+        __get_cpu_var(rcu_dyntick_sched).dynticks++;
+        WARN_ON(!(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1));
 }
 
 #else /* CONFIG_NO_HZ */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 55232ccf9cfd..48262f86c969 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -7,9 +7,18 @@
  */
 
 #include <linux/errno.h>
+#include <linux/list.h>
+#include <linux/cpumask.h>
 
 extern void cpu_idle(void);
 
+struct call_single_data {
+        struct list_head list;
+        void (*func) (void *info);
+        void *info;
+        unsigned int flags;
+};
+
 #ifdef CONFIG_SMP
 
 #include <linux/preempt.h>
@@ -52,15 +61,34 @@ extern void smp_cpus_done(unsigned int max_cpus);
 /*
  * Call a function on all other processors
  */
-int smp_call_function(void(*func)(void *info), void *info, int retry, int wait);
-
+int smp_call_function(void(*func)(void *info), void *info, int wait);
+int smp_call_function_mask(cpumask_t mask, void(*func)(void *info), void *info,
+                                int wait);
 int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
-                                int retry, int wait);
+                                int wait);
+void __smp_call_function_single(int cpuid, struct call_single_data *data);
+
+/*
+ * Generic and arch helpers
+ */
+#ifdef CONFIG_USE_GENERIC_SMP_HELPERS
+void generic_smp_call_function_single_interrupt(void);
+void generic_smp_call_function_interrupt(void);
+void init_call_single_data(void);
+void ipi_call_lock(void);
+void ipi_call_unlock(void);
+void ipi_call_lock_irq(void);
+void ipi_call_unlock_irq(void);
+#else
+static inline void init_call_single_data(void)
+{
+}
+#endif
 
 /*
  * Call a function on all processors
  */
-int on_each_cpu(void (*func) (void *info), void *info, int retry, int wait);
+int on_each_cpu(void (*func) (void *info), void *info, int wait);
 
 #define MSG_ALL_BUT_SELF        0x8000  /* Assume <32768 CPU's */
 #define MSG_ALL                 0x8001
@@ -90,9 +118,9 @@ static inline int up_smp_call_function(void (*func)(void *), void *info)
 {
         return 0;
 }
-#define smp_call_function(func, info, retry, wait) \
+#define smp_call_function(func, info, wait) \
                         (up_smp_call_function(func, info))
-#define on_each_cpu(func,info,retry,wait)       \
+#define on_each_cpu(func,info,wait)             \
         ({                                      \
                 local_irq_disable();            \
                 func(info);                     \
@@ -102,7 +130,7 @@ static inline int up_smp_call_function(void (*func)(void *), void *info)
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()                      1
 #define smp_prepare_boot_cpu()                  do {} while (0)
-#define smp_call_function_single(cpuid, func, info, retry, wait) \
+#define smp_call_function_single(cpuid, func, info, wait) \
 ({ \
         WARN_ON(cpuid != 0);    \
         local_irq_disable();    \
@@ -112,7 +140,9 @@ static inline void smp_send_reschedule(int cpu) { }
 })
 #define smp_call_function_mask(mask, func, info, wait) \
                         (up_smp_call_function(func, info))
-
+static inline void init_call_single_data(void)
+{
+}
 #endif /* !SMP */
 
 /*
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index f6a9fe0ef09c..00b78763a1bf 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -134,6 +134,7 @@ struct scsi_device {
         unsigned no_start_on_add:1;     /* do not issue start on add */
         unsigned allow_restart:1; /* issue START_UNIT in error handler */
         unsigned manage_start_stop:1;   /* Let HLD (sd) manage start/stop */
+        unsigned start_stop_pwr_cond:1; /* Set power cond. in START_STOP_UNIT */
         unsigned no_uld_attach:1; /* disable connecting to upper level drivers */
         unsigned select_no_atn:1;
         unsigned fix_capacity:1;        /* READ_CAPACITY is too high by 1 */
diff --git a/init/main.c b/init/main.c
index f7fb20021d48..edeace036fd9 100644
--- a/init/main.c
+++ b/init/main.c
@@ -31,6 +31,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/start_kernel.h>
 #include <linux/security.h>
+#include <linux/smp.h>
 #include <linux/workqueue.h>
 #include <linux/profile.h>
 #include <linux/rcupdate.h>
@@ -758,6 +759,7 @@ static void __init do_initcalls(void)
  */
 static void __init do_basic_setup(void)
 {
+        rcu_init_sched(); /* needed by module_init stage. */
         /* drivers will send hotplug events */
         init_workqueues();
         usermodehelper_init();
@@ -779,6 +781,7 @@ static void __init do_pre_smp_initcalls(void)
 {
         extern int spawn_ksoftirqd(void);
 
+        init_call_single_data();
         migration_init();
         spawn_ksoftirqd();
         if (!nosoftlockup)
diff --git a/kernel/Makefile b/kernel/Makefile
index f6328e16dfdd..0a7ed838984b 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
 obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
 obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o
 obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
+obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o
 obj-$(CONFIG_SMP) += spinlock.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
 obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 2913a8bff612..b8e4dce80a74 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -622,7 +622,7 @@ static void retrigger_next_event(void *arg)
 void clock_was_set(void)
 {
         /* Retrigger the CPU local events everywhere */
-        on_each_cpu(retrigger_next_event, NULL, 0, 1);
+        on_each_cpu(retrigger_next_event, NULL, 1);
 }
 
 /*
diff --git a/kernel/pid.c b/kernel/pid.c
index 20d59fa2d493..30bd5d4b2ac7 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/init.h>
+#include <linux/rculist.h>
 #include <linux/bootmem.h>
 #include <linux/hash.h>
 #include <linux/pid_namespace.h>
diff --git a/kernel/profile.c b/kernel/profile.c
index ae7ead82cbc9..58926411eb2a 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -252,7 +252,7 @@ static void profile_flip_buffers(void)
         mutex_lock(&profile_flip_mutex);
         j = per_cpu(cpu_profile_flip, get_cpu());
         put_cpu();
-        on_each_cpu(__profile_flip_buffers, NULL, 0, 1);
+        on_each_cpu(__profile_flip_buffers, NULL, 1);
         for_each_online_cpu(cpu) {
                 struct profile_hit *hits = per_cpu(cpu_profile_hits, cpu)[j];
                 for (i = 0; i < NR_PROFILE_HIT; ++i) {
@@ -275,7 +275,7 @@ static void profile_discard_flip_buffers(void)
         mutex_lock(&profile_flip_mutex);
         i = per_cpu(cpu_profile_flip, get_cpu());
         put_cpu();
-        on_each_cpu(__profile_flip_buffers, NULL, 0, 1);
+        on_each_cpu(__profile_flip_buffers, NULL, 1);
         for_each_online_cpu(cpu) {
                 struct profile_hit *hits = per_cpu(cpu_profile_hits, cpu)[i];
                 memset(hits, 0, NR_PROFILE_HIT*sizeof(struct profile_hit));
@@ -558,7 +558,7 @@ static int __init create_hash_tables(void)
 out_cleanup:
         prof_on = 0;
         smp_mb();
-        on_each_cpu(profile_nop, NULL, 0, 1);
+        on_each_cpu(profile_nop, NULL, 1);
         for_each_online_cpu(cpu) {
                 struct page *page;
 
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c
index 65c0906080ef..16eeeaa9d618 100644
--- a/kernel/rcuclassic.c
+++ b/kernel/rcuclassic.c
@@ -387,6 +387,10 @@ static void __rcu_offline_cpu(struct rcu_data *this_rdp,
         rcu_move_batch(this_rdp, rdp->donelist, rdp->donetail);
         rcu_move_batch(this_rdp, rdp->curlist, rdp->curtail);
         rcu_move_batch(this_rdp, rdp->nxtlist, rdp->nxttail);
+
+        local_irq_disable();
+        this_rdp->qlen += rdp->qlen;
+        local_irq_enable();
 }
 
 static void rcu_offline_cpu(int cpu)
@@ -516,10 +520,38 @@ void rcu_check_callbacks(int cpu, int user)
         if (user ||
             (idle_cpu(cpu) && !in_softirq() &&
                                 hardirq_count() <= (1 << HARDIRQ_SHIFT))) {
+
+                /*
+                 * Get here if this CPU took its interrupt from user
+                 * mode or from the idle loop, and if this is not a
+                 * nested interrupt.  In this case, the CPU is in
+                 * a quiescent state, so count it.
+                 *
+                 * Also do a memory barrier.  This is needed to handle
+                 * the case where writes from a preempt-disable section
+                 * of code get reordered into schedule() by this CPU's
+                 * write buffer.  The memory barrier makes sure that
+                 * the rcu_qsctr_inc() and rcu_bh_qsctr_inc() are see
+                 * by other CPUs to happen after any such write.
+                 */
+
+                smp_mb();  /* See above block comment. */
                 rcu_qsctr_inc(cpu);
                 rcu_bh_qsctr_inc(cpu);
-        } else if (!in_softirq())
+
+        } else if (!in_softirq()) {
+
+                /*
+                 * Get here if this CPU did not take its interrupt from
+                 * softirq, in other words, if it is not interrupting
+                 * a rcu_bh read-side critical section.  This is an _bh
+                 * critical section, so count it.  The memory barrier
+                 * is needed for the same reason as is the above one.
+                 */
+
+                smp_mb();  /* See above block comment. */
                 rcu_bh_qsctr_inc(cpu);
+        }
         raise_rcu_softirq();
 }
 
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index c09605f8d16c..f14f372cf6f5 100644
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -39,16 +39,16 @@
 #include <linux/sched.h>
 #include <asm/atomic.h>
 #include <linux/bitops.h>
-#include <linux/completion.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/mutex.h>
 #include <linux/module.h>
 
-struct rcu_synchronize {
-        struct rcu_head head;
-        struct completion completion;
+enum rcu_barrier {
+        RCU_BARRIER_STD,
+        RCU_BARRIER_BH,
+        RCU_BARRIER_SCHED,
 };
 
 static DEFINE_PER_CPU(struct rcu_head, rcu_barrier_head) = {NULL};
@@ -60,7 +60,7 @@ static struct completion rcu_barrier_completion;
  * Awaken the corresponding synchronize_rcu() instance now that a
  * grace period has elapsed.
  */
-static void wakeme_after_rcu(struct rcu_head  *head)
+void wakeme_after_rcu(struct rcu_head  *head)
 {
         struct rcu_synchronize *rcu;
 
@@ -77,17 +77,7 @@ static void wakeme_after_rcu(struct rcu_head  *head)
  * sections are delimited by rcu_read_lock() and rcu_read_unlock(),
  * and may be nested.
  */
-void synchronize_rcu(void)
-{
-        struct rcu_synchronize rcu;
-
-        init_completion(&rcu.completion);
-        /* Will wake me after RCU finished */
-        call_rcu(&rcu.head, wakeme_after_rcu);
-
-        /* Wait for it */
-        wait_for_completion(&rcu.completion);
-}
+synchronize_rcu_xxx(synchronize_rcu, call_rcu)
 EXPORT_SYMBOL_GPL(synchronize_rcu);
 
 static void rcu_barrier_callback(struct rcu_head *notused)
@@ -99,19 +89,30 @@ static void rcu_barrier_callback(struct rcu_head *notused)
 /*
  * Called with preemption disabled, and from cross-cpu IRQ context.
  */
-static void rcu_barrier_func(void *notused)
+static void rcu_barrier_func(void *type)
 {
         int cpu = smp_processor_id();
         struct rcu_head *head = &per_cpu(rcu_barrier_head, cpu);
 
         atomic_inc(&rcu_barrier_cpu_count);
-        call_rcu(head, rcu_barrier_callback);
+        switch ((enum rcu_barrier)type) {
+        case RCU_BARRIER_STD:
+                call_rcu(head, rcu_barrier_callback);
+                break;
+        case RCU_BARRIER_BH:
+                call_rcu_bh(head, rcu_barrier_callback);
+                break;
+        case RCU_BARRIER_SCHED:
+                call_rcu_sched(head, rcu_barrier_callback);
+                break;
+        }
 }
 
-/**
- * rcu_barrier - Wait until all the in-flight RCUs are complete.
+/*
+ * Orchestrate the specified type of RCU barrier, waiting for all
+ * RCU callbacks of the specified type to complete.
  */
-void rcu_barrier(void)
+static void _rcu_barrier(enum rcu_barrier type)
 {
         BUG_ON(in_interrupt());
         /* Take cpucontrol mutex to protect against CPU hotplug */
@@ -127,13 +128,39 @@ void rcu_barrier(void)
          * until all the callbacks are queued.
          */
         rcu_read_lock();
-        on_each_cpu(rcu_barrier_func, NULL, 0, 1);
+        on_each_cpu(rcu_barrier_func, (void *)type, 1);
         rcu_read_unlock();
         wait_for_completion(&rcu_barrier_completion);
         mutex_unlock(&rcu_barrier_mutex);
 }
+
+/**
+ * rcu_barrier - Wait until all in-flight call_rcu() callbacks complete.
+ */
+void rcu_barrier(void)
+{
+        _rcu_barrier(RCU_BARRIER_STD);
+}
 EXPORT_SYMBOL_GPL(rcu_barrier);
 
+/**
+ * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete.
+ */
+void rcu_barrier_bh(void)
+{
+        _rcu_barrier(RCU_BARRIER_BH);
+}
+EXPORT_SYMBOL_GPL(rcu_barrier_bh);
+
+/**
+ * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks.
+ */
+void rcu_barrier_sched(void)
+{
+        _rcu_barrier(RCU_BARRIER_SCHED);
+}
+EXPORT_SYMBOL_GPL(rcu_barrier_sched);
+
 void __init rcu_init(void)
 {
         __rcu_init();
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c
index 9bf445664457..6f62b77d93c4 100644
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
@@ -46,11 +46,11 @@
 #include <asm/atomic.h>
 #include <linux/bitops.h>
 #include <linux/module.h>
+#include <linux/kthread.h>
 #include <linux/completion.h>
 #include <linux/moduleparam.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
-#include <linux/rcupdate.h>
 #include <linux/cpu.h>
 #include <linux/random.h>
 #include <linux/delay.h>
@@ -82,14 +82,18 @@ struct rcu_data {
         spinlock_t      lock;           /* Protect rcu_data fields. */
         long            completed;      /* Number of last completed batch. */
         int             waitlistcount;
-        struct tasklet_struct rcu_tasklet;
         struct rcu_head *nextlist;
         struct rcu_head **nexttail;
         struct rcu_head *waitlist[GP_STAGES];
         struct rcu_head **waittail[GP_STAGES];
-        struct rcu_head *donelist;
+        struct rcu_head *donelist;      /* from waitlist & waitschedlist */
         struct rcu_head **donetail;
         long rcu_flipctr[2];
+        struct rcu_head *nextschedlist;
+        struct rcu_head **nextschedtail;
+        struct rcu_head *waitschedlist;
+        struct rcu_head **waitschedtail;
+        int rcu_sched_sleeping;
 #ifdef CONFIG_RCU_TRACE
         struct rcupreempt_trace trace;
 #endif /* #ifdef CONFIG_RCU_TRACE */
@@ -131,11 +135,24 @@ enum rcu_try_flip_states {
         rcu_try_flip_waitmb_state,
 };
 
+/*
+ * States for rcu_ctrlblk.rcu_sched_sleep.
+ */
+
+enum rcu_sched_sleep_states {
+        rcu_sched_not_sleeping, /* Not sleeping, callbacks need GP.  */
+        rcu_sched_sleep_prep,   /* Thinking of sleeping, rechecking. */
+        rcu_sched_sleeping,     /* Sleeping, awaken if GP needed. */
+};
+
 struct rcu_ctrlblk {
         spinlock_t      fliplock;       /* Protect state-machine transitions. */
         long            completed;      /* Number of last completed batch. */
         enum rcu_try_flip_states rcu_try_flip_state; /* The current state of
                                                         the rcu state machine */
+        spinlock_t      schedlock;      /* Protect rcu_sched sleep state. */
+        enum rcu_sched_sleep_states sched_sleep; /* rcu_sched state. */
+        wait_queue_head_t sched_wq;     /* Place for rcu_sched to sleep. */
 };
 
 static DEFINE_PER_CPU(struct rcu_data, rcu_data);
@@ -143,8 +160,12 @@ static struct rcu_ctrlblk rcu_ctrlblk = {
         .fliplock = __SPIN_LOCK_UNLOCKED(rcu_ctrlblk.fliplock),
         .completed = 0,
         .rcu_try_flip_state = rcu_try_flip_idle_state,
+        .schedlock = __SPIN_LOCK_UNLOCKED(rcu_ctrlblk.schedlock),
+        .sched_sleep = rcu_sched_not_sleeping,
+        .sched_wq = __WAIT_QUEUE_HEAD_INITIALIZER(rcu_ctrlblk.sched_wq),
 };
 
+static struct task_struct *rcu_sched_grace_period_task;
 
 #ifdef CONFIG_RCU_TRACE
 static char *rcu_try_flip_state_names[] =
@@ -207,6 +228,8 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(enum rcu_mb_flag_values, rcu_mb_flag)
  */
 #define RCU_TRACE_RDP(f, rdp) RCU_TRACE(f, &((rdp)->trace));
 
+#define RCU_SCHED_BATCH_TIME (HZ / 50)
+
 /*
  * Return the number of RCU batches processed thus far.  Useful
  * for debug and statistics.
@@ -411,32 +434,34 @@ static void __rcu_advance_callbacks(struct rcu_data *rdp)
         }
 }
 
-#ifdef CONFIG_NO_HZ
+DEFINE_PER_CPU_SHARED_ALIGNED(struct rcu_dyntick_sched, rcu_dyntick_sched) = {
+        .dynticks = 1,
+};
 
-DEFINE_PER_CPU(long, dynticks_progress_counter) = 1;
-static DEFINE_PER_CPU(long, rcu_dyntick_snapshot);
+#ifdef CONFIG_NO_HZ
 static DEFINE_PER_CPU(int, rcu_update_flag);
 
 /**
  * rcu_irq_enter - Called from Hard irq handlers and NMI/SMI.
  *
  * If the CPU was idle with dynamic ticks active, this updates the
- * dynticks_progress_counter to let the RCU handling know that the
+ * rcu_dyntick_sched.dynticks to let the RCU handling know that the
  * CPU is active.
  */
 void rcu_irq_enter(void)
 {
         int cpu = smp_processor_id();
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
 
         if (per_cpu(rcu_update_flag, cpu))
                 per_cpu(rcu_update_flag, cpu)++;
 
         /*
          * Only update if we are coming from a stopped ticks mode
-         * (dynticks_progress_counter is even).
+         * (rcu_dyntick_sched.dynticks is even).
          */
         if (!in_interrupt() &&
-            (per_cpu(dynticks_progress_counter, cpu) & 0x1) == 0) {
+            (rdssp->dynticks & 0x1) == 0) {
                 /*
                  * The following might seem like we could have a race
                  * with NMI/SMIs. But this really isn't a problem.
@@ -459,12 +484,12 @@ void rcu_irq_enter(void)
                  * RCU read-side critical sections on this CPU would
                  * have already completed.
                  */
-                per_cpu(dynticks_progress_counter, cpu)++;
+                rdssp->dynticks++;
                 /*
                  * The following memory barrier ensures that any
                  * rcu_read_lock() primitives in the irq handler
                  * are seen by other CPUs to follow the above
-                 * increment to dynticks_progress_counter. This is
+                 * increment to rcu_dyntick_sched.dynticks. This is
                  * required in order for other CPUs to correctly
                  * determine when it is safe to advance the RCU
                  * grace-period state machine.
@@ -472,7 +497,7 @@ void rcu_irq_enter(void)
                 smp_mb(); /* see above block comment. */
                 /*
                  * Since we can't determine the dynamic tick mode from
-                 * the dynticks_progress_counter after this routine,
+                 * the rcu_dyntick_sched.dynticks after this routine,
                  * we use a second flag to acknowledge that we came
                  * from an idle state with ticks stopped.
                  */
@@ -480,7 +505,7 @@ void rcu_irq_enter(void)
                 /*
                  * If we take an NMI/SMI now, they will also increment
                  * the rcu_update_flag, and will not update the
-                 * dynticks_progress_counter on exit. That is for
+                 * rcu_dyntick_sched.dynticks on exit. That is for
                  * this IRQ to do.
                  */
         }
@@ -490,12 +515,13 @@ void rcu_irq_enter(void)
  * rcu_irq_exit - Called from exiting Hard irq context.
  *
  * If the CPU was idle with dynamic ticks active, update the
- * dynticks_progress_counter to put let the RCU handling be
+ * rcu_dyntick_sched.dynticks to put let the RCU handling be
  * aware that the CPU is going back to idle with no ticks.
  */
 void rcu_irq_exit(void)
 {
         int cpu = smp_processor_id();
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
 
         /*
          * rcu_update_flag is set if we interrupted the CPU
@@ -503,7 +529,7 @@ void rcu_irq_exit(void)
          * Once this occurs, we keep track of interrupt nesting
          * because a NMI/SMI could also come in, and we still
          * only want the IRQ that started the increment of the
-         * dynticks_progress_counter to be the one that modifies
+         * rcu_dyntick_sched.dynticks to be the one that modifies
          * it on exit.
          */
         if (per_cpu(rcu_update_flag, cpu)) {
@@ -515,28 +541,29 @@ void rcu_irq_exit(void)
 
                 /*
                  * If an NMI/SMI happens now we are still
-                 * protected by the dynticks_progress_counter being odd.
+                 * protected by the rcu_dyntick_sched.dynticks being odd.
                  */
 
                 /*
                  * The following memory barrier ensures that any
                  * rcu_read_unlock() primitives in the irq handler
                  * are seen by other CPUs to preceed the following
-                 * increment to dynticks_progress_counter. This
+                 * increment to rcu_dyntick_sched.dynticks. This
                  * is required in order for other CPUs to determine
                  * when it is safe to advance the RCU grace-period
                  * state machine.
                  */
                 smp_mb(); /* see above block comment. */
-                per_cpu(dynticks_progress_counter, cpu)++;
-                WARN_ON(per_cpu(dynticks_progress_counter, cpu) & 0x1);
+                rdssp->dynticks++;
+                WARN_ON(rdssp->dynticks & 0x1);
         }
 }
 
 static void dyntick_save_progress_counter(int cpu)
 {
-        per_cpu(rcu_dyntick_snapshot, cpu) =
-                per_cpu(dynticks_progress_counter, cpu);
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
+
+        rdssp->dynticks_snap = rdssp->dynticks;
 }
 
 static inline int
@@ -544,9 +571,10 @@ rcu_try_flip_waitack_needed(int cpu)
 {
         long curr;
         long snap;
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
 
-        curr = per_cpu(dynticks_progress_counter, cpu);
-        snap = per_cpu(rcu_dyntick_snapshot, cpu);
+        curr = rdssp->dynticks;
+        snap = rdssp->dynticks_snap;
         smp_mb(); /* force ordering with cpu entering/leaving dynticks. */
 
         /*
@@ -567,7 +595,7 @@ rcu_try_flip_waitack_needed(int cpu)
          * that this CPU already acknowledged the counter.
          */
 
-        if ((curr - snap) > 2 || (snap & 0x1) == 0)
+        if ((curr - snap) > 2 || (curr & 0x1) == 0)
                 return 0;
 
         /* We need this CPU to explicitly acknowledge the counter flip. */
@@ -580,9 +608,10 @@ rcu_try_flip_waitmb_needed(int cpu)
 {
         long curr;
         long snap;
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
 
-        curr = per_cpu(dynticks_progress_counter, cpu);
-        snap = per_cpu(rcu_dyntick_snapshot, cpu);
+        curr = rdssp->dynticks;
+        snap = rdssp->dynticks_snap;
         smp_mb(); /* force ordering with cpu entering/leaving dynticks. */
 
         /*
@@ -609,14 +638,86 @@ rcu_try_flip_waitmb_needed(int cpu)
         return 1;
 }
 
+static void dyntick_save_progress_counter_sched(int cpu)
+{
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
+
+        rdssp->sched_dynticks_snap = rdssp->dynticks;
+}
+
+static int rcu_qsctr_inc_needed_dyntick(int cpu)
+{
+        long curr;
+        long snap;
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
+
+        curr = rdssp->dynticks;
+        snap = rdssp->sched_dynticks_snap;
+        smp_mb(); /* force ordering with cpu entering/leaving dynticks. */
+
+        /*
+         * If the CPU remained in dynticks mode for the entire time
+         * and didn't take any interrupts, NMIs, SMIs, or whatever,
+         * then it cannot be in the middle of an rcu_read_lock(), so
+         * the next rcu_read_lock() it executes must use the new value
+         * of the counter.  Therefore, this CPU has been in a quiescent
+         * state the entire time, and we don't need to wait for it.
+         */
+
+        if ((curr == snap) && ((curr & 0x1) == 0))
+                return 0;
+
+        /*
+         * If the CPU passed through or entered a dynticks idle phase with
+         * no active irq handlers, then, as above, this CPU has already
+         * passed through a quiescent state.
+         */
+
+        if ((curr - snap) > 2 || (snap & 0x1) == 0)
+                return 0;
+
+        /* We need this CPU to go through a quiescent state. */
+
+        return 1;
+}
+
 #else /* !CONFIG_NO_HZ */
 
-# define dyntick_save_progress_counter(cpu)     do { } while (0)
-# define rcu_try_flip_waitack_needed(cpu)       (1)
-# define rcu_try_flip_waitmb_needed(cpu)        (1)
+# define dyntick_save_progress_counter(cpu)             do { } while (0)
+# define rcu_try_flip_waitack_needed(cpu)               (1)
+# define rcu_try_flip_waitmb_needed(cpu)                (1)
+
+# define dyntick_save_progress_counter_sched(cpu)       do { } while (0)
+# define rcu_qsctr_inc_needed_dyntick(cpu)              (1)
 
 #endif /* CONFIG_NO_HZ */
 
+static void save_qsctr_sched(int cpu)
+{
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
+
+        rdssp->sched_qs_snap = rdssp->sched_qs;
+}
+
+static inline int rcu_qsctr_inc_needed(int cpu)
+{
+        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
+
+        /*
+         * If there has been a quiescent state, no more need to wait
+         * on this CPU.
+         */
+
+        if (rdssp->sched_qs != rdssp->sched_qs_snap) {
+                smp_mb(); /* force ordering with cpu entering schedule(). */
+                return 0;
+        }
+
+        /* We need this CPU to go through a quiescent state. */
+
+        return 1;
+}
+
 /*
  * Get here when RCU is idle.  Decide whether we need to
  * move out of idle state, and return non-zero if so.
@@ -819,6 +920,26 @@ void rcu_check_callbacks(int cpu, int user)
         unsigned long flags;
         struct rcu_data *rdp = RCU_DATA_CPU(cpu);
 
+        /*
+         * If this CPU took its interrupt from user mode or from the
+         * idle loop, and this is not a nested interrupt, then
+         * this CPU has to have exited all prior preept-disable
+         * sections of code.  So increment the counter to note this.
+         *
+         * The memory barrier is needed to handle the case where
+         * writes from a preempt-disable section of code get reordered
+         * into schedule() by this CPU's write buffer.  So the memory
+         * barrier makes sure that the rcu_qsctr_inc() is seen by other
+         * CPUs to happen after any such write.
+         */
+
+        if (user ||
+            (idle_cpu(cpu) && !in_softirq() &&
+             hardirq_count() <= (1 << HARDIRQ_SHIFT))) {
+                smp_mb();       /* Guard against aggressive schedule(). */
+                rcu_qsctr_inc(cpu);
+        }
+
         rcu_check_mb(cpu);
         if (rcu_ctrlblk.completed == rdp->completed)
                 rcu_try_flip();
@@ -869,6 +990,8 @@ void rcu_offline_cpu(int cpu)
         struct rcu_head *list = NULL;
         unsigned long flags;
         struct rcu_data *rdp = RCU_DATA_CPU(cpu);
+        struct rcu_head *schedlist = NULL;
+        struct rcu_head **schedtail = &schedlist;
         struct rcu_head **tail = &list;
 
         /*
@@ -882,6 +1005,11 @@ void rcu_offline_cpu(int cpu)
                 rcu_offline_cpu_enqueue(rdp->waitlist[i], rdp->waittail[i],
                                                 list, tail);
         rcu_offline_cpu_enqueue(rdp->nextlist, rdp->nexttail, list, tail);
+        rcu_offline_cpu_enqueue(rdp->waitschedlist, rdp->waitschedtail,
+                                schedlist, schedtail);
+        rcu_offline_cpu_enqueue(rdp->nextschedlist, rdp->nextschedtail,
+                                schedlist, schedtail);
+        rdp->rcu_sched_sleeping = 0;
         spin_unlock_irqrestore(&rdp->lock, flags);
         rdp->waitlistcount = 0;
 
@@ -916,12 +1044,15 @@ void rcu_offline_cpu(int cpu)
          * fix.
          */
 
-        local_irq_save(flags);
+        local_irq_save(flags);  /* disable preempt till we know what lock. */
         rdp = RCU_DATA_ME();
         spin_lock(&rdp->lock);
         *rdp->nexttail = list;
         if (list)
                 rdp->nexttail = tail;
+        *rdp->nextschedtail = schedlist;
+        if (schedlist)
+                rdp->nextschedtail = schedtail;
         spin_unlock_irqrestore(&rdp->lock, flags);
 }
 
@@ -936,10 +1067,25 @@ void rcu_offline_cpu(int cpu)
 void __cpuinit rcu_online_cpu(int cpu)
 {
         unsigned long flags;
+        struct rcu_data *rdp;
 
         spin_lock_irqsave(&rcu_ctrlblk.fliplock, flags);
         cpu_set(cpu, rcu_cpu_online_map);
         spin_unlock_irqrestore(&rcu_ctrlblk.fliplock, flags);
+
+        /*
+         * The rcu_sched grace-period processing might have bypassed
+         * this CPU, given that it was not in the rcu_cpu_online_map
+         * when the grace-period scan started.  This means that the
+         * grace-period task might sleep.  So make sure that if this
+         * should happen, the first callback posted to this CPU will
+         * wake up the grace-period task if need be.
+         */
+
+        rdp = RCU_DATA_CPU(cpu);
+        spin_lock_irqsave(&rdp->lock, flags);
+        rdp->rcu_sched_sleeping = 1;
+        spin_unlock_irqrestore(&rdp->lock, flags);
 }
 
 static void rcu_process_callbacks(struct softirq_action *unused)
@@ -982,31 +1128,196 @@ void call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu))
         *rdp->nexttail = head;
         rdp->nexttail = &head->next;
         RCU_TRACE_RDP(rcupreempt_trace_next_add, rdp);
-        spin_unlock(&rdp->lock);
-        local_irq_restore(flags);
+        spin_unlock_irqrestore(&rdp->lock, flags);
 }
 EXPORT_SYMBOL_GPL(call_rcu);
 
+void call_rcu_sched(struct rcu_head *head, void (*func)(struct rcu_head *rcu))
+{
+        unsigned long flags;
+        struct rcu_data *rdp;
+        int wake_gp = 0;
+
+        head->func = func;
+        head->next = NULL;
+        local_irq_save(flags);
+        rdp = RCU_DATA_ME();
+        spin_lock(&rdp->lock);
+        *rdp->nextschedtail = head;
+        rdp->nextschedtail = &head->next;
+        if (rdp->rcu_sched_sleeping) {
+
+                /* Grace-period processing might be sleeping... */
+
+                rdp->rcu_sched_sleeping = 0;
+                wake_gp = 1;
+        }
+        spin_unlock_irqrestore(&rdp->lock, flags);
+        if (wake_gp) {
+
+                /* Wake up grace-period processing, unless someone beat us. */
+
+                spin_lock_irqsave(&rcu_ctrlblk.schedlock, flags);
+                if (rcu_ctrlblk.sched_sleep != rcu_sched_sleeping)
+                        wake_gp = 0;
+                rcu_ctrlblk.sched_sleep = rcu_sched_not_sleeping;
+                spin_unlock_irqrestore(&rcu_ctrlblk.schedlock, flags);
+                if (wake_gp)
+                        wake_up_interruptible(&rcu_ctrlblk.sched_wq);
+        }
+}
+EXPORT_SYMBOL_GPL(call_rcu_sched);
+
 /*
  * Wait until all currently running preempt_disable() code segments
  * (including hardware-irq-disable segments) complete.  Note that
  * in -rt this does -not- necessarily result in all currently executing
  * interrupt -handlers- having completed.
  */
-void __synchronize_sched(void)
+synchronize_rcu_xxx(__synchronize_sched, call_rcu_sched)
+EXPORT_SYMBOL_GPL(__synchronize_sched);
+
+/*
+ * kthread function that manages call_rcu_sched grace periods.
+ */
+static int rcu_sched_grace_period(void *arg)
 {
-        cpumask_t oldmask;
+        int couldsleep;         /* might sleep after current pass. */
+        int couldsleepnext = 0; /* might sleep after next pass. */
         int cpu;
+        unsigned long flags;
+        struct rcu_data *rdp;
+        int ret;
 
-        if (sched_getaffinity(0, &oldmask) < 0)
-                oldmask = cpu_possible_map;
-        for_each_online_cpu(cpu) {
-                sched_setaffinity(0, &cpumask_of_cpu(cpu));
-                schedule();
-        }
-        sched_setaffinity(0, &oldmask);
+        /*
+         * Each pass through the following loop handles one
+         * rcu_sched grace period cycle.
+         */
+        do {
+                /* Save each CPU's current state. */
+
+                for_each_online_cpu(cpu) {
+                        dyntick_save_progress_counter_sched(cpu);
+                        save_qsctr_sched(cpu);
+                }
+
+                /*
+                 * Sleep for about an RCU grace-period's worth to
+                 * allow better batching and to consume less CPU.
+                 */
+                schedule_timeout_interruptible(RCU_SCHED_BATCH_TIME);
+
+                /*
+                 * If there was nothing to do last time, prepare to
+                 * sleep at the end of the current grace period cycle.
+                 */
+                couldsleep = couldsleepnext;
+                couldsleepnext = 1;
+                if (couldsleep) {
+                        spin_lock_irqsave(&rcu_ctrlblk.schedlock, flags);
+                        rcu_ctrlblk.sched_sleep = rcu_sched_sleep_prep;
+                        spin_unlock_irqrestore(&rcu_ctrlblk.schedlock, flags);
+                }
+
+                /*
+                 * Wait on each CPU in turn to have either visited
+                 * a quiescent state or been in dynticks-idle mode.
+                 */
+                for_each_online_cpu(cpu) {
+                        while (rcu_qsctr_inc_needed(cpu) &&
+                               rcu_qsctr_inc_needed_dyntick(cpu)) {
+                                /* resched_cpu(cpu); @@@ */
+                                schedule_timeout_interruptible(1);
+                        }
+                }
+
+                /* Advance callbacks for each CPU.  */
+
+                for_each_online_cpu(cpu) {
+
+                        rdp = RCU_DATA_CPU(cpu);
+                        spin_lock_irqsave(&rdp->lock, flags);
+
+                        /*
+                         * We are running on this CPU irq-disabled, so no
+                         * CPU can go offline until we re-enable irqs.
+                         * The current CPU might have already gone
+                         * offline (between the for_each_offline_cpu and
+                         * the spin_lock_irqsave), but in that case all its
+                         * callback lists will be empty, so no harm done.
+                         *
+                         * Advance the callbacks!  We share normal RCU's
+                         * donelist, since callbacks are invoked the
+                         * same way in either case.
+                         */
+                        if (rdp->waitschedlist != NULL) {
+                                *rdp->donetail = rdp->waitschedlist;
+                                rdp->donetail = rdp->waitschedtail;
+
+                                /*
+                                 * Next rcu_check_callbacks() will
+                                 * do the required raise_softirq().
+                                 */
+                        }
+                        if (rdp->nextschedlist != NULL) {
+                                rdp->waitschedlist = rdp->nextschedlist;
+                                rdp->waitschedtail = rdp->nextschedtail;
+                                couldsleep = 0;
+                                couldsleepnext = 0;
+                        } else {
+                                rdp->waitschedlist = NULL;
+                                rdp->waitschedtail = &rdp->waitschedlist;
+                        }
+                        rdp->nextschedlist = NULL;
+                        rdp->nextschedtail = &rdp->nextschedlist;
+
+                        /* Mark sleep intention. */
+
+                        rdp->rcu_sched_sleeping = couldsleep;
+
+                        spin_unlock_irqrestore(&rdp->lock, flags);
+                }
+
+                /* If we saw callbacks on the last scan, go deal with them. */
+
+                if (!couldsleep)
+                        continue;
+
+                /* Attempt to block... */
+
+                spin_lock_irqsave(&rcu_ctrlblk.schedlock, flags);
+                if (rcu_ctrlblk.sched_sleep != rcu_sched_sleep_prep) {
+
+                        /*
+                         * Someone posted a callback after we scanned.
+                         * Go take care of it.
+                         */
+                        spin_unlock_irqrestore(&rcu_ctrlblk.schedlock, flags);
+                        couldsleepnext = 0;
+                        continue;
+                }
+
+                /* Block until the next person posts a callback. */
+
+                rcu_ctrlblk.sched_sleep = rcu_sched_sleeping;
+                spin_unlock_irqrestore(&rcu_ctrlblk.schedlock, flags);
+                ret = 0;
+                __wait_event_interruptible(rcu_ctrlblk.sched_wq,
+                        rcu_ctrlblk.sched_sleep != rcu_sched_sleeping,
+                        ret);
+
+                /*
+                 * Signals would prevent us from sleeping, and we cannot
+                 * do much with them in any case.  So flush them.
+                 */
+                if (ret)
+                        flush_signals(current);
+                couldsleepnext = 0;
+
+        } while (!kthread_should_stop());
+
+        return (0);
 }
-EXPORT_SYMBOL_GPL(__synchronize_sched);
 
 /*
  * Check to see if any future RCU-related work will need to be done
@@ -1023,7 +1334,9 @@ int rcu_needs_cpu(int cpu)
 
         return (rdp->donelist != NULL ||
                 !!rdp->waitlistcount ||
-                rdp->nextlist != NULL);
+                rdp->nextlist != NULL ||
+                rdp->nextschedlist != NULL ||
+                rdp->waitschedlist != NULL);
 }
 
 int rcu_pending(int cpu)
@@ -1034,7 +1347,9 @@ int rcu_pending(int cpu)
 
         if (rdp->donelist != NULL ||
             !!rdp->waitlistcount ||
-            rdp->nextlist != NULL)
+            rdp->nextlist != NULL ||
+            rdp->nextschedlist != NULL ||
+            rdp->waitschedlist != NULL)
                 return 1;
 
         /* The RCU core needs an acknowledgement from this CPU. */
@@ -1101,6 +1416,11 @@ void __init __rcu_init(void)
                 rdp->donetail = &rdp->donelist;
                 rdp->rcu_flipctr[0] = 0;
                 rdp->rcu_flipctr[1] = 0;
+                rdp->nextschedlist = NULL;
+                rdp->nextschedtail = &rdp->nextschedlist;
+                rdp->waitschedlist = NULL;
+                rdp->waitschedtail = &rdp->waitschedlist;
+                rdp->rcu_sched_sleeping = 0;
         }
         register_cpu_notifier(&rcu_nb);
 
@@ -1123,11 +1443,15 @@ void __init __rcu_init(void)
 }
 
 /*
- * Deprecated, use synchronize_rcu() or synchronize_sched() instead.
+ * Late-boot-time RCU initialization that must wait until after scheduler
+ * has been initialized.
  */
-void synchronize_kernel(void)
+void __init rcu_init_sched(void)
 {
-        synchronize_rcu();
+        rcu_sched_grace_period_task = kthread_run(rcu_sched_grace_period,
+                                                  NULL,
+                                                  "rcu_sched_grace_period");
+        WARN_ON(IS_ERR(rcu_sched_grace_period_task));
 }
 
 #ifdef CONFIG_RCU_TRACE
diff --git a/kernel/rcupreempt_trace.c b/kernel/rcupreempt_trace.c
index 49ac4947af24..5edf82c34bbc 100644
--- a/kernel/rcupreempt_trace.c
+++ b/kernel/rcupreempt_trace.c
@@ -38,7 +38,6 @@
 #include <linux/moduleparam.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
-#include <linux/rcupdate.h>
 #include <linux/cpu.h>
 #include <linux/mutex.h>
 #include <linux/rcupreempt_trace.h>
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index 33acc424667e..90b5b123f7a1 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -57,7 +57,9 @@ static int stat_interval;	/* Interval between stats, in seconds. */
                                 /*  Defaults to "only at end of test". */
 static int verbose;             /* Print more debug info. */
 static int test_no_idle_hz;     /* Test RCU's support for tickless idle CPUs. */
-static int shuffle_interval = 5; /* Interval between shuffles (in sec)*/
+static int shuffle_interval = 3; /* Interval between shuffles (in sec)*/
+static int stutter = 5;         /* Start/stop testing interval (in sec) */
+static int irqreader = 1;       /* RCU readers from irq (timers). */
 static char *torture_type = "rcu"; /* What RCU implementation to torture. */
 
 module_param(nreaders, int, 0444);
@@ -72,6 +74,10 @@ module_param(test_no_idle_hz, bool, 0444);
 MODULE_PARM_DESC(test_no_idle_hz, "Test support for tickless idle CPUs");
 module_param(shuffle_interval, int, 0444);
 MODULE_PARM_DESC(shuffle_interval, "Number of seconds between shuffles");
+module_param(stutter, int, 0444);
+MODULE_PARM_DESC(stutter, "Number of seconds to run/halt test");
+module_param(irqreader, int, 0444);
+MODULE_PARM_DESC(irqreader, "Allow RCU readers from irq handlers");
 module_param(torture_type, charp, 0444);
 MODULE_PARM_DESC(torture_type, "Type of RCU to torture (rcu, rcu_bh, srcu)");
 
@@ -91,6 +97,7 @@ static struct task_struct **fakewriter_tasks;
 static struct task_struct **reader_tasks;
 static struct task_struct *stats_task;
 static struct task_struct *shuffler_task;
+static struct task_struct *stutter_task;
 
 #define RCU_TORTURE_PIPE_LEN 10
 
@@ -117,8 +124,18 @@ static atomic_t n_rcu_torture_alloc_fail;
 static atomic_t n_rcu_torture_free;
 static atomic_t n_rcu_torture_mberror;
 static atomic_t n_rcu_torture_error;
+static long n_rcu_torture_timers = 0;
 static struct list_head rcu_torture_removed;
 
+static int stutter_pause_test = 0;
+
+#if defined(MODULE) || defined(CONFIG_RCU_TORTURE_TEST_RUNNABLE)
+#define RCUTORTURE_RUNNABLE_INIT 1
+#else
+#define RCUTORTURE_RUNNABLE_INIT 0
+#endif
+int rcutorture_runnable = RCUTORTURE_RUNNABLE_INIT;
+
 /*
  * Allocate an element from the rcu_tortures pool.
  */
@@ -179,6 +196,16 @@ rcu_random(struct rcu_random_state *rrsp)
         return swahw32(rrsp->rrs_state);
 }
 
+static void
+rcu_stutter_wait(void)
+{
+        while (stutter_pause_test || !rcutorture_runnable)
+                if (rcutorture_runnable)
+                        schedule_timeout_interruptible(1);
+                else
+                        schedule_timeout_interruptible(round_jiffies_relative(HZ));
+}
+
 /*
  * Operations vector for selecting different types of tests.
  */
@@ -192,7 +219,9 @@ struct rcu_torture_ops {
         int (*completed)(void);
         void (*deferredfree)(struct rcu_torture *p);
         void (*sync)(void);
+        void (*cb_barrier)(void);
         int (*stats)(char *page);
+        int irqcapable;
         char *name;
 };
 static struct rcu_torture_ops *cur_ops = NULL;
@@ -265,7 +294,9 @@ static struct rcu_torture_ops rcu_ops = {
         .completed = rcu_torture_completed,
         .deferredfree = rcu_torture_deferred_free,
         .sync = synchronize_rcu,
+        .cb_barrier = rcu_barrier,
         .stats = NULL,
+        .irqcapable = 1,
         .name = "rcu"
 };
 
@@ -304,7 +335,9 @@ static struct rcu_torture_ops rcu_sync_ops = {
         .completed = rcu_torture_completed,
         .deferredfree = rcu_sync_torture_deferred_free,
         .sync = synchronize_rcu,
+        .cb_barrier = NULL,
         .stats = NULL,
+        .irqcapable = 1,
         .name = "rcu_sync"
 };
 
@@ -364,7 +397,9 @@ static struct rcu_torture_ops rcu_bh_ops = {
         .completed = rcu_bh_torture_completed,
         .deferredfree = rcu_bh_torture_deferred_free,
         .sync = rcu_bh_torture_synchronize,
+        .cb_barrier = rcu_barrier_bh,
         .stats = NULL,
+        .irqcapable = 1,
         .name = "rcu_bh"
 };
 
@@ -377,7 +412,9 @@ static struct rcu_torture_ops rcu_bh_sync_ops = {
         .completed = rcu_bh_torture_completed,
         .deferredfree = rcu_sync_torture_deferred_free,
         .sync = rcu_bh_torture_synchronize,
+        .cb_barrier = NULL,
         .stats = NULL,
+        .irqcapable = 1,
         .name = "rcu_bh_sync"
 };
 
@@ -458,6 +495,7 @@ static struct rcu_torture_ops srcu_ops = {
         .completed = srcu_torture_completed,
         .deferredfree = rcu_sync_torture_deferred_free,
         .sync = srcu_torture_synchronize,
+        .cb_barrier = NULL,
         .stats = srcu_torture_stats,
         .name = "srcu"
 };
@@ -482,6 +520,11 @@ static int sched_torture_completed(void)
         return 0;
 }
 
+static void rcu_sched_torture_deferred_free(struct rcu_torture *p)
+{
+        call_rcu_sched(&p->rtort_rcu, rcu_torture_cb);
+}
+
 static void sched_torture_synchronize(void)
 {
         synchronize_sched();
@@ -494,12 +537,28 @@ static struct rcu_torture_ops sched_ops = {
         .readdelay = rcu_read_delay,  /* just reuse rcu's version. */
         .readunlock = sched_torture_read_unlock,
         .completed = sched_torture_completed,
-        .deferredfree = rcu_sync_torture_deferred_free,
+        .deferredfree = rcu_sched_torture_deferred_free,
         .sync = sched_torture_synchronize,
+        .cb_barrier = rcu_barrier_sched,
         .stats = NULL,
+        .irqcapable = 1,
         .name = "sched"
 };
 
+static struct rcu_torture_ops sched_ops_sync = {
+        .init = rcu_sync_torture_init,
+        .cleanup = NULL,
+        .readlock = sched_torture_read_lock,
+        .readdelay = rcu_read_delay,  /* just reuse rcu's version. */
+        .readunlock = sched_torture_read_unlock,
+        .completed = sched_torture_completed,
+        .deferredfree = rcu_sync_torture_deferred_free,
+        .sync = sched_torture_synchronize,
+        .cb_barrier = NULL,
+        .stats = NULL,
+        .name = "sched_sync"
+};
+
 /*
  * RCU torture writer kthread.  Repeatedly substitutes a new structure
  * for that pointed to by rcu_torture_current, freeing the old structure
@@ -537,6 +596,7 @@ rcu_torture_writer(void *arg)
                 }
                 rcu_torture_current_version++;
                 oldbatch = cur_ops->completed();
+                rcu_stutter_wait();
         } while (!kthread_should_stop() && !fullstop);
         VERBOSE_PRINTK_STRING("rcu_torture_writer task stopping");
         while (!kthread_should_stop())
@@ -560,6 +620,7 @@ rcu_torture_fakewriter(void *arg)
                 schedule_timeout_uninterruptible(1 + rcu_random(&rand)%10);
                 udelay(rcu_random(&rand) & 0x3ff);
                 cur_ops->sync();
+                rcu_stutter_wait();
         } while (!kthread_should_stop() && !fullstop);
 
         VERBOSE_PRINTK_STRING("rcu_torture_fakewriter task stopping");
@@ -569,6 +630,52 @@ rcu_torture_fakewriter(void *arg)
 }
 
 /*
+ * RCU torture reader from timer handler.  Dereferences rcu_torture_current,
+ * incrementing the corresponding element of the pipeline array.  The
+ * counter in the element should never be greater than 1, otherwise, the
+ * RCU implementation is broken.
+ */
+static void rcu_torture_timer(unsigned long unused)
+{
+        int idx;
+        int completed;
+        static DEFINE_RCU_RANDOM(rand);
+        static DEFINE_SPINLOCK(rand_lock);
+        struct rcu_torture *p;
+        int pipe_count;
+
+        idx = cur_ops->readlock();
+        completed = cur_ops->completed();
+        p = rcu_dereference(rcu_torture_current);
+        if (p == NULL) {
+                /* Leave because rcu_torture_writer is not yet underway */
+                cur_ops->readunlock(idx);
+                return;
+        }
+        if (p->rtort_mbtest == 0)
+                atomic_inc(&n_rcu_torture_mberror);
+        spin_lock(&rand_lock);
+        cur_ops->readdelay(&rand);
+        n_rcu_torture_timers++;
+        spin_unlock(&rand_lock);
+        preempt_disable();
+        pipe_count = p->rtort_pipe_count;
+        if (pipe_count > RCU_TORTURE_PIPE_LEN) {
+                /* Should not happen, but... */
+                pipe_count = RCU_TORTURE_PIPE_LEN;
+        }
+        ++__get_cpu_var(rcu_torture_count)[pipe_count];
+        completed = cur_ops->completed() - completed;
+        if (completed > RCU_TORTURE_PIPE_LEN) {
+                /* Should not happen, but... */
+                completed = RCU_TORTURE_PIPE_LEN;
+        }
+        ++__get_cpu_var(rcu_torture_batch)[completed];
+        preempt_enable();
+        cur_ops->readunlock(idx);
+}
+
+/*
  * RCU torture reader kthread.  Repeatedly dereferences rcu_torture_current,
  * incrementing the corresponding element of the pipeline array.  The
  * counter in the element should never be greater than 1, otherwise, the
@@ -582,11 +689,18 @@ rcu_torture_reader(void *arg)
         DEFINE_RCU_RANDOM(rand);
         struct rcu_torture *p;
         int pipe_count;
+        struct timer_list t;
 
         VERBOSE_PRINTK_STRING("rcu_torture_reader task started");
         set_user_nice(current, 19);
+        if (irqreader && cur_ops->irqcapable)
+                setup_timer_on_stack(&t, rcu_torture_timer, 0);
 
         do {
+                if (irqreader && cur_ops->irqcapable) {
+                        if (!timer_pending(&t))
+                                mod_timer(&t, 1);
+                }
                 idx = cur_ops->readlock();
                 completed = cur_ops->completed();
                 p = rcu_dereference(rcu_torture_current);
@@ -615,8 +729,11 @@ rcu_torture_reader(void *arg)
                 preempt_enable();
                 cur_ops->readunlock(idx);
                 schedule();
+                rcu_stutter_wait();
         } while (!kthread_should_stop() && !fullstop);
         VERBOSE_PRINTK_STRING("rcu_torture_reader task stopping");
+        if (irqreader && cur_ops->irqcapable)
+                del_timer_sync(&t);
         while (!kthread_should_stop())
                 schedule_timeout_uninterruptible(1);
         return 0;
@@ -647,20 +764,22 @@ rcu_torture_printk(char *page)
         cnt += sprintf(&page[cnt], "%s%s ", torture_type, TORTURE_FLAG);
         cnt += sprintf(&page[cnt],
                        "rtc: %p ver: %ld tfle: %d rta: %d rtaf: %d rtf: %d "
-                       "rtmbe: %d",
+                       "rtmbe: %d nt: %ld",
                        rcu_torture_current,
                        rcu_torture_current_version,
                        list_empty(&rcu_torture_freelist),
                        atomic_read(&n_rcu_torture_alloc),
                        atomic_read(&n_rcu_torture_alloc_fail),
                        atomic_read(&n_rcu_torture_free),
-                       atomic_read(&n_rcu_torture_mberror));
+                       atomic_read(&n_rcu_torture_mberror),
+                       n_rcu_torture_timers);
         if (atomic_read(&n_rcu_torture_mberror) != 0)
                 cnt += sprintf(&page[cnt], " !!!");
         cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
         if (i > 1) {
                 cnt += sprintf(&page[cnt], "!!! ");
                 atomic_inc(&n_rcu_torture_error);
+                WARN_ON_ONCE(1);
         }
         cnt += sprintf(&page[cnt], "Reader Pipe: ");
         for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
@@ -785,15 +904,34 @@ rcu_torture_shuffle(void *arg)
         return 0;
 }
 
+/* Cause the rcutorture test to "stutter", starting and stopping all
+ * threads periodically.
+ */
+static int
+rcu_torture_stutter(void *arg)
+{
+        VERBOSE_PRINTK_STRING("rcu_torture_stutter task started");
+        do {
+                schedule_timeout_interruptible(stutter * HZ);
+                stutter_pause_test = 1;
+                if (!kthread_should_stop())
+                        schedule_timeout_interruptible(stutter * HZ);
+                stutter_pause_test = 0;
+        } while (!kthread_should_stop());
+        VERBOSE_PRINTK_STRING("rcu_torture_stutter task stopping");
+        return 0;
+}
+
 static inline void
 rcu_torture_print_module_parms(char *tag)
 {
         printk(KERN_ALERT "%s" TORTURE_FLAG
                 "--- %s: nreaders=%d nfakewriters=%d "
                 "stat_interval=%d verbose=%d test_no_idle_hz=%d "
-                "shuffle_interval = %d\n",
+                "shuffle_interval=%d stutter=%d irqreader=%d\n",
                 torture_type, tag, nrealreaders, nfakewriters,
-                stat_interval, verbose, test_no_idle_hz, shuffle_interval);
+                stat_interval, verbose, test_no_idle_hz, shuffle_interval,
+                stutter, irqreader);
 }
 
 static void
@@ -802,6 +940,11 @@ rcu_torture_cleanup(void)
         int i;
 
         fullstop = 1;
+        if (stutter_task) {
+                VERBOSE_PRINTK_STRING("Stopping rcu_torture_stutter task");
+                kthread_stop(stutter_task);
+        }
+        stutter_task = NULL;
         if (shuffler_task) {
                 VERBOSE_PRINTK_STRING("Stopping rcu_torture_shuffle task");
                 kthread_stop(shuffler_task);
@@ -848,7 +991,9 @@ rcu_torture_cleanup(void)
         stats_task = NULL;
 
         /* Wait for all RCU callbacks to fire.  */
-        rcu_barrier();
+
+        if (cur_ops->cb_barrier != NULL)
+                cur_ops->cb_barrier();
 
         rcu_torture_stats_print();  /* -After- the stats thread is stopped! */
 
@@ -868,7 +1013,7 @@ rcu_torture_init(void)
         int firsterr = 0;
         static struct rcu_torture_ops *torture_ops[] =
                 { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops,
-                  &srcu_ops, &sched_ops, };
+                  &srcu_ops, &sched_ops, &sched_ops_sync, };
 
         /* Process args and tell the world that the torturer is on the job. */
         for (i = 0; i < ARRAY_SIZE(torture_ops); i++) {
@@ -988,6 +1133,19 @@ rcu_torture_init(void)
                         goto unwind;
                 }
         }
+        if (stutter < 0)
+                stutter = 0;
+        if (stutter) {
+                /* Create the stutter thread */
+                stutter_task = kthread_run(rcu_torture_stutter, NULL,
+                                          "rcu_torture_stutter");
+                if (IS_ERR(stutter_task)) {
+                        firsterr = PTR_ERR(stutter_task);
+                        VERBOSE_PRINTK_ERRSTRING("Failed to create stutter");
+                        stutter_task = NULL;
+                        goto unwind;
+                }
+        }
         return 0;
 
 unwind:
diff --git a/kernel/smp.c b/kernel/smp.c
new file mode 100644
index 000000000000..462c785ca1ee
--- /dev/null
+++ b/kernel/smp.c
@@ -0,0 +1,383 @@
+/*
+ * Generic helpers for smp ipi calls
+ *
+ * (C) Jens Axboe <jens.axboe@oracle.com> 2008
+ *
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/percpu.h>
+#include <linux/rcupdate.h>
+#include <linux/rculist.h>
+#include <linux/smp.h>
+
+static DEFINE_PER_CPU(struct call_single_queue, call_single_queue);
+static LIST_HEAD(call_function_queue);
+__cacheline_aligned_in_smp DEFINE_SPINLOCK(call_function_lock);
+
+enum {
+        CSD_FLAG_WAIT           = 0x01,
+        CSD_FLAG_ALLOC          = 0x02,
+};
+
+struct call_function_data {
+        struct call_single_data csd;
+        spinlock_t lock;
+        unsigned int refs;
+        cpumask_t cpumask;
+        struct rcu_head rcu_head;
+};
+
+struct call_single_queue {
+        struct list_head list;
+        spinlock_t lock;
+};
+
+void __cpuinit init_call_single_data(void)
+{
+        int i;
+
+        for_each_possible_cpu(i) {
+                struct call_single_queue *q = &per_cpu(call_single_queue, i);
+
+                spin_lock_init(&q->lock);
+                INIT_LIST_HEAD(&q->list);
+        }
+}
+
+static void csd_flag_wait(struct call_single_data *data)
+{
+        /* Wait for response */
+        do {
+                /*
+                 * We need to see the flags store in the IPI handler
+                 */
+                smp_mb();
+                if (!(data->flags & CSD_FLAG_WAIT))
+                        break;
+                cpu_relax();
+        } while (1);
+}
+
+/*
+ * Insert a previously allocated call_single_data element for execution
+ * on the given CPU. data must already have ->func, ->info, and ->flags set.
+ */
+static void generic_exec_single(int cpu, struct call_single_data *data)
+{
+        struct call_single_queue *dst = &per_cpu(call_single_queue, cpu);
+        int wait = data->flags & CSD_FLAG_WAIT, ipi;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dst->lock, flags);
+        ipi = list_empty(&dst->list);
+        list_add_tail(&data->list, &dst->list);
+        spin_unlock_irqrestore(&dst->lock, flags);
+
+        if (ipi)
+                arch_send_call_function_single_ipi(cpu);
+
+        if (wait)
+                csd_flag_wait(data);
+}
+
+static void rcu_free_call_data(struct rcu_head *head)
+{
+        struct call_function_data *data;
+
+        data = container_of(head, struct call_function_data, rcu_head);
+
+        kfree(data);
+}
+
+/*
+ * Invoked by arch to handle an IPI for call function. Must be called with
+ * interrupts disabled.
+ */
+void generic_smp_call_function_interrupt(void)
+{
+        struct call_function_data *data;
+        int cpu = get_cpu();
+
+        /*
+         * It's ok to use list_for_each_rcu() here even though we may delete
+         * 'pos', since list_del_rcu() doesn't clear ->next
+         */
+        rcu_read_lock();
+        list_for_each_entry_rcu(data, &call_function_queue, csd.list) {
+                int refs;
+
+                if (!cpu_isset(cpu, data->cpumask))
+                        continue;
+
+                data->csd.func(data->csd.info);
+
+                spin_lock(&data->lock);
+                cpu_clear(cpu, data->cpumask);
+                WARN_ON(data->refs == 0);
+                data->refs--;
+                refs = data->refs;
+                spin_unlock(&data->lock);
+
+                if (refs)
+                        continue;
+
+                spin_lock(&call_function_lock);
+                list_del_rcu(&data->csd.list);
+                spin_unlock(&call_function_lock);
+
+                if (data->csd.flags & CSD_FLAG_WAIT) {
+                        /*
+                         * serialize stores to data with the flag clear
+                         * and wakeup
+                         */
+                        smp_wmb();
+                        data->csd.flags &= ~CSD_FLAG_WAIT;
+                } else
+                        call_rcu(&data->rcu_head, rcu_free_call_data);
+        }
+        rcu_read_unlock();
+
+        put_cpu();
+}
+
+/*
+ * Invoked by arch to handle an IPI for call function single. Must be called
+ * from the arch with interrupts disabled.
+ */
+void generic_smp_call_function_single_interrupt(void)
+{
+        struct call_single_queue *q = &__get_cpu_var(call_single_queue);
+        LIST_HEAD(list);
+
+        /*
+         * Need to see other stores to list head for checking whether
+         * list is empty without holding q->lock
+         */
+        smp_mb();
+        while (!list_empty(&q->list)) {
+                unsigned int data_flags;
+
+                spin_lock(&q->lock);
+                list_replace_init(&q->list, &list);
+                spin_unlock(&q->lock);
+
+                while (!list_empty(&list)) {
+                        struct call_single_data *data;
+
+                        data = list_entry(list.next, struct call_single_data,
+                                                list);
+                        list_del(&data->list);
+
+                        /*
+                         * 'data' can be invalid after this call if
+                         * flags == 0 (when called through
+                         * generic_exec_single(), so save them away before
+                         * making the call.
+                         */
+                        data_flags = data->flags;
+
+                        data->func(data->info);
+
+                        if (data_flags & CSD_FLAG_WAIT) {
+                                smp_wmb();
+                                data->flags &= ~CSD_FLAG_WAIT;
+                        } else if (data_flags & CSD_FLAG_ALLOC)
+                                kfree(data);
+                }
+                /*
+                 * See comment on outer loop
+                 */
+                smp_mb();
+        }
+}
+
+/*
+ * smp_call_function_single - Run a function on a specific CPU
+ * @func: The function to run. This must be fast and non-blocking.
+ * @info: An arbitrary pointer to pass to the function.
+ * @wait: If true, wait until function has completed on other CPUs.
+ *
+ * Returns 0 on success, else a negative status code. Note that @wait
+ * will be implicitly turned on in case of allocation failures, since
+ * we fall back to on-stack allocation.
+ */
+int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
+                             int wait)
+{
+        struct call_single_data d;
+        unsigned long flags;
+        /* prevent preemption and reschedule on another processor */
+        int me = get_cpu();
+
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
+
+        if (cpu == me) {
+                local_irq_save(flags);
+                func(info);
+                local_irq_restore(flags);
+        } else {
+                struct call_single_data *data = NULL;
+
+                if (!wait) {
+                        data = kmalloc(sizeof(*data), GFP_ATOMIC);
+                        if (data)
+                                data->flags = CSD_FLAG_ALLOC;
+                }
+                if (!data) {
+                        data = &d;
+                        data->flags = CSD_FLAG_WAIT;
+                }
+
+                data->func = func;
+                data->info = info;
+                generic_exec_single(cpu, data);
+        }
+
+        put_cpu();
+        return 0;
+}
+EXPORT_SYMBOL(smp_call_function_single);
+
+/**
+ * __smp_call_function_single(): Run a function on another CPU
+ * @cpu: The CPU to run on.
+ * @data: Pre-allocated and setup data structure
+ *
+ * Like smp_call_function_single(), but allow caller to pass in a pre-allocated
+ * data structure. Useful for embedding @data inside other structures, for
+ * instance.
+ *
+ */
+void __smp_call_function_single(int cpu, struct call_single_data *data)
+{
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON((data->flags & CSD_FLAG_WAIT) && irqs_disabled());
+
+        generic_exec_single(cpu, data);
+}
+
+/**
+ * smp_call_function_mask(): Run a function on a set of other CPUs.
+ * @mask: The set of cpus to run on.
+ * @func: The function to run. This must be fast and non-blocking.
+ * @info: An arbitrary pointer to pass to the function.
+ * @wait: If true, wait (atomically) until function has completed on other CPUs.
+ *
+ * Returns 0 on success, else a negative status code.
+ *
+ * If @wait is true, then returns once @func has returned. Note that @wait
+ * will be implicitly turned on in case of allocation failures, since
+ * we fall back to on-stack allocation.
+ *
+ * You must not call this function with disabled interrupts or from a
+ * hardware interrupt handler or from a bottom half handler. Preemption
+ * must be disabled when calling this function.
+ */
+int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info,
+                           int wait)
+{
+        struct call_function_data d;
+        struct call_function_data *data = NULL;
+        cpumask_t allbutself;
+        unsigned long flags;
+        int cpu, num_cpus;
+
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
+
+        cpu = smp_processor_id();
+        allbutself = cpu_online_map;
+        cpu_clear(cpu, allbutself);
+        cpus_and(mask, mask, allbutself);
+        num_cpus = cpus_weight(mask);
+
+        /*
+         * If zero CPUs, return. If just a single CPU, turn this request
+         * into a targetted single call instead since it's faster.
+         */
+        if (!num_cpus)
+                return 0;
+        else if (num_cpus == 1) {
+                cpu = first_cpu(mask);
+                return smp_call_function_single(cpu, func, info, wait);
+        }
+
+        if (!wait) {
+                data = kmalloc(sizeof(*data), GFP_ATOMIC);
+                if (data)
+                        data->csd.flags = CSD_FLAG_ALLOC;
+        }
+        if (!data) {
+                data = &d;
+                data->csd.flags = CSD_FLAG_WAIT;
+                wait = 1;
+        }
+
+        spin_lock_init(&data->lock);
+        data->csd.func = func;
+        data->csd.info = info;
+        data->refs = num_cpus;
+        data->cpumask = mask;
+
+        spin_lock_irqsave(&call_function_lock, flags);
+        list_add_tail_rcu(&data->csd.list, &call_function_queue);
+        spin_unlock_irqrestore(&call_function_lock, flags);
+
+        /* Send a message to all CPUs in the map */
+        arch_send_call_function_ipi(mask);
+
+        /* optionally wait for the CPUs to complete */
+        if (wait)
+                csd_flag_wait(&data->csd);
+
+        return 0;
+}
+EXPORT_SYMBOL(smp_call_function_mask);
+
+/**
+ * smp_call_function(): Run a function on all other CPUs.
+ * @func: The function to run. This must be fast and non-blocking.
+ * @info: An arbitrary pointer to pass to the function.
+ * @wait: If true, wait (atomically) until function has completed on other CPUs.
+ *
+ * Returns 0 on success, else a negative status code.
+ *
+ * If @wait is true, then returns once @func has returned; otherwise
+ * it returns just before the target cpu calls @func. In case of allocation
+ * failure, @wait will be implicitly turned on.
+ *
+ * You must not call this function with disabled interrupts or from a
+ * hardware interrupt handler or from a bottom half handler.
+ */
+int smp_call_function(void (*func)(void *), void *info, int wait)
+{
+        int ret;
+
+        preempt_disable();
+        ret = smp_call_function_mask(cpu_online_map, func, info, wait);
+        preempt_enable();
+        return ret;
+}
+EXPORT_SYMBOL(smp_call_function);
+
+void ipi_call_lock(void)
+{
+        spin_lock(&call_function_lock);
+}
+
+void ipi_call_unlock(void)
+{
+        spin_unlock(&call_function_lock);
+}
+
+void ipi_call_lock_irq(void)
+{
+        spin_lock_irq(&call_function_lock);
+}
+
+void ipi_call_unlock_irq(void)
+{
+        spin_unlock_irq(&call_function_lock);
+}
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 3e9e896fdc5b..81e2fe0f983a 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -645,12 +645,12 @@ __init int spawn_ksoftirqd(void)
 /*
  * Call a function on all processors
  */
-int on_each_cpu(void (*func) (void *info), void *info, int retry, int wait)
+int on_each_cpu(void (*func) (void *info), void *info, int wait)
 {
         int ret = 0;
 
         preempt_disable();
-        ret = smp_call_function(func, info, retry, wait);
+        ret = smp_call_function(func, info, wait);
         local_irq_disable();
         func(info);
         local_irq_enable();
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 0d562d6531eb..6b16e16428d8 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -83,6 +83,9 @@ extern int maps_protect;
 extern int sysctl_stat_interval;
 extern int latencytop_enabled;
 extern int sysctl_nr_open_min, sysctl_nr_open_max;
+#ifdef CONFIG_RCU_TORTURE_TEST
+extern int rcutorture_runnable;
+#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
 
 /* Constants used for minimum and  maximum */
 #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM)
@@ -820,6 +823,16 @@ static struct ctl_table kern_table[] = {
                 .child          = key_sysctls,
         },
 #endif
+#ifdef CONFIG_RCU_TORTURE_TEST
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "rcutorture_runnable",
+                .data           = &rcutorture_runnable,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+        },
+#endif
 /*
  * NOTE: do not add new entries to this table unless you have read
  * Documentation/sysctl/ctl_unnumbered.txt
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 67f80c261709..f48d0f09d32f 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -268,7 +268,7 @@ void tick_broadcast_on_off(unsigned long reason, int *oncpu)
                        "offline CPU #%d\n", *oncpu);
         else
                 smp_call_function_single(*oncpu, tick_do_broadcast_on_off,
-                                         &reason, 1, 1);
+                                         &reason, 1);
 }
 
 /*
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c459e8547bd8..df27132a56f4 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -530,16 +530,34 @@ config BOOT_PRINTK_DELAY
 config RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL
-        depends on m
         default n
         help
           This option provides a kernel module that runs torture tests
           on the RCU infrastructure.  The kernel module may be built
           after the fact on the running kernel to be tested, if desired.
 
+          Say Y here if you want RCU torture tests to be built into
+          the kernel.
           Say M if you want the RCU torture tests to build as a module.
           Say N if you are unsure.
 
+config RCU_TORTURE_TEST_RUNNABLE
+        bool "torture tests for RCU runnable by default"
+        depends on RCU_TORTURE_TEST = y
+        default n
+        help
+          This option provides a way to build the RCU torture tests
+          directly into the kernel without them starting up at boot
+          time.  You can use /proc/sys/kernel/rcutorture_runnable
+          to manually override this setting.  This /proc file is
+          available only when the RCU torture tests have been built
+          into the kernel.
+
+          Say Y here if you want the RCU torture tests to start during
+          boot (you probably don't).
+          Say N here if you want the RCU torture tests to start only
+          after being manually enabled via /proc.
+
 config KPROBES_SANITY_TEST
         bool "Kprobes sanity tests"
         depends on DEBUG_KERNEL
diff --git a/lib/textsearch.c b/lib/textsearch.c
index be8bda3862f5..a3e500ad51d7 100644
--- a/lib/textsearch.c
+++ b/lib/textsearch.c
@@ -97,6 +97,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/init.h>
+#include <linux/rculist.h>
 #include <linux/rcupdate.h>
 #include <linux/err.h>
 #include <linux/textsearch.h>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f024b9b3a2a6..79ac4afc908c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -918,7 +918,7 @@ void drain_local_pages(void *arg)
  */
 void drain_all_pages(void)
 {
-        on_each_cpu(drain_local_pages, NULL, 0, 1);
+        on_each_cpu(drain_local_pages, NULL, 1);
 }
 
 #ifdef CONFIG_HIBERNATION
diff --git a/mm/slab.c b/mm/slab.c
index b4aa4c88250e..052e7d64537e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2446,7 +2446,7 @@ static void drain_cpu_caches(struct kmem_cache *cachep)
         struct kmem_list3 *l3;
         int node;
 
-        on_each_cpu(do_drain, cachep, 1, 1);
+        on_each_cpu(do_drain, cachep, 1);
         check_irq_on();
         for_each_online_node(node) {
                 l3 = cachep->nodelists[node];
@@ -3931,7 +3931,7 @@ static int do_tune_cpucache(struct kmem_cache *cachep, int limit,
         }
         new->cachep = cachep;
 
-        on_each_cpu(do_ccupdate_local, (void *)new, 1, 1);
+        on_each_cpu(do_ccupdate_local, (void *)new, 1);
 
         check_irq_on();
         cachep->batchcount = batchcount;
diff --git a/mm/slub.c b/mm/slub.c
index 488400d10700..35ab38a94b46 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1496,7 +1496,7 @@ static void flush_cpu_slab(void *d)
 static void flush_all(struct kmem_cache *s)
 {
 #ifdef CONFIG_SMP
-        on_each_cpu(flush_cpu_slab, s, 1, 1);
+        on_each_cpu(flush_cpu_slab, s, 1);
 #else
         unsigned long flags;
 
diff --git a/net/802/psnap.c b/net/802/psnap.c
index 31128cb92a23..ea4643931446 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -20,6 +20,7 @@
 #include <linux/mm.h>
 #include <linux/in.h>
 #include <linux/init.h>
+#include <linux/rculist.h>
 
 static LIST_HEAD(snap_list);
 static DEFINE_SPINLOCK(snap_lock);
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index ab2225da0ee2..08f14f6c5fd6 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -27,6 +27,7 @@
 #include <linux/mm.h>
 #include <linux/in.h>
 #include <linux/init.h>
+#include <linux/rculist.h>
 #include <net/p8022.h>
 #include <net/arp.h>
 #include <linux/rtnetlink.h>
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 72c5976a5ce3..142060f02054 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -15,6 +15,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/rculist.h>
 #include <linux/spinlock.h>
 #include <linux/times.h>
 #include <linux/netdevice.h>
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index e38034aa56f5..9e96ffcd29a3 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -13,6 +13,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
+#include <linux/rculist.h>
 
 #include "br_private.h"
 #include "br_private_stp.h"
diff --git a/net/core/flow.c b/net/core/flow.c
index 19991175fdeb..5cf81052d044 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -298,7 +298,7 @@ void flow_cache_flush(void)
         init_completion(&info.completion);
 
         local_bh_disable();
-        smp_call_function(flow_cache_flush_per_cpu, &info, 1, 0);
+        smp_call_function(flow_cache_flush_per_cpu, &info, 0);
         flow_cache_flush_tasklet((unsigned long)&info);
         local_bh_enable();
 
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 7f82b7616212..cc34ac769a3c 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -480,7 +480,7 @@ static void iucv_setmask_mp(void)
                 if (cpu_isset(cpu, iucv_buffer_cpumask) &&
                     !cpu_isset(cpu, iucv_irq_cpumask))
                         smp_call_function_single(cpu, iucv_allow_cpu,
-                                                 NULL, 0, 1);
+                                                 NULL, 1);
         preempt_enable();
 }
 
@@ -498,7 +498,7 @@ static void iucv_setmask_up(void)
         cpumask = iucv_irq_cpumask;
         cpu_clear(first_cpu(iucv_irq_cpumask), cpumask);
         for_each_cpu_mask(cpu, cpumask)
-                smp_call_function_single(cpu, iucv_block_cpu, NULL, 0, 1);
+                smp_call_function_single(cpu, iucv_block_cpu, NULL, 1);
 }
 
 /**
@@ -523,7 +523,7 @@ static int iucv_enable(void)
         rc = -EIO;
         preempt_disable();
         for_each_online_cpu(cpu)
-                smp_call_function_single(cpu, iucv_declare_cpu, NULL, 0, 1);
+                smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
         preempt_enable();
         if (cpus_empty(iucv_buffer_cpumask))
                 /* No cpu could declare an iucv buffer. */
@@ -545,7 +545,7 @@ out:
  */
 static void iucv_disable(void)
 {
-        on_each_cpu(iucv_retrieve_cpu, NULL, 0, 1);
+        on_each_cpu(iucv_retrieve_cpu, NULL, 1);
         kfree(iucv_path_table);
 }
 
@@ -580,7 +580,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
         case CPU_ONLINE_FROZEN:
         case CPU_DOWN_FAILED:
         case CPU_DOWN_FAILED_FROZEN:
-                smp_call_function_single(cpu, iucv_declare_cpu, NULL, 0, 1);
+                smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
                 break;
         case CPU_DOWN_PREPARE:
         case CPU_DOWN_PREPARE_FROZEN:
@@ -589,10 +589,10 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
                 if (cpus_empty(cpumask))
                         /* Can't offline last IUCV enabled cpu. */
                         return NOTIFY_BAD;
-                smp_call_function_single(cpu, iucv_retrieve_cpu, NULL, 0, 1);
+                smp_call_function_single(cpu, iucv_retrieve_cpu, NULL, 1);
                 if (cpus_empty(iucv_irq_cpumask))
                         smp_call_function_single(first_cpu(iucv_buffer_cpumask),
-                                                 iucv_allow_cpu, NULL, 0, 1);
+                                                 iucv_allow_cpu, NULL, 1);
                 break;
         }
         return NOTIFY_OK;
@@ -652,7 +652,7 @@ static void iucv_cleanup_queue(void)
          * pending interrupts force them to the work queue by calling
          * an empty function on all cpus.
          */
-        smp_call_function(__iucv_cleanup_queue, NULL, 0, 1);
+        smp_call_function(__iucv_cleanup_queue, NULL, 1);
         spin_lock_irq(&iucv_queue_lock);
         list_for_each_entry_safe(p, n, &iucv_task_queue, list) {
                 /* Remove stale work items from the task queue. */
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index 7d1b11703741..8e0b4c8f62a8 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -20,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
+#include <linux/rculist.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_l3proto.h>
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 0edefcfc5949..077bcd228799 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/rculist.h>
 #include <linux/types.h>
 #include <linux/timer.h>
 #include <linux/skbuff.h>
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index 02c2f7c0b255..643c032a3a57 100644
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -30,8 +30,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/rcupdate.h>
-#include <linux/list.h>
+#include <linux/rculist.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 2d29e260da3d..d4eae6af0738 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1266,12 +1266,12 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
         case CPU_UP_CANCELED:
                 printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n",
                        cpu);
-                smp_call_function_single(cpu, hardware_disable, NULL, 0, 1);
+                smp_call_function_single(cpu, hardware_disable, NULL, 1);
                 break;
         case CPU_ONLINE:
                 printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n",
                        cpu);
-                smp_call_function_single(cpu, hardware_enable, NULL, 0, 1);
+                smp_call_function_single(cpu, hardware_enable, NULL, 1);
                 break;
         }
         return NOTIFY_OK;
@@ -1286,7 +1286,7 @@ static int kvm_reboot(struct notifier_block *notifier, unsigned long val,
                  * in vmx root mode.
                  */
                 printk(KERN_INFO "kvm: exiting hardware virtualization\n");
-                on_each_cpu(hardware_disable, NULL, 0, 1);
+                on_each_cpu(hardware_disable, NULL, 1);
         }
         return NOTIFY_OK;
 }
@@ -1474,12 +1474,12 @@ int kvm_init(void *opaque, unsigned int vcpu_size,
         for_each_online_cpu(cpu) {
                 smp_call_function_single(cpu,
                                 kvm_arch_check_processor_compat,
-                                &r, 0, 1);
+                                &r, 1);
                 if (r < 0)
                         goto out_free_1;
         }
 
-        on_each_cpu(hardware_enable, NULL, 0, 1);
+        on_each_cpu(hardware_enable, NULL, 1);
         r = register_cpu_notifier(&kvm_cpu_notifier);
         if (r)
                 goto out_free_2;
@@ -1525,7 +1525,7 @@ out_free_3:
         unregister_reboot_notifier(&kvm_reboot_notifier);
         unregister_cpu_notifier(&kvm_cpu_notifier);
 out_free_2:
-        on_each_cpu(hardware_disable, NULL, 0, 1);
+        on_each_cpu(hardware_disable, NULL, 1);
 out_free_1:
         kvm_arch_hardware_unsetup();
 out_free_0:
@@ -1547,7 +1547,7 @@ void kvm_exit(void)
         sysdev_class_unregister(&kvm_sysdev_class);
         unregister_reboot_notifier(&kvm_reboot_notifier);
         unregister_cpu_notifier(&kvm_cpu_notifier);
-        on_each_cpu(hardware_disable, NULL, 0, 1);
+        on_each_cpu(hardware_disable, NULL, 1);
         kvm_arch_hardware_unsetup();
         kvm_arch_exit();
         kvm_exit_debug();