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

resolved merge conflicts with futex code

Browse Source
This commit is contained in:
Balazs Gerofi bgerofi@riken.jp
2013-06-02 16:42:08 +09:00
parent 5d78660011 2627d4df55
commit 4a27a65cb0
39 changed files with 2539 additions and 2144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ void *get_x86_this_cpu_kstack(void);
void init_processors_local(int max_id);
void assign_processor_id(void);
void arch_delay(int);
void x86_set_warm_reset(void);
void x86_set_warm_reset(unsigned long ip, char *first_page_va);
void x86_init_perfctr(void);
extern int kprintf(const char *format, ...);
@@ -393,12 +393,7 @@ static void outb(uint8_t v, uint16_t port)
static void set_warm_reset_vector(unsigned long ip)
{
/* Write CMOS */
x86_set_warm_reset();
/* Set vector */
*(unsigned short *)(first_page_va + 0x469) = (ip >> 4);
*(unsigned short *)(first_page_va + 0x467) = ip & 0xf;
x86_set_warm_reset(ip, first_page_va);
}
static void wait_icr_idle(void)