git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
s390
/
net
/
iucv.c
diff --git
a/drivers/s390/net/iucv.c
b/drivers/s390/net/iucv.c
index
e0c7deb
..
821dde8
100644
(file)
--- a/
drivers/s390/net/iucv.c
+++ b/
drivers/s390/net/iucv.c
@@
-33,7
+33,6
@@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/config.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
@@
-336,8
+335,8
@@
do { \
#else
#else
-#define iucv_debug(lvl, fmt, args...)
-#define iucv_dumpit(title, buf, len)
+#define iucv_debug(lvl, fmt, args...)
do { } while (0)
+#define iucv_dumpit(title, buf, len)
do { } while (0)
#endif
#endif
@@
-693,7
+692,7
@@
iucv_retrieve_buffer (void)
iucv_debug(1, "entering");
if (iucv_cpuid != -1) {
smp_call_function_on(iucv_retrieve_buffer_cpuid,
iucv_debug(1, "entering");
if (iucv_cpuid != -1) {
smp_call_function_on(iucv_retrieve_buffer_cpuid,
-
0
, 0, 1, iucv_cpuid);
+
NULL
, 0, 1, iucv_cpuid);
/* Release the cpu reserved by iucv_declare_buffer. */
smp_put_cpu(iucv_cpuid);
iucv_cpuid = -1;
/* Release the cpu reserved by iucv_declare_buffer. */
smp_put_cpu(iucv_cpuid);
iucv_cpuid = -1;