From ab16512669c1435979d70aa51ff25328483ad238 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Wed, 3 Oct 2007 20:42:45 -0700 Subject: [PATCH] vcompound: crypto: Fallback for temporary order 2 allocation The crypto subsystem needs an order 2 allocation. This is a temporary buffer for xoring data so we can safely allow fallback. Cc: Dan Williams Signed-off-by: Christoph Lameter --- crypto/xor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.25-rc5-mm1/crypto/xor.c =================================================================== --- linux-2.6.25-rc5-mm1.orig/crypto/xor.c 2008-03-20 18:04:44.649120096 -0700 +++ linux-2.6.25-rc5-mm1/crypto/xor.c 2008-03-20 19:41:35.383789613 -0700 @@ -101,7 +101,7 @@ calibrate_xor_blocks(void) void *b1, *b2; struct xor_block_template *f, *fastest; - b1 = (void *) __get_free_pages(GFP_KERNEL, 2); + b1 = __alloc_vcompound(GFP_KERNEL, 2); if (!b1) { printk(KERN_WARNING "xor: Yikes! No memory available.\n"); return -ENOMEM; @@ -140,7 +140,7 @@ calibrate_xor_blocks(void) #undef xor_speed - free_pages((unsigned long)b1, 2); + __free_vcompound(b1); active_template = fastest; return 0;