| From 4dc86ae1f925b2121d4e75058675895f83e54c71 Mon Sep 17 00:00:00 2001 |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| Date: Fri, 9 Apr 2010 10:05:33 -0700 |
| Subject: Revert "memory-hotplug: add 0x prefix to HEX block_size_bytes" |
| |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| |
| commit 4dc86ae1f925b2121d4e75058675895f83e54c71 upstream. |
| |
| This reverts commit ba168fc37dea145deeb8fa9e7e71c748d2e00d74. |
| |
| It changes user-visible sysfs interfaces, and breaks some existing user |
| space applications which apparently rely on the fact that the output |
| does not contain the "0x" prefix. |
| |
| Requested-by: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> |
| Acked-by: Wu Fengguang <fengguang.wu@intel.com> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/base/memory.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/base/memory.c |
| +++ b/drivers/base/memory.c |
| @@ -311,7 +311,7 @@ static SYSDEV_ATTR(removable, 0444, show |
| static ssize_t |
| print_block_size(struct class *class, 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 CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL); |
