Commit 9873aed5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] Fix sclp_vt220 error handling.
  [S390] cio: Reorganize initialization.
  [S390] cio: Make CIO_* macros safe if dbfs are not available.
  [S390] cio: Clean up messages.
  [S390] Fix IRQ tracing.
  [S390] vmur: fix diag14_read.
  [S390] Wire up sys_fallocate.
  [S390] add types.h include to s390_ext.h
  [S390] cio: Remove deprecated rdc/rcd.
  [S390] Get rid of new section mismatch warnings.
  [S390] sclp: kill unused SCLP config option.
  [S390] cio: Remove remains of _ccw_device_get_device_number().
  [S390] cio: css_sch_device_register() can be made static.
  [S390] Improve __smp_call_function_map.
  [S390] Convert to smp_call_function_single.
parents 7b557376 5aaaf9f0

Documentation/feature-removal-schedule.txt

+0 −16
Original line number Diff line number Diff line
@@ -211,22 +211,6 @@ Who: Richard Purdie <rpurdie@rpsys.net> 


---------------------------



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 <cornelia.huck@de.ibm.com>



---------------------------



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
Original line number Diff line number Diff line
@@ -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,

			smp_call_function_single(i, add_virt_timer_periodic,

						 &per_cpu(appldata_timer, i),

					     0, 1, 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
Original line number Diff line number Diff line
@@ -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/entry.S

+4 −2
Original line number Diff line number Diff line
@@ -624,9 +624,11 @@ io_work_loop: 
# _TIF_MCCK_PENDING is set, call handler

#

io_mcck_pending:

	TRACE_IRQS_OFF

	l	%r1,BASED(.Ls390_handle_mcck)

	la	%r14,BASED(io_work_loop)

	br	%r1			# TIF bit will be cleared by handler

	basr	%r14,%r1		# TIF bit will be cleared by handler

	TRACE_IRQS_ON

	b	BASED(io_work_loop)



#

# _TIF_NEED_RESCHED is set, call schedule

arch/s390/kernel/entry64.S

+4 −2
Original line number Diff line number Diff line
@@ -611,8 +611,10 @@ io_work_loop: 
# _TIF_MCCK_PENDING is set, call handler

#

io_mcck_pending:

	larl	%r14,io_work_loop

	jg	s390_handle_mcck	# TIF bit will be cleared by handler

	TRACE_IRQS_OFF

	brasl	%r14,s390_handle_mcck	# TIF bit will be cleared by handler

	TRACE_IRQS_ON

	j	io_work_loop



#

# _TIF_NEED_RESCHED is set, call schedule