Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 8dd2a82c29111bb8ad2a2933aa269b49f72d356d

Authored by Daniel Lezcano
Committed by Linus Torvalds
1 parent 17a6d4411a
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

namespaces Kconfig: make namespace a submenu 

Make the namespaces config option a submenu.

Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: "Serge E. Hallyn" <serue@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 8 additions and 6 deletions Side-by-side Diff

... ... @@ -734,7 +734,7 @@
734 734  
735 735 If unsure, say N.
736 736  
737   -config NAMESPACES
  737 +menuconfig NAMESPACES
738 738 bool "Namespaces support" if EMBEDDED
739 739 default !EMBEDDED
740 740 help
741 741  
... ... @@ -743,9 +743,10 @@
743 743 or same user id or pid may refer to different tasks when used in
744 744 different namespaces.
745 745  
  746 +if NAMESPACES
  747 +
746 748 config UTS_NS
747 749 bool "UTS namespace"
748   - depends on NAMESPACES
749 750 default y
750 751 help
751 752 In this namespace tasks see different info provided with the
... ... @@ -753,7 +754,7 @@
753 754  
754 755 config IPC_NS
755 756 bool "IPC namespace"
756   - depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE)
  757 + depends on (SYSVIPC || POSIX_MQUEUE)
757 758 default y
758 759 help
759 760 In this namespace tasks work with IPC ids which correspond to
... ... @@ -761,7 +762,7 @@
761 762  
762 763 config USER_NS
763 764 bool "User namespace (EXPERIMENTAL)"
764   - depends on NAMESPACES && EXPERIMENTAL
  765 + depends on EXPERIMENTAL
765 766 default y
766 767 help
767 768 This allows containers, i.e. vservers, to use user namespaces
... ... @@ -770,7 +771,6 @@
770 771  
771 772 config PID_NS
772 773 bool "PID Namespaces"
773   - depends on NAMESPACES
774 774 default y
775 775 help
776 776 Support process id namespaces. This allows having multiple
777 777  
... ... @@ -779,11 +779,13 @@
779 779  
780 780 config NET_NS
781 781 bool "Network namespace"
782   - depends on NAMESPACES && NET
  782 + depends on NET
783 783 default y
784 784 help
785 785 Allow user space to create what appear to be multiple instances
786 786 of the network stack.
  787 +
  788 +endif # NAMESPACES
787 789  
788 790 config BLK_DEV_INITRD
789 791 bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"