Merge v5.3-rc1 into drm-misc-next
Noralf needs some SPI patches in 5.3 to merge some work on tinydrm. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
This commit is contained in:
@@ -31,6 +31,7 @@
|
||||
#include <linux/module.h>
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/mount.h>
|
||||
#include <linux/pseudo_fs.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/srcu.h>
|
||||
|
||||
@@ -535,28 +536,15 @@ EXPORT_SYMBOL(drm_dev_unplug);
|
||||
static int drm_fs_cnt;
|
||||
static struct vfsmount *drm_fs_mnt;
|
||||
|
||||
static const struct dentry_operations drm_fs_dops = {
|
||||
.d_dname = simple_dname,
|
||||
};
|
||||
|
||||
static const struct super_operations drm_fs_sops = {
|
||||
.statfs = simple_statfs,
|
||||
};
|
||||
|
||||
static struct dentry *drm_fs_mount(struct file_system_type *fs_type, int flags,
|
||||
const char *dev_name, void *data)
|
||||
static int drm_fs_init_fs_context(struct fs_context *fc)
|
||||
{
|
||||
return mount_pseudo(fs_type,
|
||||
"drm:",
|
||||
&drm_fs_sops,
|
||||
&drm_fs_dops,
|
||||
0x010203ff);
|
||||
return init_pseudo(fc, 0x010203ff) ? 0 : -ENOMEM;
|
||||
}
|
||||
|
||||
static struct file_system_type drm_fs_type = {
|
||||
.name = "drm",
|
||||
.owner = THIS_MODULE,
|
||||
.mount = drm_fs_mount,
|
||||
.init_fs_context = drm_fs_init_fs_context,
|
||||
.kill_sb = kill_anon_super,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user