diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 08:04:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 08:04:08 -0800 |
| commit | c2048b0a0a6e589d9813766489f78185cbabcdc6 (patch) | |
| tree | e3245fb17e97329925d0aa0a350f604d6d3f1f71 /drivers | |
| parent | autofs4 - remove ioctl mutex (bz23142) (diff) | |
| parent | [S390] css: fix rsid evaluation for 2nd crw (diff) | |
| download | linux-dev-c2048b0a0a6e589d9813766489f78185cbabcdc6.tar.xz linux-dev-c2048b0a0a6e589d9813766489f78185cbabcdc6.zip | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] css: fix rsid evaluation for 2nd crw
[S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus
Diffstat (limited to 'drivers')
| -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) init_subchannel_id(&mchk_schid); mchk_schid.sch_no = crw0->rsid; if (crw1) - mchk_schid.ssid = (crw1->rsid >> 8) & 3; + mchk_schid.ssid = (crw1->rsid >> 4) & 3; /* * Since we are always presented with IPI in the CRW, we have to |