From mboxrd@z Thu Jan  1 00:00:00 1970
From: Magnus Damm <magnus@valinux.co.jp>
Subject: [PATCH] Fix parse_size_and_unit() breakage in
	xen-3.0.4-testing (kdump broken)
Date: Wed, 10 Jan 2007 17:42:15 +0900
Message-ID: <20070110084215.13837.79290.sendpatchset@localhost>
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Campbell <Ian.Campbell@XenSource.com>
Cc: Christoph Egger <Christoph.Egger@amd.com>, xen-devel@lists.xensource.com, Magnus Damm <magnus@valinux.co.jp>, Hiromichi Itou <ito@begi.net>
List-Id: xen-devel@lists.xenproject.org

Fix parse_size_and_unit() breakage in xen-3.0.4-testing (kdump broken)

Kdump has been broken since xen-3.0.4-testing.hg-13109.
Many thanks to Hiromichi Itou for tracking this down.

Signed-Off-By: Magnus Damm <magnus@valinux.co.jp>

---

Applies to xen-3.0.4-testing-13130.

--- 0001/xen/common/lib.c
+++ work/xen/common/lib.c	2007-01-10 11:18:38.000000000 +0900
@@ -442,7 +442,7 @@ s64 __moddi3(s64 a, s64 b)
 unsigned long long parse_size_and_unit(const char *s, const char **ps)
 {
 	unsigned long long ret;
-	const char *s1;
+	const char *s1 = NULL;
 
 	ret = simple_strtoull(s, &s1, 0);
 
@@ -454,7 +454,7 @@ unsigned long long parse_size_and_unit(c
 	case 'K': case 'k':
 		ret <<= 10;
 	case 'B': case 'b':
-		s++;
+		s1++;
 		break;
 	default:
 		ret <<= 10; /* default to kB */