Revert "Make credit2 the default scheduler"

The migration code reads scheduler parameters on the sending side and
tries to set them again on the receiving side, failing if this fails;
the result is that a simple upgrade from 4.11 -> 4.12 will now fail
all migrations.  Solving this is not simple; revert the credit2
upgrade until we can sort something out.

This reverts commit ec6662445b1ec9231ca69583863de644206ef313.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>

diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 3a1c585d2570b5c61099c64fbbe27f1bbf604f52..1a6d6281c15a02635435a757759c6d8cf1b2a541 100644 (file)
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -215,7 +215,7 @@ config SCHED_NULL
 
 choice
        prompt "Default Scheduler?"
-       default SCHED_CREDIT2_DEFAULT
+       default SCHED_CREDIT_DEFAULT
 
        config SCHED_CREDIT_DEFAULT
                bool "Credit Scheduler" if SCHED_CREDIT
@@ -236,7 +236,7 @@ config SCHED_DEFAULT
        default "rtds" if SCHED_RTDS_DEFAULT
        default "arinc653" if SCHED_ARINC653_DEFAULT
        default "null" if SCHED_NULL_DEFAULT
-       default "credit2"
+       default "credit"
 
 endmenu