remove conflict
This commit is contained in:
parent
bdebe44a26
commit
83ea776de8
1 changed files with 0 additions and 13 deletions
|
@ -256,19 +256,6 @@ int page_init(void)
|
|||
/* Replace default pagefault handler */
|
||||
irq_uninstall_handler(14);
|
||||
irq_install_handler(14, page_fault_handler);
|
||||
<<<<<<< HEAD
|
||||
|
||||
/* Map kernel */
|
||||
addr = (size_t) &kernel_start;
|
||||
npages = PAGE_FLOOR((size_t) &kernel_end - (size_t) &kernel_start) >> PAGE_BITS;
|
||||
page_map(addr, addr, npages, PG_RW | PG_GLOBAL);
|
||||
|
||||
#ifdef CONFIG_VGA
|
||||
/* Map video memory */
|
||||
page_map(VIDEO_MEM_ADDR, VIDEO_MEM_ADDR, 1, PG_RW | PG_PCD | PG_GLOBAL);
|
||||
#endif
|
||||
=======
|
||||
>>>>>>> refs/heads/stage5
|
||||
|
||||
/* Map multiboot information and modules */
|
||||
if (mb_info) {
|
||||
|
|
Loading…
Add table
Reference in a new issue