stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- add a workaround to use paging and the apic at the same time

Browse source 
(we don't use __attribute__((optimize(0))))


git-svn-id: http://svn.lfbs.rwth-aachen.de/svn/scc/trunk/MetalSVM@366 315a16e6-25f9-4109-90ae-ca3045a26c18
This commit is contained in:
stefan 2011-01-05 20:12:07 +00:00
parent 8646b56a63
commit 9d2b73c6cb
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/apic.c
View file

@ -35,7 +35,7 @@
/* disable optimization for the following functions */
//static int apic_send_ipi(uint32_t id, uint32_t mode, uint32_t vector) __attribute__((optimize(0)));
static int wakeup_all_aps(uint32_t start_eip) __attribute__((optimize(0)));
int apic_calibration(void) __attribute__((optimize(0)));
//int apic_calibration(void) __attribute__((optimize(0)));
//int ioapic_intoff(uint8_t irq, uint8_t apicid) __attribute__((optimize(0)));
//int ioapic_inton(uint8_t irq, uint8_t apicid) __attribute__((optimize(0)));
@ -311,7 +311,7 @@ int apic_calibration(void)
irq_disable();
#if MAX_CORES > 1
smp_init();
//smp_init();
#endif
if (ioapic) {

2
kernel/main.c
View file

@ -97,7 +97,7 @@ int main(void)
kprintf("Kernel starts at %p and ends at %p\n", &kernel_start, &kernel_end);
system_calibration();
//network_init();
network_init();
kprintf("Processor frequency: %u MHz\n", get_cpu_frequency());
kprintf("Total memory: %u MBytes\n", atomic_int32_read(&total_pages)/((1024*1024)/PAGE_SIZE));

4
kernel/tests.c
View file

@ -105,11 +105,11 @@ int test_init(void)
sem_init(&consuming, 0);
mailbox_int32_init(&mbox);
//create_kernel_task(&id1, foo, "Hello from foo1\n");
create_kernel_task(&id1, foo, "Hello from foo1\n");
//create_kernel_task(&id2, join_test, NULL);
//create_kernel_task(&id3, producer, NULL);
//create_kernel_task(&id4, consumer, NULL);
create_user_task(&id5, 8192, "/bin/hello", 1, argv);
//create_user_task(&id5, 8192, "/bin/hello", 1, argv);
return 0;
}