Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	arch/microblaze/include/asm/socket.h

3 files changed, 10 insertions, 7 deletions

diff --git a/arch/avr32/include/asm/pgalloc.h b/arch/avr32/include/asm/pgalloc.h
index 640821323943..92ecd8446ef8 100644
--- a/arch/avr32/include/asm/pgalloc.h
+++ b/arch/avr32/include/asm/pgalloc.h
@@ -83,7 +83,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
         quicklist_free_page(QUICK_PT, NULL, pte);
 }
 
-#define __pte_free_tlb(tlb,pte)                         \
+#define __pte_free_tlb(tlb,pte,addr)                    \
 do {                                                    \
         pgtable_page_dtor(pte);                         \
         tlb_remove_page((tlb), pte);                    \
diff --git a/arch/avr32/include/asm/thread_info.h b/arch/avr32/include/asm/thread_info.h
index 4442f8d2d423..fc42de5ca209 100644
--- a/arch/avr32/include/asm/thread_info.h
+++ b/arch/avr32/include/asm/thread_info.h
@@ -40,7 +40,7 @@ struct thread_info {
         .exec_domain    = &default_exec_domain,                         \
         .flags          = 0,                                            \
         .cpu            = 0,                                            \
-        .preempt_count  = 1,                                            \
+        .preempt_count  = INIT_PREEMPT_COUNT,                           \
         .restart_block  = {                                             \
                 .fn     = do_no_restart_syscall                         \
         }                                                               \
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c
index 6e3d491184ea..b91b2044af9c 100644
--- a/arch/avr32/kernel/traps.c
+++ b/arch/avr32/kernel/traps.c
@@ -32,22 +32,25 @@ void NORET_TYPE die(const char *str, struct pt_regs *regs, long err)
         spin_lock_irq(&die_lock);
         bust_spinlocks(1);
 
-        printk(KERN_ALERT "Oops: %s, sig: %ld [#%d]\n" KERN_EMERG,
+        printk(KERN_ALERT "Oops: %s, sig: %ld [#%d]\n",
                str, err, ++die_counter);
+
+        printk(KERN_EMERG);
+
 #ifdef CONFIG_PREEMPT
-        printk("PREEMPT ");
+        printk(KERN_CONT "PREEMPT ");
 #endif
 #ifdef CONFIG_FRAME_POINTER
-        printk("FRAME_POINTER ");
+        printk(KERN_CONT "FRAME_POINTER ");
 #endif
         if (current_cpu_data.features & AVR32_FEATURE_OCD) {
                 unsigned long did = ocd_read(DID);
-                printk("chip: 0x%03lx:0x%04lx rev %lu\n",
+                printk(KERN_CONT "chip: 0x%03lx:0x%04lx rev %lu\n",
                        (did >> 1) & 0x7ff,
                        (did >> 12) & 0x7fff,
                        (did >> 28) & 0xf);
         } else {
-                printk("cpu: arch %u r%u / core %u r%u\n",
+                printk(KERN_CONT "cpu: arch %u r%u / core %u r%u\n",
                        current_cpu_data.arch_type,
                        current_cpu_data.arch_revision,
                        current_cpu_data.cpu_type,