Update of /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv18787/ruby-2.6/arch/i386/kernel
Modified Files:
setup.c
Log Message:
sync to 2.6.0-test9
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c 2 Oct 2003 09:32:18 -0000 1.2
+++ setup.c 28 Oct 2003 07:17:35 -0000 1.3
@@ -64,10 +64,10 @@
unsigned long mmu_cr4_features;
EXPORT_SYMBOL_GPL(mmu_cr4_features);
-#ifdef CONFIG_ACPI
- int acpi_disabled __initdata = 0;
+#ifdef CONFIG_ACPI_INTERPRETER
+ int acpi_disabled = 0;
#else
- int acpi_disabled __initdata = 1;
+ int acpi_disabled = 1;
#endif
EXPORT_SYMBOL(acpi_disabled);
@@ -139,22 +139,23 @@
probe_extension_roms(roms);
}
-static void __init limit_regions (unsigned long long size)
+static void __init limit_regions(unsigned long long size)
{
+ unsigned long long current_addr = 0;
int i;
- unsigned long long current_size = 0;
for (i = 0; i < e820.nr_map; i++) {
if (e820.map[i].type == E820_RAM) {
- current_size += e820.map[i].size;
- if (current_size >= size) {
- e820.map[i].size -= current_size-size;
+ current_addr = e820.map[i].addr + e820.map[i].size;
+ if (current_addr >= size) {
+ e820.map[i].size -= current_addr-size;
e820.nr_map = i + 1;
return;
}
}
}
}
+
static void __init add_memory_region(unsigned long long start,
unsigned long long size, int type)
{
@@ -964,7 +965,6 @@
apm_info.bios = APM_BIOS_INFO;
ist_info = IST_INFO;
saved_videomode = VIDEO_MODE;
- printk("Video mode to be used for restore is %lx\n", saved_videomode);
if( SYS_DESC_TABLE.length != 0 ) {
MCA_bus = SYS_DESC_TABLE.table[3] &0x2;
machine_id = SYS_DESC_TABLE.table[0];
|
