Please pull git390 'for-linus' branch
Subsystems (4)
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:
Documentation/s390/CommonIO | 2 + Documentation/s390/cds.txt | 52 ++++++++++++++++------------------- Documentation/s390/driver-model.txt | 3 ++ arch/s390/defconfig | 12 +++----- arch/s390/kernel/compat_linux.c | 2 + arch/s390/kernel/syscalls.S | 1 + drivers/s390/block/dasd.c | 1 + drivers/s390/char/monwriter.c | 14 +++++++-- drivers/s390/cio/device_fsm.c | 4 +++ drivers/s390/cio/qdio.c | 2 + include/asm-s390/pgtable.h | 50 +++++++++++++++++++++++++++------- include/asm-s390/unistd.h | 3 +- 12 files changed, 94 insertions(+), 52 deletions(-)
Cedric Le Goater:
[S390] fix vmlinux link when CONFIG_SYSIPC=n
Cornelia Huck:
[S390] cio: sch_no -> schid.sch_no conversion. [S390] cio: update documentation.
Heiko Carstens:
[S390] Wire up epoll_pwait syscall.
Martin Schwidefsky:
[S390] Fix pte type checking.
[S390] update default configuration
Melissa Howland:
[S390] monwriter find header logic.
Peter Oberparleiter:
[S390] cio: invalid device operational notification
Stefan Weinhuber:
[S390] dasd: clean up timer.
Documentation/s390/CommonIO +1 -1
@@ -66,7 +66,7 @@ Command line parameters When a device is un-ignored, device recognition and sensing is performed and the device driver will be notified if possible, so the device will become - available to the system. + available to the system. Note that un-ignoring is performed asynchronously. You can also add ranges of devices to be ignored by piping to /proc/cio_ignore; "add <device range>, <device range>, ..." will ignore the
Documentation/s390/cds.txt +24 -28
90 lines not on this page · raw message
Documentation/s390/driver-model.txt +3 -0
@@ -239,6 +239,9 @@ status - Can be 'online' or 'offline'. type - The physical type of the channel path. +shared - Whether the channel path is shared. + +cmg - The channel measurement group. 3. System devices -----------------
arch/s390/defconfig +5 -7
@@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18 -# Wed Oct 4 19:45:46 2006 +# Linux kernel version: 2.6.19-rc2 +# Wed Oct 18 17:11:10 2006 # CONFIG_MMU=y CONFIG_LOCKDEP_SUPPORT=y
@@ -211,6 +211,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_INET6_XFRM_MODE_BEET=y # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=y # CONFIG_IPV6_TUNNEL is not set # CONFIG_IPV6_SUBTREES is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -528,6 +529,7 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y
@@ -646,10 +648,6 @@ # # CONFIG_NLS is not set # -# Distributed Lock Manager -# - -# # Instrumentation Support #
@@ -669,7 +667,6 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 -# CONFIG_DETECT_SOFTLOCKUP is not set # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set CONFIG_DEBUG_PREEMPT=y
@@ -690,6 +687,7 @@ # CONFIG_DEBUG_LIST is not set # CONFIG_FRAME_POINTER is not set # CONFIG_UNWIND_INFO is not set CONFIG_FORCED_INLINING=y +CONFIG_HEADERS_CHECK=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_LKDTM is not set
arch/s390/kernel/compat_linux.c +2 -0
@@ -295,6 +295,7 @@ static inline long put_tv32(struct compa* * This is really horribly ugly. */ +#ifdef CONFIG_SYSVIPC asmlinkage long sys32_ipc (u32 call,int first,int second,int third,u32 ptr) {if (call >>16 )/* hack for backward compatibility */
@@ -338,6 +339,7 @@ asmlinkage long sys32_ipc(u32 call, int return -ENOSYS; } +#endif asmlinkage long sys32_truncate64 (const char __user * path,unsigned long high,unsigned long low) {
arch/s390/kernel/syscalls.S +1 -0
@@ -320,3 +320,4 @@ SYSCALL(sys_tee,sys_tee,sys_tee_wrapper) SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice_wrapper) NI_SYSCALL /* 310 sys_move_pages */ SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper) +SYSCALL(sys_epoll_pwait,sys_epoll_pwait,sys_ni_syscall)
drivers/s390/block/dasd.c +1 -0
@@ -203,6 +203,7 @@ dasd_state_basic_to_known(struct dasd_de rc =dasd_flush_ccw_queue (device,1 );if (rc)return rc; +dasd_clear_timer (device);DBF_DEV_EVENT (DBF_EMERG , device,"%p debug area deleted" , device);if (device->debug_area !=NULL ) {
drivers/s390/char/monwriter.c +10 -4
@@ -73,12 +73,15 @@ static inline struct mon_buf *monwrite_fstruct mon_buf *entry, *next;list_for_each_entry_safe (entry, next, &monpriv->list, list) -if (entry->hdr.applid == monhdr->applid && +if ((entry->hdr.mon_function == monhdr->mon_function || + monhdr->mon_function ==MONWRITE_STOP_INTERVAL ) && + entry->hdr.applid == monhdr->applid && entry->hdr.record_num == monhdr->record_num && entry->hdr.version == monhdr->version && entry->hdr.release == monhdr->release && entry->hdr.mod_level == monhdr->mod_level)return entry; +return NULL ; }
@@ -92,7 +95,9 @@ static int monwrite_new_hdr(struct mon_p monhdr->mon_function >MONWRITE_START_CONFIG || monhdr->hdrlen != sizeof(struct monwrite_hdr)) return -EINVAL; - monbuf =monwrite_find_hdr (monpriv, monhdr); + monbuf =NULL ; +if (monhdr->mon_function !=MONWRITE_GEN_EVENT ) + monbuf =monwrite_find_hdr (monpriv, monhdr);if (monbuf) {if (monhdr->mon_function ==MONWRITE_STOP_INTERVAL ) { monhdr->datalen = monbuf->hdr.datalen;
@@ -104,7 +109,7 @@ static int monwrite_new_hdr(struct mon_pkfree (monbuf); monbuf =NULL ; } - }else { + }else if (monhdr->mon_function !=MONWRITE_STOP_INTERVAL ) {if (mon_buf_count >= mon_max_bufs)return -ENOSPC ; monbuf =kzalloc (sizeof (struct mon_buf ),GFP_KERNEL );
@@ -118,7 +123,8 @@ static int monwrite_new_hdr(struct mon_p } monbuf->hdr = *monhdr;list_add_tail (&monbuf->list, &monpriv->list); - mon_buf_count++; +if (monhdr->mon_function !=MONWRITE_GEN_EVENT ) + mon_buf_count++; } monpriv->current_buf = monbuf;return 0 ;
drivers/s390/cio/device_fsm.c +4 -0
@@ -578,9 +578,13 @@ ccw_device_verify_done(struct ccw_device }break ;case -ETIME : +/* Reset oper notify indication after verify error. */ + cdev->private->flags.donotify =0 ;ccw_device_done (cdev,DEV_STATE_BOXED );break ;default : +/* Reset oper notify indication after verify error. */ + cdev->private->flags.donotify =0 ;PREPARE_WORK (&cdev->private->kick_work, ccw_device_nopath_notify, cdev);queue_work (ccw_device_notify_work, &cdev->private->kick_work);
drivers/s390/cio/qdio.c +1 -1
@@ -3529,7 +3529,7 @@ do_QDIO(struct ccw_device *cdev,unsigned#ifdef CONFIG_QDIO_DEBUG char dbf_text[20 ]; -sprintf (dbf_text,"doQD%04x" ,cdev->private->sch_no); +sprintf (dbf_text,"doQD%04x" ,cdev->private->schid.sch_no);QDIO_DBF_TEXT3 (0 ,trace,dbf_text);#endif /* CONFIG_QDIO_DEBUG */
include/asm-s390/pgtable.h +40 -10
76 lines not on this page · raw message
include/asm-s390/unistd.h +2 -1
@@ -249,8 +249,9 @@ #define __NR_tee 308#define __NR_vmsplice 309/* Number 310 is reserved for new sys_move_pages */ #define __NR_getcpu 311 +#define __NR_epoll_pwait 312 -#define NR_syscalls 312 +#define NR_syscalls 313/* * There are some system calls that are not present on 64 bit, some