projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 's390-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-2.6-microblaze.git]
/
drivers
/
s390
/
block
/
dcssblk.c
diff --git
a/drivers/s390/block/dcssblk.c
b/drivers/s390/block/dcssblk.c
index
ba66aa6
..
6d1689a
100644
(file)
--- a/
drivers/s390/block/dcssblk.c
+++ b/
drivers/s390/block/dcssblk.c
@@
-920,7
+920,7
@@
__dcssblk_direct_access(struct dcssblk_dev_info *dev_info, pgoff_t pgoff,
dev_sz = dev_info->end - dev_info->start + 1;
if (kaddr)
- *kaddr =
(void *) dev_info->start + offset
;
+ *kaddr =
__va(dev_info->start + offset)
;
if (pfn)
*pfn = __pfn_to_pfn_t(PFN_DOWN(dev_info->start + offset),
PFN_DEV|PFN_SPECIAL);