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/feature-removal-schedule.txt | 16 -- arch/s390/appldata/appldata_base.c | 12 +- arch/s390/kernel/compat_wrapper.S | 10 + arch/s390/kernel/head.S | 1 + arch/s390/kernel/smp.c | 30 ++-- arch/s390/kernel/sys_s390.c | 20 +++ arch/s390/kernel/syscalls.S | 2 +- arch/s390/kernel/vmlinux.lds.S | 1 + arch/s390/kernel/vtime.c | 2 +- arch/s390/mm/vmem.c | 6 +- drivers/s390/char/Kconfig | 12 +- drivers/s390/char/raw3270.c | 6 +- drivers/s390/char/sclp_vt220.c | 3 +- drivers/s390/cio/css.c | 2 +- drivers/s390/cio/css.h | 1 - drivers/s390/cio/device_ops.c | 257 ---------------------------- include/asm-s390/ccwdev.h | 5 - include/asm-s390/s390_ext.h | 2 + include/asm-s390/smp.h | 11 +- include/asm-s390/unistd.h | 2 +- net/iucv/iucv.c | 15 +- 21 files changed, 75 insertions(+), 341 deletions(-)
Christian Borntraeger (1):
[S390] add types.h include to s390_ext.h
Cornelia Huck (3):
[S390] cio: css_sch_device_register() can be made static. [S390] cio: Remove remains of _ccw_device_get_device_number(). [S390] cio: Remove deprecated rdc/rcd.
Heiko Carstens (4):
[S390] Convert to smp_call_function_single. [S390] Improve __smp_call_function_map. [S390] sclp: kill unused SCLP config option. [S390] Get rid of new section mismatch warnings.
Martin Schwidefsky (1):
[S390] Wire up sys_fallocate.
Documentation/feature-removal-schedule.txt +0 -16
@@ -211,22 +211,6 @@ Who: Richard Purdie <[email protected]> --------------------------- -What: read_dev_chars(), read_conf_data{,_lpm}() (s390 common I/O layer) -When: December 2007 -Why: These functions are a leftover from 2.4 times. They have several - problems: - - Duplication of checks that are done in the device driver's - interrupt handler - - common I/O layer can't do device specific error recovery - - device driver can't be notified for conditions happening during - execution of the function - Device drivers should issue the read device characteristics and read - configuration data ccws and do the appropriate error handling - themselves. -Who: Cornelia Huck <[email protected]> - ---------------------------- - What: i2c-ixp2000, i2c-ixp4xx and scx200_i2c drivers When: September 2007 Why: Obsolete. The new i2c-gpio driver replaces all hardware-specific
arch/s390/appldata/appldata_base.c +6 -6
@@ -173,7 +173,7 @@ int appldata_diag(char record_nr, u16 function, unsigned long buffer,/* * appldata_mod_vtimer_wrap() * -* wrapper function for mod_virt_timer(), because smp_call_function_on() +* wrapper function for mod_virt_timer(), because smp_call_function_single() * accepts only one parameter. */ static void __appldata_mod_vtimer_wrap (void *p) {
@@ -208,9 +208,9 @@ __appldata_vtimer_setup(int cmd) num_online_cpus()) * TOD_MICRO;for_each_online_cpu (i) {per_cpu (appldata_timer, i).expires = per_cpu_interval; -smp_call_function_on (add_virt_timer_periodic, - &per_cpu (appldata_timer, i), -0 ,1 , i); +smp_call_function_single (i, add_virt_timer_periodic, + &per_cpu (appldata_timer, i), +0 ,1 ); } appldata_timer_active =1 ;P_INFO ("Monitoring timer started.\n" );
@@ -236,8 +236,8 @@ __appldata_vtimer_setup(int cmd) } args; args.timer = &per_cpu (appldata_timer, i); args.expires = per_cpu_interval; -smp_call_function_on (__appldata_mod_vtimer_wrap, - &args,0 ,1 , i); +smp_call_function_single (i, __appldata_mod_vtimer_wrap, + &args,0 ,1 ); } } }
arch/s390/kernel/compat_wrapper.S +10 -0
@@ -1710,3 +1710,13 @@ compat_sys_timerfd_wrapper: sys_eventfd_wrapper: llgfr %r2,%r2 # unsigned int jg sys_eventfd + + .globl sys_fallocate_wrapper +sys_fallocate_wrapper: + lgfr %r2,%r2 # int + lgfr %r3,%r3 # int + sllg %r4,%r4,32 # get high word of 64bit loff_t + lr %r4,%r5 # get low word of 64bit loff_t + sllg %r5,%r6,32 # get high word of 64bit loff_t + l %r5,164(%r15) # get low word of 64bit loff_t + jg sys_fallocate
arch/s390/kernel/head.S +1 -0
@@ -35,6 +35,7 @@ #define ARCH_OFFSET 0 #endif +.section ".text.head","ax" #ifndef CONFIG_IPL .org 0 .long 0x00080000,0x80000000+startup # Just a restart PSW
arch/s390/kernel/smp.c +13 -17
@@ -120,7 +120,7 @@ static void __smp_call_function_map(void (*func) (void *info), void *info,if (wait) data.finished =CPU_MASK_NONE ; -spin_lock_bh (&call_lock); +spin_lock (&call_lock); call_data = &data;for_each_cpu_mask (cpu, map)
@@ -129,18 +129,16 @@ static void __smp_call_function_map(void (*func) (void *info), void *info,/* Wait for response */ while (!cpus_equal (map, data.started))cpu_relax (); -if (wait)while (!cpus_equal (map, data.finished))cpu_relax (); - -spin_unlock_bh (&call_lock); - +spin_unlock (&call_lock); out: -local_irq_disable (); -if (local) +if (local) { +local_irq_disable ();func (info); -local_irq_enable (); +local_irq_enable (); + } }/*
@@ -170,30 +168,28 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic,EXPORT_SYMBOL (smp_call_function);/* -* smp_call_function_on: +* smp_call_function_single: +* @cpu: the CPU where func should run * @func: the function to run; this must be fast and non-blocking * @info: an arbitrary pointer to pass to the function * @nonatomic: unused * @wait: if true, wait (atomically) until function has completed on other CPUs -* @cpu: the CPU where func should run * * Run a function on one processor. * * You must not call this function with disabled interrupts, from a * hardware interrupt handler or from a bottom half. */ -int smp_call_function_on (void (*func) (void *info),void *info,int nonatomic, -int wait,int cpu) +int smp_call_function_single (int cpu,void (*func) (void *info),void *info, +int nonatomic,int wait) { -cpumask_t map =CPU_MASK_NONE ; -preempt_disable (); -cpu_set (cpu, map); -__smp_call_function_map (func, info, nonatomic, wait, map); +__smp_call_function_map (func, info, nonatomic, wait, +cpumask_of_cpu (cpu));preempt_enable ();return 0 ; } -EXPORT_SYMBOL (smp_call_function_on); +EXPORT_SYMBOL (smp_call_function_single);static void do_send_stop (void ) {
arch/s390/kernel/sys_s390.c +20 -0
@@ -265,3 +265,23 @@ s390_fadvise64_64(struct fadvise64_64_args __user *args)return -EFAULT ;return sys_fadvise64_64 (a.fd, a.offset, a.len, a.advice); } + +#ifndef CONFIG_64BIT +/* +* This is a wrapper to call sys_fallocate(). For 31 bit s390 the last +* 64 bit argument "len" is split into the upper and lower 32 bits. The +* system call wrapper in the user space loads the value to %r6/%r7. +* The code in entry.S keeps the values in %r2 - %r6 where they are and +* stores %r7 to 96(%r15). But the standard C linkage requires that +* the whole 64 bit value for len is stored on the stack and doesn't +* use %r6 at all. So s390_fallocate has to convert the arguments from +* %r2: fd, %r3: mode, %r4/%r5: offset, %r6/96(%r15)-99(%r15): len +* to +* %r2: fd, %r3: mode, %r4/%r5: offset, 96(%r15)-103(%r15): len +*/ +asmlinkage long s390_fallocate (int fd,int mode,loff_t offset, +u32 len_high,u32 len_low) +{ +return sys_fallocate (fd, mode, offset, ((u64 )len_high <<32 ) | len_low); +} +#endif
arch/s390/kernel/syscalls.S +1 -1
@@ -322,7 +322,7 @@ NI_SYSCALL /* 310 sys_move_pages */ SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper) SYSCALL(sys_epoll_pwait,sys_epoll_pwait,compat_sys_epoll_pwait_wrapper) SYSCALL(sys_utimes,sys_utimes,compat_sys_utimes_wrapper) -NI_SYSCALL /* 314 sys_fallocate */ +SYSCALL(s390_fallocate,sys_fallocate,sys_fallocate_wrapper) SYSCALL(sys_utimensat,sys_utimensat,compat_sys_utimensat_wrapper) /* 315 */ SYSCALL(sys_signalfd,sys_signalfd,compat_sys_signalfd_wrapper) SYSCALL(sys_timerfd,sys_timerfd,compat_sys_timerfd_wrapper)
arch/s390/kernel/vmlinux.lds.S +1 -0
@@ -21,6 +21,7 @@ SECTIONS . = 0x00000000; _text = .; /* Text and read-only data */ .text : { + *(.text.head) TEXT_TEXT SCHED_TEXT LOCK_TEXT
arch/s390/kernel/vtime.c +1 -1
@@ -415,7 +415,7 @@ EXPORT_SYMBOL(add_virt_timer_periodic);/* * If we change a pending timer the function must be called on the CPU -* where the timer is running on, e.g. by smp_call_function_on() +* where the timer is running on, e.g. by smp_call_function_single() * * The original mod_timer adds the timer if it is not pending. For compatibility * we do the same. The timer will be added on the current CPU as a oneshot timer.
arch/s390/mm/vmem.c +3 -3
@@ -29,8 +29,8 @@ struct memory_segment {static LIST_HEAD (mem_segs); -void memmap_init (unsigned long size,int nid,unsigned long zone, -unsigned long start_pfn) +void __meminit memmap_init (unsigned long size,int nid,unsigned long zone, +unsigned long start_pfn) {struct page *start, *end;struct page *map_start, *map_end;
@@ -66,7 +66,7 @@ void memmap_init(unsigned long size, int nid, unsigned long zone, } } -static inline void *vmem_alloc_pages (unsigned int order) +static void __init_refok *vmem_alloc_pages(unsigned int order) {if (slab_is_available ())return (void *)__get_free_pages (GFP_KERNEL , order);
drivers/s390/char/Kconfig +3 -9
@@ -44,15 +44,9 @@ config CCW_CONSOLE depends on TN3215_CONSOLE || TN3270_CONSOLE default y -config SCLP - bool "Support for SCLP" - depends on S390 - help - Include support for the SCLP interface to the service element. - config SCLP_TTY bool "Support for SCLP line mode terminal" - depends on SCLP + depends on S390 help Include support for IBM SCLP line-mode terminals.
@@ -65,7 +59,7 @@ config SCLP_CONSOLE config SCLP_VT220_TTY bool "Support for SCLP VT220-compatible terminal" - depends on SCLP + depends on S390 help Include support for an IBM SCLP VT220-compatible terminal.
@@ -78,7 +72,7 @@ config SCLP_VT220_CONSOLE config SCLP_CPI tristate "Control-Program Identification" - depends on SCLP + depends on S390 help This option enables the hardware console interface for system identification. This is commonly used for workload management and
drivers/s390/char/raw3270.c +2 -4
@@ -147,8 +147,7 @@ raw3270_request_alloc(size_t size)* Allocate a new 3270 ccw request from bootmem. Only works very * early in the boot process. Only con3270.c should be using this. */ -struct raw3270_request * -raw3270_request_alloc_bootmem (size_t size) +struct raw3270_request __init *raw3270_request_alloc_bootmem (size_t size) {struct raw3270_request *rq;
@@ -848,8 +847,7 @@ raw3270_setup_device(struct ccw_device *cdev, struct raw3270 *rp, char *ascebc)/* * Setup 3270 device configured as console. */ -struct raw3270 * -raw3270_setup_console (struct ccw_device *cdev) +struct raw3270 __init *raw3270_setup_console (struct ccw_device *cdev) {struct raw3270 *rp;char *ascebc;
drivers/s390/char/sclp_vt220.c +1 -2
@@ -621,8 +621,7 @@ sclp_vt220_flush_buffer(struct tty_struct *tty)/* * Initialize all relevant components and register driver with system. */ -static int -__sclp_vt220_init (int early) +static int __init_refok __sclp_vt220_init(int early) {void *page;int i;
drivers/s390/cio/css.c +1 -1
@@ -109,7 +109,7 @@ css_subchannel_release(struct device *dev) } } -int css_sch_device_register (struct subchannel *sch) +static int css_sch_device_register (struct subchannel *sch) {int ret;
drivers/s390/cio/css.h +0 -1
@@ -139,7 +139,6 @@ struct css_driver {*/ extern struct bus_type css_bus_type; -extern int css_sch_device_register (struct subchannel *);extern void css_sch_device_unregister (struct subchannel *);extern struct subchannel *get_subchannel_by_schid (struct subchannel_id );extern int css_init_done;
drivers/s390/cio/device_ops.c +0 -257
274 lines not on this page · raw message
include/asm-s390/ccwdev.h +0 -5
@@ -165,11 +165,6 @@ extern int ccw_device_resume(struct ccw_device *);extern int ccw_device_halt (struct ccw_device *,unsigned long );extern int ccw_device_clear (struct ccw_device *,unsigned long ); -extern int __deprecated read_dev_chars (struct ccw_device *cdev,void **buffer,int length); -extern int __deprecated read_conf_data (struct ccw_device *cdev,void **buffer,int *length); -extern int __deprecated read_conf_data_lpm (struct ccw_device *cdev,void **buffer, -int *length,__u8 lpm); -extern int ccw_device_set_online (struct ccw_device *cdev);extern int ccw_device_set_offline (struct ccw_device *cdev);
include/asm-s390/s390_ext.h +2 -0
@@ -10,6 +10,8 @@* Martin Schwidefsky ([email protected]) */ +#include <linux/types.h> +typedef void (*ext_int_handler_t )(__u16 code);/*
include/asm-s390/smp.h +1 -10
@@ -36,8 +36,7 @@ extern void machine_halt_smp(void);extern void machine_power_off_smp (void );extern void smp_setup_cpu_possible_map (void ); -extern int smp_call_function_on (void (*func) (void *info),void *info, -int nonatomic,int wait,int cpu); +#define NO_PROC_ID 0xFF/* No processor magic marker */ /*
@@ -96,14 +95,6 @@ extern int __cpu_up (unsigned int cpu);#endif #ifndef CONFIG_SMP -static inline int -smp_call_function_on (void (*func) (void *info),void *info, -int nonatomic,int wait,int cpu) -{ -func (info); -return 0 ; -} -static inline void smp_send_stop (void ) {/* Disable all interrupts/machine checks */
include/asm-s390/unistd.h +1 -1
@@ -251,7 +251,7 @@#define __NR_getcpu 311#define __NR_epoll_pwait 312#define __NR_utimes 313 -/* Number 314 is reserved for new sys_fallocate */ +#define __NR_fallocate 314#define __NR_utimensat 315#define __NR_signalfd 316#define __NR_timerfd 317
net/iucv/iucv.c +8 -7
@@ -479,7 +479,8 @@ static void iucv_setmask_mp(void)/* Enable all cpus with a declared buffer. */ if (cpu_isset (cpu, iucv_buffer_cpumask) && !cpu_isset (cpu, iucv_irq_cpumask)) -smp_call_function_on (iucv_allow_cpu,NULL ,0 ,1 , cpu); +smp_call_function_single (cpu, iucv_allow_cpu, +NULL ,0 ,1 );preempt_enable (); }
@@ -497,7 +498,7 @@ static void iucv_setmask_up(void) cpumask = iucv_irq_cpumask;cpu_clear (first_cpu (iucv_irq_cpumask), cpumask);for_each_cpu_mask (cpu, cpumask) -smp_call_function_on (iucv_block_cpu,NULL ,0 ,1 , cpu); +smp_call_function_single (cpu, iucv_block_cpu,NULL ,0 ,1 ); }/**
@@ -522,7 +523,7 @@ static int iucv_enable(void) rc = -EIO ;preempt_disable ();for_each_online_cpu (cpu) -smp_call_function_on (iucv_declare_cpu,NULL ,0 ,1 , cpu); +smp_call_function_single (cpu, iucv_declare_cpu,NULL ,0 ,1 );preempt_enable ();if (cpus_empty (iucv_buffer_cpumask))/* No cpu could declare an iucv buffer. */
@@ -578,7 +579,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,case CPU_ONLINE_FROZEN :case CPU_DOWN_FAILED :case CPU_DOWN_FAILED_FROZEN : -smp_call_function_on (iucv_declare_cpu,NULL ,0 ,1 , cpu); +smp_call_function_single (cpu, iucv_declare_cpu,NULL ,0 ,1 );break ;case CPU_DOWN_PREPARE :case CPU_DOWN_PREPARE_FROZEN :
@@ -587,10 +588,10 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,if (cpus_empty (cpumask))/* Can't offline last IUCV enabled cpu. */ return NOTIFY_BAD ; -smp_call_function_on (iucv_retrieve_cpu,NULL ,0 ,1 , cpu); +smp_call_function_single (cpu, iucv_retrieve_cpu,NULL ,0 ,1 );if (cpus_empty (iucv_irq_cpumask)) -smp_call_function_on (iucv_allow_cpu,NULL ,0 ,1 , -first_cpu (iucv_buffer_cpumask)); +smp_call_function_single (first_cpu (iucv_buffer_cpumask), + iucv_allow_cpu,NULL ,0 ,1 );break ; }return NOTIFY_OK ;