git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'futexes-for-linus', 'irq-core-for-linus' and 'bkl-drivers-for-linus...
[sfrench/cifs-2.6.git]
/
drivers
/
s390
/
cio
/
chsc_sch.c
diff --git
a/drivers/s390/cio/chsc_sch.c
b/drivers/s390/cio/chsc_sch.c
index c84ac9443079fb2b616f72c2bc56479528e03aed..852612f5dba0607d81b29c8ae5ecd8c7ca44053d 100644
(file)
--- a/
drivers/s390/cio/chsc_sch.c
+++ b/
drivers/s390/cio/chsc_sch.c
@@
-51,7
+51,7
@@
static void chsc_subchannel_irq(struct subchannel *sch)
{
struct chsc_private *private = sch->private;
struct chsc_request *request = private->request;
{
struct chsc_private *private = sch->private;
struct chsc_request *request = private->request;
- struct irb *irb = (struct irb *)
__LC_IRB
;
+ struct irb *irb = (struct irb *)
&S390_lowcore.irb
;
CHSC_LOG(4, "irb");
CHSC_LOG_HEX(4, irb, sizeof(*irb));
CHSC_LOG(4, "irb");
CHSC_LOG_HEX(4, irb, sizeof(*irb));
@@
-237,7
+237,7
@@
static int chsc_async(struct chsc_async_area *chsc_area,
int ret = -ENODEV;
char dbf[10];
int ret = -ENODEV;
char dbf[10];
- chsc_area->header.key = PAGE_DEFAULT_KEY;
+ chsc_area->header.key = PAGE_DEFAULT_KEY
>> 4
;
while ((sch = chsc_get_next_subchannel(sch))) {
spin_lock(sch->lock);
private = sch->private;
while ((sch = chsc_get_next_subchannel(sch))) {
spin_lock(sch->lock);
private = sch->private;