diff --git a/kernel/Kconfig b/kernel/Kconfig index f5e15ae4..71f4e8c3 100644 --- a/kernel/Kconfig +++ b/kernel/Kconfig @@ -4,7 +4,7 @@ config MARS tristate "storage system MARS (EXPERIMENTAL)" - depends on BLOCK && PROC_SYSCTL && HIGH_RES_TIMERS + depends on BLOCK && PROC_SYSCTL && HIGH_RES_TIMERS && !DEBUG_SLAB && !DEBUG_SG default n ---help--- Experimental storage System. Only compile as a module! diff --git a/kernel/mars.h b/kernel/mars.h index 0f714ef2..5e7ed036 100644 --- a/kernel/mars.h +++ b/kernel/mars.h @@ -26,6 +26,13 @@ #ifndef CONFIG_HIGH_RES_TIMERS #error CONFIG_HIGH_RES_TIMERS must be set #endif +#ifdef CONFIG_DEBUG_SLAB +#error Fixme: CONFIG_DEBUG_SLAB does not work (fix the bio offset calculation) +#endif +#ifdef CONFIG_DEBUG_SG +#error Fixme: CONFIG_DEBUG_SG does not work (fix the bio offset calculation) +#endif + /////////////////////////////////////////////////////////////////////////