diff options
| author | Rob Clark <robdclark@chromium.org> | 2023-03-20 10:31:25 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-03-20 10:31:25 -0700 |
| commit | e752ab11dcb48353727ea26eefd740155e028865 (patch) | |
| tree | bbd47198be4e42bbf990096ca36e96f3da40cfb6 /include/linux/buffer_head.h | |
| parent | 1844e680d56bb0c4e0489138f2b7ba2dc1c988e3 (diff) | |
| parent | 8bf6e20253b2d2b614f2c0b491f840e956fa6b05 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into msm-next
Merge drm-next into msm-next to pick up external clk and PM dependencies
for improved a6xx GPU reset sequence.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'include/linux/buffer_head.h')
| -rw-r--r-- | include/linux/buffer_head.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 33fa5e94aa80..8f14dca5fed7 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -61,7 +61,10 @@ typedef void (bh_end_io_t)(struct buffer_head *bh, int uptodate); struct buffer_head { unsigned long b_state; /* buffer state bitmap (see above) */ struct buffer_head *b_this_page;/* circular list of page's buffers */ - struct page *b_page; /* the page this bh is mapped to */ + union { + struct page *b_page; /* the page this bh is mapped to */ + struct folio *b_folio; /* the folio this bh is mapped to */ + }; sector_t b_blocknr; /* start block number */ size_t b_size; /* size of mapping */ |