diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-06-16 10:21:31 -0700 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-01-22 12:16:09 +0100 |
| commit | 93568d6fc509923db204320062b1883bc9962b0d (patch) | |
| tree | c5933098190fcbf1240c66b808410a91be835d6c /arch/s390/defconfig | |
| parent | 032f1be056a2e84f8817b56fe6d76e8e83285578 (diff) | |
| download | linux-stable-93568d6fc509923db204320062b1883bc9962b0d.tar.gz linux-stable-93568d6fc509923db204320062b1883bc9962b0d.tar.bz2 linux-stable-93568d6fc509923db204320062b1883bc9962b0d.zip | |
s390: update default configuration
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/defconfig')
| -rw-r--r-- | arch/s390/defconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 785c5f24d6f9..83ef702d2403 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig @@ -14,7 +14,6 @@ CONFIG_IKCONFIG_PROC=y CONFIG_CGROUPS=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y @@ -22,12 +21,8 @@ CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y CONFIG_NAMESPACES=y CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y CONFIG_EXPERT=y +CONFIG_BPF_SYSCALL=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y CONFIG_OPROFILE=y |