diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-14 22:25:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-14 22:25:18 +0200 |
| commit | d0331aa9789707140e938d14629c200b32ae1d0f (patch) | |
| tree | 744a6b6d34f242e122bf78ca9f3a95c1548907a3 /block/blk-cgroup.h | |
| parent | perf/bpf: Change the !CONFIG_BPF_SYSCALL stubs to static inlines (diff) | |
| parent | Merge tag 'pull-sysfs-annotation-fix' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-d0331aa9789707140e938d14629c200b32ae1d0f.tar.xz linux-d0331aa9789707140e938d14629c200b32ae1d0f.zip | |
Merge branch 'linus' into perf/core, to pick up perf/urgent fixes
Pick up perf/urgent fixes that are upstream already, but not
yet in the perf/core development branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'block/blk-cgroup.h')
| -rw-r--r-- | block/blk-cgroup.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 78b74106bf10..90b3959d88cf 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -189,6 +189,7 @@ struct blkcg_policy { extern struct blkcg blkcg_root; extern bool blkcg_debug_stats; +void blkg_init_queue(struct request_queue *q); int blkcg_init_disk(struct gendisk *disk); void blkcg_exit_disk(struct gendisk *disk); @@ -482,6 +483,7 @@ struct blkcg { }; static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, void *key) { return NULL; } +static inline void blkg_init_queue(struct request_queue *q) { } static inline int blkcg_init_disk(struct gendisk *disk) { return 0; } static inline void blkcg_exit_disk(struct gendisk *disk) { } static inline int blkcg_policy_register(struct blkcg_policy *pol) { return 0; } |