summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2010-03-15 00:35:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-17 18:43:47 -0700
commit57b552ba0b2faf7cce66d476ef8ce7f6210c62fd (patch)
treee9ce4977fdf2259bd5c860b3358261f8f3522c5f
parentbc32df00894f0e1dbf583cc3dab210d2969b078a (diff)
downloadlinux-3.10-57b552ba0b2faf7cce66d476ef8ce7f6210c62fd.tar.gz
linux-3.10-57b552ba0b2faf7cce66d476ef8ce7f6210c62fd.tar.bz2
linux-3.10-57b552ba0b2faf7cce66d476ef8ce7f6210c62fd.zip
memory hotplug/s390: set phys_device
Implement arch specific arch_get_memory_phys_device function and initialize phys_device for each memory section. That way we finally can tell which piece of memory belongs to which physical device. This makes s390's /sys/devices/system/memory/memoryX/phys_device display the correct thing? Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Dave Hansen <haveblue@us.ibm.com> Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/s390/char/sclp_cmd.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index b3beab610da..fc7ae05ce48 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -704,6 +704,13 @@ int sclp_chp_deconfigure(struct chp_id chpid)
return do_chp_configure(SCLP_CMDW_DECONFIGURE_CHPATH | chpid.id << 8);
}
+int arch_get_memory_phys_device(unsigned long start_pfn)
+{
+ if (!rzm)
+ return 0;
+ return PFN_PHYS(start_pfn) / rzm;
+}
+
struct chp_info_sccb {
struct sccb_header header;
u8 recognized[SCLP_CHP_INFO_MASK_SIZE];