diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index eff5298fe..0223e5955 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -9025,7 +9025,8 @@ int __init scst_lib_init(void)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
 	scsi_io_context_cache = kmem_cache_create("scst_scsi_io_context",
 					sizeof(struct scsi_io_context),
-					0, 0, NULL);
+					__alignof__(struct scsi_io_context),
+					0, NULL);
 	if (!scsi_io_context_cache) {
 		PRINT_ERROR("%s", "Can't init scsi io context cache");
 		res = -ENOMEM;
diff --git a/scst/src/scst_mem.c b/scst/src/scst_mem.c
index 7ef29c736..d5fc98b1e 100644
--- a/scst/src/scst_mem.c
+++ b/scst/src/scst_mem.c
@@ -1373,7 +1373,8 @@ static void sgv_pool_init_cache(struct sgv_pool *pool, int cache_num)
 		sizeof(pool->cache_names[cache_num]),
 		"%s-%uK", pool->name, (pages << PAGE_SHIFT) >> 10);
 	pool->caches[cache_num] = kmem_cache_create(
-		pool->cache_names[cache_num], size, 0, SCST_SLAB_FLAGS, NULL
+		pool->cache_names[cache_num], size,
+		__alignof__(struct sgv_pool_obj), SCST_SLAB_FLAGS, NULL
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23))
 		, NULL);
 #else