Please pull git390 'for-linus' branch
Subsystems (38)
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
arch/s390/Kconfig | 49 +++------ arch/s390/defconfig | 234 +++++++++++++++++++++----------------- arch/s390/hypfs/inode.c | 2 +- arch/s390/kernel/ipl.c | 26 ++-- arch/s390/mm/fault.c | 5 +- drivers/ata/Kconfig | 1 + drivers/auxdisplay/Kconfig | 1 + drivers/block/Kconfig | 4 +- drivers/char/Kconfig | 11 ++- drivers/char/ipmi/Kconfig | 2 + drivers/char/tpm/Kconfig | 1 + drivers/crypto/Kconfig | 22 ++++ drivers/dma/Kconfig | 1 + drivers/edac/Kconfig | 1 + drivers/hwmon/Kconfig | 1 + drivers/i2c/Kconfig | 1 + drivers/ide/Kconfig | 1 + drivers/ieee1394/Kconfig | 1 + drivers/infiniband/Kconfig | 1 + drivers/input/Kconfig | 1 + drivers/isdn/Kconfig | 1 + drivers/kvm/Kconfig | 1 + drivers/leds/Kconfig | 1 + drivers/media/Kconfig | 1 + drivers/message/fusion/Kconfig | 1 + drivers/message/i2o/Kconfig | 1 + drivers/mfd/Kconfig | 1 + drivers/mmc/Kconfig | 1 + drivers/mtd/Kconfig | 1 + drivers/net/phy/Kconfig | 1 + drivers/net/wireless/Kconfig | 1 + drivers/parport/Kconfig | 1 + drivers/pnp/Kconfig | 1 + drivers/rtc/Kconfig | 1 + drivers/s390/Kconfig | 239 --------------------------------------- drivers/s390/block/Kconfig | 11 +- drivers/s390/block/dasd.c | 8 +- drivers/s390/block/dasd_diag.c | 10 +- drivers/s390/block/dasd_eckd.c | 6 +- drivers/s390/block/dasd_ioctl.c | 4 +- drivers/s390/char/Kconfig | 166 +++++++++++++++++++++++++++ drivers/s390/char/monreader.c | 14 +- drivers/s390/char/raw3270.c | 5 +- drivers/s390/char/sclp.h | 3 + drivers/s390/char/sclp_sdias.c | 8 +- drivers/s390/char/zcore.c | 9 +- drivers/s390/cio/css.c | 3 +- drivers/s390/cio/css.h | 2 - drivers/s390/cio/device.c | 4 +- drivers/s390/cio/device_ops.c | 11 ++ drivers/s390/cio/qdio.c | 1 + drivers/s390/net/Kconfig | 8 +- drivers/s390/net/qeth_mpc.c | 4 +- drivers/s390/scsi/zfcp_aux.c | 8 +- drivers/s390/scsi/zfcp_dbf.c | 2 +- drivers/serial/Kconfig | 1 + drivers/spi/Kconfig | 1 + drivers/telephony/Kconfig | 1 + drivers/usb/Kconfig | 1 + drivers/video/Kconfig | 1 + drivers/w1/Kconfig | 1 + include/asm-s390/ccwdev.h | 3 +- include/asm-s390/ipl.h | 2 +- include/asm-s390/param.h | 2 +- net/Kconfig | 1 + net/ax25/Kconfig | 2 +- net/bluetooth/Kconfig | 2 +- net/irda/Kconfig | 2 +- sound/Kconfig | 1 + 69 files changed, 468 insertions(+), 459 deletions(-) delete mode 100644 drivers/s390/Kconfig create mode 100644 drivers/s390/char/Kconfig
Cornelia Huck (4):
[S390] fix subsystem removal fallout
[S390] cio: Get rid of _ccw_device_get_device_number(). [S390] cio: Make some structures and a function static. [S390] dasd: Fix modular build.
Heiko Carstens (2):
[S390] Avoid sparse warnings.
[S390] Avoid compile warning.
Martin Schwidefsky (8):
[S390] monreader inlining cleanup.
[S390] Kconfig: refine depends statements. [S390] Kconfig: menus with depends on HAS_IOMEM. [S390] Kconfig: unwanted menus for s390. [S390] Kconfig: common config options for s390. [S390] Kconfig: use common Kconfig files for s390. [S390] Kconfig: no wireless on s390. [S390] update default configuration.
Ursula Braun (1):
[S390] qdio: re-add lost perf_stats.tl_runs change in qdio_handle_pci
arch/s390/Kconfig +16 -33
@@ -4,27 +4,23 @@ # config MMU - bool - default y + def_bool y config ZONE_DMA def_bool y depends on 64BIT config LOCKDEP_SUPPORT - bool - default y + def_bool y config STACKTRACE_SUPPORT - bool - default y + def_bool y config RWSEM_GENERIC_SPINLOCK bool config RWSEM_XCHGADD_ALGORITHM - bool - default y + def_bool y config ARCH_HAS_ILOG2_U32 bool
@@ -35,8 +31,7 @@ config ARCH_HAS_ILOG2_U64 default n config GENERIC_HWEIGHT - bool - default y + def_bool y config GENERIC_TIME def_bool y
@@ -55,8 +50,7 @@ config NO_DMA mainmenu "Linux Kernel Configuration" config S390 - bool - default y + def_bool y source "init/Kconfig"
@@ -280,6 +274,10 @@ config WARN_STACK_SIZE config ARCH_POPULATES_NODE_MAP def_bool y +comment "Kernel preemption" + +source "kernel/Kconfig.preempt" + source "mm/Kconfig" config HOLES_IN_ZONE
@@ -320,17 +318,6 @@ config QDIO_DEBUG comment "Misc" -config PREEMPT - bool "Preemptible Kernel" - help - This option reduces the latency of the kernel when reacting to - real-time or interactive events by allowing a low priority process to - be preempted even if it is in kernel mode executing a system call. - This allows applications to run more reliably even when the system is - under load. - - Say N if you are unsure. - config IPL bool "Builtin IPL record support" help
@@ -488,6 +475,8 @@ config APPLDATA_NET_SUM This can also be compiled as a module, which will be called appldata_net_sum.o. +source kernel/Kconfig.hz + config NO_IDLE_HZ bool "No HZ timer ticks in idle" help
@@ -535,18 +524,12 @@ endmenu source "net/Kconfig" config PCMCIA - bool - default n - -source "drivers/base/Kconfig" + def_bool n -source "drivers/connector/Kconfig" - -source "drivers/scsi/Kconfig" - -source "drivers/s390/Kconfig" +config CCW + def_bool y -source "drivers/net/Kconfig" +source "drivers/Kconfig" source "fs/Kconfig"
arch/s390/defconfig +128 -106
407 lines not on this page · raw message
arch/s390/hypfs/inode.c +1 -1
@@ -477,7 +477,7 @@ static int __init hypfs_init(void) goto fail_diag; } } -kset_set_kset_s (&s390_subsys, hypervisor_subsys); +kobj_set_kset_s (&s390_subsys, hypervisor_subsys); rc =subsystem_register (&s390_subsys);if (rc) goto fail_sysfs;
arch/s390/kernel/ipl.c +13 -13
@@ -816,23 +816,23 @@ static int __init ipl_register_fcp_files(void) {int rc; - rc =sysfs_create_group (&ipl_subsys.kset.kobj, + rc =sysfs_create_group (&ipl_subsys.kobj, &ipl_fcp_attr_group);if (rc) goto out; - rc =sysfs_create_bin_file (&ipl_subsys.kset.kobj, + rc =sysfs_create_bin_file (&ipl_subsys.kobj, &ipl_parameter_attr);if (rc) goto out_ipl_parm; - rc =sysfs_create_bin_file (&ipl_subsys.kset.kobj, + rc =sysfs_create_bin_file (&ipl_subsys.kobj, &ipl_scp_data_attr);if (!rc) goto out; -sysfs_remove_bin_file (&ipl_subsys.kset.kobj, &ipl_parameter_attr); +sysfs_remove_bin_file (&ipl_subsys.kobj, &ipl_parameter_attr); out_ipl_parm: -sysfs_remove_group (&ipl_subsys.kset.kobj, &ipl_fcp_attr_group); +sysfs_remove_group (&ipl_subsys.kobj, &ipl_fcp_attr_group); out:return rc; }
@@ -846,7 +846,7 @@ static int __init ipl_init(void)return rc;switch (ipl_info.type) {case IPL_TYPE_CCW : - rc =sysfs_create_group (&ipl_subsys.kset.kobj, + rc =sysfs_create_group (&ipl_subsys.kobj, &ipl_ccw_attr_group);break ;case IPL_TYPE_FCP :
@@ -854,11 +854,11 @@ static int __init ipl_init(void) rc =ipl_register_fcp_files ();break ;case IPL_TYPE_NSS : - rc =sysfs_create_group (&ipl_subsys.kset.kobj, + rc =sysfs_create_group (&ipl_subsys.kobj, &ipl_nss_attr_group);break ;default : - rc =sysfs_create_group (&ipl_subsys.kset.kobj, + rc =sysfs_create_group (&ipl_subsys.kobj, &ipl_unknown_attr_group);break ; }
@@ -885,7 +885,7 @@ static int __init reipl_nss_init(void)if (!MACHINE_IS_VM )return 0 ; - rc =sysfs_create_group (&reipl_subsys.kset.kobj, &reipl_nss_attr_group); + rc =sysfs_create_group (&reipl_subsys.kobj, &reipl_nss_attr_group);if (rc)return rc;strncpy (reipl_nss_name, kernel_nss_name,NSS_NAME_SIZE +1 );
@@ -900,7 +900,7 @@ static int __init reipl_ccw_init(void) reipl_block_ccw = (void *)get_zeroed_page (GFP_KERNEL );if (!reipl_block_ccw)return -ENOMEM ; - rc =sysfs_create_group (&reipl_subsys.kset.kobj, &reipl_ccw_attr_group); + rc =sysfs_create_group (&reipl_subsys.kobj, &reipl_ccw_attr_group);if (rc) {free_page ((unsigned long )reipl_block_ccw);return rc;
@@ -938,7 +938,7 @@ static int __init reipl_fcp_init(void) reipl_block_fcp = (void *)get_zeroed_page (GFP_KERNEL );if (!reipl_block_fcp)return -ENOMEM ; - rc =sysfs_create_group (&reipl_subsys.kset.kobj, &reipl_fcp_attr_group); + rc =sysfs_create_group (&reipl_subsys.kobj, &reipl_fcp_attr_group);if (rc) {free_page ((unsigned long )reipl_block_fcp);return rc;
@@ -990,7 +990,7 @@ static int __init dump_ccw_init(void) dump_block_ccw = (void *)get_zeroed_page (GFP_KERNEL );if (!dump_block_ccw)return -ENOMEM ; - rc =sysfs_create_group (&dump_subsys.kset.kobj, &dump_ccw_attr_group); + rc =sysfs_create_group (&dump_subsys.kobj, &dump_ccw_attr_group);if (rc) {free_page ((unsigned long )dump_block_ccw);return rc;
@@ -1014,7 +1014,7 @@ static int __init dump_fcp_init(void) dump_block_fcp = (void *)get_zeroed_page (GFP_KERNEL );if (!dump_block_fcp)return -ENOMEM ; - rc =sysfs_create_group (&dump_subsys.kset.kobj, &dump_fcp_attr_group); + rc =sysfs_create_group (&dump_subsys.kobj, &dump_fcp_attr_group);if (rc) {free_page ((unsigned long )dump_block_fcp);return rc;
arch/s390/mm/fault.c +4 -1
@@ -253,7 +253,10 @@ static int signal_return(struct mm_struct *mm, struct pt_regs *regs, unsigned long address, unsigned long error_code) { u16 instruction; -int rc, compat; +int rc; +#ifdef CONFIG_COMPAT +int compat; +#endif pagefault_disable (); rc =__get_user (instruction, (u16 __user *) regs->psw.addr);
drivers/ata/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Serial ATA (prod) and Parallel ATA (experimental) drivers" + depends on HAS_IOMEM config ATA tristate "ATA device support"
drivers/auxdisplay/Kconfig +1 -0
@@ -6,6 +6,7 @@ # menu "Auxiliary Display support" + depends on PARPORT config KS0108 tristate "KS0108 LCD Controller"
drivers/block/Kconfig +2 -2
@@ -444,8 +444,6 @@ config CDROM_PKTCDVD_WCACHE this option is dangerous unless the CD-RW media is known good, as we don't do deferred write error handling yet. -source "drivers/s390/block/Kconfig" - config ATA_OVER_ETH tristate "ATA over Ethernet support" depends on NET
@@ -453,6 +451,8 @@ config ATA_OVER_ETH This driver provides Support for ATA over Ethernet block devices like the Coraid EtherDrive (R) Storage Blade. +source "drivers/s390/block/Kconfig" + endmenu endif
drivers/char/Kconfig +8 -3
@@ -6,6 +6,7 @@ menu "Character devices" config VT bool "Virtual terminal" if EMBEDDED + depends on !S390 select INPUT default y if !VIOCONS ---help---
@@ -81,6 +82,7 @@ config VT_HW_CONSOLE_BINDING config SERIAL_NONSTANDARD bool "Non-standard serial port support" + depends on HAS_IOMEM ---help--- Say Y here if you have any non-standard serial boards -- boards which aren't supported using the standard "dumb" serial driver.
@@ -765,7 +767,7 @@ config NVRAM config RTC tristate "Enhanced Real Time Clock Support" - depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH + depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH && !S390 ---help--- If you say Y here and create a character special file /dev/rtc with major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -813,7 +815,7 @@ config SGI_IP27_RTC config GEN_RTC tristate "Generic /dev/rtc emulation" - depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV + depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390 ---help--- If you say Y here and create a character special file /dev/rtc with major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -858,6 +860,7 @@ config COBALT_LCD config DTLK tristate "Double Talk PC internal speech card support" + depends on ISA help This driver is for the DoubleTalk PC, a speech synthesizer manufactured by RC Systems (<http://www.rcsys.com/>). It is also
@@ -1043,7 +1046,7 @@ config HPET_MMAP config HANGCHECK_TIMER tristate "Hangcheck timer" - depends on X86 || IA64 || PPC64 + depends on X86 || IA64 || PPC64 || S390 help The hangcheck-timer module detects when the system has gone out to lunch past a certain margin. It can reboot the system
@@ -1078,5 +1081,7 @@ config DEVPORT depends on ISA || PCI default y +source "drivers/s390/char/Kconfig" + endmenu
drivers/char/ipmi/Kconfig +2 -0
@@ -3,6 +3,8 @@ # menu "IPMI" + depends on HAS_IOMEM + config IPMI_HANDLER tristate 'IPMI top-level message handler' help
drivers/char/tpm/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "TPM devices" + depends on HAS_IOMEM config TCG_TPM tristate "TPM Hardware Support"
drivers/crypto/Kconfig +22 -0
@@ -56,4 +56,26 @@ config CRYPTO_DEV_GEODE To compile this driver as a module, choose M here: the module will be called geode-aes. +config ZCRYPT + tristate "Support for PCI-attached cryptographic adapters" + depends on S390 + select ZCRYPT_MONOLITHIC if ZCRYPT="y" + default "m" + help + Select this option if you want to use a PCI-attached cryptographic + adapter like: + + PCI Cryptographic Accelerator (PCICA) + + PCI Cryptographic Coprocessor (PCICC) + + PCI-X Cryptographic Coprocessor (PCIXCC) + + Crypto Express2 Coprocessor (CEX2C) + + Crypto Express2 Accelerator (CEX2A) + +config ZCRYPT_MONOLITHIC + bool "Monolithic zcrypt module" + depends on ZCRYPT="m" + help + Select this option if you want to have a single module z90crypt.ko + that contains all parts of the crypto device driver (ap bus, + request router and all the card drivers). + endmenu
drivers/dma/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "DMA Engine support" + depends on !S390 config DMA_ENGINE bool "Support for DMA engines"
drivers/edac/Kconfig +1 -0
@@ -7,6 +7,7 @@ # menu 'EDAC - error detection and reporting (RAS) (EXPERIMENTAL)' + depends on HAS_IOMEM config EDAC tristate "EDAC core system error reporting (EXPERIMENTAL)"
drivers/hwmon/Kconfig +1 -0
@@ -4,6 +4,7 @@ menuconfig HWMON tristate "Hardware Monitoring support" + depends on HAS_IOMEM default y help Hardware monitoring devices let you monitor the hardware health
drivers/i2c/Kconfig +1 -0
@@ -4,6 +4,7 @@ menuconfig I2C tristate "I2C support" + depends on HAS_IOMEM ---help--- I2C (pronounce: I-square-C) is a slow serial bus protocol used in many micro controller applications and developed by Philips. SMBus,
drivers/ide/Kconfig +1 -0
@@ -7,6 +7,7 @@ if BLOCK menu "ATA/ATAPI/MFM/RLL support" + depends on HAS_IOMEM config IDE tristate "ATA/ATAPI/MFM/RLL support"
drivers/ieee1394/Kconfig +1 -0
@@ -1,4 +1,5 @@ menu "IEEE 1394 (FireWire) support" + depends on PCI || BROKEN config IEEE1394 tristate "IEEE 1394 (FireWire) support"
drivers/infiniband/Kconfig +1 -0
@@ -1,4 +1,5 @@ menu "InfiniBand support" + depends on HAS_IOMEM config INFINIBAND depends on PCI || BROKEN
drivers/input/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Input device support" + depends on !S390 config INPUT tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
drivers/isdn/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "ISDN subsystem" + depends on !S390 config ISDN tristate "ISDN support"
drivers/kvm/Kconfig +1 -0
@@ -2,6 +2,7 @@ # KVM configuration # menu "Virtualization" + depends on X86 config KVM tristate "Kernel-based Virtual Machine (KVM) support"
drivers/leds/Kconfig +1 -0
@@ -1,5 +1,6 @@ menu "LED devices" + depends on HAS_IOMEM config NEW_LEDS bool "LED Support"
drivers/media/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Multimedia devices" + depends on HAS_IOMEM config VIDEO_DEV tristate "Video For Linux"
drivers/message/fusion/Kconfig +1 -0
@@ -1,5 +1,6 @@ menu "Fusion MPT device support" + depends on PCI config FUSION bool
drivers/message/i2o/Kconfig +1 -0
@@ -1,5 +1,6 @@ menu "I2O device support" + depends on PCI config I2O tristate "I2O support"
drivers/mfd/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Multifunction device drivers" + depends on HAS_IOMEM config MFD_SM501 tristate "Support for Silicon Motion SM501"
drivers/mmc/Kconfig +1 -0
@@ -4,6 +4,7 @@ menuconfig MMC tristate "MMC/SD card support" + depends on HAS_IOMEM help MMC is the "multi-media card" bus protocol.
drivers/mtd/Kconfig +1 -0
@@ -2,6 +2,7 @@ menuconfig MTD tristate "Memory Technology Device (MTD) support" + depends on HAS_IOMEM help Memory Technology Devices are flash, RAM and similar chips, often used for solid state file systems on embedded devices. This option
drivers/net/phy/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "PHY device support" + depends on !S390 config PHYLIB tristate "PHY Device support and infrastructure"
drivers/net/wireless/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Wireless LAN" + depends on !S390 config WLAN_PRE80211 bool "Wireless LAN (pre-802.11)"
drivers/parport/Kconfig +1 -0
@@ -6,6 +6,7 @@ # menu "Parallel port support" + depends on HAS_IOMEM config PARPORT tristate "Parallel port support"
drivers/pnp/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Plug and Play support" + depends on HAS_IOMEM config PNP bool "Plug and Play support"
drivers/rtc/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Real Time Clock" + depends on !S390 config RTC_LIB tristate
drivers/s390/Kconfig deleted +0 -239
239 lines not on this page · raw message
drivers/s390/block/Kconfig +4 -7
@@ -1,11 +1,9 @@ -if S390 && BLOCK - comment "S/390 block device drivers" - depends on S390 + depends on S390 && BLOCK config BLK_DEV_XPRAM tristate "XPRAM disk support" - depends on S390 + depends on S390 && BLOCK help Select this option if you want to use your expanded storage on S/390 or zSeries as a disk. This is useful as a _fast_ swap device if you
@@ -15,12 +13,13 @@ config BLK_DEV_XPRAM config DCSSBLK tristate "DCSSBLK support" + depends on S390 && BLOCK help Support for dcss block device config DASD tristate "Support for DASD devices" - depends on CCW + depends on CCW && BLOCK help Enable this option if you want to access DASDs directly utilizing S/390s channel subsystem commands. This is necessary for running
@@ -62,5 +61,3 @@ config DASD_EER This driver provides a character device interface to the DASD extended error reporting. This is only needed if you want to use applications written for the EER facility. - -endif
drivers/s390/block/dasd.c +5 -3
@@ -2174,9 +2174,10 @@ dasd_generic_notify(struct ccw_device *cdev, int event)return ret; } -struct dasd_ccw_req *dasd_generic_build_rdc (struct dasd_device *device, -void *rdc_buffer, -int rdc_buffer_size,char *magic) +static struct dasd_ccw_req *dasd_generic_build_rdc (struct dasd_device *device, +void *rdc_buffer, +int rdc_buffer_size, +char *magic) {struct dasd_ccw_req *cqr;struct ccw1 *ccw;
@@ -2219,6 +2220,7 @@ int dasd_generic_read_dev_chars(struct dasd_device *device, char *magic,dasd_sfree_request (cqr, cqr->device);return ret; } +EXPORT_SYMBOL_GPL (dasd_generic_read_dev_chars);static int __init dasd_init (void )
drivers/s390/block/dasd_diag.c +6 -4
@@ -50,6 +50,7 @@ struct dasd_diag_private {struct dasd_diag_rw_io iob;struct dasd_diag_init_io iib;blocknum_t pt_block; +struct ccw_dev_id dev_id; };struct dasd_diag_req {
@@ -102,7 +103,7 @@ mdsk_init_io(struct dasd_device *device, unsigned int blocksize, iib = &private->iib;memset (iib,0 ,sizeof (struct dasd_diag_init_io )); - iib->dev_nr =_ccw_device_get_device_number (device->cdev); + iib->dev_nr = private->dev_id.devno; iib->block_size = blocksize; iib->offset = offset; iib->flaga =DASD_DIAG_FLAGA_DEFAULT ;
@@ -127,7 +128,7 @@ mdsk_term_io(struct dasd_device * device) private = (struct dasd_diag_private *) device->private; iib = &private->iib;memset (iib,0 ,sizeof (struct dasd_diag_init_io )); - iib->dev_nr =_ccw_device_get_device_number (device->cdev); + iib->dev_nr = private->dev_id.devno; rc =dia250 (iib,TERM_BIO );return rc; }
@@ -166,7 +167,7 @@ dasd_start_diag(struct dasd_ccw_req * cqr) private = (struct dasd_diag_private *) device->private; dreq = (struct dasd_diag_req *) cqr->data; - private->iob.dev_nr =_ccw_device_get_device_number (device->cdev); + private->iob.dev_nr = private->dev_id.devno; private->iob.key =0 ; private->iob.flags =DASD_DIAG_RWFLAG_ASYNC ; private->iob.block_count = dreq->block_count;
@@ -323,11 +324,12 @@ dasd_diag_check_device(struct dasd_device *device) "memory allocation failed for private data");return -ENOMEM ; } +ccw_device_get_id (device->cdev, &private->dev_id); device->private = (void *) private; }/* Read Device Characteristics */ rdc_data = (void *) &(private->rdc_data); - rdc_data->dev_nr =_ccw_device_get_device_number (device->cdev); + rdc_data->dev_nr = private->dev_id.devno; rdc_data->rdc_len =sizeof (struct dasd_diag_characteristics ); rc =diag210 ((struct diag210 *) rdc_data);
drivers/s390/block/dasd_eckd.c +3 -3
@@ -450,9 +450,9 @@ dasd_eckd_generate_uid(struct dasd_device *device, struct dasd_uid *uid)return 0 ; } -struct dasd_ccw_req *dasd_eckd_build_rcd_lpm (struct dasd_device *device, -void *rcd_buffer, -struct ciw *ciw,__u8 lpm) +static struct dasd_ccw_req *dasd_eckd_build_rcd_lpm (struct dasd_device *device, +void *rcd_buffer, +struct ciw *ciw,__u8 lpm) {struct dasd_ccw_req *cqr;struct ccw1 *ccw;
drivers/s390/block/dasd_ioctl.c +3 -1
@@ -255,6 +255,7 @@ dasd_ioctl_information(struct dasd_device *device,unsigned long flags;int rc;struct ccw_device *cdev; +struct ccw_dev_id dev_id;if (!device->discipline->fill_info)return -EINVAL ;
@@ -270,8 +271,9 @@ dasd_ioctl_information(struct dasd_device *device, } cdev = device->cdev; +ccw_device_get_id (cdev, &dev_id); - dasd_info->devno =_ccw_device_get_device_number (device->cdev); + dasd_info->devno = dev_id.devno; dasd_info->schid =_ccw_device_get_subchannel_number (device->cdev); dasd_info->cu_type = cdev->id.cu_type; dasd_info->cu_model = cdev->id.cu_model;
drivers/s390/char/Kconfig new file +166 -0
166 lines not on this page · raw message
drivers/s390/char/monreader.c +7 -7
@@ -97,7 +97,7 @@ static u8 user_data_sever[16] = {* Create the 8 bytes EBCDIC DCSS segment name from * an ASCII name, incl. padding */ -static inline void dcss_mkname (char *ascii_name,char *ebcdic_name) +static void dcss_mkname (char *ascii_name,char *ebcdic_name) {int i;
@@ -191,7 +191,7 @@ static inline u32 mon_rec_end(struct mon_msg *monmsg)return *((u32 *) (mon_mca_start (monmsg) + monmsg->mca_offset +8 )); } -static inline int mon_check_mca (struct mon_msg *monmsg) +static int mon_check_mca (struct mon_msg *monmsg) { if ((mon_rec_end(monmsg) <= mon_rec_start(monmsg)) || (mon_rec_start(monmsg) < mon_dcss_start) ||
@@ -209,8 +209,8 @@ static inline int mon_check_mca(struct mon_msg *monmsg)return 0 ; } -static inline int mon_send_reply (struct mon_msg *monmsg, -struct mon_private *monpriv) +static int mon_send_reply (struct mon_msg *monmsg, +struct mon_private *monpriv) {int rc;
@@ -236,7 +236,7 @@ static inline int mon_send_reply(struct mon_msg *monmsg,return 0 ; } -static inline void mon_free_mem (struct mon_private *monpriv) +static void mon_free_mem (struct mon_private *monpriv) {int i;
@@ -246,7 +246,7 @@ static inline void mon_free_mem(struct mon_private *monpriv)kfree (monpriv); } -static inline struct mon_private *mon_alloc_mem (void ) +static struct mon_private *mon_alloc_mem (void ) {int i;struct mon_private *monpriv;
@@ -307,7 +307,7 @@ static inline void mon_next_mca(struct mon_msg *monmsg) monmsg->pos =0 ; } -static inline struct mon_msg *mon_next_message (struct mon_private *monpriv) +static struct mon_msg *mon_next_message (struct mon_private *monpriv) {struct mon_msg *monmsg;
drivers/s390/char/raw3270.c +3 -2
@@ -589,9 +589,10 @@ static int __raw3270_size_device_vm(struct raw3270 *rp) {int rc, model; +struct ccw_dev_id dev_id; - raw3270_init_diag210.vrdcdvno = -_ccw_device_get_device_number (rp->cdev); +ccw_device_get_id (rp->cdev, &dev_id); + raw3270_init_diag210.vrdcdvno = dev_id.devno; raw3270_init_diag210.vrdclen =sizeof (struct diag210 ); rc =diag210 (&raw3270_init_diag210);if (rc)
drivers/s390/char/sclp.h +3 -0
@@ -132,6 +132,9 @@ int sclp_deactivate(void);int sclp_reactivate (void );int sclp_service_call (sclp_cmdw_t command,void *sccb); +int sclp_sdias_init (void ); +void sclp_sdias_exit (void ); +/* useful inlines */ /* VM uses EBCDIC 037, LPAR+native(SE+HMC) use EBCDIC 500 */
drivers/s390/char/sclp_sdias.c +4 -4
@@ -66,9 +66,9 @@ static DEFINE_MUTEX(sdias_mutex);static void sdias_callback (struct sclp_req *request,void *data) { -struct sdias_sccb *sccb; +struct sdias_sccb *cbsccb; - sccb = (struct sdias_sccb *) request->sccb; + cbsccb = (struct sdias_sccb *) request->sccb; sclp_req_done =1 ;wake_up (&sdias_wq);/* Inform caller, that request is complete */ TRACE ("callback done\n" );
@@ -229,7 +229,7 @@ out:return rc; } -int __init sdias_init (void ) +int __init sclp_sdias_init (void ) {int rc;
@@ -248,7 +248,7 @@ int __init sdias_init(void)return 0 ; } -void __exit sdias_exit(void) +void __exit sclp_sdias_exit(void) {debug_unregister (sdias_dbf);sclp_unregister (&sclp_sdias_register);
drivers/s390/char/zcore.c +3 -6
@@ -21,6 +21,7 @@#include <asm/debug.h> #include <asm/processor.h> #include <asm/irqflags.h> +#include "sclp.h" #define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x) #define MSG(x...) printk( KERN_ALERT x )
@@ -564,8 +565,6 @@ static void __init zcore_header_init(int arch, struct zcore_header *hdr)get_cpu_id (&hdr->cpu_id); } -extern int sdias_init (void ); -static int __init zcore_init (void ) {unsigned char arch;
@@ -582,7 +581,7 @@ static int __init zcore_init(void)TRACE ("wwpn: %llx\n" , (unsigned long long ) ipl_info.data.fcp.wwpn);TRACE ("lun: %llx\n" , (unsigned long long ) ipl_info.data.fcp.lun); - rc =sdias_init (); + rc =sclp_sdias_init ();if (rc) goto fail;
@@ -634,12 +633,10 @@ fail:return rc; } -extern void sdias_exit (void ); - static void __exit zcore_exit(void) {debug_unregister (zcore_dbf); -sdias_exit (); +sclp_sdias_exit ();diag308 (DIAG308_REL_HSA ,NULL ); }
drivers/s390/cio/css.c +1 -2
@@ -191,8 +191,7 @@ static int css_register_subchannel(struct subchannel *sch)return ret; } -int -css_probe_device (struct subchannel_id schid) +static int css_probe_device (struct subchannel_id schid) {int ret;struct subchannel *sch;
drivers/s390/cio/css.h +0 -2
@@ -138,9 +138,7 @@ struct css_driver {* all css_drivers have the css_bus_type */ extern struct bus_type css_bus_type; -extern struct css_driver io_subchannel_driver; -extern int css_probe_device (struct subchannel_id );extern int css_sch_device_register (struct subchannel *);extern void css_sch_device_unregister (struct subchannel *);extern struct subchannel *get_subchannel_by_schid (struct subchannel_id );
drivers/s390/cio/device.c +2 -2
@@ -129,7 +129,7 @@ static void io_subchannel_verify(struct device *);static void io_subchannel_ioterm (struct device *);static void io_subchannel_shutdown (struct subchannel *); -struct css_driver io_subchannel_driver = { +static struct css_driver io_subchannel_driver = { .subchannel_type =SUBCHANNEL_TYPE_IO , .drv = { .name ="io_subchannel" ,
@@ -546,7 +546,7 @@ static struct attribute_group ccwdev_attr_group = { .attrs = ccwdev_attrs, }; -struct attribute_group *ccwdev_attr_groups[] = { +static struct attribute_group *ccwdev_attr_groups[] = { &ccwdev_attr_group,NULL , };
drivers/s390/cio/device_ops.c +11 -0
@@ -616,6 +616,17 @@ ccw_device_get_chp_desc(struct ccw_device *cdev, int chp_no)return chp_get_chp_desc (chpid); } +/** +* ccw_device_get_id - obtain a ccw device id +* @cdev: device to obtain the id for +* @dev_id: where to fill in the values +*/ +void ccw_device_get_id (struct ccw_device *cdev,struct ccw_dev_id *dev_id) +{ + *dev_id = cdev->private->dev_id; +} +EXPORT_SYMBOL (ccw_device_get_id); +// FIXME: these have to go: int
drivers/s390/cio/qdio.c +1 -0
@@ -1983,6 +1983,7 @@ qdio_handle_pci(struct qdio_irq *irq_ptr)if (q->is_input_q&QDIO_FLAG_NO_INPUT_INTERRUPT_CONTEXT )qdio_mark_q (q);else { +qdio_perf_stat_dec (&perf_stats.tl_runs);__qdio_inbound_processing (q); } }
drivers/s390/net/Kconfig +4 -4
@@ -3,7 +3,7 @@ menu "S/390 network device drivers" config LCS tristate "Lan Channel Station Interface" - depends on NETDEVICES && (NET_ETHERNET || TR || FDDI) + depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI) help Select this option if you want to use LCS networking on IBM S/390 or zSeries. This device driver supports Token Ring (IEEE 802.5),
@@ -13,7 +13,7 @@ config LCS config CTC tristate "CTC device support" - depends on NETDEVICES + depends on CCW && NETDEVICES help Select this option if you want to use channel-to-channel networking on IBM S/390 or zSeries. This device driver supports real CTC
@@ -42,7 +42,7 @@ config SMSGIUCV config CLAW tristate "CLAW device support" - depends on NETDEVICES + depends on CCW && NETDEVICES help This driver supports channel attached CLAW devices. CLAW is Common Link Access for Workstation. Common devices
@@ -52,7 +52,7 @@ config CLAW config QETH tristate "Gigabit Ethernet device support" - depends on NETDEVICES && IP_MULTICAST && QDIO + depends on CCW && NETDEVICES && IP_MULTICAST && QDIO help This driver supports the IBM S/390 and zSeries OSA Express adapters in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN
drivers/s390/net/qeth_mpc.c +2 -2
@@ -162,7 +162,7 @@ struct ipa_rc_msg {char *msg; }; -struct ipa_rc_msg qeth_ipa_rc_msg[] = { +static struct ipa_rc_msg qeth_ipa_rc_msg[] = { {IPA_RC_SUCCESS ,"success" }, {IPA_RC_NOTSUPP ,"Command not supported" }, {IPA_RC_IP_TABLE_FULL ,"Add Addr IP Table Full - ipv6" },
@@ -226,7 +226,7 @@ struct ipa_cmd_names {char *name; }; -struct ipa_cmd_names qeth_ipa_cmd_names[] = { +static struct ipa_cmd_names qeth_ipa_cmd_names[] = { {IPA_CMD_STARTLAN ,"startlan" }, {IPA_CMD_STOPLAN ,"stoplan" }, {IPA_CMD_SETVMAC ,"setvmac" },
drivers/s390/scsi/zfcp_aux.c +3 -5
@@ -607,8 +607,7 @@ zfcp_sg_list_free(struct zfcp_sg_list *sg_list)* @sg_count: elements in array * Return: size of entire scatter-gather list */ -size_t -zfcp_sg_size (struct scatterlist *sg,unsigned int sg_count) +static size_t zfcp_sg_size (struct scatterlist *sg,unsigned int sg_count) {unsigned int i;struct scatterlist *p;
@@ -975,8 +974,7 @@ zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter)mempool_destroy (adapter->pool.data_gid_pn); } -void -zfcp_dummy_release (struct device *dev) +static void zfcp_dummy_release (struct device *dev) {return ; }
@@ -1336,7 +1334,7 @@ zfcp_nameserver_enqueue(struct zfcp_adapter *adapter)#define ZFCP_LOG_AREA ZFCP_LOG_AREA_FC -void +static void zfcp_fsf_incoming_els_rscn (struct zfcp_adapter *adapter,struct fsf_status_read_buffer *status_buffer) {
drivers/s390/scsi/zfcp_dbf.c +1 -1
@@ -478,7 +478,7 @@ static struct debug_view zfcp_hba_dbf_view = { NULL }; -void +static void _zfcp_san_dbf_event_common_ct (const char *tag,struct zfcp_fsf_req *fsf_req,u32 s_id,u32 d_id,void *buffer,int buflen) {
drivers/serial/Kconfig +1 -0
@@ -5,6 +5,7 @@ # menu "Serial drivers" + depends on HAS_IOMEM # # The new 8250/16550 serial drivers
drivers/spi/Kconfig +1 -0
@@ -6,6 +6,7 @@ # fully appropriate there, so it'd need some thought to do well. # menu "SPI support" + depends on HAS_IOMEM config SPI bool "SPI support"
drivers/telephony/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Telephony Support" + depends on HAS_IOMEM config PHONE tristate "Linux telephony support"
drivers/usb/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "USB support" + depends on HAS_IOMEM # Host-side USB depends on having a host controller # NOTE: dummy_hcd is always an option, but it's ignored here ...
drivers/video/Kconfig +1 -0
@@ -3,6 +3,7 @@ # menu "Graphics support" + depends on HAS_IOMEM source "drivers/video/backlight/Kconfig" source "drivers/video/display/Kconfig"
drivers/w1/Kconfig +1 -0
@@ -1,4 +1,5 @@ menu "Dallas's 1-wire bus" + depends on HAS_IOMEM config W1 tristate "Dallas's 1-wire support"
include/asm-s390/ccwdev.h +2 -1
@@ -16,6 +16,7 @@/* structs from asm/cio.h */ struct irb ;struct ccw1 ; +struct ccw_dev_id ;/* simplified initializers for struct ccw_device: * CCW_DEVICE and CCW_DEVICE_DEVTYPE initialize one
@@ -175,6 +176,7 @@ extern int ccw_device_set_offline(struct ccw_device *cdev);extern struct ciw *ccw_device_get_ciw (struct ccw_device *,__u32 cmd);extern __u8 ccw_device_get_path_mask (struct ccw_device *); +extern void ccw_device_get_id (struct ccw_device *,struct ccw_dev_id *);#define get_ccwdev_lock (x) (x)->ccwlock
@@ -184,7 +186,6 @@ extern __u8 ccw_device_get_path_mask(struct ccw_device *);extern struct ccw_device *ccw_device_probe_console (void );// FIXME: these have to go -extern int _ccw_device_get_device_number (struct ccw_device *);extern int _ccw_device_get_subchannel_number (struct ccw_device *);extern void *ccw_device_get_chp_desc (struct ccw_device *,int );
include/asm-s390/ipl.h +1 -1
@@ -79,8 +79,8 @@ struct ipl_parameter_block {* IPL validity flags */ extern u32 ipl_flags; -extern u32 dump_prefix_page; +extern unsigned int zfcpdump_prefix_array[];extern void do_reipl (void );extern void ipl_save_parameters (void );
include/asm-s390/param.h +1 -1
@@ -10,7 +10,7 @@#define _ASMS390_PARAM_H#ifdef __KERNEL__ -# define HZ 100/* Internal kernel timer frequency */ +# define HZ CONFIG_HZ/* Internal kernel timer frequency */ # define USER_HZ 100/* .. some user interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ)/* like times() */ #endif
net/Kconfig +1 -0
@@ -218,6 +218,7 @@ config FIB_RULES bool menu "Wireless" + depends on !S390 source "net/wireless/Kconfig" source "net/mac80211/Kconfig"
net/ax25/Kconfig +1 -1
@@ -3,7 +3,7 @@ # menuconfig HAMRADIO - depends on NET + depends on NET && !S390 bool "Amateur Radio support" help If you want to connect your Linux box to an amateur radio, answer Y
net/bluetooth/Kconfig +1 -1
@@ -3,7 +3,7 @@ # menuconfig BT - depends on NET + depends on NET && !S390 tristate "Bluetooth subsystem support" help Bluetooth is low-cost, low-power, short-range wireless technology.
net/irda/Kconfig +1 -1
@@ -3,7 +3,7 @@ # menuconfig IRDA - depends on NET + depends on NET && !S390 tristate "IrDA (infrared) subsystem support" select CRC_CCITT ---help---
sound/Kconfig +1 -0
@@ -2,6 +2,7 @@ # menu "Sound" + depends on HAS_IOMEM config SOUND tristate "Sound card support"