* Minor cleanup.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31915 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-07-29 15:46:21 +00:00
parent c11fb6fd9f
commit 4cb7d2e55d
+6 -6
View File
@@ -4503,7 +4503,7 @@ vm_page_fault(addr_t address, addr_t faultAddress, bool isWrite, bool isUser,
// fault and someone is already waiting for a write lock on the same address // fault and someone is already waiting for a write lock on the same address
// space. This thread will then try to acquire the lock again and will // space. This thread will then try to acquire the lock again and will
// be queued after the writer. // be queued after the writer.
#if 0 # if 0
if (area) { if (area) {
struct stack_frame { struct stack_frame {
#if defined(__INTEL__) || defined(__POWERPC__) || defined(__M68K__) #if defined(__INTEL__) || defined(__POWERPC__) || defined(__M68K__)
@@ -4514,24 +4514,24 @@ vm_page_fault(addr_t address, addr_t faultAddress, bool isWrite, bool isUser,
#warning writeme #warning writeme
#endif #endif
} frame; } frame;
#ifdef __INTEL__ # ifdef __INTEL__
struct iframe* iframe = i386_get_user_iframe(); struct iframe* iframe = i386_get_user_iframe();
if (iframe == NULL) if (iframe == NULL)
panic("iframe is NULL!"); panic("iframe is NULL!");
status_t status = user_memcpy(&frame, (void*)iframe->ebp, status_t status = user_memcpy(&frame, (void*)iframe->ebp,
sizeof(struct stack_frame)); sizeof(struct stack_frame));
#elif defined(__POWERPC__) # elif defined(__POWERPC__)
struct iframe* iframe = ppc_get_user_iframe(); struct iframe* iframe = ppc_get_user_iframe();
if (iframe == NULL) if (iframe == NULL)
panic("iframe is NULL!"); panic("iframe is NULL!");
status_t status = user_memcpy(&frame, (void*)iframe->r1, status_t status = user_memcpy(&frame, (void*)iframe->r1,
sizeof(struct stack_frame)); sizeof(struct stack_frame));
#else # else
# warning "vm_page_fault() stack trace won't work" # warning "vm_page_fault() stack trace won't work"
status = B_ERROR; status = B_ERROR;
#endif # endif
dprintf("stack trace:\n"); dprintf("stack trace:\n");
int32 maxFrames = 50; int32 maxFrames = 50;
@@ -4550,7 +4550,7 @@ vm_page_fault(addr_t address, addr_t faultAddress, bool isWrite, bool isUser,
sizeof(struct stack_frame)); sizeof(struct stack_frame));
} }
} }
#endif // 0 (stack trace) # endif // 0 (stack trace)
rw_lock_read_unlock(&addressSpace->lock); rw_lock_read_unlock(&addressSpace->lock);
#endif #endif