Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 (f8c7e6c2) · Commits · 戴 / test

drivers/base/devtmpfs.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -354,6 +354,7 @@ int __init devtmpfs_init(void)
		{
		int err;
		struct vfsmount *mnt;
		char options[] = "mode=0755";

		err = register_filesystem(&dev_fs_type);
		if (err) {
		@@ -362,7 +363,7 @@ int __init devtmpfs_init(void)
		return err;
		}

		mnt = kern_mount_data(&dev_fs_type, "mode=0755");
		mnt = kern_mount_data(&dev_fs_type, options);
		if (IS_ERR(mnt)) {
		err = PTR_ERR(mnt);
		printk(KERN_ERR "devtmpfs: unable to create devtmpfs %i\n", err);

drivers/base/memory.c

+12 −20

Original line number	Diff line number	Diff line
		@@ -309,19 +309,17 @@ static SYSDEV_ATTR(removable, 0444, show_mem_removable, NULL);
		* Block size attribute stuff
		*/
		static ssize_t
		print_block_size(struct sysdev_class *class,
		struct sysdev_class_attribute *class_attr,
		char *buf)
		print_block_size(struct class class, char buf)
		{
		return sprintf(buf, "%#lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
		}

		static SYSDEV_CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
		static CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);

		static int block_size_init(void)
		{
		return sysfs_create_file(&memory_sysdev_class.kset.kobj,
		&attr_block_size_bytes.attr);
		&class_attr_block_size_bytes.attr);
		}

		/*
		@@ -332,9 +330,7 @@ static int block_size_init(void)
		*/
		#ifdef CONFIG_ARCH_MEMORY_PROBE
		static ssize_t
		memory_probe_store(struct sysdev_class *class,
		struct sysdev_class_attribute *class_attr,
		const char *buf, size_t count)
		memory_probe_store(struct class class, const char buf, size_t count)
		{
		u64 phys_addr;
		int nid;
		@@ -350,12 +346,12 @@ memory_probe_store(struct sysdev_class *class,

		return count;
		}
		static SYSDEV_CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store);
		static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store);

		static int memory_probe_init(void)
		{
		return sysfs_create_file(&memory_sysdev_class.kset.kobj,
		&attr_probe.attr);
		&class_attr_probe.attr);
		}
		#else
		static inline int memory_probe_init(void)
		@@ -371,9 +367,7 @@ static inline int memory_probe_init(void)

		/* Soft offline a page */
		static ssize_t
		store_soft_offline_page(struct sysdev_class *class,
		struct sysdev_class_attribute *class_attr,
		const char *buf, size_t count)
		store_soft_offline_page(struct class class, const char buf, size_t count)
		{
		int ret;
		u64 pfn;
		@@ -390,9 +384,7 @@ store_soft_offline_page(struct sysdev_class *class,

		/* Forcibly offline a page, including killing processes. */
		static ssize_t
		store_hard_offline_page(struct sysdev_class *class,
		struct sysdev_class_attribute *class_attr,
		const char *buf, size_t count)
		store_hard_offline_page(struct class class, const char buf, size_t count)
		{
		int ret;
		u64 pfn;
		@@ -405,18 +397,18 @@ store_hard_offline_page(struct sysdev_class *class,
		return ret ? ret : count;
		}

		static SYSDEV_CLASS_ATTR(soft_offline_page, 0644, NULL, store_soft_offline_page);
		static SYSDEV_CLASS_ATTR(hard_offline_page, 0644, NULL, store_hard_offline_page);
		static CLASS_ATTR(soft_offline_page, 0644, NULL, store_soft_offline_page);
		static CLASS_ATTR(hard_offline_page, 0644, NULL, store_hard_offline_page);

		static __init int memory_fail_init(void)
		{
		int err;

		err = sysfs_create_file(&memory_sysdev_class.kset.kobj,
		&attr_soft_offline_page.attr);
		&class_attr_soft_offline_page.attr);
		if (!err)
		err = sysfs_create_file(&memory_sysdev_class.kset.kobj,
		&attr_hard_offline_page.attr);
		&class_attr_hard_offline_page.attr);
		return err;
		}
		#else

Admin message