From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from toip4.srvr.bell.ca ([209.226.175.87]) by tomts36-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20081010074826.UHJX1669.tomts36-srv.bellnexxia.net@toip4.srvr.bell.ca> for ; Fri, 10 Oct 2008 03:48:26 -0400 Date: Fri, 10 Oct 2008 03:48:25 -0400 From: Mathieu Desnoyers Subject: Re: [PATCH] Markers : revert synchronize marker unregister static inline (update) Message-ID: <20081010074825.GF23247@Krystal> References: <20081009164700.c9042902.akpm@linux-foundation.org> <20081009170349.35e0df12.akpm@linux-foundation.org> <1223621125.8959.9.camel@penberg-laptop> <20081010071815.GA23247@Krystal> <20081010072334.GA15715@elte.hu> <20081010073749.GD23247@Krystal> <1223624589.8959.32.camel@penberg-laptop> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline In-Reply-To: <1223624589.8959.32.camel@penberg-laptop> Sender: owner-linux-mm@kvack.org Return-Path: To: Ingo Molnar , Pekka Enberg Cc: Andrew Morton , linux-mm@kvack.org, Eduard - Gabriel Munteanu , cl@linux-foundation.org List-ID: Use a #define for synchronize marker unregister to fix include dependencies. Fixes the slab circular inclusion, where rcupdate includes slab, which includes markers which includes rcupdate. Signed-off-by: Mathieu Desnoyers Acked-by: Pekka Enberg CC: Ingo Molnar CC: Andrew Morton CC: Eduard - Gabriel Munteanu CC: cl@linux-foundation.org --- include/linux/marker.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) Index: linux-2.6-lttng/include/linux/marker.h =================================================================== --- linux-2.6-lttng.orig/include/linux/marker.h 2008-10-10 03:28:03.000000000 -0400 +++ linux-2.6-lttng/include/linux/marker.h 2008-10-10 03:28:05.000000000 -0400 @@ -13,7 +13,6 @@ */ #include -#include struct module; struct marker; @@ -166,9 +165,6 @@ extern void *marker_get_private_data(con * unregistration and the end of module exit to make sure there is no caller * executing a probe when it is freed. */ -static inline void marker_synchronize_unregister(void) -{ - synchronize_sched(); -} +#define marker_synchronize_unregister() synchronize_sched() #endif -- Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org