A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Browse source 
Pull s390 fixes from Martin Schwidefsky:

 - convert the debug feature to refcount_t

 - reduce the copy size for strncpy_from_user

 - 8 bug fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/virtio: change virtio_feature_desc:features type to __le32
  s390: convert debug_info.ref_count from atomic_t to refcount_t
  s390: move _text symbol to address higher than zero
  s390/qdio: increase string buffer size
  s390/ccwgroup: increase string buffer size
  s390/topology: let topology_mnest_limit() return unsigned char
  s390/uaccess: use sane length for __strncpy_from_user()
  s390/uprobes: fix compile for !KPROBES
  s390/ftrace: fix compile for !MODULES
  s390/cputime: fix incorrect system time
This commit is contained in:
Linus Torvalds 2017-05-16 09:24:44 -07:00
commit 2b6b38b04c
13 changed files with 55 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/s390/cio/ccwgroup.c
View file

@ -35,7 +35,7 @@ static struct bus_type ccwgroup_bus_type;
static void __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
{
int i;
char str[8];
char str[16];
for (i = 0; i < gdev->count; i++) {
sprintf(str, "cdev%d", i);
@ -238,7 +238,7 @@ static void ccwgroup_release(struct device *dev)
static int __ccwgroup_create_symlinks(struct ccwgroup_device *gdev)
{
char str[8];
char str[16];
int i, rc;
for (i = 0; i < gdev->count; i++) {

2
drivers/s390/cio/qdio_debug.h
View file

@ -11,7 +11,7 @@
#include "qdio.h"
/* that gives us 15 characters in the text event views */
#define QDIO_DBF_LEN 16
#define QDIO_DBF_LEN 32
extern debug_info_t *qdio_dbf_setup;
extern debug_info_t *qdio_dbf_error;

2
drivers/s390/virtio/virtio_ccw.c
View file

@ -87,7 +87,7 @@ struct vq_info_block {
} __packed;
struct virtio_feature_desc {
__u32 features;
__le32 features;
__u8 index;
} __packed;