Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / arch / mips / cavium-octeon / setup.c

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index f1bec00d5a85dd9d03296ceacdd1025b32fc114a..008e9c8b8eac0f2ff13edf8f0df7f21172dd6a90 100644 (file)
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -729,17 +729,6 @@ void __init prom_init(void)
        octeon_write_lcd("Linux");
 #endif
 
-#ifdef CONFIG_CAVIUM_GDB
-       /*
-        * When debugging the linux kernel, force the cores to enter
-        * the debug exception handler to break in.
-        */
-       if (octeon_get_boot_debug_flag()) {
-               cvmx_write_csr(CVMX_CIU_DINT, 1 << cvmx_get_core_num());
-               cvmx_read_csr(CVMX_CIU_DINT);
-       }
-#endif
-
        octeon_setup_delays();
 
        /*
@@ -779,12 +768,6 @@ void __init prom_init(void)
                                MAX_MEMORY = 32ull << 30;
                        if (*p == '@')
                                RESERVE_LOW_MEM = memparse(p + 1, &p);
-               } else if (strcmp(arg, "ecc_verbose") == 0) {
-#ifdef CONFIG_CAVIUM_REPORT_SINGLE_BIT_ECC
-                       __cvmx_interrupt_ecc_report_single_bit_errors = 1;
-                       pr_notice("Reporting of single bit ECC errors is "
-                                 "turned on\n");
-#endif
 #ifdef CONFIG_KEXEC
                } else if (strncmp(arg, "crashkernel=", 12) == 0) {
                        crashk_size = memparse(arg+12, &p);