--- zzzz-none-000/linux-2.6.19.2/include/asm-mips/processor.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/include/asm-mips/processor.h	2008-04-10 13:38:40.000000000 +0000
@@ -83,7 +83,7 @@
 };
 
 #define INIT_FPU { \
-	{0,} \
+	.fpr = {0} \
 }
 
 #define NUM_DSP_REGS   6
@@ -95,7 +95,9 @@
 	unsigned int    dspcontrol;
 };
 
-#define INIT_DSP {{0,},}
+#define INIT_DSP { \
+    .dspr = {0} \
+}
 
 #define INIT_CPUMASK { \
 	{0,} \
@@ -160,36 +162,25 @@
 #define FPAFF_INIT
 #endif /* CONFIG_MIPS_MT_FPAFF */
 
-#define INIT_THREAD  { \
-        /* \
-         * saved main processor registers \
-         */ \
-	0, 0, 0, 0, 0, 0, 0, 0, \
-	               0, 0, 0, \
-	/* \
-	 * saved cp0 stuff \
-	 */ \
-	0, \
-	/* \
-	 * saved fpu/fpu emulator stuff \
-	 */ \
-	INIT_FPU, \
-	/* \
-	 * fpu affinity state (null if not FPAFF) \
-	 */ \
-	FPAFF_INIT \
-	/* \
-	 * saved dsp/dsp emulator stuff \
-	 */ \
-	INIT_DSP, \
-	/* \
-	 * Other stuff associated with the process \
-	 */ \
-	0, 0, 0, 0, \
-	/* \
-	 * For now the default is to fix address errors \
-	 */ \
-	MF_FIXADE, 0, 0 \
+#define INIT_THREAD { \
+    /*--- saved main processor registers ---*/  \
+    .reg16 = 0, .reg17 = 0, .reg18 = 0, .reg19 = 0, .reg20 = 0, .reg21 = 0, .reg22 = 0, .reg23 = 0, \
+	.reg29 = 0, .reg30 = 0, .reg31 = 0, \
+    /*--- saved cp0 stuff ---*/ \
+    .cp0_status = 0, \
+    /*--- saved fpu/fpu emulator stuff ---*/ \
+    INIT_FPU, \
+    /*--- fpu affinity state (null if not FPAFF) ---*/ \
+    FPAFF_INIT \
+    /*--- saved dsp/dsp emulator stuff ---*/ \
+    INIT_DSP, \
+    /*--- Other stuff associated with the process ---*/ \
+	.cp0_badvaddr = 0, .cp0_baduaddr = 0, .error_code = 0, .trap_no = 0, \
+    /*--- For now the default is to fix address errors ---*/ \
+    .mflags = MF_FIXADE, \
+	.irix_trampoline = 0, \
+	.irix_oldctx = 0, \
+	.abi = NULL \
 }
 
 struct task_struct;