Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73e8fb2d authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'work.const-qstr' into work.misc

parents 33e09f0e 3baf3289

arch/parisc/kernel/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ void flush_dcache_page(struct page *page) 
				      != (addr & (SHM_COLOUR - 1))) {

			__flush_cache_page(mpnt, addr, page_to_phys(page));

			if (old_addr)

				printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %s\n", old_addr, addr, mpnt->vm_file ? (char *)mpnt->vm_file->f_path.dentry->d_name.name : "(null)");

				printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %pD\n", old_addr, addr, mpnt->vm_file);

			old_addr = addr;

		}

	}

drivers/gpu/drm/drm_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ int drm_debugfs_create_files(const struct drm_info_list *files, int count, 
		ent = debugfs_create_file(files[i].name, S_IFREG | S_IRUGO,

					  root, tmp, &drm_debugfs_fops);

		if (!ent) {

			DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/%s\n",

				  root->d_name.name, files[i].name);

			DRM_ERROR("Cannot create /sys/kernel/debug/dri/%pd/%s\n",

				  root, files[i].name);

			kfree(tmp);

			ret = -1;

			goto fail;

drivers/gpu/drm/msm/msm_perf.c

+2 −2
Original line number Diff line number Diff line
@@ -229,8 +229,8 @@ int msm_perf_debugfs_init(struct drm_minor *minor) 
	perf->ent = debugfs_create_file("perf", S_IFREG | S_IRUGO,

			minor->debugfs_root, perf, &perf_debugfs_fops);

	if (!perf->ent) {

		DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/perf\n",

				minor->debugfs_root->d_name.name);

		DRM_ERROR("Cannot create /sys/kernel/debug/dri/%pd/perf\n",

				minor->debugfs_root);

		goto fail;

	}

drivers/gpu/drm/msm/msm_rd.c

+2 −2
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ int msm_rd_debugfs_init(struct drm_minor *minor) 
	rd->ent = debugfs_create_file("rd", S_IFREG | S_IRUGO,

			minor->debugfs_root, rd, &rd_debugfs_fops);

	if (!rd->ent) {

		DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/rd\n",

				minor->debugfs_root->d_name.name);

		DRM_ERROR("Cannot create /sys/kernel/debug/dri/%pd/rd\n",

				minor->debugfs_root);

		goto fail;

	}

drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c

+2 −4
Original line number Diff line number Diff line
@@ -2422,14 +2422,12 @@ int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir) 
	 */

	if (priv->mac80211_registered) {

		char buf[100];

		struct dentry *mac80211_dir, *dev_dir, *root_dir;

		struct dentry *mac80211_dir, *dev_dir;



		dev_dir = dbgfs_dir->d_parent;

		root_dir = dev_dir->d_parent;

		mac80211_dir = priv->hw->wiphy->debugfsdir;



		snprintf(buf, 100, "../../%s/%s", root_dir->d_name.name,

			 dev_dir->d_name.name);

		snprintf(buf, 100, "../../%pd2", dev_dir);



		if (!debugfs_create_symlink("iwlwifi", mac80211_dir, buf))

			goto err;