--- linux-mips-cvs/arch/mips/kernel/head.S 2004-11-22 14:38:23.000000000 +0100 +++ linux-broadcom/arch/mips/kernel/head.S 2005-01-31 13:13:14.000000000 +0100 @@ -28,12 +28,20 @@ #include #include +#ifdef CONFIG_BCM4710 +#undef eret +#define eret nop; nop; eret +#endif + .text + j kernel_entry + nop + /* * Reserved space for exception handlers. * Necessary for machines which link their kernels at KSEG0. */ - .fill 0x400 + .fill 0x3f4 /* The following two symbols are used for kernel profiling. */ EXPORT(stext)