Merge branch 'linux-2.6'

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 2418289ee5ca..7377d323131d 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/kdebug.h>
+#include <linux/utsname.h>
 
 #include <asm/cpu.h>
 #include <asm/delay.h>
@@ -107,8 +108,9 @@ show_regs (struct pt_regs *regs)
         print_modules();
         printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
                         smp_processor_id(), current->comm);
-        printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s\n",
-               regs->cr_ipsr, regs->cr_ifs, ip, print_tainted());
+        printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
+               regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
+               init_utsname()->release);
         print_symbol("ip is at %s\n", ip);
         printk("unat: %016lx pfs : %016lx rsc : %016lx\n",
                regs->ar_unat, regs->ar_pfs, regs->ar_rsc);
@@ -737,6 +739,7 @@ flush_thread (void)
                 ia32_drop_ia64_partial_page_list(current);
                 current->thread.task_size = IA32_PAGE_OFFSET;
                 set_fs(USER_DS);
+                memset(current->thread.tls_array, 0, sizeof(current->thread.tls_array));
         }
 #endif
 }