summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 10:05:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 10:05:33 -0700
commit4dc86ae1f925b2121d4e75058675895f83e54c71 (patch)
tree21214eec08565e2f0a7afdb56d1d9293a3136b28 /drivers/base
parent9ddd3a31aedcdb55d5509b595c04b187041c8adb (diff)
downloadlinux-4dc86ae1f925b2121d4e75058675895f83e54c71.tar.gz
linux-4dc86ae1f925b2121d4e75058675895f83e54c71.tar.bz2
linux-4dc86ae1f925b2121d4e75058675895f83e54c71.zip
Revert "memory-hotplug: add 0x prefix to HEX block_size_bytes"
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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 4f4aa5897b4c..933442f40321 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -313,7 +313,7 @@ static ssize_t
print_block_size(struct sysdev_class *class, struct sysdev_class_attribute *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);