git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
s390
/
char
/
sclp_quiesce.c
diff --git
a/drivers/s390/char/sclp_quiesce.c
b/drivers/s390/char/sclp_quiesce.c
index
ffa9282
..
84c191c
100644
(file)
--- a/
drivers/s390/char/sclp_quiesce.c
+++ b/
drivers/s390/char/sclp_quiesce.c
@@
-16,6
+16,7
@@
#include <asm/atomic.h>
#include <asm/ptrace.h>
#include <asm/sigp.h>
#include <asm/atomic.h>
#include <asm/ptrace.h>
#include <asm/sigp.h>
+#include <asm/smp.h>
#include "sclp.h"
#include "sclp.h"
@@
-42,7
+43,7
@@
sclp_quiesce_handler(struct evbuf_header *evbuf)
}
static struct sclp_register sclp_quiesce_event = {
}
static struct sclp_register sclp_quiesce_event = {
- .receive_mask = E
vTyp_SigQuiesce_Mask
,
+ .receive_mask = E
VTYP_SIGQUIESCE_MASK
,
.receiver_fn = sclp_quiesce_handler
};
.receiver_fn = sclp_quiesce_handler
};
@@
-50,13
+51,7
@@
static struct sclp_register sclp_quiesce_event = {
static int __init
sclp_quiesce_init(void)
{
static int __init
sclp_quiesce_init(void)
{
- int rc;
-
- rc = sclp_register(&sclp_quiesce_event);
- if (rc)
- printk(KERN_WARNING "sclp: could not register quiesce handler "
- "(rc=%d)\n", rc);
- return rc;
+ return sclp_register(&sclp_quiesce_event);
}
module_init(sclp_quiesce_init);
}
module_init(sclp_quiesce_init);