Merge branch 'xtensa-sim-params' into xtensa-fixes

[karo-tx-linux.git] / arch / xtensa / kernel / setup.c

diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 48ffc58ca38ada2a335cc5028151d513ce0c5c0c..394ef08300b6a3188b196155e0863bf2360fef93 100644 (file)
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -126,6 +126,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)
 
 __tagtable(BP_TAG_INITRD, parse_tag_initrd);
 
+#endif /* CONFIG_BLK_DEV_INITRD */
+
 #ifdef CONFIG_OF
 
 static int __init parse_tag_fdt(const bp_tag_t *tag)
@@ -138,8 +140,6 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt);
 
 #endif /* CONFIG_OF */
 
-#endif /* CONFIG_BLK_DEV_INITRD */
-
 static int __init parse_tag_cmdline(const bp_tag_t* tag)
 {
        strlcpy(command_line, (char *)(tag->data), COMMAND_LINE_SIZE);
@@ -335,6 +335,7 @@ void __init setup_arch(char **cmdline_p)
 
        mem_reserve(__pa(&_stext), __pa(&_end));
 
+#ifdef CONFIG_VECTORS_OFFSET
        mem_reserve(__pa(&_WindowVectors_text_start),
                    __pa(&_WindowVectors_text_end));
 
@@ -371,6 +372,8 @@ void __init setup_arch(char **cmdline_p)
                    __pa(&_Level6InterruptVector_text_end));
 #endif
 
+#endif /* CONFIG_VECTORS_OFFSET */
+
 #ifdef CONFIG_SMP
        mem_reserve(__pa(&_SecondaryResetVector_text_start),
                    __pa(&_SecondaryResetVector_text_end));
@@ -449,9 +452,9 @@ void cpu_reset(void)
                        tmpaddr += SZ_512M;
 
                /* Invalidate mapping in the selected temporary area */
-               if (itlb_probe(tmpaddr) & 0x8)
+               if (itlb_probe(tmpaddr) & BIT(ITLB_HIT_BIT))
                        invalidate_itlb_entry(itlb_probe(tmpaddr));
-               if (itlb_probe(tmpaddr + PAGE_SIZE) & 0x8)
+               if (itlb_probe(tmpaddr + PAGE_SIZE) & BIT(ITLB_HIT_BIT))
                        invalidate_itlb_entry(itlb_probe(tmpaddr + PAGE_SIZE));
 
                /*