From 7566156add4e81731bfb24e8dc891447c97b06d0 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 25 Apr 2007 13:59:03 +0000 Subject: 2007-04-25 Thomas Schwinge [task #5878 --- ``Backport code from GNU Mach's trunk to gnumach-1-branch: i386_set_gdt, i386_get_gdt''] * i386/include/mach/i386/mach_i386.defs (i386_set_gdt, i386_get_gdt): Shift by two to maintain rpc id compatibility with OSKit-Mach. --- ChangeLog | 9 +++++++-- i386/include/mach/i386/mach_i386.defs | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2457dd0..5a42e66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ 2007-04-25 Thomas Schwinge - * linux/dev/glue/kmem.c (vmalloc_list_remove): Cast first argument in - the `kfree' call to what is expected. + [task #5878 --- ``Backport code from GNU Mach's trunk to + gnumach-1-branch: i386_set_gdt, i386_get_gdt''] + * i386/include/mach/i386/mach_i386.defs (i386_set_gdt, i386_get_gdt): + Shift by two to maintain rpc id compatibility with OSKit-Mach. + + * linux/dev/glue/kmem.c (vmalloc_list_remove): Cast the first argument + in the `kfree' call to what is expected. * linux/pcmcia-cs/glue/ds.c (kmalloc, kfree): Call `linux_kmalloc', respective `linux_kfree' instead. diff --git a/i386/include/mach/i386/mach_i386.defs b/i386/include/mach/i386/mach_i386.defs index 1f98dc3..5c9f367 100644 --- a/i386/include/mach/i386/mach_i386.defs +++ b/i386/include/mach/i386/mach_i386.defs @@ -67,18 +67,21 @@ routine i386_get_ldt( selector_count : int; out desc_list : descriptor_list_t); +skip; /* i386_io_perm_create */ +skip; /* i386_io_perm_modify */ + /* Modify one of a few available thread-specific segment descriptor slots. The SELECTOR must be a value from a previous call (on any thread), or -1 to allocate an available slot and return the segment selector for it. These slots are copied into the CPU on each thread switch. Returns KERN_NO_SPACE when there are no more slots available. */ -routine i386_set_gdt( - target_thread : thread_t; - inout selector : int; - desc : descriptor_t); +routine i386_set_gdt( + target_thread : thread_t; + inout selector : int; + desc : descriptor_t); /* Fetch a segment descriptor set with a prior i386_set_gdt call. */ -routine i386_get_gdt( - target_thread : thread_t; - selector : int; - out desc : descriptor_t); +routine i386_get_gdt( + target_thread : thread_t; + selector : int; + out desc : descriptor_t); -- cgit v1.2.3