Commit b7f80afa 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: (71 commits)
  [S390] sclp_tty: Fix scheduling while atomic bug.
  [S390] sclp_tty: remove ioctl interface.
  [S390] Remove P390 support.
  [S390] Cleanup vmcp printk messages.
  [S390] Cleanup lcs printk messages.
  [S390] Cleanup kprobes printk messages.
  [S390] Cleanup vmwatch printk messages.
  [S390] Cleanup dcssblk printk messages.
  [S390] Cleanup zfcp dumper printk messages.
  [S390] Cleanup vmlogrdr printk messages.
  [S390] Cleanup s390 debug feature print messages.
  [S390] Cleanup monreader printk messages.
  [S390] Cleanup appldata printk messages.
  [S390] Cleanup smsgiucv printk messages.
  [S390] Cleanup cpacf printk messages.
  [S390] Cleanup qeth print messages.
  [S390] Cleanup netiucv printk messages.
  [S390] Cleanup iucv printk messages.
  [S390] Cleanup sclp printk messages.
  [S390] Cleanup zcrypt printk messages.
  ...
parents 42c59208 5e34599f

Documentation/ABI/testing/sysfs-bus-css

0 → 100644
+35 −0
Original line number Diff line number Diff line 
What:		/sys/bus/css/devices/.../type

Date:		March 2008

Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>

		linux-s390@vger.kernel.org

Description:	Contains the subchannel type, as reported by the hardware.

		This attribute is present for all subchannel types.



What:		/sys/bus/css/devices/.../modalias

Date:		March 2008

Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>

		linux-s390@vger.kernel.org

Description:	Contains the module alias as reported with uevents.

		It is of the format css:t<type> and present for all

		subchannel types.



What:		/sys/bus/css/drivers/io_subchannel/.../chpids

Date:		December 2002

Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>

		linux-s390@vger.kernel.org

Description:	Contains the ids of the channel paths used by this

		subchannel, as reported by the channel subsystem

		during subchannel recognition.

		Note: This is an I/O-subchannel specific attribute.

Users:		s390-tools, HAL



What:		/sys/bus/css/drivers/io_subchannel/.../pimpampom

Date:		December 2002

Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>

		linux-s390@vger.kernel.org

Description:	Contains the PIM/PAM/POM values, as reported by the

		channel subsystem when last queried by the common I/O

		layer (this implies that this attribute is not neccessarily

		in sync with the values current in the channel subsystem).

		Note: This is an I/O-subchannel specific attribute.

Users:		s390-tools, HAL

Documentation/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ Code Seq# Include File Comments 
					<mailto:natalia@nikhefk.nikhef.nl>

'c'	00-7F	linux/comstats.h	conflict!

'c'	00-7F	linux/coda.h		conflict!

'c'	80-9F	asm-s390/chsc.h

'd'	00-FF	linux/char/drm/drm/h	conflict!

'd'	00-DF	linux/video_decoder.h	conflict!

'd'	F0-FF	linux/digi1.h

arch/s390/Kconfig

+21 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ config MATHEMU 
config COMPAT

	bool "Kernel support for 31 bit emulation"

	depends on 64BIT

	select COMPAT_BINFMT_ELF

	help

	  Select this option if you want to enable your system kernel to

	  handle system-calls from ELF binaries for 31 bit ESA.  This option
@@ -312,6 +313,10 @@ config ARCH_SPARSEMEM_DEFAULT 
config ARCH_SELECT_MEMORY_MODEL

       def_bool y



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y

	depends on SPARSEMEM



source "mm/Kconfig"



comment "I/O subsystem configuration"
@@ -344,6 +349,22 @@ config QDIO_DEBUG 


	  If unsure, say N.



config CHSC_SCH

	tristate "Support for CHSC subchannels"

	help

	  This driver allows usage of CHSC subchannels. A CHSC subchannel

	  is usually present on LPAR only.

	  The driver creates a device /dev/chsc, which may be used to

	  obtain I/O configuration information about the machine and

	  to issue asynchronous chsc commands (DANGEROUS).

	  You will usually only want to use this interface on a special

	  LPAR designated for system management.



	  To compile this driver as a module, choose M here: the

	  module will be called chsc_sch.



	  If unsure, say N.



comment "Misc"



config IPL

arch/s390/appldata/appldata.h

+1 −9
Original line number Diff line number Diff line
@@ -3,13 +3,11 @@ 
 *

 * Definitions and interface for Linux - z/VM Monitor Stream.

 *

 * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.

 * Copyright IBM Corp. 2003, 2008

 *

 * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>

 */



//#define APPLDATA_DEBUG			/* Debug messages on/off */



#define APPLDATA_MAX_REC_SIZE	  4024	/* Maximum size of the */

					/* data buffer */

#define APPLDATA_MAX_PROCS 100
@@ -32,12 +30,6 @@ 
#define P_ERROR(x...)	printk(KERN_ERR MY_PRINT_NAME " error: " x)

#define P_WARNING(x...)	printk(KERN_WARNING MY_PRINT_NAME " status: " x)



#ifdef APPLDATA_DEBUG

#define P_DEBUG(x...)   printk(KERN_DEBUG MY_PRINT_NAME " debug: " x)

#else

#define P_DEBUG(x...)   do {} while (0)

#endif



struct appldata_ops {

	struct list_head list;

	struct ctl_table_header *sysctl_header;

arch/s390/appldata/appldata_base.c

+7 −34
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Exports appldata_register_ops() and appldata_unregister_ops() for the

 * data gathering modules.

 *

 * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.

 * Copyright IBM Corp. 2003, 2008

 *

 * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>

 */
@@ -108,9 +108,6 @@ static LIST_HEAD(appldata_ops_list); 
 */

static void appldata_timer_function(unsigned long data)

{

	P_DEBUG("   -= Timer =-\n");

	P_DEBUG("CPU: %i, expire_count: %i\n", smp_processor_id(),

		atomic_read(&appldata_expire_count));

	if (atomic_dec_and_test(&appldata_expire_count)) {

		atomic_set(&appldata_expire_count, num_online_cpus());

		queue_work(appldata_wq, (struct work_struct *) data);
@@ -128,14 +125,11 @@ static void appldata_work_fn(struct work_struct *work) 
	struct appldata_ops *ops;

	int i;



	P_DEBUG("  -= Work Queue =-\n");

	i = 0;

	get_online_cpus();

	spin_lock(&appldata_ops_lock);

	list_for_each(lh, &appldata_ops_list) {

		ops = list_entry(lh, struct appldata_ops, list);

		P_DEBUG("list_for_each loop: %i) active = %u, name = %s\n",

			++i, ops->active, ops->name);

		if (ops->active == 1) {

			ops->callback(ops->data);

		}
@@ -212,7 +206,6 @@ __appldata_vtimer_setup(int cmd) 
						 0, 1);

		}

		appldata_timer_active = 1;

		P_INFO("Monitoring timer started.\n");

		break;

	case APPLDATA_DEL_TIMER:

		for_each_online_cpu(i)
@@ -221,7 +214,6 @@ __appldata_vtimer_setup(int cmd) 
			break;

		appldata_timer_active = 0;

		atomic_set(&appldata_expire_count, num_online_cpus());

		P_INFO("Monitoring timer stopped.\n");

		break;

	case APPLDATA_MOD_TIMER:

		per_cpu_interval = (u64) (appldata_interval*1000 /
@@ -313,10 +305,8 @@ appldata_interval_handler(ctl_table *ctl, int write, struct file *filp, 
	}

	interval = 0;

	sscanf(buf, "%i", &interval);

	if (interval <= 0) {

		P_ERROR("Timer CPU interval has to be > 0!\n");

	if (interval <= 0)

		return -EINVAL;

	}



	get_online_cpus();

	spin_lock(&appldata_timer_lock);
@@ -324,9 +314,6 @@ appldata_interval_handler(ctl_table *ctl, int write, struct file *filp, 
	__appldata_vtimer_setup(APPLDATA_MOD_TIMER);

	spin_unlock(&appldata_timer_lock);

	put_online_cpus();



	P_INFO("Monitoring CPU interval set to %u milliseconds.\n",

		 interval);

out:

	*lenp = len;

	*ppos += len;
@@ -406,23 +393,16 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp, 
			P_ERROR("START DIAG 0xDC for %s failed, "

				"return code: %d\n", ops->name, rc);

			module_put(ops->owner);

		} else {

			P_INFO("Monitoring %s data enabled, "

				"DIAG 0xDC started.\n", ops->name);

		} else

			ops->active = 1;

		}

	} else if ((buf[0] == '0') && (ops->active == 1)) {

		ops->active = 0;

		rc = appldata_diag(ops->record_nr, APPLDATA_STOP_REC,

				(unsigned long) ops->data, ops->size,

				ops->mod_lvl);

		if (rc != 0) {

		if (rc != 0)

			P_ERROR("STOP DIAG 0xDC for %s failed, "

				"return code: %d\n", ops->name, rc);

		} else {

			P_INFO("Monitoring %s data disabled, "

				"DIAG 0xDC stopped.\n", ops->name);

		}

		module_put(ops->owner);

	}

	spin_unlock(&appldata_ops_lock);
@@ -468,7 +448,6 @@ int appldata_register_ops(struct appldata_ops *ops) 
	ops->sysctl_header = register_sysctl_table(ops->ctl_table);

	if (!ops->sysctl_header)

		goto out;

	P_INFO("%s-ops registered!\n", ops->name);

	return 0;

out:

	spin_lock(&appldata_ops_lock);
@@ -490,7 +469,6 @@ void appldata_unregister_ops(struct appldata_ops *ops) 
	spin_unlock(&appldata_ops_lock);

	unregister_sysctl_table(ops->sysctl_header);

	kfree(ops->ctl_table);

	P_INFO("%s-ops unregistered!\n", ops->name);

}

/********************** module-ops management <END> **************************/
@@ -553,14 +531,9 @@ static int __init appldata_init(void) 
{

	int i;



	P_DEBUG("sizeof(parameter_list) = %lu\n",

		sizeof(struct appldata_parameter_list));



	appldata_wq = create_singlethread_workqueue("appldata");

	if (!appldata_wq) {

		P_ERROR("Could not create work queue\n");

	if (!appldata_wq)

		return -ENOMEM;

	}



	get_online_cpus();

	for_each_online_cpu(i)
@@ -571,8 +544,6 @@ static int __init appldata_init(void) 
	register_hotcpu_notifier(&appldata_nb);



	appldata_sysctl_header = register_sysctl_table(appldata_dir_table);



	P_DEBUG("Base interface initialized.\n");

	return 0;

}
@@ -584,7 +555,9 @@ EXPORT_SYMBOL_GPL(appldata_register_ops); 
EXPORT_SYMBOL_GPL(appldata_unregister_ops);

EXPORT_SYMBOL_GPL(appldata_diag);



#ifdef CONFIG_SWAP

EXPORT_SYMBOL_GPL(si_swapinfo);

#endif

EXPORT_SYMBOL_GPL(nr_threads);

EXPORT_SYMBOL_GPL(nr_running);

EXPORT_SYMBOL_GPL(nr_iowait);

CRA Git | Maintained and supported by SUSTech CRA and CCSE