From 4e78df036f17829d6f47fa09305c80824ec65ae5 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 27 Dec 2011 11:27:17 +0100
Subject: [PATCH] --- yaml --- r: 280625 b: refs/heads/master c:
 679e2ea73366cac81ede4104e6d3048cb806df2c h: refs/heads/master i:   280623:
 9a572402ff0f07cab02ee356e8aaa19838401286 v: v3

---
 [refs]                                    |  2 +-
 trunk/Documentation/dontdiff              |  1 -
 trunk/Documentation/s390/Debugging390.txt | 34 -----------------------
 trunk/arch/s390/boot/Makefile             |  2 +-
 4 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/[refs] b/[refs]
index ee12e50f08a5..0ad31c8edab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d68bddb7329a4d47d950d6b0745a7e274d230ed4
+refs/heads/master: 679e2ea73366cac81ede4104e6d3048cb806df2c
diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff
index dfa6fc6e4b28..0c083c5c2faa 100644
--- a/trunk/Documentation/dontdiff
+++ b/trunk/Documentation/dontdiff
@@ -66,7 +66,6 @@ GRTAGS
 GSYMS
 GTAGS
 Image
-Kerntypes
 Module.markers
 Module.symvers
 PENDING
diff --git a/trunk/Documentation/s390/Debugging390.txt b/trunk/Documentation/s390/Debugging390.txt
index efe998becc5b..462321c1aeea 100644
--- a/trunk/Documentation/s390/Debugging390.txt
+++ b/trunk/Documentation/s390/Debugging390.txt
@@ -41,7 +41,6 @@ ldd
 Debugging modules
 The proc file system
 Starting points for debugging scripting languages etc.
-Dumptool & Lcrash
 SysRq
 References
 Special Thanks
@@ -2455,39 +2454,6 @@ jdb <filename> another fully interactive gdb style debugger.
 
 
 
-Dumptool & Lcrash ( lkcd )
-==========================
-Michael Holzheu & others here at IBM have a fairly mature port of 
-SGI's lcrash tool which allows one to look at kernel structures in a
-running kernel.
-
-It also complements a tool called dumptool which dumps all the kernel's
-memory pages & registers to either a tape or a disk.
-This can be used by tech support or an ambitious end user do
-post mortem debugging of a machine like gdb core dumps.
-
-Going into how to use this tool in detail will be explained
-in other documentation supplied by IBM with the patches & the 
-lcrash homepage http://oss.sgi.com/projects/lkcd/ & the lcrash manpage.
-
-How they work
--------------
-Lcrash is a perfectly normal program,however, it requires 2 
-additional files, Kerntypes which is built using a patch to the 
-linux kernel sources in the linux root directory & the System.map.
-
-Kerntypes is an objectfile whose sole purpose in life
-is to provide stabs debug info to lcrash, to do this
-Kerntypes is built from kerntypes.c which just includes the most commonly
-referenced header files used when debugging, lcrash can then read the
-.stabs section of this file.
-
-Debugging a live system it uses /dev/mem
-alternatively for post mortem debugging it uses the data 
-collected by dumptool.
-
-
-
 SysRq
 =====
 This is now supported by linux for s/390 & z/Architecture.
diff --git a/trunk/arch/s390/boot/Makefile b/trunk/arch/s390/boot/Makefile
index 635d677d3281..f2737a005afc 100644
--- a/trunk/arch/s390/boot/Makefile
+++ b/trunk/arch/s390/boot/Makefile
@@ -23,4 +23,4 @@ $(obj)/compressed/vmlinux: FORCE
 
 install: $(CONFIGURE) $(obj)/image
 	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
-	      System.map Kerntypes "$(INSTALL_PATH)"
+	      System.map "$(INSTALL_PATH)"