diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/s390/char/sclp_sdias.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/s390/char/sclp_sdias.c')
| -rw-r--r-- | drivers/s390/char/sclp_sdias.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c index 6a1c58dc61a7..fa733ecd3d70 100644 --- a/drivers/s390/char/sclp_sdias.c +++ b/drivers/s390/char/sclp_sdias.c | |||
| @@ -69,9 +69,6 @@ static DEFINE_MUTEX(sdias_mutex); | |||
| 69 | 69 | ||
| 70 | static void sdias_callback(struct sclp_req *request, void *data) | 70 | static void sdias_callback(struct sclp_req *request, void *data) |
| 71 | { | 71 | { |
| 72 | struct sdias_sccb *cbsccb; | ||
| 73 | |||
| 74 | cbsccb = (struct sdias_sccb *) request->sccb; | ||
| 75 | sclp_req_done = 1; | 72 | sclp_req_done = 1; |
| 76 | wake_up(&sdias_wq); /* Inform caller, that request is complete */ | 73 | wake_up(&sdias_wq); /* Inform caller, that request is complete */ |
| 77 | TRACE("callback done\n"); | 74 | TRACE("callback done\n"); |