diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 10:40:51 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 10:40:51 -0500 |
commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /drivers/s390/cio/css.c | |
parent | 5ce2a2ddb5d75d5e2371e58011fc21351bf278cb (diff) | |
parent | 1cf215a5b43950d1a304373037828158057ff9fc (diff) |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/s390/cio/css.c')
-rw-r--r-- | drivers/s390/cio/css.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index a5050e217150..825951b6b83f 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
@@ -635,7 +635,7 @@ static void css_process_crw(struct crw *crw0, struct crw *crw1, int overflow) | |||
635 | init_subchannel_id(&mchk_schid); | 635 | init_subchannel_id(&mchk_schid); |
636 | mchk_schid.sch_no = crw0->rsid; | 636 | mchk_schid.sch_no = crw0->rsid; |
637 | if (crw1) | 637 | if (crw1) |
638 | mchk_schid.ssid = (crw1->rsid >> 8) & 3; | 638 | mchk_schid.ssid = (crw1->rsid >> 4) & 3; |
639 | 639 | ||
640 | /* | 640 | /* |
641 | * Since we are always presented with IPI in the CRW, we have to | 641 | * Since we are always presented with IPI in the CRW, we have to |