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

Commit bd796671 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "sysdev: fix prototype for memory_sysdev_class show/store functions" 



This reverts commit 8ff410da

It should not have been sent to Linus's tree yet, as it depends
on changes that are queued up in my driver-core for the .34 kernel
merge.

Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: "Zheng, Shaohui" <shaohui.zheng@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f776c5ec

drivers/base/memory.c

+12 −20
Original line number Original line Diff line number Diff line
@@ -309,19 +309,17 @@ static SYSDEV_ATTR(removable, 0444, show_mem_removable, NULL); 
 * Block size attribute stuff

 * Block size attribute stuff

 */

 */

static ssize_t

static ssize_t

print_block_size(struct sysdev_class *class,

print_block_size(struct class *class, char *buf)

		 struct sysdev_class_attribute *class_attr,

		 char *buf)

{

{

	return sprintf(buf, "%#lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);

	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)

static int block_size_init(void)

{

{

	return sysfs_create_file(&memory_sysdev_class.kset.kobj,

	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

#ifdef CONFIG_ARCH_MEMORY_PROBE

static ssize_t

static ssize_t

memory_probe_store(struct sysdev_class *class,

memory_probe_store(struct class *class, const char *buf, size_t count)

		   struct sysdev_class_attribute *class_attr,

		   const char *buf, size_t count)

{

{

	u64 phys_addr;

	u64 phys_addr;

	int nid;

	int nid;
@@ -350,12 +346,12 @@ memory_probe_store(struct sysdev_class *class, 




	return count;

	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)

static int memory_probe_init(void)

{

{

	return sysfs_create_file(&memory_sysdev_class.kset.kobj,

	return sysfs_create_file(&memory_sysdev_class.kset.kobj,

				&attr_probe.attr);

				&class_attr_probe.attr);

}

}

#else

#else

static inline int memory_probe_init(void)

static inline int memory_probe_init(void)
@@ -371,9 +367,7 @@ static inline int memory_probe_init(void) 




/* Soft offline a page */

/* Soft offline a page */

static ssize_t

static ssize_t

store_soft_offline_page(struct sysdev_class *class,

store_soft_offline_page(struct class *class, const char *buf, size_t count)

			struct sysdev_class_attribute *class_attr,

			const char *buf, size_t count)

{

{

	int ret;

	int ret;

	u64 pfn;

	u64 pfn;
@@ -390,9 +384,7 @@ store_soft_offline_page(struct sysdev_class *class, 




/* Forcibly offline a page, including killing processes. */

/* Forcibly offline a page, including killing processes. */

static ssize_t

static ssize_t

store_hard_offline_page(struct sysdev_class *class,

store_hard_offline_page(struct class *class, const char *buf, size_t count)

			struct sysdev_class_attribute *class_attr,

			const char *buf, size_t count)

{

{

	int ret;

	int ret;

	u64 pfn;

	u64 pfn;
@@ -405,18 +397,18 @@ store_hard_offline_page(struct sysdev_class *class, 
	return ret ? ret : count;

	return ret ? ret : count;

}

}





static SYSDEV_CLASS_ATTR(soft_offline_page, 0644, NULL, store_soft_offline_page);

static 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(hard_offline_page, 0644, NULL, store_hard_offline_page);





static __init int memory_fail_init(void)

static __init int memory_fail_init(void)

{

{

	int err;

	int err;





	err = sysfs_create_file(&memory_sysdev_class.kset.kobj,

	err = sysfs_create_file(&memory_sysdev_class.kset.kobj,

				&attr_soft_offline_page.attr);

				&class_attr_soft_offline_page.attr);

	if (!err)

	if (!err)

		err = sysfs_create_file(&memory_sysdev_class.kset.kobj,

		err = sysfs_create_file(&memory_sysdev_class.kset.kobj,

				&attr_hard_offline_page.attr);

				&class_attr_hard_offline_page.attr);

	return err;

	return err;

}

}

#else

#else