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

Commit 51d7cfc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] cio: deregister ccw device when pgid disband failed
  [S390] cio: Use device_schedule_callback() for removing disconnected devices.
  [S390] Fix section annotations.
  [S390] raw3270: use mutex instead of semaphore
  [S390] arch/s390/kernel/debug.c: use mutex instead of semaphore
  [S390] dasd_eer: use mutex instead of semaphore
  [S390] Add exception handler for diagnose 224
parents 5983b125 3ecb0a5a

arch/s390/hypfs/hypfs_diag.c

+14 −3
Original line number Diff line number Diff line
@@ -481,9 +481,17 @@ out: 


/* Diagnose 224 functions */



static void diag224(void *ptr)

static int diag224(void *ptr)

{

	asm volatile("diag %0,%1,0x224" : :"d" (0), "d"(ptr) : "memory");

	int rc = -ENOTSUPP;



	asm volatile(

		"	diag	%1,%2,0x224\n"

		"0:	lhi	%0,0x0\n"

		"1:\n"

		EX_TABLE(0b,1b)

		: "+d" (rc) :"d" (0), "d" (ptr) : "memory");

	return rc;

}



static int diag224_get_name_table(void)
@@ -492,7 +500,10 @@ static int diag224_get_name_table(void) 
	diag224_cpu_names = kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);

	if (!diag224_cpu_names)

		return -ENOMEM;

	diag224(diag224_cpu_names);

	if (diag224(diag224_cpu_names)) {

		kfree(diag224_cpu_names);

		return -ENOTSUPP;

	}

	EBCASC(diag224_cpu_names + 16, (*diag224_cpu_names + 1) * 16);

	return 0;

}

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;

}

arch/s390/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct resource data_resource = { 
/*

 * cpu_init() initializes state that is per-CPU.

 */

void __devinit cpu_init (void)

void __cpuinit cpu_init(void)

{

        int addr = hard_smp_processor_id();
@@ -915,7 +915,7 @@ setup_arch(char **cmdline_p) 
	setup_zfcpdump(console_devno);

}



void print_cpu_info(struct cpuinfo_S390 *cpuinfo)

void __cpuinit print_cpu_info(struct cpuinfo_S390 *cpuinfo)

{

   printk("cpu %d "

#ifdef CONFIG_SMP

arch/s390/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static unsigned int __init smp_count_cpus(void) 
/*

 *	Activate a secondary processor.

 */

int __devinit start_secondary(void *cpuvoid)

int __cpuinit start_secondary(void *cpuvoid)

{

	/* Setup the cpu */

	cpu_init();
@@ -741,7 +741,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
			smp_create_idle(cpu);

}



void __devinit smp_prepare_boot_cpu(void)

void __init smp_prepare_boot_cpu(void)

{

	BUG_ON(smp_processor_id() != 0);
@@ -750,7 +750,7 @@ void __devinit smp_prepare_boot_cpu(void) 
	current_set[0] = current;

}



void smp_cpus_done(unsigned int max_cpus)

void __init smp_cpus_done(unsigned int max_cpus)

{

	cpu_present_map = cpu_possible_map;

}

drivers/s390/block/dasd_eer.c

+8 −8
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
#include <linux/moduleparam.h>

#include <linux/device.h>

#include <linux/poll.h>

#include <linux/mutex.h>



#include <asm/uaccess.h>

#include <asm/semaphore.h>

#include <asm/atomic.h>

#include <asm/ebcdic.h>
@@ -514,7 +514,7 @@ void dasd_eer_disable(struct dasd_device *device) 
 * to transfer in a readbuffer, which is protected by the readbuffer_mutex.

 */

static char readbuffer[PAGE_SIZE];

static DECLARE_MUTEX(readbuffer_mutex);

static DEFINE_MUTEX(readbuffer_mutex);



static int dasd_eer_open(struct inode *inp, struct file *filp)

{
@@ -579,7 +579,7 @@ static ssize_t dasd_eer_read(struct file *filp, char __user *buf, 
	struct eerbuffer *eerb;



	eerb = (struct eerbuffer *) filp->private_data;

	if (down_interruptible(&readbuffer_mutex))

	if (mutex_lock_interruptible(&readbuffer_mutex))

		return -ERESTARTSYS;



	spin_lock_irqsave(&bufferlock, flags);
@@ -588,7 +588,7 @@ static ssize_t dasd_eer_read(struct file *filp, char __user *buf, 
		                  /* has been deleted             */

		eerb->residual = 0;

		spin_unlock_irqrestore(&bufferlock, flags);

		up(&readbuffer_mutex);

		mutex_unlock(&readbuffer_mutex);

		return -EIO;

	} else if (eerb->residual > 0) {

		/* OK we still have a second half of a record to deliver */
@@ -602,7 +602,7 @@ static ssize_t dasd_eer_read(struct file *filp, char __user *buf, 
			if (!tc) {

				/* no data available */

				spin_unlock_irqrestore(&bufferlock, flags);

				up(&readbuffer_mutex);

				mutex_unlock(&readbuffer_mutex);

				if (filp->f_flags & O_NONBLOCK)

					return -EAGAIN;

				rc = wait_event_interruptible(
@@ -610,7 +610,7 @@ static ssize_t dasd_eer_read(struct file *filp, char __user *buf, 
					eerb->head != eerb->tail);

				if (rc)

					return rc;

				if (down_interruptible(&readbuffer_mutex))

				if (mutex_lock_interruptible(&readbuffer_mutex))

					return -ERESTARTSYS;

				spin_lock_irqsave(&bufferlock, flags);

			}
@@ -626,11 +626,11 @@ static ssize_t dasd_eer_read(struct file *filp, char __user *buf, 
	spin_unlock_irqrestore(&bufferlock, flags);



	if (copy_to_user(buf, readbuffer, effective_count)) {

		up(&readbuffer_mutex);

		mutex_unlock(&readbuffer_mutex);

		return -EFAULT;

	}



	up(&readbuffer_mutex);

	mutex_unlock(&readbuffer_mutex);

	return effective_count;

}