From 0daf37ef3f4ad76f3e56f888b48111c1b6c9119d Mon Sep 17 00:00:00 2001 From: Arianna Avanzini Date: Sun, 17 Aug 2014 07:07:24 -0500 Subject: [PATCH] block: Switch from BFQ-v7r6 for 3.16.0 to BFQ-v7r6 for 3.17.0-rc1 --- block/bfq-cgroup.c | 2 +- block/bfq.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index f742806..eb140eb 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -871,7 +871,7 @@ struct cgroup_subsys bfqio_cgrp_subsys = { .can_attach = bfqio_can_attach, .attach = bfqio_attach, .css_free = bfqio_destroy, - .base_cftypes = bfqio_files, + .legacy_cftypes = bfqio_files, }; #else static inline void bfq_init_entity(struct bfq_entity *entity, diff --git a/block/bfq.h b/block/bfq.h index ebbd040..34b37bf 100644 --- a/block/bfq.h +++ b/block/bfq.h @@ -1,5 +1,5 @@ /* - * BFQ-v7r5 for 3.16.0: data structures and common functions prototypes. + * BFQ-v7r5 for 3.17.0-rc1: data structures and common functions prototypes. * * Based on ideas and code from CFQ: * Copyright (C) 2003 Jens Axboe -- 2.0.4