Changeset c5396c1 in mainline for kernel/arch
- Timestamp:
- 2013-09-12T10:27:17Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6e75f2d
- Parents:
- 4a5f2b0
- Location:
- kernel/arch
- Files:
-
- 5 edited
-
amd64/src/ddi/ddi.c (modified) (3 diffs)
-
amd64/src/proc/task.c (modified) (1 diff)
-
ia32/src/ddi/ddi.c (modified) (3 diffs)
-
ia32/src/proc/task.c (modified) (1 diff)
-
ia64/src/ddi/ddi.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/amd64/src/ddi/ddi.c
r4a5f2b0 rc5396c1 68 68 */ 69 69 70 void *store = malloc(bitmap_size(elements , 0), FRAME_ATOMIC);70 void *store = malloc(bitmap_size(elements), FRAME_ATOMIC); 71 71 if (!store) 72 72 return ENOMEM; 73 73 74 74 bitmap_t oldiomap; 75 bitmap_initialize(&oldiomap, task->arch.iomap.elements, 0,75 bitmap_initialize(&oldiomap, task->arch.iomap.elements, 76 76 task->arch.iomap.bits); 77 77 78 bitmap_initialize(&task->arch.iomap, elements, 0,store);78 bitmap_initialize(&task->arch.iomap, elements, store); 79 79 80 80 /* … … 129 129 130 130 bitmap_t iomap; 131 bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8, 0,131 bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8, 132 132 CPU->arch.tss->iomap); 133 133 bitmap_copy(&iomap, &TASK->arch.iomap, elements); … … 157 157 158 158 descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base; 159 size_t size = bitmap_size(elements , 0);159 size_t size = bitmap_size(elements); 160 160 gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + size); 161 161 gdtr_load(&cpugdtr); -
kernel/arch/amd64/src/proc/task.c
r4a5f2b0 rc5396c1 46 46 { 47 47 task->arch.iomapver = 0; 48 bitmap_initialize(&task->arch.iomap, 0, 0,NULL);48 bitmap_initialize(&task->arch.iomap, 0, NULL); 49 49 } 50 50 -
kernel/arch/ia32/src/ddi/ddi.c
r4a5f2b0 rc5396c1 68 68 */ 69 69 70 void *store = malloc(bitmap_size(elements , 0), FRAME_ATOMIC);70 void *store = malloc(bitmap_size(elements), FRAME_ATOMIC); 71 71 if (!store) 72 72 return ENOMEM; 73 73 74 74 bitmap_t oldiomap; 75 bitmap_initialize(&oldiomap, task->arch.iomap.elements, 0,75 bitmap_initialize(&oldiomap, task->arch.iomap.elements, 76 76 task->arch.iomap.bits); 77 77 78 bitmap_initialize(&task->arch.iomap, elements, 0,store);78 bitmap_initialize(&task->arch.iomap, elements, store); 79 79 80 80 /* … … 129 129 130 130 bitmap_t iomap; 131 bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8, 0,131 bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8, 132 132 CPU->arch.tss->iomap); 133 133 bitmap_copy(&iomap, &TASK->arch.iomap, elements); … … 157 157 158 158 descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base; 159 size_t size = bitmap_size(elements , 0);159 size_t size = bitmap_size(elements); 160 160 gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + size); 161 161 gdtr_load(&cpugdtr); -
kernel/arch/ia32/src/proc/task.c
r4a5f2b0 rc5396c1 46 46 { 47 47 task->arch.iomapver = 0; 48 bitmap_initialize(&task->arch.iomap, 0, 0,NULL);48 bitmap_initialize(&task->arch.iomap, 0, NULL); 49 49 } 50 50 -
kernel/arch/ia64/src/ddi/ddi.c
r4a5f2b0 rc5396c1 60 60 return ENOMEM; 61 61 62 void *store = malloc(bitmap_size(IO_MEMMAP_PAGES , 0), 0);62 void *store = malloc(bitmap_size(IO_MEMMAP_PAGES), 0); 63 63 if (store == NULL) 64 64 return ENOMEM; 65 65 66 bitmap_initialize(task->arch.iomap, IO_MEMMAP_PAGES, 0,store);66 bitmap_initialize(task->arch.iomap, IO_MEMMAP_PAGES, store); 67 67 bitmap_clear_range(task->arch.iomap, 0, IO_MEMMAP_PAGES); 68 68 }
Note:
See TracChangeset
for help on using the changeset viewer.
