Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 573da422 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: DS cleanup - dont treat 0 as NULL 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 970e7250

arch/x86/kernel/ds.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -238,12 +238,12 @@ static inline struct ds_context *ds_alloc_context(struct task_struct *task) 
		context = kzalloc(sizeof(*context), GFP_KERNEL);

		context = kzalloc(sizeof(*context), GFP_KERNEL);





		if (!context)

		if (!context)

			return 0;

			return NULL;





		context->ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL);

		context->ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL);

		if (!context->ds) {

		if (!context->ds) {

			kfree(context);

			kfree(context);

			return 0;

			return NULL;

		}

		}





		*p_context = context;

		*p_context = context;
@@ -279,7 +279,7 @@ static inline void ds_put_context(struct ds_context *context) 
	if (--context->count)

	if (--context->count)

		goto out;

		goto out;





	*(context->this) = 0;

	*(context->this) = NULL;





	if (context->task)

	if (context->task)

		clear_tsk_thread_flag(context->task, TIF_DS_AREA_MSR);

		clear_tsk_thread_flag(context->task, TIF_DS_AREA_MSR);
@@ -341,16 +341,16 @@ static inline void *ds_allocate_buffer(size_t size, unsigned int *pages) 
	rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;

	rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;

	vm   = current->mm->total_vm  + pgsz;

	vm   = current->mm->total_vm  + pgsz;

	if (rlim < vm)

	if (rlim < vm)

		return 0;

		return NULL;





	rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;

	rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;

	vm   = current->mm->locked_vm  + pgsz;

	vm   = current->mm->locked_vm  + pgsz;

	if (rlim < vm)

	if (rlim < vm)

		return 0;

		return NULL;





	buffer = kzalloc(size, GFP_KERNEL);

	buffer = kzalloc(size, GFP_KERNEL);

	if (!buffer)

	if (!buffer)

		return 0;

		return NULL;





	current->mm->total_vm  += pgsz;

	current->mm->total_vm  += pgsz;

	current->mm->locked_vm += pgsz;

	current->mm->locked_vm += pgsz;
@@ -395,7 +395,7 @@ static int ds_request(struct task_struct *task, void *base, size_t size, 
	if (context->owner[qual] == current)

	if (context->owner[qual] == current)

		goto out_unlock;

		goto out_unlock;

	error = -EPERM;

	error = -EPERM;

	if (context->owner[qual] != 0)

	if (context->owner[qual] != NULL)

		goto out_unlock;

		goto out_unlock;

	context->owner[qual] = current;

	context->owner[qual] = current;
@@ -445,7 +445,7 @@ static int ds_request(struct task_struct *task, void *base, size_t size, 
	return error;

	return error;





 out_release:

 out_release:

	context->owner[qual] = 0;

	context->owner[qual] = NULL;

	ds_put_context(context);

	ds_put_context(context);

	return error;

	return error;