changes

interrupt/handlers.cc

@@ -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|"

main.cc

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #include "arch/lapic.h"
 #include "boot/startup_ap.h"
 #include "arch/core_interrupt.h"

thread/scheduler.cc

@@ -2,7 +2,7 @@
 
 #include "scheduler.h"
 
-Queue<Thread> readyList = Queue<Thread>(0);
+Queue<Thread> readyList = Queue<Thread>();
 
 Scheduler::Scheduler() {
 }

user/app1/appl.cc

@@ -53,6 +53,6 @@ void Application::action() {  // NOLINT
 		activeWaitDelay(10000000);
 		if(cnt >= sizeof(text)-1)
 			cnt=0;
-		context_switch(test2,test1);
+		//context_switch(test2,test1);
 	}
 }