From: "Jan Beulich" Subject: [PATCH] linux/x86: fix an oversight of c/s 393 Date: Fri, 01 Feb 2008 08:40:36 +0000 Message-ID: <47A2E914.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Almost as usual, written and tested on 2.6.16.60 and made apply to the 2.6.18 tree without further testing. Signed-off-by: Jan Beulich Index: sle10sp2-2008-01-31/arch/i386/kernel/time-xen.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sle10sp2-2008-01-31.orig/arch/i386/kernel/time-xen.c 2007-11-16 = 11:00:13.000000000 +0100 +++ sle10sp2-2008-01-31/arch/i386/kernel/time-xen.c 2008-01-31 = 14:05:33.000000000 +0100 @@ -479,7 +479,7 @@ int do_settimeofday(struct timespec *tv) op.u.settime.secs =3D sec; op.u.settime.nsecs =3D nsec; op.u.settime.system_time =3D shadow->system_timestamp; - HYPERVISOR_platform_op(&op); + WARN_ON(HYPERVISOR_platform_op(&op)); update_wallclock(); } else if (independent_wallclock) { nsec -=3D shadow->system_timestamp;