Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2011-09-11 17:45:32 +0200
committerAlexander Graf <agraf@suse.de>2011-09-11 17:45:32 +0200
commit00b922d0d8f8a0c12c118ae48d149b030b932372 (patch)
treebec8471ada94ec40eba9c60a0e4038812f779caf
parent8a211c9645361190a2ac73318bd75dd2c8df7979 (diff)
Update config files (enable KVM on PPC64 for OBS)
-rw-r--r--config/ppc/ppc648
-rw-r--r--config/ppc64/default8
-rw-r--r--config/ppc64/ppc648
3 files changed, 18 insertions, 6 deletions
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index 002ffb81fa..7b171f44df 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -247,6 +247,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
# CONFIG_INLINE_SPIN_TRYLOCK is not set
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
@@ -4825,7 +4826,6 @@ CONFIG_XMON_DISASSEMBLY=y
CONFIG_DEBUGGER=y
# CONFIG_VIRQ_DEBUG is not set
CONFIG_BOOTX_TEXT=y
-# CONFIG_PPC_EARLY_DEBUG is not set
#
# Security options
@@ -4981,5 +4981,9 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_PPC_CLOCK is not set
CONFIG_VIRTUALIZATION=y
-# CONFIG_KVM_BOOK3S_64 is not set
+CONFIG_KVM=y
+CONFIG_KVM_BOOK3S_HANDLER=y
+CONFIG_KVM_BOOK3S_64_HANDLER=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=y
# CONFIG_VHOST_NET is not set
diff --git a/config/ppc64/default b/config/ppc64/default
index 9d6053ac06..0a6cd93276 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -247,6 +247,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
# CONFIG_INLINE_SPIN_TRYLOCK is not set
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
@@ -4806,7 +4807,6 @@ CONFIG_XMON_DISASSEMBLY=y
CONFIG_DEBUGGER=y
# CONFIG_VIRQ_DEBUG is not set
CONFIG_BOOTX_TEXT=y
-# CONFIG_PPC_EARLY_DEBUG is not set
#
# Security options
@@ -4962,5 +4962,9 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_PPC_CLOCK is not set
CONFIG_VIRTUALIZATION=y
-# CONFIG_KVM_BOOK3S_64 is not set
+CONFIG_KVM=y
+CONFIG_KVM_BOOK3S_HANDLER=y
+CONFIG_KVM_BOOK3S_64_HANDLER=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=y
# CONFIG_VHOST_NET is not set
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index 30cdccf91d..5f9ac20149 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -247,6 +247,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
# CONFIG_INLINE_SPIN_TRYLOCK is not set
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
@@ -4885,7 +4886,6 @@ CONFIG_XMON_DISASSEMBLY=y
CONFIG_DEBUGGER=y
# CONFIG_VIRQ_DEBUG is not set
CONFIG_BOOTX_TEXT=y
-# CONFIG_PPC_EARLY_DEBUG is not set
#
# Security options
@@ -5041,5 +5041,9 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_PPC_CLOCK is not set
CONFIG_VIRTUALIZATION=y
-# CONFIG_KVM_BOOK3S_64 is not set
+CONFIG_KVM=y
+CONFIG_KVM_BOOK3S_HANDLER=y
+CONFIG_KVM_BOOK3S_64_HANDLER=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=y
# CONFIG_VHOST_NET is not set