changes
This commit is contained in:
@@ -60,12 +60,7 @@ enum PAGE_FAULT_ERROR {
|
||||
|
||||
[[gnu::interrupt]] void handle_page_fault(InterruptContext *context,
|
||||
uint64_t error) {
|
||||
<<<<<<< HEAD
|
||||
(void)error;
|
||||
DBG << "Page fault encoutered at linear address " << hex
|
||||
=======
|
||||
DBG << "Page fault encountered at linear address " << hex
|
||||
>>>>>>> c0b78ee (simplify Qeue, update some comments and include paths)
|
||||
<< Core::CR<2>::read() << endl
|
||||
<< (error & PF_ERR_PRESENT ? "present" : "non-present") << " page|"
|
||||
<< (error & PF_ERR_WRITE ? "write" : "read") << " access|"
|
||||
|
||||
Reference in New Issue
Block a user