diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2023-04-04 15:37:25 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-04-04 15:37:25 -0700 |
| commit | ca712e47054678c5ce93a0e0f686353ad5561195 (patch) | |
| tree | 575dd9f2e541ddd74b72e82dfe69c5badcb9e281 /include/linux/blkdev.h | |
| parent | cxl/hdm: Extend DVSEC range register emulation for region enumeration (diff) | |
| parent | PCI/DOE: Fix memory leak with CONFIG_DEBUG_OBJECTS=y (diff) | |
| download | wireguard-linux-ca712e47054678c5ce93a0e0f686353ad5561195.tar.xz wireguard-linux-ca712e47054678c5ce93a0e0f686353ad5561195.zip | |
Merge branch 'for-6.3/cxl-doe-fixes' into for-6.3/cxl
Pick up the fixes (first 6 patches) from the DOE rework series from
Lukas for v6.3-rc.
Link: https://lore.kernel.org/all/cover.1678543498.git.lukas@wunner.de/
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d1aee08f8c18..941304f17492 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1446,11 +1446,10 @@ static inline void blk_wake_io_task(struct task_struct *waiter) wake_up_process(waiter); } -unsigned long bdev_start_io_acct(struct block_device *bdev, - unsigned int sectors, enum req_op op, +unsigned long bdev_start_io_acct(struct block_device *bdev, enum req_op op, unsigned long start_time); void bdev_end_io_acct(struct block_device *bdev, enum req_op op, - unsigned long start_time); + unsigned int sectors, unsigned long start_time); unsigned long bio_start_io_acct(struct bio *bio); void bio_end_io_acct_remapped(struct bio *bio, unsigned long start_time, |