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.2255_FC5 patched with stable patch-2.6.18.5-vs2.0...
[linux-2.6.git]
/
drivers
/
s390
/
cio
/
cio.c
diff --git
a/drivers/s390/cio/cio.c
b/drivers/s390/cio/cio.c
index
15874c8
..
89320c1
100644
(file)
--- a/
drivers/s390/cio/cio.c
+++ b/
drivers/s390/cio/cio.c
@@
-16,7
+16,6
@@
#include <linux/device.h>
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include <linux/kernel_stat.h>
#include <linux/interrupt.h>
-#include <linux/vs_context.h>
#include <asm/cio.h>
#include <asm/delay.h>
#include <asm/cio.h>
#include <asm/delay.h>
@@
-640,7
+639,6
@@
do_IRQ (struct pt_regs *regs)
spin_lock(&sch->lock);
/* Store interrupt response block to lowcore. */
if (tsch (tpi_info->schid, irb) == 0 && sch) {
spin_lock(&sch->lock);
/* Store interrupt response block to lowcore. */
if (tsch (tpi_info->schid, irb) == 0 && sch) {
-
/* Keep subchannel information word up to date. */
memcpy (&sch->schib.scsw, &irb->scsw,
sizeof (irb->scsw));
/* Keep subchannel information word up to date. */
memcpy (&sch->schib.scsw, &irb->scsw,
sizeof (irb->scsw));