Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (50 commits)
  [MIPS] Add smp_call_function_single()
  [MIPS] thread_info.h: kmalloc + memset conversion to kzalloc
  [MIPS] Kexec: Fix several 64-bit bugs.
  [MIPS] Kexec: Fix several warnings.
  [MIPS] DDB5477: Remove support
  [MIPS] Fulong: Remove unneeded header file
  [MIPS] Cobalt: Enable UART on RaQ1
  [MIPS] Remove unused GROUP_TOSHIBA_NAMES
  [MIPS] remove some duplicate includes
  [MIPS] Oprofile: Fix rm9000 performance counter handler
  [MIPS] Use -Werror on subdirectories which build cleanly.
  [MIPS] Yosemite: Fix warning.
  [MIPS] PMON: Fix cpustart declaration.
  [MIPS] Yosemite: Only build ll_ht_smp_irq_handler() if HYPERTRANSPORT.
  [MIPS] Yosemite: Fix build error due to undeclared titan_mailbox_irq().
  [MIPS] Yosemite: Don't declare titan_mailbox_irq() as asmlinkage.
  [MIPS] Yosemite: Fix warnings in i2c-yoesmite by deleting the unused code.
  [MIPS] Delete unused arch/mips/gt64120/common/
  [MIPS] Fix build warning in unaligned load/store emulator.
  [MIPS] IP32: Don't ignore request_irq's return value.
  ...

1 files changed, 13 insertions, 4 deletions

diff --git a/include/asm-mips/thread_info.h b/include/asm-mips/thread_info.h
index 645e7e2a5665..b2772df1a1bd 100644
--- a/include/asm-mips/thread_info.h
+++ b/include/asm-mips/thread_info.h
@@ -46,7 +46,7 @@ struct thread_info {
 {                                               \
         .task           = &tsk,                 \
         .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
+        .flags          = _TIF_FIXADE,          \
         .cpu            = 0,                    \
         .preempt_count  = 1,                    \
         .addr_limit     = KERNEL_DS,            \
@@ -87,9 +87,8 @@ register struct thread_info *__current_thread_info __asm__("$28");
 ({                                                              \
         struct thread_info *ret;                                \
                                                                 \
-        ret = kmalloc(THREAD_SIZE, GFP_KERNEL);                 \
-        if (ret)                                                \
-                memset(ret, 0, THREAD_SIZE);                    \
+        ret = kzalloc(THREAD_SIZE, GFP_KERNEL);                 \
+                                                                \
         ret;                                                    \
 })
 #else
@@ -118,6 +117,11 @@ register struct thread_info *__current_thread_info __asm__("$28");
 #define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18
 #define TIF_FREEZE              19
+#define TIF_FIXADE              20      /* Fix address errors in software */
+#define TIF_LOGADE              21      /* Log address errors to syslog */
+#define TIF_32BIT_REGS          22      /* also implies 16/32 fprs */
+#define TIF_32BIT_ADDR          23      /* 32-bit address space (o32/n32) */
+#define TIF_FPUBOUND            24      /* thread bound to FPU-full CPU set */
 #define TIF_SYSCALL_TRACE       31      /* syscall trace active */
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
@@ -129,6 +133,11 @@ register struct thread_info *__current_thread_info __asm__("$28");
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_FREEZE             (1<<TIF_FREEZE)
+#define _TIF_FIXADE             (1<<TIF_FIXADE)
+#define _TIF_LOGADE             (1<<TIF_LOGADE)
+#define _TIF_32BIT_REGS         (1<<TIF_32BIT_REGS)
+#define _TIF_32BIT_ADDR         (1<<TIF_32BIT_ADDR)
+#define _TIF_FPUBOUND           (1<<TIF_FPUBOUND)
 
 /* work to do on interrupt/exception return */
 #define _TIF_WORK_MASK          (0x0000ffef & ~_TIF_SECCOMP)