From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 23 Nov 2005 16:44:05 +0000 (-0800)
Subject: Revert "[NET]: Shut up warnings in net/core/flow.c"
X-Git-Tag: v2.6.15-rc3~84
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=2d0ebb36038c0626cde662a3b06da9787cfb68c3;p=linux-2.6

Revert "[NET]: Shut up warnings in net/core/flow.c"

This reverts commit af2b4079ab154bd12e8c12b02db5f31b31babe63

Changing the #define to an inline function breaks on non-SMP builds,
since wuite a few places in the kernel do not implement the ipi handler
when compiling for UP.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/linux/smp.h b/include/linux/smp.h
index b6069c8e1f..9dfa3ee769 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -94,13 +94,7 @@ void smp_prepare_boot_cpu(void);
  */
 #define raw_smp_processor_id()			0
 #define hard_smp_processor_id()			0
-
-static inline int smp_call_function(void (*func) (void *info), void *info,
-				    int retry, int wait)
-{
-	return 0;
-}
-
+#define smp_call_function(func,info,retry,wait)	({ 0; })
 #define on_each_cpu(func,info,retry,wait)	({ func(info); 0; })
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()			1