aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-09 18:22:45 +0000
committerMark Brown <broonie@kernel.org>2015-01-09 18:22:45 +0000
commit2156eda2aafa0b0f660656246a11d7c2a9947ff9 (patch)
tree81c2fadeadc2f62e3a03c5fe78b41087d2926233 /mm
parentbbba26b2fc88c77239ebcd45d7fb669018511dfe (diff)
parent312ccd6ab1510724d298ae6c19177e501d6c1ca0 (diff)
downloadlinux-linaro-stable-2156eda2aafa0b0f660656246a11d7c2a9947ff9.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk
Conflicts: arch/arm/include/asm/hardware/coresight.h drivers/Makefile drivers/of/base.c
Diffstat (limited to 'mm')
-rw-r--r--mm/backing-dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index eea1a9dfac38..2e53312b8907 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -232,8 +232,6 @@ static ssize_t stable_pages_required_show(struct device *dev,
bdi_cap_stable_pages_required(bdi) ? 1 : 0);
}
-#define __ATTR_RW(attr) __ATTR(attr, 0644, attr##_show, attr##_store)
-
static struct device_attribute bdi_dev_attrs[] = {
__ATTR_RW(read_ahead_kb),
__ATTR_RW(min_ratio),