diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-19 13:10:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-19 13:10:59 -0800 |
| commit | e3d8ede9fb45981a1d013051f14610f98764eb6b (patch) | |
| tree | f4dc3be154f5d584b7e69e454724f9c7d7673c05 | |
| parent | 2b55f366f2eedfe07057e4569a33ca4e5f7a87b8 (diff) | |
| download | patches-e3d8ede9fb45981a1d013051f14610f98764eb6b.tar.gz | |
revert patch in Linus's tree
| -rw-r--r-- | driver-core.current/revert-sysdev-fix-prototype-for-memory_sysdev_class-show-store-functions.patch | 118 | ||||
| -rw-r--r-- | series | 2 |
2 files changed, 120 insertions, 0 deletions
diff --git a/driver-core.current/revert-sysdev-fix-prototype-for-memory_sysdev_class-show-store-functions.patch b/driver-core.current/revert-sysdev-fix-prototype-for-memory_sysdev_class-show-store-functions.patch new file mode 100644 index 00000000000000..2615396db9cb77 --- /dev/null +++ b/driver-core.current/revert-sysdev-fix-prototype-for-memory_sysdev_class-show-store-functions.patch @@ -0,0 +1,118 @@ +From 97e0ddd0fc6f6f8b82ebdd55e168f9977bd306c0 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@suse.de> +Date: Tue, 19 Jan 2010 13:08:16 -0800 +Subject: [PATCH] Revert "sysdev: fix prototype for memory_sysdev_class show/store functions" + +This reverts commit 8ff410daa009c4b44be445ded5b0cec00abc0426 + +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: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/base/memory.c | 32 ++++++++++++-------------------- + 1 file changed, 12 insertions(+), 20 deletions(-) + +--- a/drivers/base/memory.c ++++ b/drivers/base/memory.c +@@ -309,19 +309,17 @@ static SYSDEV_ATTR(removable, 0444, show + * 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 * + + 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_cl + + /* 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_cl + 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 @@ -9,10 +9,12 @@ gregkh/gkh-version.patch ################################# # Driver core patches for 2.6.33 ################################# +driver-core.current/revert-sysdev-fix-prototype-for-memory_sysdev_class-show-store-functions.patch ################################# # TTY patches for 2.6.33 ################################# + tty.current/serial-imx-bit-confusion.patch tty.current/serial-core-resume-serial-hardware-with-no_console_suspend.patch tty.current/tty-fix-race-in-tty_fasync.patch |