s390 patches for the 3.6-rc4

GIT PULL Martin Schwidefsky 1 participant 1 message Aug 31, 2012

Subsystems (3)

s390 exec and binfmt s390 DASD driver

lore

Share & tools

lore

Martin Schwidefsky

author

2012-08-31 08:13 UTC #0 lore raw

Hi Linus,

please pull from the 'for-linus' branch of

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus

to receive a couple of s390 bug fixes for 3.5-rc4:

Geert Uytterhoeven (1):
s390: Always use "long" for ssize_t to match size_t

Heiko Carstens (3):
s390/dasd: fix ioctl return value s390/smp: add missing smp_store_status() for !SMP s390/32: Don't clobber personality flags on exec

 arch/s390/include/asm/elf.h         |    3 ++-
 arch/s390/include/asm/posix_types.h |    3 +--
 arch/s390/include/asm/smp.h         |    1 +
 drivers/s390/block/dasd_eckd.c      |    2 +-
 drivers/s390/block/dasd_ioctl.c     |    7 ++-----
 5 files changed, 7 insertions(+), 9 deletions(-)

arch/s390/include/asm/elf.h +2 -1

index 32e8449..9b94a16 100644
@@ -180,7 +180,8 @@ extern char elf_platform[];
 #define ELF_PLATFORM (elf_platform)
 
 #ifndef CONFIG_64BIT
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 #else /* CONFIG_64BIT */
 #define SET_PERSONALITY(ex)					\
 do {								\

arch/s390/include/asm/posix_types.h +1 -2

index 7bcc14e..bf2a2ad 100644
@@ -13,6 +13,7 @@
  */
 
 typedef unsigned long   __kernel_size_t;
+typedef long            __kernel_ssize_t;
 #define __kernel_size_t __kernel_size_t
 
 typedef unsigned short	__kernel_old_dev_t;

@@ -25,7 +26,6 @@ typedef unsigned short  __kernel_mode_t;
 typedef unsigned short  __kernel_ipc_pid_t;
 typedef unsigned short  __kernel_uid_t;
 typedef unsigned short  __kernel_gid_t;
-typedef int             __kernel_ssize_t;
 typedef int             __kernel_ptrdiff_t;
 
 #else /* __s390x__ */

@@ -35,7 +35,6 @@ typedef unsigned int    __kernel_mode_t;
 typedef int             __kernel_ipc_pid_t;
 typedef unsigned int    __kernel_uid_t;
 typedef unsigned int    __kernel_gid_t;
-typedef long            __kernel_ssize_t;
 typedef long            __kernel_ptrdiff_t;
 typedef unsigned long   __kernel_sigset_t;      /* at least 32 bits */

arch/s390/include/asm/smp.h +1 -0

index a0a8340..ce26ac3 100644
@@ -44,6 +44,7 @@ static inline void smp_call_online_cpu(void (*func)(void *), void *data)
 }
 
 static inline int smp_find_processor_id(int address) { return 0; }
+static inline int smp_store_status(int cpu) { return 0; }
 static inline int smp_vcpu_scheduled(int cpu) { return 1; }
 static inline void smp_yield_cpu(int cpu) { }
 static inline void smp_yield(void) { }

drivers/s390/block/dasd_eckd.c +1 -1

index 40a826a..2fb2b9e 100644
@@ -3804,7 +3804,7 @@ dasd_eckd_ioctl(struct dasd_block *block, unsigned int cmd, void __user *argp)
 	case BIODASDSYMMIO:
 		return dasd_symm_io(device, argp);
 	default:
-		return -ENOIOCTLCMD;
+		return -ENOTTY;
 	}
 }

drivers/s390/block/dasd_ioctl.c +2 -5

index cceae70..654c692 100644
@@ -498,12 +498,9 @@ int dasd_ioctl(struct block_device *bdev, fmode_t mode,
 		break;
 	default:
 		/* if the discipline has an ioctl method try it. */
-		if (base->discipline->ioctl) {
+		rc = -ENOTTY;
+		if (base->discipline->ioctl)
 			rc = base->discipline->ioctl(block, cmd, argp);
-			if (rc == -ENOIOCTLCMD)
-				rc = -EINVAL;
-		} else
-			rc = -EINVAL;
 	}
 	dasd_put_device(base);
 	return rc;