Please pull git390 'for-linus' branch
Subsystems (6)
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 | 11 -- arch/s390/Kconfig | 7 + arch/s390/kernel/compat_wrapper.S | 2 +- arch/s390/kernel/entry.S | 29 ++-- arch/s390/kernel/entry64.S | 57 +++++-- arch/s390/kernel/ptrace.c | 100 +----------- arch/s390/kvm/Kconfig | 1 - arch/s390/kvm/intercept.c | 3 + arch/s390/kvm/kvm-s390.c | 5 +- arch/s390/mm/Makefile | 1 + arch/s390/mm/init.c | 3 + arch/s390/mm/page-states.c | 79 +++++++++ drivers/s390/char/tty3270.c | 15 +- drivers/s390/cio/blacklist.c | 323 +++++++++++++++++++------------------ drivers/s390/cio/cio.c | 39 ++---- drivers/s390/cio/cio.h | 2 - drivers/s390/cio/cio_debug.h | 6 - drivers/s390/cio/css.c | 4 +- drivers/s390/cio/device.c | 25 ++-- drivers/s390/cio/device_fsm.c | 44 +++--- drivers/s390/cio/device_id.c | 4 +- drivers/s390/cio/device_pgid.c | 12 +- drivers/s390/s390mach.c | 3 +- include/asm-s390/kvm_host.h | 1 + include/asm-s390/page.h | 11 ++ include/asm-s390/ptrace.h | 2 + include/asm-s390/system.h | 6 + 27 files changed, 408 insertions(+), 387 deletions(-) create mode 100644 arch/s390/mm/page-states.c
Christian Borntraeger (1):
[S390] s390-kvm: leave sie context on work. Removes preemption requirement
Heiko Carstens (1):
[S390] tty3270: fix put_char fail/success conversion.
Martin Schwidefsky (3):
[S390] s390: Optimize user and work TIF check [S390] s390mach compile warning [S390] guest page hinting light
Michael Ernst (2):
[S390] cio: Remove cio_msg kernel parameter. [S390] cio: Fix parsing mechanism for blacklisted devices.
Roland McGrath (1):
[S390] compat ptrace cleanup
Documentation/s390/CommonIO +0 -11
@@ -8,17 +8,6 @@ Command line parameters Enable logging of debug information in case of ccw device timeouts. - -* cio_msg = yes | no - - Determines whether information on found devices and sensed device - characteristics should be shown during startup or when new devices are - found, i. e. messages of the types "Detected device 0.0.4711 on subchannel - 0.0.0042" and "SenseID: Device 0.0.4711 reports: ...". - - Default is off. - - * cio_ignore = {all} | {<device> | <range of devices>} | {!<device> | !<range of devices>}
arch/s390/Kconfig +7 -0
@@ -430,6 +430,13 @@ config CMM_IUCV Select this option to enable the special message interface to the cooperative memory management. +config PAGE_STATES + bool "Unused page notification" + help + This enables the notification of unused pages to the + hypervisor. The ESSA instruction is used to do the states + changes between a page that has content and the unused state. + config VIRT_TIMER bool "Virtual CPU timer support" help
arch/s390/kernel/compat_wrapper.S +1 -1
@@ -121,7 +121,7 @@ sys32_ptrace_wrapper: lgfr %r3,%r3 # long llgtr %r4,%r4 # long llgfr %r5,%r5 # long - jg sys_ptrace # branch to system call + jg compat_sys_ptrace # branch to system call .globl sys32_alarm_wrapper sys32_alarm_wrapper:
arch/s390/kernel/entry.S +14 -15
@@ -279,8 +279,6 @@ sysc_do_restart: st %r2,SP_R2(%r15) # store return value (change R2 on stack) sysc_return: - tm SP_PSW+1(%r15),0x01 # returning to user ? - bno BASED(sysc_restore) tm __TI_flags+3(%r9),_TIF_WORK_SVC bnz BASED(sysc_work) # there is work to do (signals etc.) sysc_restore:
@@ -312,6 +310,8 @@ sysc_work_loop: # One of the work bits is on. Find out which one. # sysc_work: + tm SP_PSW+1(%r15),0x01 # returning to user ? + bno BASED(sysc_restore) tm __TI_flags+3(%r9),_TIF_MCCK_PENDING bo BASED(sysc_mcck_pending) tm __TI_flags+3(%r9),_TIF_NEED_RESCHED
@@ -602,12 +602,6 @@ io_no_vtime: la %r2,SP_PTREGS(%r15) # address of register-save area basr %r14,%r1 # branch to standard irq handler io_return: - tm SP_PSW+1(%r15),0x01 # returning to user ? -#ifdef CONFIG_PREEMPT - bno BASED(io_preempt) # no -> check for preemptive scheduling -#else - bno BASED(io_restore) # no-> skip resched & signal -#endif tm __TI_flags+3(%r9),_TIF_WORK_INT bnz BASED(io_work) # there is work to do (signals etc.) io_restore:
@@ -629,10 +623,18 @@ io_restore_trace_psw: .long 0, io_restore_trace + 0x80000000 #endif -#ifdef CONFIG_PREEMPT -io_preempt: +# +# switch to kernel stack, then check the TIF bits +# +io_work: + tm SP_PSW+1(%r15),0x01 # returning to user ? +#ifndef CONFIG_PREEMPT + bno BASED(io_restore) # no-> skip resched & signal +#else + bnz BASED(io_work_user) # no -> check for preemptive scheduling + # check for preemptive scheduling icm %r0,15,__TI_precount(%r9) - bnz BASED(io_restore) + bnz BASED(io_restore) # preemption disabled l %r1,SP_R15(%r15) s %r1,BASED(.Lc_spsize) mvc SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
@@ -646,10 +648,7 @@ io_resume_loop: br %r1 # call schedule #endif -# -# switch to kernel stack, then check the TIF bits -# -io_work: +io_work_user: l %r1,__LC_KERNEL_STACK s %r1,BASED(.Lc_spsize) mvc SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
arch/s390/kernel/entry64.S +42 -15
94 lines not on this page · raw message
arch/s390/kernel/ptrace.c +6 -94
131 lines not on this page · raw message
arch/s390/kvm/Kconfig +0 -1
@@ -22,7 +22,6 @@ config KVM select PREEMPT_NOTIFIERS select ANON_INODES select S390_SWITCH_AMODE - select PREEMPT ---help--- Support hosting paravirtualized guest machines using the SIE virtualization capability on the mainframe. This should work
arch/s390/kvm/intercept.c +3 -0
@@ -105,6 +105,9 @@ static intercept_handler_t instruction_handlers[256] = {static int handle_noop (struct kvm_vcpu *vcpu) {switch (vcpu->arch.sie_block->icptcode) { +case 0x0 : + vcpu->stat.exit_null++; +break ;case 0x10 : vcpu->stat.exit_external_request++;break ;
arch/s390/kvm/kvm-s390.c +1 -4
@@ -31,6 +31,7 @@struct kvm_stats_debugfs_item debugfs_entries[] = { {"userspace_handled" ,VCPU_STAT (exit_userspace) }, + {"exit_null" ,VCPU_STAT (exit_null) }, {"exit_validity" ,VCPU_STAT (exit_validity) }, {"exit_stop_request" ,VCPU_STAT (exit_stop_request) }, {"exit_external_request" ,VCPU_STAT (exit_external_request) },
@@ -221,10 +222,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) vcpu->arch.guest_fpregs.fpc &=FPC_VALID_MASK ;restore_fp_regs (&vcpu->arch.guest_fpregs);restore_access_regs (vcpu->arch.guest_acrs); - -if (signal_pending (current)) -atomic_set_mask (CPUSTAT_STOP_INT , - &vcpu->arch.sie_block->cpuflags); }void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu)
arch/s390/mm/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-y := init.o fault.o extmem.o mmap.o vmem.o pgtable.o obj-$(CONFIG_CMM) += cmm.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o +obj-$(CONFIG_PAGE_STATES) += page-states.o
arch/s390/mm/init.c +3 -0
@@ -126,6 +126,9 @@ void __init mem_init(void)/* clear the zero-page */ memset (empty_zero_page,0 ,PAGE_SIZE ); +/* Setup guest page hinting */ +cmma_init (); +/* this will put all low memory onto the freelists */ totalram_pages +=free_all_bootmem ();
arch/s390/mm/page-states.c new file +79 -0
79 lines not on this page · raw message
drivers/s390/char/tty3270.c +6 -9
@@ -965,8 +965,7 @@ tty3270_write_room(struct tty_struct *tty)* Insert character into the screen at the current position with the * current color and highlight. This function does NOT do cursor movement. */ -static int -tty3270_put_character (struct tty3270 *tp,char ch) +static void tty3270_put_character (struct tty3270 *tp,char ch) {struct tty3270_line *line;struct tty3270_cell *cell;
@@ -986,7 +985,6 @@ tty3270_put_character(struct tty3270 *tp, char ch) cell->character = tp->view.ascebc[(unsigned int ) ch]; cell->highlight = tp->highlight; cell->f_color = tp->f_color; -return 1 ; }/*
@@ -1612,16 +1610,15 @@ tty3270_write(struct tty_struct * tty,/* * Put single characters to the ttys character buffer */ -static void -tty3270_put_char (struct tty_struct *tty,unsigned char ch) +static int tty3270_put_char (struct tty_struct *tty,unsigned char ch) {struct tty3270 *tp; tp = tty->driver_data; -if (!tp) -return ; -if (tp->char_count <TTY3270_CHAR_BUF_SIZE ) - tp->char_buf[tp->char_count++] = ch; +if (!tp || tp->char_count >=TTY3270_CHAR_BUF_SIZE ) +return 0 ; + tp->char_buf[tp->char_count++] = ch; +return 1 ; }/*
drivers/s390/cio/blacklist.c +169 -154
388 lines not on this page · raw message
drivers/s390/cio/cio.c +10 -29
@@ -39,23 +39,6 @@ debug_info_t *cio_debug_msg_id;debug_info_t *cio_debug_trace_id;debug_info_t *cio_debug_crw_id; -int cio_show_msg; - -static int __init -cio_setup (char *parm) -{ -if (!strcmp (parm,"yes" )) - cio_show_msg =1 ; -else if (!strcmp (parm,"no" )) - cio_show_msg =0 ; -else -printk (KERN_ERR "cio: cio_setup: " -"invalid cio_msg parameter '%s'" , parm); -return 1 ; -} - -__setup ("cio_msg=" , cio_setup); -/* * Function: cio_debug_init * Initializes three debug logs for common I/O:
@@ -166,7 +149,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm)stsch (sch->schid, &sch->schib); -CIO_MSG_EVENT (0 ,"cio_start: 'not oper' status for " +CIO_MSG_EVENT (2 ,"cio_start: 'not oper' status for " "subchannel 0.%x.%04x!\n" , sch->schid.ssid, sch->schid.sch_no);sprintf (dbf_text,"no%s" , sch->dev.bus_id);
@@ -567,10 +550,9 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)* ... just being curious we check for non I/O subchannels */ if (sch->st !=0 ) { -CIO_DEBUG (KERN_INFO ,0 , -"Subchannel 0.%x.%04x reports " -"non-I/O subchannel type %04X\n" , - sch->schid.ssid, sch->schid.sch_no, sch->st); +CIO_MSG_EVENT (4 ,"Subchannel 0.%x.%04x reports " +"non-I/O subchannel type %04X\n" , + sch->schid.ssid, sch->schid.sch_no, sch->st);/* We stop here for non-io subchannels. */ err = sch->st; goto out;
@@ -588,7 +570,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)* This device must not be known to Linux. So we simply * say that there is no device and return ENODEV. */ -CIO_MSG_EVENT (4 ,"Blacklisted device detected " +CIO_MSG_EVENT (6 ,"Blacklisted device detected " "at devno %04X, subchannel set %x\n" , sch->schib.pmcw.dev, sch->schid.ssid); err = -ENODEV ;
@@ -601,12 +583,11 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid) sch->lpm = sch->schib.pmcw.pam & sch->opm; sch->isc =3 ; -CIO_DEBUG (KERN_INFO ,0 , -"Detected device %04x on subchannel 0.%x.%04X" -" - PIM = %02X, PAM = %02X, POM = %02X\n" , - sch->schib.pmcw.dev, sch->schid.ssid, - sch->schid.sch_no, sch->schib.pmcw.pim, - sch->schib.pmcw.pam, sch->schib.pmcw.pom); +CIO_MSG_EVENT (6 ,"Detected device %04x on subchannel 0.%x.%04X " +"- PIM = %02X, PAM = %02X, POM = %02X\n" , + sch->schib.pmcw.dev, sch->schid.ssid, + sch->schid.sch_no, sch->schib.pmcw.pim, + sch->schib.pmcw.pam, sch->schib.pmcw.pom);/* * We now have to initially ...
drivers/s390/cio/cio.h +0 -2
@@ -118,6 +118,4 @@ extern void *cio_get_console_priv(void);#define cio_get_console_priv () NULL#endif -extern int cio_show_msg; -#endif
drivers/s390/cio/cio_debug.h +0 -6
@@ -31,10 +31,4 @@ static inline void CIO_HEX_EVENT(int level, void *data, int length) } } -#define CIO_DEBUG(printk_level, event_level, msg...) do { \ - if (cio_show_msg) \ - printk(printk_level "cio: " msg); \ - CIO_MSG_EVENT(event_level, msg); \ - } while (0) -#endif
drivers/s390/cio/css.c +2 -2
@@ -570,7 +570,7 @@ static void reprobe_all(struct work_struct *unused) {int ret; -CIO_MSG_EVENT (2 ,"reprobe start\n" ); +CIO_MSG_EVENT (4 ,"reprobe start\n" ); need_reprobe =0 ;/* Make sure initial subchannel scan is done. */
@@ -578,7 +578,7 @@ static void reprobe_all(struct work_struct *unused) atomic_read(&ccw_device_init_count) == 0); ret =for_each_subchannel_staged (NULL , reprobe_subchannel,NULL ); -CIO_MSG_EVENT (2 ,"reprobe done (rc=%d, need_reprobe=%d)\n" , ret, +CIO_MSG_EVENT (4 ,"reprobe done (rc=%d, need_reprobe=%d)\n" , ret, need_reprobe); }
drivers/s390/cio/device.c +12 -13
@@ -341,7 +341,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev) rc =device_schedule_callback (&cdev->dev, ccw_device_remove_orphan_cb);if (rc) -CIO_MSG_EVENT (2 ,"Couldn't unregister orphan " +CIO_MSG_EVENT (0 ,"Couldn't unregister orphan " "0.%x.%04x\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -351,7 +351,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev) rc =device_schedule_callback (cdev->dev.parent, ccw_device_remove_sch_cb);if (rc) -CIO_MSG_EVENT (2 ,"Couldn't unregister disconnected device " +CIO_MSG_EVENT (0 ,"Couldn't unregister disconnected device " "0.%x.%04x\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -397,7 +397,7 @@ int ccw_device_set_offline(struct ccw_device *cdev)if (ret ==0 )wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev));else { -CIO_MSG_EVENT (2 ,"ccw_device_offline returned %d, " +CIO_MSG_EVENT (0 ,"ccw_device_offline returned %d, " "device 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -433,7 +433,7 @@ int ccw_device_set_online(struct ccw_device *cdev)if (ret ==0 )wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev));else { -CIO_MSG_EVENT (2 ,"ccw_device_online returned %d, " +CIO_MSG_EVENT (0 ,"ccw_device_online returned %d, " "device 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -451,7 +451,7 @@ int ccw_device_set_online(struct ccw_device *cdev)if (ret ==0 )wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev));else -CIO_MSG_EVENT (2 ,"ccw_device_offline returned %d, " +CIO_MSG_EVENT (0 ,"ccw_device_offline returned %d, " "device 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -803,7 +803,7 @@ static void sch_attach_disconnected_device(struct subchannel *sch, other_sch =to_subchannel (get_device (cdev->dev.parent)); ret =device_move (&cdev->dev, &sch->dev);if (ret) { -CIO_MSG_EVENT (2 ,"Moving disconnected device 0.%x.%04x failed " +CIO_MSG_EVENT (0 ,"Moving disconnected device 0.%x.%04x failed " "(ret=%d)!\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno, ret);put_device (&other_sch->dev);
@@ -933,7 +933,7 @@ io_subchannel_register(struct work_struct *work) ret =device_reprobe (&cdev->dev);if (ret)/* We can't do much here. */ -CIO_MSG_EVENT (2 ,"device_reprobe() returned" +CIO_MSG_EVENT (0 ,"device_reprobe() returned" " %d for 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -1086,7 +1086,7 @@ static void ccw_device_move_to_sch(struct work_struct *work) rc =device_move (&cdev->dev, &sch->dev);mutex_unlock (&sch->reg_mutex);if (rc) { - CIO_MSG_EVENT(2, "Moving device 0.%x.%04x to subchannel " + CIO_MSG_EVENT(0, "Moving device 0.%x.%04x to subchannel " "0.%x.%04x failed (ret=%d)!\n", cdev->private->dev_id.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
@@ -1446,8 +1446,7 @@ ccw_device_remove (struct device *dev)wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev)); else - //FIXME: we can't fail! - CIO_MSG_EVENT(2, "ccw_device_offline returned %d, " + CIO_MSG_EVENT(0, "ccw_device_offline returned %d, ""device 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -1524,7 +1523,7 @@ static int recovery_check(struct device *dev, void *data)spin_lock_irq (cdev->ccwlock);switch (cdev->private->state) {case DEV_STATE_DISCONNECTED : -CIO_MSG_EVENT (3 ,"recovery: trigger 0.%x.%04x\n" , +CIO_MSG_EVENT (4 ,"recovery: trigger 0.%x.%04x\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno);dev_fsm_event (cdev,DEV_EVENT_VERIFY );
@@ -1554,7 +1553,7 @@ static void recovery_work_func(struct work_struct *unused) }spin_unlock_irq (&recovery_lock); }else -CIO_MSG_EVENT (2 ,"recovery: end\n" ); +CIO_MSG_EVENT (4 ,"recovery: end\n" ); } static DECLARE_WORK(recovery_work, recovery_work_func);
@@ -1572,7 +1571,7 @@ void ccw_device_schedule_recovery(void) {unsigned long flags; -CIO_MSG_EVENT (2 ,"recovery: schedule\n" ); +CIO_MSG_EVENT (4 ,"recovery: schedule\n" );spin_lock_irqsave (&recovery_lock, flags);if (!timer_pending (&recovery_timer) || (recovery_phase !=0 )) { recovery_phase =0 ;
drivers/s390/cio/device_fsm.c +22 -22
76 lines not on this page · raw message
drivers/s390/cio/device_id.c +2 -2
@@ -214,7 +214,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)* sense id information. So, for intervention required, * we use the "whack it until it talks" strategy... */ -CIO_MSG_EVENT (2 ,"SenseID : device %04x on Subchannel " +CIO_MSG_EVENT (0 ,"SenseID : device %04x on Subchannel " "0.%x.%04x reports cmd reject\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no);
@@ -239,7 +239,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev) lpm =to_io_private (sch)->orb.lpm;if ((lpm & sch->schib.pmcw.pim & sch->schib.pmcw.pam) !=0 ) - CIO_MSG_EVENT(2, "SenseID : path %02X for device %04x " + CIO_MSG_EVENT(4, "SenseID : path %02X for device %04x " "on subchannel 0.%x.%04x is " "'not operational'\n", lpm, cdev->private->dev_id.devno,
drivers/s390/cio/device_pgid.c +6 -6
@@ -79,7 +79,7 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev)/* ret is 0, -EBUSY, -EACCES or -ENODEV */ if (ret != -EACCES )return ret; - CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel " + CIO_MSG_EVENT(3, "SNID - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not " "operational'\n", cdev->private->dev_id.devno,
@@ -159,7 +159,7 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)u8 lpm; lpm =to_io_private (sch)->orb.lpm; -CIO_MSG_EVENT (2 ,"SNID - Device %04x on Subchannel 0.%x.%04x," +CIO_MSG_EVENT (3 ,"SNID - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, lpm);
@@ -275,7 +275,7 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)return ret; }/* PGID command failed on this path. */ -CIO_MSG_EVENT (2 ,"SPID - Device %04x on Subchannel " +CIO_MSG_EVENT (3 ,"SPID - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);
@@ -317,7 +317,7 @@ static int __ccw_device_do_nop(struct ccw_device *cdev)return ret; }/* nop command failed on this path. */ -CIO_MSG_EVENT (2 ,"NOP - Device %04x on Subchannel " +CIO_MSG_EVENT (3 ,"NOP - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);
@@ -362,7 +362,7 @@ __ccw_device_check_pgid(struct ccw_device *cdev)return -EAGAIN ; }if (irb->scsw.cc ==3 ) { -CIO_MSG_EVENT (2 ,"SPID - Device %04x on Subchannel 0.%x.%04x," +CIO_MSG_EVENT (3 ,"SPID - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);
@@ -391,7 +391,7 @@ static int __ccw_device_check_nop(struct ccw_device *cdev)return -ETIME ; }if (irb->scsw.cc ==3 ) { -CIO_MSG_EVENT (2 ,"NOP - Device %04x on Subchannel 0.%x.%04x," +CIO_MSG_EVENT (3 ,"NOP - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);
drivers/s390/s390mach.c +2 -1
@@ -48,10 +48,11 @@ s390_collect_crw_info(void *param)int ccode;struct semaphore *sem;unsigned int chain; +int ignore; sem = (struct semaphore *)param; repeat: -down_interruptible (sem); + ignore =down_interruptible (sem); chain =0 ;while (1 ) {if (unlikely (chain >1 )) {
include/asm-s390/kvm_host.h +1 -0
@@ -104,6 +104,7 @@ struct sie_block {struct kvm_vcpu_stat {u32 exit_userspace; +u32 exit_null;u32 exit_external_request;u32 exit_external_interrupt;u32 exit_stop_request;
include/asm-s390/page.h +11 -0
@@ -125,6 +125,17 @@ page_get_storage_key(unsigned long addr) return skey; } +#ifdef CONFIG_PAGE_STATES + +struct page ; +void arch_free_page (struct page *page,int order); +void arch_alloc_page (struct page *page,int order); + +#define HAVE_ARCH_FREE_PAGE +#define HAVE_ARCH_ALLOC_PAGE + +#endif +#endif /* !__ASSEMBLY__ */ /* to align the pointer to the (next) page boundary */
include/asm-s390/ptrace.h +2 -0
@@ -471,6 +471,8 @@ struct task_struct;extern void user_enable_single_step (struct task_struct *);extern void user_disable_single_step (struct task_struct *); +#define __ARCH_WANT_COMPAT_SYS_PTRACE +#define user_mode (regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)#define instruction_pointer (regs) ((regs)->psw.addr & PSW_ADDR_INSN)#define regs_return_value (regs)((regs)->gprs[2])
include/asm-s390/system.h +6 -0
@@ -116,6 +116,12 @@ extern void pfault_fini(void);#define pfault_fini () do { } while (0)#endif /* CONFIG_PFAULT */ +#ifdef CONFIG_PAGE_STATES +extern void cmma_init (void ); +#else +static inline void cmma_init (void ) { } +#endif +#define finish_arch_switch (prev) do { \ set_fs(current->thread.mm_segment); \ account_vtime(prev); \