Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 130 → Rev 131

/SPARTAN/trunk/arch/ia32/src/smp/mps.c
37,7 → 37,6
#include <func.h>
#include <arch/types.h>
#include <typedefs.h>
#include <mm/page.h>
#include <cpu.h>
#include <arch/asm.h>
#include <arch/bios/bios.h>
202,16 → 201,6
else
config.cpu_count = configure_via_default(fs->config_type);
 
if (config.cpu_count > 1) {
map_page_to_frame((__address) l_apic, (__address) l_apic, PAGE_NOT_CACHEABLE, 0);
}
/*
* Must be initialized outside the kmp thread, since it is waited
* on before the kmp thread is created.
*/
waitq_initialize(&kmp_completion_wq);
return;
}
 
343,8 → 332,6
return;
}
map_page_to_frame((__address) ioa->io_apic, (__address) ioa->io_apic, PAGE_NOT_CACHEABLE, 0);
io_apic = ioa->io_apic;
}
 
/SPARTAN/trunk/arch/ia32/src/smp/smp.c
57,6 → 57,18
mps_init();
ops = &mps_config_operations;
}
 
if (config.cpu_count > 1) {
map_page_to_frame((__address) l_apic, (__address) l_apic, PAGE_NOT_CACHEABLE, 0);
map_page_to_frame((__address) io_apic, (__address) io_apic, PAGE_NOT_CACHEABLE, 0);
}
 
/*
* Must be initialized outside the kmp thread, since it is waited
* on before the kmp thread is created.
*/
waitq_initialize(&kmp_completion_wq);
 
}
 
/*
/SPARTAN/trunk/arch/ia32/src/acpi/madt.c
32,7 → 32,6
#include <arch/acpi/madt.h>
#include <arch/smp/apic.h>
#include <arch/smp/smp.h>
#include <mm/page.h>
#include <panic.h>
#include <debug.h>
#include <config.h>
111,7 → 110,7
{
struct madt_apic_header *end = (struct madt_apic_header *) (((__u8 *) acpi_madt) + acpi_madt->header.length);
struct madt_apic_header *h = &acpi_madt->apic_header[0];
__u8 prev_type = 0; /* used to detect incosecutive entries */
__u8 prev_type = 0; /* used to detect inconsecutive entries */
 
 
l_apic = (__u32 *) acpi_madt->l_apic_address;
177,7 → 176,6
if (!madt_io_apic_entry_cnt++) {
madt_io_apic_entries = ioa;
io_apic = (__u32 *) ioa->io_apic_address;
map_page_to_frame((__address) io_apic, (__address) io_apic, PAGE_NOT_CACHEABLE, 0);
}
else {
/* currently not supported */