diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/Kconfig | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index bbd386f572d9..21db07efd7a0 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -790,23 +790,6 @@ config TOSHIBA_RBTX4938 | |||
790 | 790 | ||
791 | endchoice | 791 | endchoice |
792 | 792 | ||
793 | config KEXEC | ||
794 | bool "Kexec system call (EXPERIMENTAL)" | ||
795 | depends on EXPERIMENTAL | ||
796 | help | ||
797 | kexec is a system call that implements the ability to shutdown your | ||
798 | current kernel, and to start another kernel. It is like a reboot | ||
799 | but it is indepedent of the system firmware. And like a reboot | ||
800 | you can start any kernel with it, not just Linux. | ||
801 | |||
802 | The name comes from the similiarity to the exec system call. | ||
803 | |||
804 | It is an ongoing process to be certain the hardware in a machine | ||
805 | is properly shutdown, so do not be surprised if this code does not | ||
806 | initially work for you. It may help to enable device hotplugging | ||
807 | support. As of this writing the exact hardware interface is | ||
808 | strongly in flux, so no good recommendation can be made. | ||
809 | |||
810 | source "arch/mips/ddb5xxx/Kconfig" | 793 | source "arch/mips/ddb5xxx/Kconfig" |
811 | source "arch/mips/gt64120/ev64120/Kconfig" | 794 | source "arch/mips/gt64120/ev64120/Kconfig" |
812 | source "arch/mips/jazz/Kconfig" | 795 | source "arch/mips/jazz/Kconfig" |
@@ -1859,6 +1842,40 @@ config MIPS_INSANE_LARGE | |||
1859 | This will result in additional memory usage, so it is not | 1842 | This will result in additional memory usage, so it is not |
1860 | recommended for normal users. | 1843 | recommended for normal users. |
1861 | 1844 | ||
1845 | config KEXEC | ||
1846 | bool "Kexec system call (EXPERIMENTAL)" | ||
1847 | depends on EXPERIMENTAL | ||
1848 | help | ||
1849 | kexec is a system call that implements the ability to shutdown your | ||
1850 | current kernel, and to start another kernel. It is like a reboot | ||
1851 | but it is indepedent of the system firmware. And like a reboot | ||
1852 | you can start any kernel with it, not just Linux. | ||
1853 | |||
1854 | The name comes from the similiarity to the exec system call. | ||
1855 | |||
1856 | It is an ongoing process to be certain the hardware in a machine | ||
1857 | is properly shutdown, so do not be surprised if this code does not | ||
1858 | initially work for you. It may help to enable device hotplugging | ||
1859 | support. As of this writing the exact hardware interface is | ||
1860 | strongly in flux, so no good recommendation can be made. | ||
1861 | |||
1862 | config SECCOMP | ||
1863 | bool "Enable seccomp to safely compute untrusted bytecode" | ||
1864 | depends on PROC_FS && BROKEN | ||
1865 | default y | ||
1866 | help | ||
1867 | This kernel feature is useful for number crunching applications | ||
1868 | that may need to compute untrusted bytecode during their | ||
1869 | execution. By using pipes or other transports made available to | ||
1870 | the process as file descriptors supporting the read/write | ||
1871 | syscalls, it's possible to isolate those applications in | ||
1872 | their own address space using seccomp. Once seccomp is | ||
1873 | enabled via /proc/<pid>/seccomp, it cannot be disabled | ||
1874 | and the task is only allowed to execute a few safe syscalls | ||
1875 | defined by each seccomp mode. | ||
1876 | |||
1877 | If unsure, say Y. Only embedded should say N here. | ||
1878 | |||
1862 | endmenu | 1879 | endmenu |
1863 | 1880 | ||
1864 | config RWSEM_GENERIC_SPINLOCK | 1881 | config RWSEM_GENERIC_SPINLOCK |
@@ -2025,23 +2042,6 @@ config BINFMT_ELF32 | |||
2025 | bool | 2042 | bool |
2026 | default y if MIPS32_O32 || MIPS32_N32 | 2043 | default y if MIPS32_O32 || MIPS32_N32 |
2027 | 2044 | ||
2028 | config SECCOMP | ||
2029 | bool "Enable seccomp to safely compute untrusted bytecode" | ||
2030 | depends on PROC_FS && BROKEN | ||
2031 | default y | ||
2032 | help | ||
2033 | This kernel feature is useful for number crunching applications | ||
2034 | that may need to compute untrusted bytecode during their | ||
2035 | execution. By using pipes or other transports made available to | ||
2036 | the process as file descriptors supporting the read/write | ||
2037 | syscalls, it's possible to isolate those applications in | ||
2038 | their own address space using seccomp. Once seccomp is | ||
2039 | enabled via /proc/<pid>/seccomp, it cannot be disabled | ||
2040 | and the task is only allowed to execute a few safe syscalls | ||
2041 | defined by each seccomp mode. | ||
2042 | |||
2043 | If unsure, say Y. Only embedded should say N here. | ||
2044 | |||
2045 | config PM | 2045 | config PM |
2046 | bool "Power Management support (EXPERIMENTAL)" | 2046 | bool "Power Management support (EXPERIMENTAL)" |
2047 | depends on EXPERIMENTAL && SOC_AU1X00 | 2047 | depends on EXPERIMENTAL && SOC_AU1X00 |