diff options
Diffstat (limited to 'arch/ppc/Kconfig')
-rw-r--r-- | arch/ppc/Kconfig | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 6e6377a69d5b..10162b187bcf 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -826,11 +826,6 @@ config MPC10X_BRIDGE | |||
826 | depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT | 826 | depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT |
827 | default y | 827 | default y |
828 | 828 | ||
829 | config FSL_OCP | ||
830 | bool | ||
831 | depends on MPC10X_BRIDGE | ||
832 | default y | ||
833 | |||
834 | config MPC10X_OPENPIC | 829 | config MPC10X_OPENPIC |
835 | bool | 830 | bool |
836 | depends on POWERPMC250 || LOPEC || SANDPOINT | 831 | depends on POWERPMC250 || LOPEC || SANDPOINT |
@@ -1083,6 +1078,23 @@ source "drivers/zorro/Kconfig" | |||
1083 | 1078 | ||
1084 | source kernel/power/Kconfig | 1079 | source kernel/power/Kconfig |
1085 | 1080 | ||
1081 | config SECCOMP | ||
1082 | bool "Enable seccomp to safely compute untrusted bytecode" | ||
1083 | depends on PROC_FS | ||
1084 | default y | ||
1085 | help | ||
1086 | This kernel feature is useful for number crunching applications | ||
1087 | that may need to compute untrusted bytecode during their | ||
1088 | execution. By using pipes or other transports made available to | ||
1089 | the process as file descriptors supporting the read/write | ||
1090 | syscalls, it's possible to isolate those applications in | ||
1091 | their own address space using seccomp. Once seccomp is | ||
1092 | enabled via /proc/<pid>/seccomp, it cannot be disabled | ||
1093 | and the task is only allowed to execute a few safe syscalls | ||
1094 | defined by each seccomp mode. | ||
1095 | |||
1096 | If unsure, say Y. Only embedded should say N here. | ||
1097 | |||
1086 | endmenu | 1098 | endmenu |
1087 | 1099 | ||
1088 | config ISA_DMA_API | 1100 | config ISA_DMA_API |