From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jan Kiszka <jan.kiszka@siemens.com>
Subject: [PATCH] Fix external module build for 2.6.22
Date: Tue, 02 Sep 2008 10:51:10 +0200
Message-ID: <48BCFE7E.8070303@siemens.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
To: kvm-devel <kvm@vger.kernel.org>
Return-path: <kvm-owner@vger.kernel.org>
Received: from gecko.sbs.de ([194.138.37.40]:18261 "EHLO gecko.sbs.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751204AbYIBIvP (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 2 Sep 2008 04:51:15 -0400
Received: from mail2.sbs.de (localhost [127.0.0.1])
	by gecko.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m828pBKq010303
	for <kvm@vger.kernel.org>; Tue, 2 Sep 2008 10:51:11 +0200
Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged))
	by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m828pBRo006517
	for <kvm@vger.kernel.org>; Tue, 2 Sep 2008 10:51:11 +0200
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h
index 2e87c57..6072fde 100644
--- a/kernel/external-module-compat-comm.h
+++ b/kernel/external-module-compat-comm.h
@@ -517,6 +517,11 @@ static inline int cancel_work_sync(struct work_struct *work)
 	return 0;
 }
 
+/* ... and it returned void before 2.6.23 */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+
+#define cancel_work_sync(work) ({ cancel_work_sync(work); 0; })
+
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)