Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv29363/linux/arch/i386/kernel
Modified Files:
apm.c setup.c
Log Message:
Synced to 2.5.20.
Index: apm.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/apm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- apm.c 25 May 2002 20:31:58 -0000 1.5
+++ apm.c 4 Jun 2002 19:45:04 -0000 1.6
@@ -1792,7 +1792,7 @@
idle_threshold = simple_strtol(str + 15, NULL, 0);
if ((strncmp(str, "idle-period=", 12) == 0) ||
(strncmp(str, "idle_period=", 12) == 0))
- idle_threshold = simple_strtol(str + 15, NULL, 0);
+ idle_period = simple_strtol(str + 12, NULL, 0);
invert = (strncmp(str, "no-", 3) == 0) ||
(strncmp(str, "no_", 3) == 0);
if (invert)
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/setup.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- setup.c 3 Jun 2002 22:44:55 -0000 1.44
+++ setup.c 4 Jun 2002 19:45:05 -0000 1.45
@@ -912,17 +912,11 @@
paging_init();
#ifdef CONFIG_ACPI_BOOT
/*
- * Initialize the ACPI boot-time table parser (gets the RSDP and SDT).
- * Must do this after paging_init (due to reliance on fixmap, and thus
- * the bootmem allocator) but before get_smp_config (to allow parsing
- * of MADT).
+ * Parse the ACPI tables for possible boot-time SMP configuration.
*/
acpi_boot_init(*cmdline_p);
#endif
#ifdef CONFIG_X86_LOCAL_APIC
- /*
- * get boot-time SMP configuration:
- */
if (smp_found_config)
get_smp_config();
#endif
|