diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 16:47:26 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 16:47:26 (GMT) |
| commit | c1e0d97d3d63d5173baf8c39a13dc5c25b031bd4 (patch) | |
| tree | 4bf35b974326f1f17de4ea3d17b65aa44811da01 /drivers | |
| parent | 7f5db6a8022e8d4bb92b3d638068d2c2a9c9b59b (diff) | |
| parent | 51120c2cc70fc241721b8016f4eff575e7d6aa30 (diff) | |
| download | linux-c1e0d97d3d63d5173baf8c39a13dc5c25b031bd4.tar.xz | |
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] MAINTAINERS: Update zcrypt driver entry
[S390] Randomize PIEs
[S390] Randomise the brk region
[S390] Add is_32bit_task() helper function
[S390] Randomize lower bits of stack address
[S390] Randomize mmap start address
[S390] Rearrange mmap.c
[S390] Enable flexible mmap layout for 64 bit processes
[S390] vdso: dont map at mmap_base
[S390] reduce miminum gap between stack and mmap_base
[S390] mmap: consider stack address randomization
[S390] Update default configuration
[S390] cio: path_event overindication after resume
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/cio/device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index e8391b89..b7eaff9 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -1835,6 +1835,7 @@ static void __ccw_device_pm_restore(struct ccw_device *cdev) * available again. Kick re-detection. */ cdev->private->flags.resuming = 1; + cdev->private->path_new_mask = LPM_ANYPATH; css_schedule_eval(sch->schid); spin_unlock_irq(sch->lock); css_complete_work(); |