Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 0f61b1e..ed4a31e 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1064,7 +1064,6 @@ config HARDLOCKUP_DETECTOR
        depends on HAVE_HARDLOCKUP_DETECTOR_PERF || HAVE_HARDLOCKUP_DETECTOR_ARCH
        select LOCKUP_DETECTOR
        select HARDLOCKUP_DETECTOR_PERF if HAVE_HARDLOCKUP_DETECTOR_PERF
-       select HARDLOCKUP_DETECTOR_ARCH if HAVE_HARDLOCKUP_DETECTOR_ARCH
        help
          Say Y here to enable the kernel to act as a watchdog to detect
          hard lockups.
@@ -2061,8 +2060,9 @@ config TEST_MIN_HEAP
          If unsure, say N.
 
 config TEST_SORT
-       tristate "Array-based sort test"
-       depends on DEBUG_KERNEL || m
+       tristate "Array-based sort test" if !KUNIT_ALL_TESTS
+       depends on KUNIT
+       default KUNIT_ALL_TESTS
        help
          This option enables the self-test function of 'sort()' at boot,
          or at module load time.
@@ -2443,8 +2443,7 @@ config SLUB_KUNIT_TEST
 
 config RATIONAL_KUNIT_TEST
        tristate "KUnit test for rational.c" if !KUNIT_ALL_TESTS
-       depends on KUNIT
-       select RATIONAL
+       depends on KUNIT && RATIONAL
        default KUNIT_ALL_TESTS
        help
          This builds the rational math unit test.