Commit 53ce2dc2 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] Change atomic_read/set to inline functions with barrier semantics.
  [S390] kprobes: fix instruction length calculation
  [S390] hypfs: inode corruption due to missing locking
  [S390] disassembler: fix b2 opcodes like srst, bsg, and others
  [S390] vmur: fix reference counting for vmur device structure
  [S390] vmur: fix diag14 exceptions with addresses > 2GB.
  [S390] qdio: Refresh buffer states for IQDIO Asynchronous output queue
  [S390] qdio: fix EQBS handling on CCQ96
  [S390] cio: change confusing message in cmf.
  [S390] cio: dont forget to set last slot to NULL in ccw_uevent().
parents 8b14cb99 c51b9621

arch/s390/hypfs/inode.c

+25 −8
Original line number Diff line number Diff line
@@ -60,17 +60,28 @@ static void hypfs_add_dentry(struct dentry *dentry) 
	hypfs_last_dentry = dentry;

}



static inline int hypfs_positive(struct dentry *dentry)

{

	return dentry->d_inode && !d_unhashed(dentry);

}



static void hypfs_remove(struct dentry *dentry)

{

	struct dentry *parent;



	parent = dentry->d_parent;

	if (!parent || !parent->d_inode)

		return;

	mutex_lock(&parent->d_inode->i_mutex);

	if (hypfs_positive(dentry)) {

		if (S_ISDIR(dentry->d_inode->i_mode))

			simple_rmdir(parent->d_inode, dentry);

		else

			simple_unlink(parent->d_inode, dentry);

	}

	d_delete(dentry);

	dput(dentry);

	mutex_unlock(&parent->d_inode->i_mutex);

}



static void hypfs_delete_tree(struct dentry *root)
@@ -315,6 +326,7 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) 
	}

	hypfs_update_update(sb);

	sb->s_root = root_dentry;

	printk(KERN_INFO "hypfs: Hypervisor filesystem mounted\n");

	return 0;



err_tree:
@@ -356,13 +368,17 @@ static struct dentry *hypfs_create_file(struct super_block *sb, 
	qname.name = name;

	qname.len = strlen(name);

	qname.hash = full_name_hash(name, qname.len);

	mutex_lock(&parent->d_inode->i_mutex);

	dentry = lookup_one_len(name, parent, strlen(name));

	if (IS_ERR(dentry))

		return ERR_PTR(-ENOMEM);

	if (IS_ERR(dentry)) {

		dentry = ERR_PTR(-ENOMEM);

		goto fail;

	}

	inode = hypfs_make_inode(sb, mode);

	if (!inode) {

		dput(dentry);

		return ERR_PTR(-ENOMEM);

		dentry = ERR_PTR(-ENOMEM);

		goto fail;

	}

	if (mode & S_IFREG) {

		inode->i_fop = &hypfs_file_ops;
@@ -379,6 +395,8 @@ static struct dentry *hypfs_create_file(struct super_block *sb, 
	inode->i_private = data;

	d_instantiate(dentry, inode);

	dget(dentry);

fail:

	mutex_unlock(&parent->d_inode->i_mutex);

	return dentry;

}
@@ -391,7 +409,6 @@ struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent, 
	if (IS_ERR(dentry))

		return dentry;

	hypfs_add_dentry(dentry);

	parent->d_inode->i_nlink++;

	return dentry;

}

arch/s390/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ EXTRA_AFLAGS := -traditional 


obj-y	:=  bitmap.o traps.o time.o process.o base.o early.o \

            setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \

	    semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o

	    semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o diag.o



obj-y	+= $(if $(CONFIG_64BIT),entry64.o,entry.o)

obj-y	+= $(if $(CONFIG_64BIT),reipl64.o,reipl.o)

arch/s390/kernel/diag.c

0 → 100644
+102 −0
Original line number Diff line number Diff line 
/*

 * Implementation of s390 diagnose codes

 *

 * Copyright IBM Corp. 2007

 * Author(s): Michael Holzheu <holzheu@de.ibm.com>

 */



#include <linux/module.h>

#include <asm/diag.h>



/*

 * Diagnose 10: Release pages

 */

void diag10(unsigned long addr)

{

	if (addr >= 0x7ff00000)

		return;

	asm volatile(

#ifdef CONFIG_64BIT

		"	sam31\n"

		"	diag	%0,%0,0x10\n"

		"0:	sam64\n"

#else

		"	diag	%0,%0,0x10\n"

		"0:\n"

#endif

		EX_TABLE(0b, 0b)

		: : "a" (addr));

}

EXPORT_SYMBOL(diag10);



/*

 * Diagnose 14: Input spool file manipulation

 */

int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode)

{

	register unsigned long _ry1 asm("2") = ry1;

	register unsigned long _ry2 asm("3") = subcode;

	int rc = 0;



	asm volatile(

#ifdef CONFIG_64BIT

		"   sam31\n"

		"   diag    %2,2,0x14\n"

		"   sam64\n"

#else

		"   diag    %2,2,0x14\n"

#endif

		"   ipm     %0\n"

		"   srl     %0,28\n"

		: "=d" (rc), "+d" (_ry2)

		: "d" (rx), "d" (_ry1)

		: "cc");



	return rc;

}

EXPORT_SYMBOL(diag14);



/*

 * Diagnose 210: Get information about a virtual device

 */

int diag210(struct diag210 *addr)

{

	/*

	 * diag 210 needs its data below the 2GB border, so we

	 * use a static data area to be sure

	 */

	static struct diag210 diag210_tmp;

	static DEFINE_SPINLOCK(diag210_lock);

	unsigned long flags;

	int ccode;



	spin_lock_irqsave(&diag210_lock, flags);

	diag210_tmp = *addr;



#ifdef CONFIG_64BIT

	asm volatile(

		"	lhi	%0,-1\n"

		"	sam31\n"

		"	diag	%1,0,0x210\n"

		"0:	ipm	%0\n"

		"	srl	%0,28\n"

		"1:	sam64\n"

		EX_TABLE(0b, 1b)

		: "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");

#else

	asm volatile(

		"	lhi	%0,-1\n"

		"	diag	%1,0,0x210\n"

		"0:	ipm	%0\n"

		"	srl	%0,28\n"

		"1:\n"

		EX_TABLE(0b, 1b)

		: "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");

#endif



	*addr = diag210_tmp;

	spin_unlock_irqrestore(&diag210_lock, flags);



	return ccode;

}

EXPORT_SYMBOL(diag210);

arch/s390/kernel/dis.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static struct insn opcode_b2[] = { 
	{ "esta", 0x4a, INSTR_RRE_RR },

	{ "lura", 0x4b, INSTR_RRE_RR },

	{ "tar", 0x4c, INSTR_RRE_AR },

	{ "cpya", INSTR_RRE_AA },

	{ "cpya", 0x4d, INSTR_RRE_AA },

	{ "sar", 0x4e, INSTR_RRE_AR },

	{ "ear", 0x4f, INSTR_RRE_RA },

	{ "csp", 0x50, INSTR_RRE_RR },

arch/s390/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void __kprobes get_instruction_type(struct arch_specific_insn *ainsn) 
	ainsn->reg = (*ainsn->insn & 0xf0) >> 4;



	/* save the instruction length (pop 5-5) in bytes */

	switch (*(__u8 *) (ainsn->insn) >> 4) {

	switch (*(__u8 *) (ainsn->insn) >> 6) {

	case 0:

		ainsn->ilen = 2;

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE