Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"A couple of s390 bug fixes for 3.5-rc4"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/32: Don't clobber personality flags on exec
s390/smp: add missing smp_store_status() for !SMP
s390/dasd: fix ioctl return value
s390: Always use "long" for ssize_t to match size_t
+7
-9
+2
-1
arch/s390/include/asm/elf.h
+2
-1
arch/s390/include/asm/elf.h
···
180
180
#define ELF_PLATFORM (elf_platform)
181
181
182
182
#ifndef CONFIG_64BIT
183
-
#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
183
+
#define SET_PERSONALITY(ex) \
184
+
set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
184
185
#else /* CONFIG_64BIT */
185
186
#define SET_PERSONALITY(ex) \
186
187
do { \
+1
-2
arch/s390/include/asm/posix_types.h
+1
-2
arch/s390/include/asm/posix_types.h
···
13
13
*/
14
14
15
15
typedef unsigned long __kernel_size_t;
16
+
typedef long __kernel_ssize_t;
16
17
#define __kernel_size_t __kernel_size_t
17
18
18
19
typedef unsigned short __kernel_old_dev_t;
···
26
25
typedef unsigned short __kernel_ipc_pid_t;
27
26
typedef unsigned short __kernel_uid_t;
28
27
typedef unsigned short __kernel_gid_t;
29
-
typedef int __kernel_ssize_t;
30
28
typedef int __kernel_ptrdiff_t;
31
29
32
30
#else /* __s390x__ */
···
35
35
typedef int __kernel_ipc_pid_t;
36
36
typedef unsigned int __kernel_uid_t;
37
37
typedef unsigned int __kernel_gid_t;
38
-
typedef long __kernel_ssize_t;
39
38
typedef long __kernel_ptrdiff_t;
40
39
typedef unsigned long __kernel_sigset_t; /* at least 32 bits */
41
40
+1
arch/s390/include/asm/smp.h
+1
arch/s390/include/asm/smp.h
···
44
44
}
45
45
46
46
static inline int smp_find_processor_id(int address) { return 0; }
47
+
static inline int smp_store_status(int cpu) { return 0; }
47
48
static inline int smp_vcpu_scheduled(int cpu) { return 1; }
48
49
static inline void smp_yield_cpu(int cpu) { }
49
50
static inline void smp_yield(void) { }
+1
-1
drivers/s390/block/dasd_eckd.c
+1
-1
drivers/s390/block/dasd_eckd.c
+2
-5
drivers/s390/block/dasd_ioctl.c
+2
-5
drivers/s390/block/dasd_ioctl.c
···
498
498
break;
499
499
default:
500
500
/* if the discipline has an ioctl method try it. */
501
-
if (base->discipline->ioctl) {
501
+
rc = -ENOTTY;
502
+
if (base->discipline->ioctl)
502
503
rc = base->discipline->ioctl(block, cmd, argp);
503
-
if (rc == -ENOIOCTLCMD)
504
-
rc = -EINVAL;
505
-
} else
506
-
rc = -EINVAL;
507
504
}
508
505
dasd_put_device(base);
509
506
return rc;