Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353634
b: refs/heads/master
c: 07ff8b5
h: refs/heads/master
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent 5fd5ad7 commit 327c7c2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: daef22cf07f44c9152e17f260769edffb14f6bae
refs/heads/master: 07ff8b5358b8abcfe4c0d3806782e627bd36679d
10 changes: 5 additions & 5 deletions trunk/arch/powerpc/kvm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ config KVM_BOOK3S_PR

config KVM_BOOK3S_32
tristate "KVM support for PowerPC book3s_32 processors"
depends on EXPERIMENTAL && PPC_BOOK3S_32 && !SMP && !PTE_64BIT
depends on PPC_BOOK3S_32 && !SMP && !PTE_64BIT
select KVM
select KVM_BOOK3S_32_HANDLER
select KVM_BOOK3S_PR
Expand All @@ -56,7 +56,7 @@ config KVM_BOOK3S_32

config KVM_BOOK3S_64
tristate "KVM support for PowerPC book3s_64 processors"
depends on EXPERIMENTAL && PPC_BOOK3S_64
depends on PPC_BOOK3S_64
select KVM_BOOK3S_64_HANDLER
select KVM
---help---
Expand Down Expand Up @@ -97,7 +97,7 @@ config KVM_BOOKE_HV

config KVM_440
bool "KVM support for PowerPC 440 processors"
depends on EXPERIMENTAL && 44x
depends on 44x
select KVM
select KVM_MMIO
---help---
Expand All @@ -122,7 +122,7 @@ config KVM_EXIT_TIMING

config KVM_E500V2
bool "KVM support for PowerPC E500v2 processors"
depends on EXPERIMENTAL && E500 && !PPC_E500MC
depends on E500 && !PPC_E500MC
select KVM
select KVM_MMIO
select MMU_NOTIFIER
Expand All @@ -137,7 +137,7 @@ config KVM_E500V2

config KVM_E500MC
bool "KVM support for PowerPC E500MC/E5500 processors"
depends on EXPERIMENTAL && PPC_E500MC
depends on PPC_E500MC
select KVM
select KVM_MMIO
select KVM_BOOKE_HV
Expand Down

0 comments on commit 327c7c2

Please sign in to comment.