| /trunk/kernel/generic/src/console/console.c |
|---|
| 60,6 → 60,7 |
| static chardev_operations_t null_stdout_ops = { |
| .write = null_putchar |
| }; |
| chardev_t null_stdout = { |
| .name = "null", |
| .op = &null_stdout_ops |
| /trunk/kernel/arch/amd64/include/mm/as.h |
|---|
| 38,7 → 38,7 |
| #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 |
| #define KERNEL_ADDRESS_SPACE_START_ARCH (unsigned long) 0xffff800000000000 |
| #define KERNEL_ADDRESS_SPACE_END_ARCH (unsigned long) 0xffffffffffffffff |
| #define KERNEL_ADDRESS_SPACE_END_ARCH (unsigned long) 0xffffffff80000000 |
| #define USER_ADDRESS_SPACE_START_ARCH (unsigned long) 0x0000000000000000 |
| #define USER_ADDRESS_SPACE_END_ARCH (unsigned long) 0x00007fffffffffff |
| /trunk/kernel/arch/amd64/src/amd64.c |
|---|
| 71,13 → 71,12 |
| */ |
| static void clean_IOPL_NT_flags(void) |
| { |
| asm |
| ( |
| "pushfq;" |
| "pop %%rax;" |
| "and $~(0x7000),%%rax;" |
| "pushq %%rax;" |
| "popfq;" |
| asm ( |
| "pushfq\n" |
| "pop %%rax\n" |
| "and $~(0x7000), %%rax\n" |
| "pushq %%rax\n" |
| "popfq\n" |
| : |
| : |
| :"%rax" |
| 90,11 → 89,10 |
| */ |
| static void clean_AM_flag(void) |
| { |
| asm |
| ( |
| "mov %%cr0,%%rax;" |
| "and $~(0x40000),%%rax;" |
| "mov %%rax,%%cr0;" |
| asm ( |
| "mov %%cr0, %%rax\n" |
| "and $~(0x40000), %%rax\n" |
| "mov %%rax, %%cr0\n" |
| : |
| : |
| :"%rax" |
| 127,6 → 125,7 |
| } |
| } |
| void arch_post_mm_init(void) |
| { |
| if (config.cpu_active == 1) { |
| 148,9 → 147,9 |
| /* Merge all memory zones to 1 big zone */ |
| zone_merge_all(); |
| } |
| /* Setup fast SYSCALL/SYSRET */ |
| syscall_setup_cpu(); |
| } |
| void arch_post_cpu_init() |
| /trunk/kernel/arch/amd64/src/mm/page.c |
|---|
| 95,6 → 95,7 |
| /* Standard identity mapping */ |
| page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, identity_flags); |
| } |
| /* Upper kernel mapping |
| * - from zero to top of kernel (include bottom addresses |
| * because some are needed for init ) |
| /trunk/kernel/arch/ia32/src/mm/frame.c |
|---|
| 61,11 → 61,9 |
| for (i = 0; i < e820counter; i++) { |
| if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) { |
| start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, |
| FRAME_SIZE)); |
| size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, |
| FRAME_SIZE)); |
| if (minconf < start || minconf >= start + size) |
| start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE)); |
| size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE)); |
| if ((minconf < start) || (minconf >= start + size)) |
| conf = start; |
| else |
| conf = minconf; |
| 116,7 → 114,6 |
| cmd_initialize(&e820_info); |
| cmd_register(&e820_info); |
| minconf = 1; |
| #ifdef CONFIG_SMP |
| minconf = max(minconf, |