oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit c468f4efa5a9414c23949372158e711bd7b82a29.

Since we use the new boot loader, this hack is no longer necessary.
This commit is contained in:
Tomas Hruby 2012-02-24 10:16:55 +01:00 committed by Arun Thomas
parent dd9c147444
commit d991abdd34
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/arch/i386/arch_system.c
View File

@ -665,31 +665,9 @@ u32_t params_size, params_offset, mon_ds;
PUBLIC int arch_get_params(char *params, int maxsize) PUBLIC int arch_get_params(char *params, int maxsize)
{ {
int size = 0; phys_copy(seg2phys(mon_ds) + params_offset, vir2phys(params),
MIN(maxsize, params_size));
#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));
params[maxsize-1] = '\0'; params[maxsize-1] = '\0';
return OK; return OK;
} }