From 6e0613afdf2b3e751dc185c6e10af35a49951871 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 1 Aug 2008 16:39:18 +0200
Subject: [PATCH] --- yaml --- r: 107179 b: refs/heads/master c:
 d918fe2bd72830dfbe8ca2bb30d49930d1356e6d h: refs/heads/master i:   107177:
 50c8b1d0f1e176b494b16e38f3530681444b4165   107175:
 9ba59279e8eeb63bcec06fc8591f9ef8cfb64172 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/s390/kernel/mem_detect.c | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index f2dc4983892d..59fafcbb47d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b8e3004aea95c687e8991583e7b150ec1416ff3
+refs/heads/master: d918fe2bd72830dfbe8ca2bb30d49930d1356e6d
diff --git a/trunk/arch/s390/kernel/mem_detect.c b/trunk/arch/s390/kernel/mem_detect.c
index 18ed7abe16c5..9872999c66d1 100644
--- a/trunk/arch/s390/kernel/mem_detect.c
+++ b/trunk/arch/s390/kernel/mem_detect.c
@@ -9,27 +9,6 @@
 #include <asm/sclp.h>
 #include <asm/setup.h>
 
-static int memory_fast_detect(struct mem_chunk *chunk)
-{
-	unsigned long val0 = 0;
-	unsigned long val1 = 0xc;
-	int rc = -EOPNOTSUPP;
-
-	if (ipl_flags & IPL_NSS_VALID)
-		return -EOPNOTSUPP;
-	asm volatile(
-		"	diag	%1,%2,0x260\n"
-		"0:	lhi	%0,0\n"
-		"1:\n"
-		EX_TABLE(0b,1b)
-		: "+d" (rc), "+d" (val0), "+d" (val1) : : "cc");
-
-	if (rc || val0 != val1)
-		return -EOPNOTSUPP;
-	chunk->size = val0 + 1;
-	return 0;
-}
-
 static inline int tprot(unsigned long addr)
 {
 	int rc = -EFAULT;
@@ -84,8 +63,6 @@ void detect_memory_layout(struct mem_chunk chunk[])
 	unsigned long flags, cr0;
 
 	memset(chunk, 0, MEMORY_CHUNKS * sizeof(struct mem_chunk));
-	if (memory_fast_detect(&chunk[0]) == 0)
-		return;
 	/* Disable IRQs, DAT and low address protection so tprot does the
 	 * right thing and we don't get scheduled away with low address
 	 * protection disabled.