mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z
This commit is contained in:
commit
ece2ccb668
375 changed files with 1008 additions and 1471 deletions
|
|
@ -15,7 +15,6 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/kmod.h>
|
||||
#include <linux/kobj_map.h>
|
||||
#include <linux/buffer_head.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/idr.h>
|
||||
#include <linux/log2.h>
|
||||
|
|
@ -507,7 +506,7 @@ static int exact_lock(dev_t devt, void *data)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void register_disk(struct gendisk *disk)
|
||||
static void register_disk(struct gendisk *disk)
|
||||
{
|
||||
struct device *ddev = disk_to_dev(disk);
|
||||
struct block_device *bdev;
|
||||
|
|
@ -1109,7 +1108,7 @@ struct class block_class = {
|
|||
.name = "block",
|
||||
};
|
||||
|
||||
static char *block_devnode(struct device *dev, mode_t *mode)
|
||||
static char *block_devnode(struct device *dev, umode_t *mode)
|
||||
{
|
||||
struct gendisk *disk = dev_to_disk(dev);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue