diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-11-27 14:40:51 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-11-27 14:40:51 +0300 |
commit | acf403ecc4155153e5e2c1640be90fc166e56ba7 (patch) | |
tree | e9655b84776cec00a4da077f5dd1e336dfd9c7c0 /init | |
parent | 69eba10e606a80665f8573221fec589430d9d1cb (diff) | |
parent | b61f90eac1ff9d1b30497e611aba4651d4066706 (diff) | |
download | linux-acf403ecc4155153e5e2c1640be90fc166e56ba7.tar.xz |
Merge branch 'topic/usb-resume' into for-next
Merge the proper mixer resume support for quirk codes.
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 14 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3ee28ae02cc8..2081a4d3d917 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1341,6 +1341,10 @@ config SYSCTL_ARCH_UNALIGN_ALLOW config HAVE_PCSPKR_PLATFORM bool +# interpreter that classic socket filters depend on +config BPF + bool + menuconfig EXPERT bool "Configure standard kernel features (expert users)" # Unhide debug options, to make the on-by-default options visible @@ -1521,6 +1525,16 @@ config EVENTFD If unsure, say Y. +# syscall, maps, verifier +config BPF_SYSCALL + bool "Enable bpf() system call" if EXPERT + select ANON_INODES + select BPF + default n + help + Enable the bpf() system call that allows to manipulate eBPF + programs and maps via file descriptors. + config SHMEM bool "Use full shmem filesystem" if EXPERT default y diff --git a/init/main.c b/init/main.c index 800a0daede7e..321d0ceb26d3 100644 --- a/init/main.c +++ b/init/main.c @@ -544,7 +544,7 @@ asmlinkage __visible void __init start_kernel(void) static_command_line, __start___param, __stop___param - __start___param, -1, -1, &unknown_bootoption); - if (after_dashes) + if (!IS_ERR_OR_NULL(after_dashes)) parse_args("Setting init args", after_dashes, NULL, 0, -1, -1, set_init_arg); |