gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of postpeta.pccluster.org:mckernel

Browse Source
This commit is contained in:
Tomoki Shirasawa
2014-06-25 13:45:46 +09:00
parent 770eae0186 a9bebf1e14
commit dc7f38c8c7
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/cpu.c
View File

@ -510,6 +510,11 @@ void cpu_halt(void)
asm volatile("hlt"); asm volatile("hlt");
} }
void cpu_safe_halt(void)
{
asm volatile("sti; hlt");
}
void cpu_enable_interrupt(void) void cpu_enable_interrupt(void)
{ {
asm volatile("sti"); asm volatile("sti");

12
kernel/process.c
View File

@ -1554,16 +1554,16 @@ void release_process(struct process *proc)
static void idle(void) static void idle(void)
{ {
//unsigned int flags;
//flags = ihk_mc_spinlock_lock(&cpu_status_lock);
//ihk_mc_spinlock_unlock(&cpu_status_lock, flags);
cpu_local_var(status) = CPU_STATUS_IDLE; cpu_local_var(status) = CPU_STATUS_IDLE;
cpu_enable_interrupt();
while (1) { while (1) {
cpu_enable_interrupt();
schedule(); schedule();
//cpu_local_var(status) = CPU_STATUS_IDLE; cpu_disable_interrupt();
cpu_halt(); if (cpu_local_var(status) == CPU_STATUS_IDLE)
cpu_safe_halt();
else
cpu_enable_interrupt();
} }
} }

1
lib/include/ihk/cpu.h
View File

@ -19,6 +19,7 @@
void cpu_enable_interrupt(void); void cpu_enable_interrupt(void);
void cpu_disable_interrupt(void); void cpu_disable_interrupt(void);
void cpu_halt(void); void cpu_halt(void);
void cpu_safe_halt(void);
void cpu_restore_interrupt(unsigned long); void cpu_restore_interrupt(unsigned long);
void cpu_pause(void); void cpu_pause(void);