summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-27 10:28:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-27 10:28:34 -0700
commit005fbcd03458b6c0044f65c1fe8d8a68d726a321 (patch)
tree60265e75c50f3acf802e195363f44b8a10acdf80 /arch
parentfefb82756e9fd89d0c0d5983e056df81d51eb075 (diff)
parent0c8c77d35582c3f7989f1316368da5ae7f14ad4b (diff)
downloadlinux-005fbcd03458b6c0044f65c1fe8d8a68d726a321.tar.bz2
Merge tag 'driver-core-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH: "Here are some kernfs fixes for 3.15-rc3 that resolve some reported problems. Nothing huge, but all needed" * tag 'driver-core-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: s390/ccwgroup: Fix memory corruption kernfs: add back missing error check in kernfs_fop_mmap() kernfs: fix a subdir count leak
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/include/asm/ccwgroup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h
index 6e670f88d125..ebc2913f9ee0 100644
--- a/arch/s390/include/asm/ccwgroup.h
+++ b/arch/s390/include/asm/ccwgroup.h
@@ -22,8 +22,8 @@ struct ccwgroup_device {
/* public: */
unsigned int count;
struct device dev;
- struct ccw_device *cdev[0];
struct work_struct ungroup_work;
+ struct ccw_device *cdev[0];
};
/**