Revert "SMP - no_apic=0 and acpi=1 set when CONFIG_SMP=y"

This reverts commit c468f4efa5a9414c23949372158e711bd7b82a29.

Since we use the new boot loader, this hack is no longer necessary.

diff --git a/kernel/arch/i386/arch_system.c b/kernel/arch/i386/arch_system.c
index a1ddfa4c1f4b5a4ef194acbc29689cd71885dd53..439e84f8b71ea2a7202338bb4b699c75651ef541 100644 (file)
--- a/kernel/arch/i386/arch_system.c
+++ b/kernel/arch/i386/arch_system.c
@@ -665,31 +665,9 @@ u32_t params_size, params_offset, mon_ds;
 
 PUBLIC int arch_get_params(char *params, int maxsize)
 {
-       int size = 0;
-
-#ifdef CONFIG_SMP
-       /*
-        * FIXME
-        * This is a TEMPORARY change until we can pass boot
-        * command line to multiboot kernels from the boot
-        * monitor
-        *
-        * '\0' separated list of command line options
-        */
-       char cmdline[] = "no_apic=0\0acpi=1";
-
-       if (maxsize < sizeof(cmdline) - 1)
-               panic("cmdline (%d) exceeds maxsize (%d)",
-                               sizeof(cmdline), maxsize);
-       memcpy(params, cmdline, sizeof(cmdline));
-       size = sizeof(cmdline);
-       params[size+1] = '\0';
-#endif
-
-       phys_copy(seg2phys(mon_ds) + params_offset, vir2phys(params + size),
-               MIN(maxsize - size, params_size));
+       phys_copy(seg2phys(mon_ds) + params_offset, vir2phys(params),
+               MIN(maxsize, params_size));
        params[maxsize-1] = '\0';
-
        return OK;
 }