Commit 3c443cbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents
  [S390] smsgiucv: declare char pointers as "const"
  [S390] dasd: automatic recognition of read-only devices
  [S390] remove unused qdio flags in zfcp and qeth
  [S390] Cleanup xtime usage
  [S390] qdio: add missing bracket
  [S390] cio: fix init_count in case of recognition after steal lock
  [S390] dasd: security and PSF update patch for EMC CKD ioctl
  [S390] hvc_iucv: allocate memory buffers for IUCV in zone DMA
  [S390] uaccess: make sure copy_from_user_overflow is builtin
parents d4014030 1ffaa640

arch/s390/include/asm/qdio.h

+0 −7
Original line number Diff line number Diff line
@@ -321,11 +321,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int, 
#define QDIO_ERROR_ACTIVATE_CHECK_CONDITION	0x40

#define QDIO_ERROR_SLSB_STATE			0x80



/* for qdio_initialize */

#define QDIO_INBOUND_0COPY_SBALS		0x01

#define QDIO_OUTBOUND_0COPY_SBALS		0x02

#define QDIO_USE_OUTBOUND_PCIS			0x04



/* for qdio_cleanup */

#define QDIO_FLAG_CLEANUP_USING_CLEAR		0x01

#define QDIO_FLAG_CLEANUP_USING_HALT		0x02
@@ -344,7 +339,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int, 
 * @input_handler: handler to be called for input queues

 * @output_handler: handler to be called for output queues

 * @int_parm: interruption parameter

 * @flags: initialization flags

 * @input_sbal_addr_array:  address of no_input_qs * 128 pointers

 * @output_sbal_addr_array: address of no_output_qs * 128 pointers

 */
@@ -361,7 +355,6 @@ struct qdio_initialize { 
	qdio_handler_t *input_handler;

	qdio_handler_t *output_handler;

	unsigned long int_parm;

	unsigned long flags;

	void **input_sbal_addr_array;

	void **output_sbal_addr_array;

};

arch/s390/kernel/time.c

+5 −5
Original line number Diff line number Diff line
@@ -73,15 +73,15 @@ unsigned long long monotonic_clock(void) 
}

EXPORT_SYMBOL(monotonic_clock);



void tod_to_timeval(__u64 todval, struct timespec *xtime)

void tod_to_timeval(__u64 todval, struct timespec *xt)

{

	unsigned long long sec;



	sec = todval >> 12;

	do_div(sec, 1000000);

	xtime->tv_sec = sec;

	xt->tv_sec = sec;

	todval -= (sec * 1000000) << 12;

	xtime->tv_nsec = ((todval * 1000) >> 12);

	xt->tv_nsec = ((todval * 1000) >> 12);

}

EXPORT_SYMBOL(tod_to_timeval);
@@ -216,8 +216,8 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, 
	++vdso_data->tb_update_count;

	smp_wmb();

	vdso_data->xtime_tod_stamp = clock->cycle_last;

	vdso_data->xtime_clock_sec = xtime.tv_sec;

	vdso_data->xtime_clock_nsec = xtime.tv_nsec;

	vdso_data->xtime_clock_sec = wall_time->tv_sec;

	vdso_data->xtime_clock_nsec = wall_time->tv_nsec;

	vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec;

	vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec;

	smp_wmb();

arch/s390/lib/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Makefile for s390-specific library files..

#



lib-y += delay.o string.o uaccess_std.o uaccess_pt.o usercopy.o

lib-y += delay.o string.o uaccess_std.o uaccess_pt.o

obj-y += usercopy.o

obj-$(CONFIG_32BIT) += div64.o qrnnd.o ucmpdi2.o

lib-$(CONFIG_64BIT) += uaccess_mvcos.o

lib-$(CONFIG_SMP) += spinlock.o

arch/s390/mm/cmm.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static struct ctl_table cmm_dir_table[] = { 
#ifdef CONFIG_CMM_IUCV

#define SMSG_PREFIX "CMM"

static void

cmm_smsg_target(char *from, char *msg)

cmm_smsg_target(const char *from, char *msg)

{

	long nr, seconds;

drivers/char/hvc_iucv.c

+4 −2
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ struct hvc_iucv_private *hvc_iucv_get_private(uint32_t num) 
 *

 * This function allocates a new struct iucv_tty_buffer element and, optionally,

 * allocates an internal data buffer with the specified size @size.

 * The internal data buffer is always allocated with GFP_DMA which is

 * required for receiving and sending data with IUCV.

 * Note: The total message size arises from the internal buffer size and the

 *	 members of the iucv_tty_msg structure.

 * The function returns NULL if memory allocation has failed.
@@ -154,7 +156,7 @@ static struct iucv_tty_buffer *alloc_tty_buffer(size_t size, gfp_t flags) 


	if (size > 0) {

		bufp->msg.length = MSG_SIZE(size);

		bufp->mbuf = kmalloc(bufp->msg.length, flags);

		bufp->mbuf = kmalloc(bufp->msg.length, flags | GFP_DMA);

		if (!bufp->mbuf) {

			mempool_free(bufp, hvc_iucv_mempool);

			return NULL;
@@ -237,7 +239,7 @@ static int hvc_iucv_write(struct hvc_iucv_private *priv, 
	if (!rb->mbuf) { /* message not yet received ... */

		/* allocate mem to store msg data; if no memory is available

		 * then leave the buffer on the list and re-try later */

		rb->mbuf = kmalloc(rb->msg.length, GFP_ATOMIC);

		rb->mbuf = kmalloc(rb->msg.length, GFP_ATOMIC | GFP_DMA);

		if (!rb->mbuf)

			return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE