2.5.39 s390 (1/26): arch.
PATCH 1/1 2.5.39 s390 (1/26): arch.
s390 arch file changes for 2.5.39.
arch/s390/kernel/Makefile +2 -2
@@ -5,8 +5,8 @@ EXTRA_TARGETS := head.o init_task.o EXTRA_AFLAGS := -traditional -export-objs := debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o -obj-y := entry.o bitmap.o traps.o time.o process.o irq.o \ +export-objs := debug.o ebcdic.o s390_ext.o smp.o s390_ksyms.o +obj-y := entry.o bitmap.o traps.o time.o process.o \ setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ semaphore.o s390fpu.o reipl.o s390_ext.o debug.o
arch/s390/kernel/head.S +1 -1
@@ -653,5 +653,5 @@ .Lstart: .long start_kernel .Lbss_bgn: .long __bss_start .Lbss_end: .long _end -.Laregs: .long 0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 +.Laregs: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
arch/s390/kernel/init_task.c +1 -1
@@ -15,7 +15,7 @@static struct fs_struct init_fs =INIT_FS ;static struct files_struct init_files =INIT_FILES ; -static struct signal_struct init_signals =INIT_SIGNALS ; +static struct signal_struct init_signals =INIT_SIGNALS (init_signals);struct mm_struct init_mm =INIT_MM (init_mm);/*
arch/s390/kernel/irq.c +0 -360
360 lines not on this page · raw message
arch/s390/kernel/process.c +38 -31
122 lines not on this page · raw message
arch/s390/kernel/setup.c +1 -1
@@ -524,7 +524,7 @@seq_printf (m,"vendor_id : IBM/S390\n" "# processors : %i\n" "bogomips per cpu: %lu.%02lu\n" , - smp_num_cpus, loops_per_jiffy/(500000 /HZ ), +num_online_cpus (), loops_per_jiffy/(500000 /HZ ), (loops_per_jiffy/(5000 /HZ ))%100 ); }if (cpu_online_map & (1 << n)) {
arch/s390/kernel/smp.c +75 -120
333 lines not on this page · raw message
arch/s390/kernel/time.c +16 -37
102 lines not on this page · raw message
arch/s390/kernel/traps.c +8 -0
@@ -170,6 +170,14 @@show_trace (sp); } +/* +* The architecture-independent dump_stack generator +*/ +void dump_stack (void ) +{ +show_stack (0 ); +} +void show_registers (struct pt_regs *regs) {mm_segment_t old_fs;
arch/s390x/kernel/Makefile +2 -2
@@ -5,10 +5,10 @@ EXTRA_TARGETS := head.o init_task.o EXTRA_AFLAGS := -traditional -export-objs := debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o \ +export-objs := debug.o ebcdic.o s390_ext.o smp.o s390_ksyms.o \ exec32.o -obj-y := entry.o bitmap.o traps.o time.o process.o irq.o \ +obj-y := entry.o bitmap.o traps.o time.o process.o \ setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ semaphore.o s390fpu.o reipl.o s390_ext.o debug.o
arch/s390x/kernel/entry.S +2 -2
@@ -551,8 +551,8 @@ .long SYSCALL(sys_rt_sigtimedwait,sys32_rt_sigtimedwait_wrapper) .long SYSCALL(sys_rt_sigqueueinfo,sys32_rt_sigqueueinfo_wrapper) .long SYSCALL(sys_rt_sigsuspend_glue,sys32_rt_sigsuspend_glue) - .long SYSCALL(sys_pread,sys32_pread_wrapper) /* 180 */ - .long SYSCALL(sys_pwrite,sys32_pwrite_wrapper) + .long SYSCALL(sys_pread64,sys32_pread_wrapper) /* 180 */ + .long SYSCALL(sys_pwrite64,sys32_pwrite_wrapper) .long SYSCALL(sys_ni_syscall,sys32_chown16_wrapper) /* old chown16 syscall */ .long SYSCALL(sys_getcwd,sys32_getcwd_wrapper) .long SYSCALL(sys_capget,sys32_capget_wrapper)
arch/s390x/kernel/head.S +1 -1
@@ -645,5 +645,5 @@ # .align 8 .Ldw: .quad 0x0002000180000000,0x0000000000000000 -.Laregs: .long 0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0 +.Laregs: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
arch/s390x/kernel/init_task.c +1 -1
@@ -15,7 +15,7 @@static struct fs_struct init_fs =INIT_FS ;static struct files_struct init_files =INIT_FILES ; -static struct signal_struct init_signals =INIT_SIGNALS ; +static struct signal_struct init_signals =INIT_SIGNALS (init_signals);struct mm_struct init_mm =INIT_MM (init_mm);/*
arch/s390x/kernel/irq.c +0 -361
361 lines not on this page · raw message
arch/s390x/kernel/linux32.c +17 -8
@@ -1953,15 +1953,19 @@return -EINVAL ; } -spin_lock_irq (¤t->sigmask_lock); - sig =dequeue_signal (&these, &info); +spin_lock_irq (¤t->sig->siglock); +spin_lock (¤t->sigmask_lock); + sig =dequeue_signal (¤t->sig->shared_pending, &these, &info); +if (!sig) + sig =dequeue_signal (¤t->pending, &these, &info);if (!sig) {/* None ready -- temporarily unblock those we're interested in so that we'll be awakened when they arrive. */ -sigset_t oldblocked = current->blocked; + current->real_blocked = current->blocked;sigandsets (¤t->blocked, ¤t->blocked, &these);recalc_sigpending (); -spin_unlock_irq (¤t->sigmask_lock); +spin_unlock (¤t->sigmask_lock); +spin_unlock_irq (¤t->sig->siglock); timeout =MAX_SCHEDULE_TIMEOUT ;if (uts)
@@ -1971,12 +1975,17 @@ current->state =TASK_INTERRUPTIBLE ; timeout =schedule_timeout (timeout); -spin_lock_irq (¤t->sigmask_lock); - sig =dequeue_signal (&these, &info); - current->blocked = oldblocked; +spin_lock_irq (¤t->sig->siglock); +spin_lock (¤t->sigmask_lock); + sig =dequeue_signal (¤t->sig->shared_pending, &these, &info); +if (!sig) + sig =dequeue_signal (¤t->pending, &these, &info); + current->blocked = current->real_blocked; +siginitset (¤t->real_blocked,0 );recalc_sigpending (); } -spin_unlock_irq (¤t->sigmask_lock); +spin_unlock (¤t->sigmask_lock); +spin_unlock_irq (¤t->sig->siglock);if (sig) { ret = sig;
arch/s390x/kernel/process.c +38 -31
121 lines not on this page · raw message
arch/s390x/kernel/setup.c +1 -1
@@ -514,7 +514,7 @@seq_printf (m,"vendor_id : IBM/S390\n" "# processors : %i\n" "bogomips per cpu: %lu.%02lu\n" , - smp_num_cpus, loops_per_jiffy/(500000 /HZ ), +num_online_cpus (), loops_per_jiffy/(500000 /HZ ), (loops_per_jiffy/(5000 /HZ ))%100 ); }if (cpu_online_map & (1 << n)) {
arch/s390x/kernel/smp.c +76 -121
331 lines not on this page · raw message
arch/s390x/kernel/time.c +10 -9
@@ -47,18 +47,18 @@extern rwlock_t xtime_lock;extern unsigned long wall_jiffies; -void tod_to_timeval (__u64 todval,struct timeval *xtime) +void tod_to_timeval (__u64 todval,struct timespec *xtime) { - todval >>=12 ; - xtime->tv_sec = todval /1000000 ; - xtime->tv_usec = todval %1000000 ; + xtime->tv_sec = (todval >>12 ) /1000000 ; + todval -= (xtime->tv_sec *1000000 ) <<12 ; + xtime->tv_nsec = ((todval *1000 ) >>12 ); }static inline unsigned long do_gettimeoffset (void ) {__u64 now; - asm ("STCK 0(%0)" : :"a" (&now) :"memory" ,"cc" ); + asmvolatile ("STCK 0(%0)" : :"a" (&now) :"memory" ,"cc" ); now = (now - init_timer_cc) >>12 ;/* We require the offset from the latest update of xtime */ now -= (__u64 ) wall_jiffies*USECS_PER_JIFFY ;
@@ -75,7 +75,7 @@read_lock_irqsave (&xtime_lock, flags); sec = xtime.tv_sec; - usec = xtime.tv_usec +do_gettimeoffset (); + usec = xtime.tv_nsec +do_gettimeoffset ();read_unlock_irqrestore (&xtime_lock, flags);while (usec >=1000000 ) {
@@ -104,7 +104,8 @@ tv->tv_sec--; } - xtime = *tv; + xtime.tv_sec = tv->tv_sec; + xtime.tv_nsec = tv->tv_usec *1000 ; time_adjust =0 ;/* stop active adjtime() */ time_status |=STA_UNSYNC ; time_maxerror =NTP_PHASE_LIMIT ;
@@ -125,7 +126,7 @@ {int cpu =smp_processor_id (); -irq_enter (cpu,0 ); +irq_enter ();/* * set clock comparator for next tick
@@ -147,7 +148,7 @@do_timer (regs);#endif -irq_exit (cpu,0 ); +irq_exit (); }/*
arch/s390x/kernel/traps.c +8 -0
@@ -172,6 +172,14 @@show_trace (sp); } +/* +* The architecture-independent dump_stack generator +*/ +void dump_stack (void ) +{ +show_stack (0 ); +} +void show_registers (struct pt_regs *regs) {mm_segment_t old_fs;