Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / arch / frv / kernel / head.S

diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S
index c73b4fe9f6ca4be6f20121b931ab32d9ec93ce15..fecf751c5cae27e25b24d7f547b34b0366d3315b 100644 (file)
--- a/arch/frv/kernel/head.S
+++ b/arch/frv/kernel/head.S
@@ -9,9 +9,9 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/linkage.h>
+#include <asm/thread_info.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
 #include <asm/spr-regs.h>
@@ -513,6 +513,9 @@ __head_mmu_enabled:
        movgs           gr0,ccr
        movgs           gr0,cccr
 
+       # initialise the virtual interrupt handling
+       subcc           gr0,gr0,gr0,icc2                /* set Z, clear C */
+
 #ifdef CONFIG_MMU
        movgs           gr3,scr2
        movgs           gr3,scr3