Please pull git390 'for-linus' branch
Subsystems (8)
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/appldata/appldata.h | 1 - arch/s390/appldata/appldata_base.c | 74 ++++---------------- arch/s390/appldata/appldata_mem.c | 1 - arch/s390/appldata/appldata_net_sum.c | 1 - arch/s390/appldata/appldata_os.c | 1 - arch/s390/kernel/early.c | 2 +- arch/s390/kernel/entry.S | 120 +++++++++++++++++++++----------- arch/s390/kernel/entry64.S | 114 ++++++++++++++++++++----------- arch/s390/kernel/setup.c | 6 ++- arch/s390/kernel/smp.c | 56 ++------------- arch/s390/kernel/traps.c | 1 + arch/s390/mm/cmm.c | 3 - drivers/s390/cio/css.c | 2 +- drivers/s390/cio/device_fsm.c | 2 +- drivers/s390/cio/device_id.c | 45 +++---------- include/asm-s390/system.h | 5 ++ include/linux/sysctl.h | 6 -- kernel/sysctl_check.c | 14 ---- mm/rmap.c | 9 ++- net/iucv/iucv.c | 107 +++++++++++++++++------------- 20 files changed, 263 insertions(+), 307 deletions(-)
Christian Borntraeger (2):
[S390] magic sysrq: check for in_atomic before doing an console_unblank [S390] Optimize storage key handling for anonymous pages
Christoph Lameter (1):
[S390] Explicitly code allocpercpu calls in iucv
Cornelia Huck (1):
[S390] cio: Register/unregister subchannels only from kslowcrw.
Heiko Carstens (7):
[S390] Fix irq tracing and lockdep_sys_exit calls. [S390] cmm: remove unused binary sysctls. [S390] appldata: remove unused binary sysctls. [S390] Fix kernel preemption.
[S390] Dont overwrite lowcores on smp_send_stop(). [S390] Fix memory detection.
[S390] Add missing die_notifier() call to die().
Peter Oberparleiter (1):
[S390] cio: change device sense procedure to work with pav aliases
arch/s390/appldata/appldata.h +0 -1
@@ -45,7 +45,6 @@ struct appldata_ops {int active;/* monitoring status */ /* fill in from here */ -unsigned int ctl_nr;/* sysctl ID */ char name[APPLDATA_PROC_NAME_LENGTH ];/* name of /proc fs node */ unsigned char record_nr;/* Record Nr. for Product ID */ void (*callback)(void *data);/* callback function */
arch/s390/appldata/appldata_base.c +15 -59
134 lines not on this page · raw message
arch/s390/appldata/appldata_mem.c +0 -1
@@ -147,7 +147,6 @@ static void appldata_get_mem_data(void *data)static struct appldata_ops ops = { - .ctl_nr =CTL_APPLDATA_MEM , .name ="mem" , .record_nr =APPLDATA_RECORD_MEM_ID , .size =sizeof (struct appldata_mem_data ),
arch/s390/appldata/appldata_net_sum.c +0 -1
@@ -142,7 +142,6 @@ static void appldata_get_net_sum_data(void *data)static struct appldata_ops ops = { - .ctl_nr =CTL_APPLDATA_NET_SUM , .name ="net_sum" , .record_nr =APPLDATA_RECORD_NET_SUM_ID , .size =sizeof (struct appldata_net_sum_data ),
arch/s390/appldata/appldata_os.c +0 -1
@@ -82,7 +82,6 @@ struct appldata_os_data {static struct appldata_os_data *appldata_os_data;static struct appldata_ops ops = { - .ctl_nr =CTL_APPLDATA_OS , .name ="os" , .record_nr =APPLDATA_RECORD_OS_ID , .owner =THIS_MODULE ,
arch/s390/kernel/early.c +1 -1
@@ -200,7 +200,7 @@ static noinline __init void find_memory_chunks(unsigned long memsize) cc =__tprot (addr);while (cc == old_cc) { addr +=CHUNK_INCR ; -if (addr >= memsize) +if (memsize && addr >= memsize)break ;#ifndef CONFIG_64BIT if (addr ==ADDR2G )
arch/s390/kernel/entry.S +79 -41
311 lines not on this page · raw message
arch/s390/kernel/entry64.S +73 -41
292 lines not on this page · raw message
arch/s390/kernel/setup.c +5 -1
@@ -347,7 +347,7 @@ void (*_machine_power_off)(void) = do_machine_power_off_nonsmp;void machine_restart (char *command) { -if (!in_interrupt () || oops_in_progress) +if ((!in_interrupt () && !in_atomic ()) || oops_in_progress)/* * Only unblank the console if we are called in enabled * context or a bust_spinlocks cleared the way for us.
@@ -492,6 +492,10 @@ static void setup_addressing_mode(void)printk ("S390 address spaces switched, " );set_amode_and_uaccess (PSW_ASC_PRIMARY ,PSW32_ASC_PRIMARY ); } +#ifdef CONFIG_TRACE_IRQFLAGS + sysc_restore_trace_psw.mask = psw_kernel_bits & ~PSW_MASK_MCHECK ; + io_restore_trace_psw.mask = psw_kernel_bits & ~PSW_MASK_MCHECK ; +#endif } static void __init
arch/s390/kernel/smp.c +7 -49
79 lines not on this page · raw message
arch/s390/kernel/traps.c +1 -0
@@ -260,6 +260,7 @@ void die(const char * str, struct pt_regs * regs, long err)bust_spinlocks (1 );printk ("%s: %04lx [#%d]\n" , str, err &0xffff , ++die_counter);print_modules (); +notify_die (DIE_OOPS , str, regs, err, current->thread.trap_no,SIGSEGV );show_regs (regs);bust_spinlocks (0 );add_taint (TAINT_DIE );
arch/s390/mm/cmm.c +0 -3
@@ -341,19 +341,16 @@ cmm_timeout_handler(ctl_table *ctl, int write, struct file *filp,static struct ctl_table cmm_table[] = { { - .ctl_name =VM_CMM_PAGES , .procname ="cmm_pages" , .mode =0644 , .proc_handler = &cmm_pages_handler, }, { - .ctl_name =VM_CMM_TIMED_PAGES , .procname ="cmm_timed_pages" , .mode =0644 , .proc_handler = &cmm_pages_handler, }, { - .ctl_name =VM_CMM_TIMEOUT , .procname ="cmm_timeout" , .mode =0644 , .proc_handler = &cmm_timeout_handler,
drivers/s390/cio/css.c +1 -1
@@ -483,7 +483,7 @@ static DECLARE_WORK(css_reprobe_work, reprobe_all);void css_schedule_reprobe (void ) { need_reprobe =1 ; -queue_work (ccw_device_work, &css_reprobe_work); +queue_work (slow_path_wq, &css_reprobe_work); }EXPORT_SYMBOL_GPL (css_schedule_reprobe);
drivers/s390/cio/device_fsm.c +1 -1
@@ -1034,7 +1034,7 @@ device_trigger_reprobe(struct subchannel *sch)if (sch->schib.pmcw.dev != cdev->private->dev_id.devno) {PREPARE_WORK (&cdev->private->kick_work, ccw_device_move_to_orphanage); -queue_work (ccw_device_work, &cdev->private->kick_work); +queue_work (slow_path_wq, &cdev->private->kick_work); }else ccw_device_start_id (cdev,0 ); }
drivers/s390/cio/device_id.c +9 -36
75 lines not on this page · raw message
include/asm-s390/system.h +5 -0
@@ -388,6 +388,11 @@ extern void (*_machine_power_off)(void);#define arch_align_stack (x) (x) +#ifdef CONFIG_TRACE_IRQFLAGS +extern psw_t sysc_restore_trace_psw; +extern psw_t io_restore_trace_psw; +#endif +#endif /* __KERNEL__ */ #endif
include/linux/sysctl.h +0 -6
@@ -70,7 +70,6 @@ enumCTL_ABI =9 ,/* Binary emulation */ CTL_CPU =10 ,/* CPU stuff (speed scaling, etc) */ CTL_ARLAN =254 ,/* arlan wireless driver */ -CTL_APPLDATA =2120 ,/* s390 appldata */ CTL_S390DBF =5677 ,/* s390 debug */ CTL_SUNRPC =7249 ,/* sunrpc debug */ CTL_PM=9899, /* frv power management */
@@ -207,11 +206,6 @@ enumVM_PANIC_ON_OOM =33 ,/* panic at out-of-memory */ VM_VDSO_ENABLED =34 ,/* map VDSO into new processes? */ VM_MIN_SLAB=35, /* Percent pages ignored by zone reclaim */ - -/* s390 vm cmm sysctls */ -VM_CMM_PAGES =1111 , -VM_CMM_TIMED_PAGES =1112 , - VM_CMM_TIMEOUT=1113, };
kernel/sysctl_check.c +0 -14
@@ -140,9 +140,6 @@ static struct trans_ctl_table trans_vm_table[] = { { VM_PANIC_ON_OOM, "panic_on_oom" }, { VM_VDSO_ENABLED, "vdso_enabled" }, { VM_MIN_SLAB, "min_slab_ratio" }, - { VM_CMM_PAGES, "cmm_pages" }, - { VM_CMM_TIMED_PAGES, "cmm_timed_pages" }, - { VM_CMM_TIMEOUT, "cmm_timeout" }, {} };
@@ -1219,16 +1216,6 @@ static struct trans_ctl_table trans_arlan_table[] = { {} }; -static struct trans_ctl_table trans_appldata_table[] = { - {CTL_APPLDATA_TIMER ,"timer" }, - {CTL_APPLDATA_INTERVAL ,"interval" }, - {CTL_APPLDATA_OS ,"os" }, - {CTL_APPLDATA_NET_SUM ,"net_sum" }, - {CTL_APPLDATA_MEM ,"mem" }, - {} - -}; -static struct trans_ctl_table trans_s390dbf_table[] = { {5678 /* CTL_S390DBF_STOPPABLE */ ,"debug_stoppable" }, {5679 /* CTL_S390DBF_ACTIVE */ ,"debug_active" },
@@ -1273,7 +1260,6 @@ static struct trans_ctl_table trans_root_table[] = { { CTL_ABI, "abi" },/* CTL_CPU not used */ { CTL_ARLAN, "arlan", trans_arlan_table }, - { CTL_APPLDATA, "appldata", trans_appldata_table }, { CTL_S390DBF, "s390dbf", trans_s390dbf_table }, { CTL_SUNRPC, "sunrpc", trans_sunrpc_table }, { CTL_PM, "pm", trans_pm_table },
mm/rmap.c +5 -4
@@ -471,11 +471,12 @@ int page_mkclean(struct page *page)if (page_mapped (page)) {struct address_space *mapping =page_mapping (page); -if (mapping) +if (mapping) { ret =page_mkclean_file (mapping, page); -if (page_test_dirty (page)) { -page_clear_dirty (page); - ret =1 ; +if (page_test_dirty (page)) { +page_clear_dirty (page); + ret =1 ; + } } }
net/iucv/iucv.c +61 -46
259 lines not on this page · raw message