gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete struct member 'type' from address_space structure

Browse Source
This commit is contained in:
Tomoki Shirasawa
2016-01-06 20:17:00 +09:00
parent f7b5b48266
commit 75c6a94839
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/include/process.h
View File

@@ -219,9 +219,6 @@ struct address_space {
void *opt; void *opt;
void (*free_cb)(struct address_space *, void *); void (*free_cb)(struct address_space *, void *);
ihk_atomic_t refcount; ihk_atomic_t refcount;
int type;
#define ADDRESS_SPACE_NORMAL 1
#define ADDRESS_SPACE_PVAS 2
cpu_set_t cpu_set; cpu_set_t cpu_set;
ihk_spinlock_t cpu_set_lock; ihk_spinlock_t cpu_set_lock;
int nslots; int nslots;

9
kernel/process.c
View File

@@ -142,7 +142,7 @@ chain_thread(struct thread *thread)
} }
struct address_space * struct address_space *
create_address_space(struct resource_set *res, int type, int n) create_address_space(struct resource_set *res, int n)
{ {
struct address_space *asp; struct address_space *asp;
void *pt; void *pt;
@@ -157,7 +157,6 @@ create_address_space(struct resource_set *res, int type, int n)
} }
memset(asp, '\0', sizeof(struct address_space) + sizeof(int) * n); memset(asp, '\0', sizeof(struct address_space) + sizeof(int) * n);
asp->type = type;
asp->nslots = n; asp->nslots = n;
asp->page_table = pt; asp->page_table = pt;
ihk_atomic_set(&asp->refcount, 1); ihk_atomic_set(&asp->refcount, 1);
@@ -228,8 +227,7 @@ create_thread(unsigned long user_pc)
ihk_atomic_set(&thread->refcount, 2); ihk_atomic_set(&thread->refcount, 2);
proc = kmalloc(sizeof(struct process), IHK_MC_AP_NOWAIT); proc = kmalloc(sizeof(struct process), IHK_MC_AP_NOWAIT);
vm = kmalloc(sizeof(struct process_vm), IHK_MC_AP_NOWAIT); vm = kmalloc(sizeof(struct process_vm), IHK_MC_AP_NOWAIT);
asp = create_address_space(cpu_local_var(resource_set), asp = create_address_space(cpu_local_var(resource_set), 1);
ADDRESS_SPACE_NORMAL, 1);
if (!proc || !vm || !asp) if (!proc || !vm || !asp)
goto err; goto err;
memset(proc, 0, sizeof(struct process)); memset(proc, 0, sizeof(struct process));
@@ -367,8 +365,7 @@ clone_thread(struct thread *org, unsigned long pc, unsigned long sp,
init_process(proc, org->proc); init_process(proc, org->proc);
proc->termsig = termsig; proc->termsig = termsig;
asp = create_address_space(cpu_local_var(resource_set), asp = create_address_space(cpu_local_var(resource_set), 1);
ADDRESS_SPACE_NORMAL, 1);
if(!asp){ if(!asp){
kfree(proc); kfree(proc);
goto err_free_proc; goto err_free_proc;