From b0a979e8d187297187d0945150bd6283958ae13b Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 15 Mar 2010 00:35:05 -0400
Subject: [PATCH] --- yaml --- r: 188108 b: refs/heads/master c:
 57b552ba0b2faf7cce66d476ef8ce7f6210c62fd h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/char/sclp_cmd.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 644c71ed7e16..28eef07d9ad0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc32df00894f0e1dbf583cc3dab210d2969b078a
+refs/heads/master: 57b552ba0b2faf7cce66d476ef8ce7f6210c62fd
diff --git a/trunk/drivers/s390/char/sclp_cmd.c b/trunk/drivers/s390/char/sclp_cmd.c
index b3beab610da4..fc7ae05ce48a 100644
--- a/trunk/drivers/s390/char/sclp_cmd.c
+++ b/trunk/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];