Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index c0f56e4..c944691 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -682,7 +682,8 @@ config IKHEADERS
 
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
-       range 12 25
+       range 12 25 if !H8300
+       range 12 19 if H8300
        default 17
        depends on PRINTK
        help
@@ -1691,6 +1692,7 @@ config BPF_SYSCALL
        bool "Enable bpf() system call"
        select BPF
        select IRQ_WORK
+       select TASKS_TRACE_RCU
        default n
        help
          Enable the bpf() system call that allows to manipulate eBPF
@@ -1710,6 +1712,8 @@ config BPF_JIT_DEFAULT_ON
        def_bool ARCH_WANT_DEFAULT_BPF_JIT || BPF_JIT_ALWAYS_ON
        depends on HAVE_EBPF_JIT && BPF_JIT
 
+source "kernel/bpf/preload/Kconfig"
+
 config USERFAULTFD
        bool "Enable userfaultfd() system call"
        depends on MMU