Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

3 files changed, 20 insertions, 80 deletions

diff --git a/arch/m32r/mm/fault-nommu.c b/arch/m32r/mm/fault-nommu.c
index 03fc4c858e0e..9880abac3f54 100644
--- a/arch/m32r/mm/fault-nommu.c
+++ b/arch/m32r/mm/fault-nommu.c
@@ -7,8 +7,6 @@
  *    Copyright (C) 1995  Linus Torvalds
  */
 
-/* $Id: fault-nommu.c,v 1.1 2004/03/30 06:40:59 sakugawa Exp $ */
-
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -46,32 +44,6 @@ unsigned int tlb_entry_d_dat[NR_CPUS];
 #define tlb_entry_d tlb_entry_d_dat[smp_processor_id()]
 #endif
 
-/*
- * Unlock any spinlocks which will prevent us from getting the
- * message out
- */
-void bust_spinlocks(int yes)
-{
-        int loglevel_save = console_loglevel;
-
-        if (yes) {
-                oops_in_progress = 1;
-                return;
-        }
-#ifdef CONFIG_VT
-        unblank_screen();
-#endif
-        oops_in_progress = 0;
-        /*
-         * OK, the message is on the console.  Now we call printk()
-         * without oops_in_progress set so that printk will give klogd
-         * a poke.  Hold onto your hats...
-         */
-        console_loglevel = 15;          /* NMI oopser may have shut the console up */
-        printk(" ");
-        console_loglevel = loglevel_save;
-}
-
 void do_BUG(const char *file, int line)
 {
         bust_spinlocks(1);
@@ -161,4 +133,3 @@ void local_flush_tlb_all(void)
 {
         BUG();
 }
-
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
index 9b9feb0f1610..037d58e82fb5 100644
--- a/arch/m32r/mm/fault.c
+++ b/arch/m32r/mm/fault.c
@@ -49,32 +49,6 @@ unsigned int tlb_entry_d_dat[NR_CPUS];
 
 extern void init_tlb(void);
 
-/*
- * Unlock any spinlocks which will prevent us from getting the
- * message out
- */
-void bust_spinlocks(int yes)
-{
-        int loglevel_save = console_loglevel;
-
-        if (yes) {
-                oops_in_progress = 1;
-                return;
-        }
-#ifdef CONFIG_VT
-        unblank_screen();
-#endif
-        oops_in_progress = 0;
-        /*
-         * OK, the message is on the console.  Now we call printk()
-         * without oops_in_progress set so that printk will give klogd
-         * a poke.  Hold onto your hats...
-         */
-        console_loglevel = 15;          /* NMI oopser may have shut the console up */
-        printk(" ");
-        console_loglevel = loglevel_save;
-}
-
 /*======================================================================*
  * do_page_fault()
  *======================================================================*
@@ -362,8 +336,10 @@ vmalloc_fault:
                 if (!pte_present(*pte_k))
                         goto no_context;
 
-                addr = (address & PAGE_MASK) | (error_code & ACE_INSTRUCTION);
+                addr = (address & PAGE_MASK);
+                set_thread_fault_code(error_code);
                 update_mmu_cache(NULL, addr, *pte_k);
+                set_thread_fault_code(0);
                 return;
         }
 }
@@ -377,7 +353,7 @@ vmalloc_fault:
 void update_mmu_cache(struct vm_area_struct *vma, unsigned long vaddr,
         pte_t pte)
 {
-        unsigned long *entry1, *entry2;
+        volatile unsigned long *entry1, *entry2;
         unsigned long pte_data, flags;
         unsigned int *entry_dat;
         int inst = get_thread_fault_code() & ACE_INSTRUCTION;
@@ -391,30 +367,26 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long vaddr,
 
         vaddr = (vaddr & PAGE_MASK) | get_asid();
 
+        pte_data = pte_val(pte);
+
 #ifdef CONFIG_CHIP_OPSP
         entry1 = (unsigned long *)ITLB_BASE;
-        for(i = 0 ; i < NR_TLB_ENTRIES; i++) {
-                if(*entry1++ == vaddr) {
-                        pte_data = pte_val(pte);
-                        set_tlb_data(entry1, pte_data);
-                        break;
-                }
-                entry1++;
+        for (i = 0; i < NR_TLB_ENTRIES; i++) {
+                if (*entry1++ == vaddr) {
+                        set_tlb_data(entry1, pte_data);
+                        break;
+                }
+                entry1++;
         }
         entry2 = (unsigned long *)DTLB_BASE;
-        for(i = 0 ; i < NR_TLB_ENTRIES ; i++) {
-                if(*entry2++ == vaddr) {
-                        pte_data = pte_val(pte);
-                        set_tlb_data(entry2, pte_data);
-                        break;
-                }
-                entry2++;
+        for (i = 0; i < NR_TLB_ENTRIES; i++) {
+                if (*entry2++ == vaddr) {
+                        set_tlb_data(entry2, pte_data);
+                        break;
+                }
+                entry2++;
         }
-        local_irq_restore(flags);
-        return;
 #else
-        pte_data = pte_val(pte);
-
         /*
          * Update TLB entries
          *  entry1: ITLB entry address
@@ -439,6 +411,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long vaddr,
                 "i" (MSVA_offset), "i" (MTOP_offset), "i" (MIDXI_offset)
                 : "r4", "memory"
         );
+#endif
 
         if ((!inst && entry2 >= DTLB_END) || (inst && entry1 >= ITLB_END))
                 goto notfound;
@@ -482,7 +455,6 @@ notfound:
         set_tlb_data(entry1, pte_data);
 
         goto found;
-#endif
 }
 
 /*======================================================================*
diff --git a/arch/m32r/mm/mmu.S b/arch/m32r/mm/mmu.S
index 9a4d40b3d6a2..8bb74b10dca7 100644
--- a/arch/m32r/mm/mmu.S
+++ b/arch/m32r/mm/mmu.S
@@ -4,8 +4,6 @@
  *  Copyright (C) 2001 by Hiroyuki Kondo
  */
 
-/* $Id: mmu.S,v 1.15 2004/03/16 02:56:27 takata Exp $ */
-
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/smp.h>
@@ -345,5 +343,4 @@ ENTRY(m32r_otlb_entrys)
 
 #endif  /* CONFIG_MMU */
 
-.end
-
+        .end