[PATCH] s390: arch update

 - New default configuration.
 - Fix get_tv32/put_tv32.
 - Replace generic dma-mapping file with empty one.
 - Remove wrong comment from dma.h.

arch/s390/defconfig

@@ -20,6 +20,7 @@ CONFIG_SYSVIPC=y
 CONFIG_SYSCTL=y
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_EMBEDDED is not set
+# CONFIG_KALLSYMS is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 
@@ -169,7 +170,7 @@ CONFIG_IP_MULTICAST=y
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
@@ -180,7 +181,7 @@ CONFIG_IPV6=m
 #
 # SCTP Configuration (EXPERIMENTAL)
 #
-CONFIG_IPV6_SCTP__=m
+CONFIG_IPV6_SCTP__=y
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
@@ -383,7 +384,6 @@ CONFIG_IBM_PARTITION=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_KALLSYMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 
 #

arch/s390/kernel/compat_linux.c

@@ -250,14 +250,14 @@ asmlinkage long sys32_getegid16(void)
 static inline long get_tv32(struct timeval *o, struct compat_timeval *i)
 {
 	return (!access_ok(VERIFY_READ, tv32, sizeof(*tv32)) ||
-		(__get_user(o->tv_sec, &i->tv_sec) |
+		(__get_user(o->tv_sec, &i->tv_sec) ||
 		 __get_user(o->tv_usec, &i->tv_usec)));
 }
 
 static inline long put_tv32(struct compat_timeval *o, struct timeval *i)
 {
 	return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) ||
-		(__put_user(i->tv_sec, &o->tv_sec) |
+		(__put_user(i->tv_sec, &o->tv_sec) ||
 		 __put_user(i->tv_usec, &o->tv_usec)));
 }
 

include/asm-s390/dma-mapping.h

-#include <asm-generic/dma-mapping.h>
+/*
+ *  include/asm-s390/dma-mapping.h
+ *
+ *  S390 version
+ *
+ *  This file exists so that #include <dma-mapping.h> doesn't break anything.
+ */
+
+#ifndef _ASM_DMA_MAPPING_H
+#define _ASM_DMA_MAPPING_H
+#endif /* _ASM_DMA_MAPPING_H */

include/asm-s390/dma.h

@@ -2,8 +2,6 @@
  *  include/asm-s390/dma.h
  *
  *  S390 version
- *
- *  This file exists so that an #include <dma.h> doesn't break anything.
  */
 
 #ifndef _ASM_DMA_H