From d5643660386a3433b74bd5760cc2e97be4d12418 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 8 Mar 2010 12:25:14 +0100 Subject: [PATCH] --- yaml --- r: 186987 b: refs/heads/master c: 596a95cdf0ba35ea353fb5b65750f596d712041e h: refs/heads/master i: 186985: c3a45e47c79934908ef7bbe8a96a4025fde1759a 186983: 8eb3234799d34d113111c809b874e9539b9880b3 v: v3 --- [refs] | 2 +- trunk/arch/s390/lib/Makefile | 3 ++- trunk/fs/fscache/Kconfig | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d5abb098e44b..33cbe7e4d984 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4014030d2b2508aaf54093a5885f1c8a2275dd7 +refs/heads/master: 596a95cdf0ba35ea353fb5b65750f596d712041e diff --git a/trunk/arch/s390/lib/Makefile b/trunk/arch/s390/lib/Makefile index cd54a1c352af..761ab8b56afc 100644 --- a/trunk/arch/s390/lib/Makefile +++ b/trunk/arch/s390/lib/Makefile @@ -2,7 +2,8 @@ # Makefile for s390-specific library files.. # -lib-y += delay.o string.o uaccess_std.o uaccess_pt.o usercopy.o +lib-y += delay.o string.o uaccess_std.o uaccess_pt.o +obj-y += usercopy.o obj-$(CONFIG_32BIT) += div64.o qrnnd.o ucmpdi2.o lib-$(CONFIG_64BIT) += uaccess_mvcos.o lib-$(CONFIG_SMP) += spinlock.o diff --git a/trunk/fs/fscache/Kconfig b/trunk/fs/fscache/Kconfig index cc94bb9563f2..864dac20a242 100644 --- a/trunk/fs/fscache/Kconfig +++ b/trunk/fs/fscache/Kconfig @@ -1,6 +1,7 @@ config FSCACHE tristate "General filesystem local caching manager" + depends on EXPERIMENTAL select SLOW_WORK help This option enables a generic filesystem caching manager that can be