Commit a57c21c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  Driver-Core: extend devnode callbacks to provide permissions
parents e11c675e e454cea2

arch/x86/kernel/cpuid.c

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static struct notifier_block __refdata cpuid_class_cpu_notifier = 
	.notifier_call = cpuid_class_cpu_callback,

};



static char *cpuid_nodename(struct device *dev)

static char *cpuid_devnode(struct device *dev, mode_t *mode)

{

	return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt));

}
@@ -203,7 +203,7 @@ static int __init cpuid_init(void) 
		err = PTR_ERR(cpuid_class);

		goto out_chrdev;

	}

	cpuid_class->nodename = cpuid_nodename;

	cpuid_class->devnode = cpuid_devnode;

	for_each_online_cpu(i) {

		err = cpuid_device_create(i);

		if (err != 0)

arch/x86/kernel/microcode_core.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static const struct file_operations microcode_fops = { 
static struct miscdevice microcode_dev = {

	.minor			= MICROCODE_MINOR,

	.name			= "microcode",

	.devnode		= "cpu/microcode",

	.nodename		= "cpu/microcode",

	.fops			= &microcode_fops,

};

arch/x86/kernel/msr.c

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static struct notifier_block __refdata msr_class_cpu_notifier = { 
	.notifier_call = msr_class_cpu_callback,

};



static char *msr_nodename(struct device *dev)

static char *msr_devnode(struct device *dev, mode_t *mode)

{

	return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev->devt));

}
@@ -262,7 +262,7 @@ static int __init msr_init(void) 
		err = PTR_ERR(msr_class);

		goto out_chrdev;

	}

	msr_class->nodename = msr_nodename;

	msr_class->devnode = msr_devnode;

	for_each_online_cpu(i) {

		err = msr_device_create(i);

		if (err != 0)

block/bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ EXPORT_SYMBOL_GPL(bsg_register_queue); 


static struct cdev bsg_cdev;



static char *bsg_nodename(struct device *dev)

static char *bsg_devnode(struct device *dev, mode_t *mode)

{

	return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev));

}
@@ -1087,7 +1087,7 @@ static int __init bsg_init(void) 
		ret = PTR_ERR(bsg_class);

		goto destroy_kmemcache;

	}

	bsg_class->nodename = bsg_nodename;

	bsg_class->devnode = bsg_devnode;



	ret = alloc_chrdev_region(&devid, 0, BSG_MAX_DEVS, "bsg");

	if (ret)

block/genhd.c

+4 −4
Original line number Diff line number Diff line
@@ -998,12 +998,12 @@ struct class block_class = { 
	.name		= "block",

};



static char *block_nodename(struct device *dev)

static char *block_devnode(struct device *dev, mode_t *mode)

{

	struct gendisk *disk = dev_to_disk(dev);



	if (disk->nodename)

		return disk->nodename(disk);

	if (disk->devnode)

		return disk->devnode(disk, mode);

	return NULL;

}
@@ -1011,7 +1011,7 @@ static struct device_type disk_type = { 
	.name		= "disk",

	.groups		= disk_attr_groups,

	.release	= disk_release,

	.nodename	= block_nodename,

	.devnode	= block_devnode,

};



#ifdef CONFIG_PROC_FS