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

Commit e11f0d04 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin Schwidefsky
Browse files

[S390] arch/s390/kernel/debug.c: use mutex instead of semaphore 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 3006d7c6

arch/s390/kernel/debug.c

+11 −11
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ unsigned int debug_feature_version = __DEBUG_FEATURE_VERSION; 


static debug_info_t *debug_area_first = NULL;

static debug_info_t *debug_area_last = NULL;

static DECLARE_MUTEX(debug_lock);

static DEFINE_MUTEX(debug_mutex);



static int initialized;
@@ -576,7 +576,7 @@ debug_input(struct file *file, const char __user *user_buf, size_t length, 
	int rc = 0;

	file_private_info_t *p_info;



	down(&debug_lock);

	mutex_lock(&debug_mutex);

	p_info = ((file_private_info_t *) file->private_data);

	if (p_info->view->input_proc)

		rc = p_info->view->input_proc(p_info->debug_info_org,
@@ -584,7 +584,7 @@ debug_input(struct file *file, const char __user *user_buf, size_t length, 
					      length, offset);

	else

		rc = -EPERM;

	up(&debug_lock);

	mutex_unlock(&debug_mutex);

	return rc;		/* number of input characters */

}
@@ -602,7 +602,7 @@ debug_open(struct inode *inode, struct file *file) 
	file_private_info_t *p_info;

	debug_info_t *debug_info, *debug_info_snapshot;



	down(&debug_lock);

	mutex_lock(&debug_mutex);

	debug_info = file->f_path.dentry->d_inode->i_private;

	/* find debug view */

	for (i = 0; i < DEBUG_MAX_VIEWS; i++) {
@@ -653,7 +653,7 @@ found: 
	file->private_data = p_info;

	debug_info_get(debug_info);

out:

	up(&debug_lock);

	mutex_unlock(&debug_mutex);

	return rc;

}
@@ -688,7 +688,7 @@ debug_register (char *name, int pages_per_area, int nr_areas, int buf_size) 


	if (!initialized)

		BUG();

	down(&debug_lock);

	mutex_lock(&debug_mutex);



        /* create new debug_info */
@@ -702,7 +702,7 @@ out: 
        if (!rc){

		printk(KERN_ERR "debug: debug_register failed for %s\n",name);

        }

	up(&debug_lock);

	mutex_unlock(&debug_mutex);

	return rc;

}
@@ -716,9 +716,9 @@ debug_unregister(debug_info_t * id) 
{

	if (!id)

		goto out;

	down(&debug_lock);

	mutex_lock(&debug_mutex);

	debug_info_put(id);

	up(&debug_lock);

	mutex_unlock(&debug_mutex);



out:

	return;
@@ -1054,11 +1054,11 @@ __init debug_init(void) 
	int rc = 0;



	s390dbf_sysctl_header = register_sysctl_table(s390dbf_dir_table);

	down(&debug_lock);

	mutex_lock(&debug_mutex);

	debug_debugfs_root_entry = debugfs_create_dir(DEBUG_DIR_ROOT,NULL);

	printk(KERN_INFO "debug: Initialization complete\n");

	initialized = 1;

	up(&debug_lock);

	mutex_unlock(&debug_mutex);



	return rc;

}