Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-block.git] / arch / microblaze / kernel / entry.S

diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index d68a397e39361ee8ff144b9f28f8584f183393f2..ca15bc5c7449f9ba79ed9e024f88c1b13d49e60b 100644 (file)
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -988,16 +988,15 @@ ENTRY(_switch_to)
        nop
 
 ENTRY(_reset)
-       brai    0x70; /* Jump back to FS-boot */
+       brai    0; /* Jump to reset vector */
 
        /* These are compiled and loaded into high memory, then
         * copied into place in mach_early_setup */
        .section        .init.ivt, "ax"
+#if CONFIG_MANUAL_RESET_VECTOR
        .org    0x0
-       /* this is very important - here is the reset vector */
-       /* in current MMU branch you don't care what is here - it is
-        * used from bootloader site - but this is correct for FS-BOOT */
-       brai    0x70
+       brai    CONFIG_MANUAL_RESET_VECTOR
+#endif
        .org    0x8
        brai    TOPHYS(_user_exception); /* syscall handler */
        .org    0x10