diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /drivers/s390/char/vmur.c | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'drivers/s390/char/vmur.c')
| -rw-r--r-- | drivers/s390/char/vmur.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c index 7d9e67cb6471..31b902e94f7b 100644 --- a/drivers/s390/char/vmur.c +++ b/drivers/s390/char/vmur.c | |||
| @@ -170,7 +170,7 @@ static void urdev_put(struct urdev *urd) | |||
| 170 | */ | 170 | */ |
| 171 | static int ur_pm_suspend(struct ccw_device *cdev) | 171 | static int ur_pm_suspend(struct ccw_device *cdev) |
| 172 | { | 172 | { |
| 173 | struct urdev *urd = cdev->dev.driver_data; | 173 | struct urdev *urd = dev_get_drvdata(&cdev->dev); |
| 174 | 174 | ||
| 175 | TRACE("ur_pm_suspend: cdev=%p\n", cdev); | 175 | TRACE("ur_pm_suspend: cdev=%p\n", cdev); |
| 176 | if (urd->open_flag) { | 176 | if (urd->open_flag) { |