diff options
| author | Kees Cook <keescook@chromium.org> | 2013-01-16 21:53:22 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 17:43:12 -0500 |
| commit | 07ff8b5358b8abcfe4c0d3806782e627bd36679d (patch) | |
| tree | 4f0b7dfb97fa6aa0b7c2b2bc95dcfede478aaed7 | |
| parent | daef22cf07f44c9152e17f260769edffb14f6bae (diff) | |
arch/powerpc/kvm: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
CC: Alexander Graf <agraf@suse.de>
CC: Avi Kivity <avi@redhat.com>
CC: Marcelo Tosatti <mtosatti@redhat.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/powerpc/kvm/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index 4730c953f435..63c67ec72e43 100644 --- a/arch/powerpc/kvm/Kconfig +++ b/arch/powerpc/kvm/Kconfig | |||
| @@ -41,7 +41,7 @@ config KVM_BOOK3S_PR | |||
| 41 | 41 | ||
| 42 | config KVM_BOOK3S_32 | 42 | config KVM_BOOK3S_32 |
| 43 | tristate "KVM support for PowerPC book3s_32 processors" | 43 | tristate "KVM support for PowerPC book3s_32 processors" |
| 44 | depends on EXPERIMENTAL && PPC_BOOK3S_32 && !SMP && !PTE_64BIT | 44 | depends on PPC_BOOK3S_32 && !SMP && !PTE_64BIT |
| 45 | select KVM | 45 | select KVM |
| 46 | select KVM_BOOK3S_32_HANDLER | 46 | select KVM_BOOK3S_32_HANDLER |
| 47 | select KVM_BOOK3S_PR | 47 | select KVM_BOOK3S_PR |
| @@ -56,7 +56,7 @@ config KVM_BOOK3S_32 | |||
| 56 | 56 | ||
| 57 | config KVM_BOOK3S_64 | 57 | config KVM_BOOK3S_64 |
| 58 | tristate "KVM support for PowerPC book3s_64 processors" | 58 | tristate "KVM support for PowerPC book3s_64 processors" |
| 59 | depends on EXPERIMENTAL && PPC_BOOK3S_64 | 59 | depends on PPC_BOOK3S_64 |
| 60 | select KVM_BOOK3S_64_HANDLER | 60 | select KVM_BOOK3S_64_HANDLER |
| 61 | select KVM | 61 | select KVM |
| 62 | ---help--- | 62 | ---help--- |
| @@ -97,7 +97,7 @@ config KVM_BOOKE_HV | |||
| 97 | 97 | ||
| 98 | config KVM_440 | 98 | config KVM_440 |
| 99 | bool "KVM support for PowerPC 440 processors" | 99 | bool "KVM support for PowerPC 440 processors" |
| 100 | depends on EXPERIMENTAL && 44x | 100 | depends on 44x |
| 101 | select KVM | 101 | select KVM |
| 102 | select KVM_MMIO | 102 | select KVM_MMIO |
| 103 | ---help--- | 103 | ---help--- |
| @@ -122,7 +122,7 @@ config KVM_EXIT_TIMING | |||
| 122 | 122 | ||
| 123 | config KVM_E500V2 | 123 | config KVM_E500V2 |
| 124 | bool "KVM support for PowerPC E500v2 processors" | 124 | bool "KVM support for PowerPC E500v2 processors" |
| 125 | depends on EXPERIMENTAL && E500 && !PPC_E500MC | 125 | depends on E500 && !PPC_E500MC |
| 126 | select KVM | 126 | select KVM |
| 127 | select KVM_MMIO | 127 | select KVM_MMIO |
| 128 | select MMU_NOTIFIER | 128 | select MMU_NOTIFIER |
| @@ -137,7 +137,7 @@ config KVM_E500V2 | |||
| 137 | 137 | ||
| 138 | config KVM_E500MC | 138 | config KVM_E500MC |
| 139 | bool "KVM support for PowerPC E500MC/E5500 processors" | 139 | bool "KVM support for PowerPC E500MC/E5500 processors" |
| 140 | depends on EXPERIMENTAL && PPC_E500MC | 140 | depends on PPC_E500MC |
| 141 | select KVM | 141 | select KVM |
| 142 | select KVM_MMIO | 142 | select KVM_MMIO |
| 143 | select KVM_BOOKE_HV | 143 | select KVM_BOOKE_HV |