i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed two warnings.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2115 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2002-11-29 08:36:42 +00:00
parent 8a531eeb0a
commit 8a91be0446
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/arch/x86/arch_int.c
+4 -4
View File
@@ -183,20 +183,20 @@ i386_handle_trap(struct iframe frame)
unsigned int cr2; unsigned int cr2;
addr newip; addr newip;
asm ("movl %%cr2, %0" : "=r" (cr2) ); asm("movl %%cr2, %0" : "=r" (cr2));
// get the old interrupt enable/disable state and restore to that // get the old interrupt enable/disable state and restore to that
if(frame.flags & 0x200) { if (frame.flags & 0x200) {
dprintf("page_fault: enabling interrupts\n"); dprintf("page_fault: enabling interrupts\n");
if (!kernel_startup) if (!kernel_startup)
dprintf("page_fault, but interrupts are disabled. touching address %p from eip %p\n", cr2, frame.eip); dprintf("page_fault, but interrupts are disabled. touching address %p from eip %p\n", (void *)cr2, (void *)frame.eip);
enable_interrupts(); enable_interrupts();
} }
ret = vm_page_fault(cr2, frame.eip, ret = vm_page_fault(cr2, frame.eip,
(frame.error_code & 0x2) != 0, (frame.error_code & 0x2) != 0,
(frame.error_code & 0x4) != 0, (frame.error_code & 0x4) != 0,
&newip); &newip);
if(newip != 0) { if (newip != 0) {
// the page fault handler wants us to modify the iframe to set the // the page fault handler wants us to modify the iframe to set the
// IP the cpu will return to to be this ip // IP the cpu will return to to be this ip
frame.eip = newip; frame.eip = newip;