12 files changed, 79 insertions, 170 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index b7ca5bf9acfc..01c5c082f970 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -14,6 +14,10 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config GENERIC_HWEIGHT
+        bool
+        default y
+
 config GENERIC_CALIBRATE_DELAY
         bool
         default y
@@ -460,6 +464,8 @@ config PCMCIA
 
 source "drivers/base/Kconfig"
 
+source "drivers/connector/Kconfig"
+
 source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index d06a8d71c71d..54d35c130907 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -531,12 +531,11 @@ int appldata_register_ops(struct appldata_ops *ops)
                 P_ERROR("ctl_nr %i already in use!\n", ops->ctl_nr);
                 return -EBUSY;
         }
-        ops->ctl_table = kmalloc(4*sizeof(struct ctl_table), GFP_KERNEL);
+        ops->ctl_table = kzalloc(4*sizeof(struct ctl_table), GFP_KERNEL);
         if (ops->ctl_table == NULL) {
                 P_ERROR("Not enough memory for %s ctl_table!\n", ops->name);
                 return -ENOMEM;
         }
-        memset(ops->ctl_table, 0, 4*sizeof(struct ctl_table));
 
         spin_lock(&appldata_ops_lock);
         list_for_each(lh, &appldata_ops_list) {
diff --git a/arch/s390/crypto/crypt_s390_query.c b/arch/s390/crypto/crypt_s390_query.c
index def02bdc44a4..54fb11d7fadd 100644
--- a/arch/s390/crypto/crypt_s390_query.c
+++ b/arch/s390/crypto/crypt_s390_query.c
@@ -55,7 +55,7 @@ static void query_available_functions(void)
         printk(KERN_INFO "KMC_AES_256: %d\n",
                 crypt_s390_func_available(KMC_AES_256_ENCRYPT));
 
-        /* query available KIMD fucntions */
+        /* query available KIMD functions */
         printk(KERN_INFO "KIMD_QUERY: %d\n",
                 crypt_s390_func_available(KIMD_QUERY));
         printk(KERN_INFO "KIMD_SHA_1: %d\n",
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index cc058dc3bc8b..5e14de37c17b 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -26,7 +26,6 @@
 #include <linux/resource.h>
 #include <linux/times.h>
 #include <linux/utsname.h>
-#include <linux/timex.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/sem.h>
@@ -705,79 +704,6 @@ asmlinkage long sys32_sendfile64(int out_fd, int in_fd,
         return ret;
 }
 
-/* Handle adjtimex compatibility. */
-
-struct timex32 {
-        u32 modes;
-        s32 offset, freq, maxerror, esterror;
-        s32 status, constant, precision, tolerance;
-        struct compat_timeval time;
-        s32 tick;
-        s32 ppsfreq, jitter, shift, stabil;
-        s32 jitcnt, calcnt, errcnt, stbcnt;
-        s32  :32; s32  :32; s32  :32; s32  :32;
-        s32  :32; s32  :32; s32  :32; s32  :32;
-        s32  :32; s32  :32; s32  :32; s32  :32;
-};
-
-extern int do_adjtimex(struct timex *);
-
-asmlinkage long sys32_adjtimex(struct timex32 __user *utp)
-{
-        struct timex txc;
-        int ret;
-
-        memset(&txc, 0, sizeof(struct timex));
-
-        if(get_user(txc.modes, &utp->modes) ||
-           __get_user(txc.offset, &utp->offset) ||
-           __get_user(txc.freq, &utp->freq) ||
-           __get_user(txc.maxerror, &utp->maxerror) ||
-           __get_user(txc.esterror, &utp->esterror) ||
-           __get_user(txc.status, &utp->status) ||
-           __get_user(txc.constant, &utp->constant) ||
-           __get_user(txc.precision, &utp->precision) ||
-           __get_user(txc.tolerance, &utp->tolerance) ||
-           __get_user(txc.time.tv_sec, &utp->time.tv_sec) ||
-           __get_user(txc.time.tv_usec, &utp->time.tv_usec) ||
-           __get_user(txc.tick, &utp->tick) ||
-           __get_user(txc.ppsfreq, &utp->ppsfreq) ||
-           __get_user(txc.jitter, &utp->jitter) ||
-           __get_user(txc.shift, &utp->shift) ||
-           __get_user(txc.stabil, &utp->stabil) ||
-           __get_user(txc.jitcnt, &utp->jitcnt) ||
-           __get_user(txc.calcnt, &utp->calcnt) ||
-           __get_user(txc.errcnt, &utp->errcnt) ||
-           __get_user(txc.stbcnt, &utp->stbcnt))
-                return -EFAULT;
-
-        ret = do_adjtimex(&txc);
-
-        if(put_user(txc.modes, &utp->modes) ||
-           __put_user(txc.offset, &utp->offset) ||
-           __put_user(txc.freq, &utp->freq) ||
-           __put_user(txc.maxerror, &utp->maxerror) ||
-           __put_user(txc.esterror, &utp->esterror) ||
-           __put_user(txc.status, &utp->status) ||
-           __put_user(txc.constant, &utp->constant) ||
-           __put_user(txc.precision, &utp->precision) ||
-           __put_user(txc.tolerance, &utp->tolerance) ||
-           __put_user(txc.time.tv_sec, &utp->time.tv_sec) ||
-           __put_user(txc.time.tv_usec, &utp->time.tv_usec) ||
-           __put_user(txc.tick, &utp->tick) ||
-           __put_user(txc.ppsfreq, &utp->ppsfreq) ||
-           __put_user(txc.jitter, &utp->jitter) ||
-           __put_user(txc.shift, &utp->shift) ||
-           __put_user(txc.stabil, &utp->stabil) ||
-           __put_user(txc.jitcnt, &utp->jitcnt) ||
-           __put_user(txc.calcnt, &utp->calcnt) ||
-           __put_user(txc.errcnt, &utp->errcnt) ||
-           __put_user(txc.stbcnt, &utp->stbcnt))
-                ret = -EFAULT;
-
-        return ret;
-}
-
 #ifdef CONFIG_SYSCTL
 struct __sysctl_args32 {
         u32 name;
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 50e80138e7ad..199da68bd7be 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -551,10 +551,10 @@ sys32_newuname_wrapper:
         llgtr   %r2,%r2                 # struct new_utsname *
         jg      s390x_newuname          # branch to system call
 
-        .globl  sys32_adjtimex_wrapper 
-sys32_adjtimex_wrapper:
-        llgtr   %r2,%r2                 # struct timex_emu31 *
-        jg      sys32_adjtimex          # branch to system call
+        .globl  compat_sys_adjtimex_wrapper
+compat_sys_adjtimex_wrapper:
+        llgtr   %r2,%r2                 # struct compat_timex *
+        jg      compat_sys_adjtimex     # branch to system call
 
         .globl  sys32_mprotect_wrapper 
 sys32_mprotect_wrapper:
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 896d39d0e4ce..06a3fbc12536 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -204,16 +204,13 @@ debug_areas_alloc(int pages_per_area, int nr_areas)
                         goto fail_malloc_areas2;
                 }
                 for(j = 0; j < pages_per_area; j++) {
-                        areas[i][j] = (debug_entry_t*)kmalloc(PAGE_SIZE,
-                                                GFP_KERNEL);
+                        areas[i][j] = kzalloc(PAGE_SIZE, GFP_KERNEL);
                         if(!areas[i][j]) {
                                 for(j--; j >=0 ; j--) {
                                         kfree(areas[i][j]);
                                 }
                                 kfree(areas[i]);
                                 goto fail_malloc_areas2;
-                        } else {
-                                memset(areas[i][j],0,PAGE_SIZE);
                         }
                 }
         }
@@ -249,14 +246,12 @@ debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size,
         rc = (debug_info_t*) kmalloc(sizeof(debug_info_t), GFP_KERNEL);
         if(!rc)
                 goto fail_malloc_rc;
-        rc->active_entries = (int*)kmalloc(nr_areas * sizeof(int), GFP_KERNEL);
+        rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL);
         if(!rc->active_entries)
                 goto fail_malloc_active_entries;
-        memset(rc->active_entries, 0, nr_areas * sizeof(int));
-        rc->active_pages = (int*)kmalloc(nr_areas * sizeof(int), GFP_KERNEL);
+        rc->active_pages = kcalloc(nr_areas, sizeof(int), GFP_KERNEL);
         if(!rc->active_pages)
                 goto fail_malloc_active_pages;
-        memset(rc->active_pages, 0, nr_areas * sizeof(int));
         if((mode == ALL_AREAS) && (pages_per_area != 0)){
                 rc->areas = debug_areas_alloc(pages_per_area, nr_areas);
                 if(!rc->areas)
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index da6fbae8df91..4a0f5a1551ea 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -76,17 +76,17 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
 /*
  * Need to know about CPUs going idle?
  */
-static struct notifier_block *idle_chain;
+static ATOMIC_NOTIFIER_HEAD(idle_chain);
 
 int register_idle_notifier(struct notifier_block *nb)
 {
-        return notifier_chain_register(&idle_chain, nb);
+        return atomic_notifier_chain_register(&idle_chain, nb);
 }
 EXPORT_SYMBOL(register_idle_notifier);
 
 int unregister_idle_notifier(struct notifier_block *nb)
 {
-        return notifier_chain_unregister(&idle_chain, nb);
+        return atomic_notifier_chain_unregister(&idle_chain, nb);
 }
 EXPORT_SYMBOL(unregister_idle_notifier);
 
@@ -95,7 +95,7 @@ void do_monitor_call(struct pt_regs *regs, long interruption_code)
         /* disable monitor call class 0 */
         __ctl_clear_bit(8, 15);
 
-        notifier_call_chain(&idle_chain, CPU_NOT_IDLE,
+        atomic_notifier_call_chain(&idle_chain, CPU_NOT_IDLE,
                             (void *)(long) smp_processor_id());
 }
 
@@ -103,7 +103,7 @@ extern void s390_handle_mcck(void);
 /*
  * The idle loop on a S390...
  */
-void default_idle(void)
+static void default_idle(void)
 {
         int cpu, rc;
 
@@ -116,7 +116,8 @@ void default_idle(void)
                 return;
         }
 
-        rc = notifier_call_chain(&idle_chain, CPU_IDLE, (void *)(long) cpu);
+        rc = atomic_notifier_call_chain(&idle_chain,
+                        CPU_IDLE, (void *)(long) cpu);
         if (rc != NOTIFY_OK && rc != NOTIFY_DONE)
                 BUG();
         if (rc != NOTIFY_OK) {
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 24f62f16c0e5..0a04e4a564b2 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -78,8 +78,6 @@ extern int _text,_etext, _edata, _end;
 
 #include <asm/setup.h>
 
-static char command_line[COMMAND_LINE_SIZE] = { 0, };
-
 static struct resource code_resource = {
         .name  = "Kernel code",
         .start = (unsigned long) &_text,
@@ -335,63 +333,38 @@ add_memory_hole(unsigned long start, unsigned long end)
         }
 }
 
-static void __init
-parse_cmdline_early(char **cmdline_p)
+static int __init early_parse_mem(char *p)
+{
+        memory_end = memparse(p, &p);
+        return 0;
+}
+early_param("mem", early_parse_mem);
+
+/*
+ * "ipldelay=XXX[sm]" sets ipl delay in seconds or minutes
+ */
+static int __init early_parse_ipldelay(char *p)
 {
-        char c = ' ', cn, *to = command_line, *from = COMMAND_LINE;
         unsigned long delay = 0;
 
-        /* Save unparsed command line copy for /proc/cmdline */
-        memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
-        saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+        delay = simple_strtoul(p, &p, 0);
 
-        for (;;) {
-                /*
-                 * "mem=XXX[kKmM]" sets memsize
-                 */
-                if (c == ' ' && strncmp(from, "mem=", 4) == 0) {
-                        memory_end = simple_strtoul(from+4, &from, 0);
-                        if ( *from == 'K' || *from == 'k' ) {
-                                memory_end = memory_end << 10;
-                                from++;
-                        } else if ( *from == 'M' || *from == 'm' ) {
-                                memory_end = memory_end << 20;
-                                from++;
-                        }
-                }
-                /*
-                 * "ipldelay=XXX[sm]" sets ipl delay in seconds or minutes
-                 */
-                if (c == ' ' && strncmp(from, "ipldelay=", 9) == 0) {
-                        delay = simple_strtoul(from+9, &from, 0);
-                        if (*from == 's' || *from == 'S') {
-                                delay = delay*1000000;
-                                from++;
-                        } else if (*from == 'm' || *from == 'M') {
-                                delay = delay*60*1000000;
-                                from++;
-                        }
-                        /* now wait for the requested amount of time */
-                        udelay(delay);
-                }
-                cn = *(from++);
-                if (!cn)
-                        break;
-                if (cn == '\n')
-                        cn = ' ';  /* replace newlines with space */
-                if (cn == 0x0d)
-                        cn = ' ';  /* replace 0x0d with space */
-                if (cn == ' ' && c == ' ')
-                        continue;  /* remove additional spaces */
-                c = cn;
-                if (to - command_line >= COMMAND_LINE_SIZE)
-                        break;
-                *(to++) = c;
+        switch (*p) {
+        case 's':
+        case 'S':
+                delay *= 1000000;
+                break;
+        case 'm':
+        case 'M':
+                delay *= 60 * 1000000;
         }
-        if (c == ' ' && to > command_line) to--;
-        *to = '\0';
-        *cmdline_p = command_line;
+
+        /* now wait for the requested amount of time */
+        udelay(delay);
+
+        return 0;
 }
+early_param("ipldelay", early_parse_ipldelay);
 
 static void __init
 setup_lowcore(void)
@@ -580,9 +553,26 @@ setup_arch(char **cmdline_p)
                "We are running native (64 bit mode)\n");
 #endif /* CONFIG_64BIT */
 
+        /* Save unparsed command line copy for /proc/cmdline */
+        strlcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
+
+        *cmdline_p = COMMAND_LINE;
+        *(*cmdline_p + COMMAND_LINE_SIZE - 1) = '\0';
+
         ROOT_DEV = Root_RAM0;
+
+        init_mm.start_code = PAGE_OFFSET;
+        init_mm.end_code = (unsigned long) &_etext;
+        init_mm.end_data = (unsigned long) &_edata;
+        init_mm.brk = (unsigned long) &_end;
+
+        memory_end = memory_size;
+
+        parse_early_param();
+
 #ifndef CONFIG_64BIT
-        memory_end = memory_size & ~0x400000UL;  /* align memory end to 4MB */
+        memory_end &= ~0x400000UL;
+
         /*
          * We need some free virtual space to be able to do vmalloc.
          * On a machine with 2GB memory we make sure that we have at
@@ -591,17 +581,9 @@ setup_arch(char **cmdline_p)
         if (memory_end > 1920*1024*1024)
                 memory_end = 1920*1024*1024;
 #else /* CONFIG_64BIT */
-        memory_end = memory_size & ~0x200000UL;  /* detected in head.s */
+        memory_end &= ~0x200000UL;
 #endif /* CONFIG_64BIT */
 
-        init_mm.start_code = PAGE_OFFSET;
-        init_mm.end_code = (unsigned long) &_etext;
-        init_mm.end_data = (unsigned long) &_edata;
-        init_mm.brk = (unsigned long) &_end;
-
-        parse_cmdline_early(cmdline_p);
-        parse_early_param();
-
         setup_memory();
         setup_resources();
         setup_lowcore();
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 7dbe00c76c6b..343120c9223d 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -665,7 +665,9 @@ __cpu_up(unsigned int cpu)
         cpu_lowcore->current_task = (unsigned long) idle;
         cpu_lowcore->cpu_data.cpu_nr = cpu;
         eieio();
-        signal_processor(cpu,sigp_restart);
+
+        while (signal_processor(cpu,sigp_restart) == sigp_busy)
+                udelay(10);
 
         while (!cpu_online(cpu))
                 cpu_relax();
@@ -799,9 +801,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
          */
         print_cpu_info(&S390_lowcore.cpu_data);
 
-        for(i = 0; i < NR_CPUS; i++) {
-                if (!cpu_possible(i))
-                        continue;
+        for_each_possible_cpu(i) {
                 lowcore_ptr[i] = (struct _lowcore *)
                         __get_free_pages(GFP_KERNEL|GFP_DMA, 
                                         sizeof(void*) == 8 ? 1 : 0);
@@ -831,7 +831,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 #endif
         set_prefix((u32)(unsigned long) lowcore_ptr[smp_processor_id()]);
 
-        for_each_cpu(cpu)
+        for_each_possible_cpu(cpu)
                 if (cpu != smp_processor_id())
                         smp_create_idle(cpu);
 }
@@ -868,7 +868,7 @@ static int __init topology_init(void)
         int cpu;
         int ret;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
                 if (ret)
                         printk(KERN_WARNING "topology_init: register_cpu %d "
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 7c88d85c3597..2f56654da821 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -132,7 +132,7 @@ SYSCALL(sys_clone_glue,sys_clone_glue,sys32_clone_glue)		/* 120 */
 SYSCALL(sys_setdomainname,sys_setdomainname,sys32_setdomainname_wrapper)
 SYSCALL(sys_newuname,s390x_newuname,sys32_newuname_wrapper)
 NI_SYSCALL                                                      /* modify_ldt for i386 */
-SYSCALL(sys_adjtimex,sys_adjtimex,sys32_adjtimex_wrapper)
+SYSCALL(sys_adjtimex,sys_adjtimex,compat_sys_adjtimex_wrapper)
 SYSCALL(sys_mprotect,sys_mprotect,sys32_mprotect_wrapper)       /* 125 */
 SYSCALL(sys_sigprocmask,sys_sigprocmask,compat_sys_sigprocmask_wrapper)
 NI_SYSCALL                                                      /* old "create module" */
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index b075ab499d05..51596f429235 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -339,19 +339,19 @@ static struct ctl_table cmm_table[] = {
         {
                 .ctl_name       = VM_CMM_PAGES,
                 .procname       = "cmm_pages",
-                .mode           = 0600,
+                .mode           = 0644,
                 .proc_handler   = &cmm_pages_handler,
         },
         {
                 .ctl_name       = VM_CMM_TIMED_PAGES,
                 .procname       = "cmm_timed_pages",
-                .mode           = 0600,
+                .mode           = 0644,
                 .proc_handler   = &cmm_pages_handler,
         },
         {
                 .ctl_name       = VM_CMM_TIMEOUT,
                 .procname       = "cmm_timeout",
-                .mode           = 0600,
+                .mode           = 0644,
                 .proc_handler   = &cmm_timeout_handler,
         },
         { .ctl_name = 0 }
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index df953383724d..a055894f3bd8 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -292,7 +292,7 @@ void free_initmem(void)
         addr = (unsigned long)(&__init_begin);
         for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
                 ClearPageReserved(virt_to_page(addr));
-                set_page_count(virt_to_page(addr), 1);
+                init_page_count(virt_to_page(addr));
                 free_page(addr);
                 totalram_pages++;
         }
@@ -307,7 +307,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                 printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
         for (; start < end; start += PAGE_SIZE) {
                 ClearPageReserved(virt_to_page(start));
-                set_page_count(virt_to_page(start), 1);
+                init_page_count(virt_to_page(start));
                 free_page(start);
                 totalram_pages++;
         }