diff --git a/[refs] b/[refs] index 39df29886ad7..fd20b23c49d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 802c1f6648aeb3eea670b4ef8b10014169b65699 +refs/heads/master: b48ee7135230ac43b6820d59a784ac0bd51ae552 diff --git a/trunk/include/asm-x86/dma-mapping_32.h b/trunk/include/asm-x86/dma-mapping_32.h index fd7246dddad4..d0512c9251b7 100644 --- a/trunk/include/asm-x86/dma-mapping_32.h +++ b/trunk/include/asm-x86/dma-mapping_32.h @@ -21,7 +21,7 @@ dma_get_cache_alignment(void) { /* no easy way to get cache size on all x86, so return the * maximum possible, to be safe */ - return (1 << INTERNODE_CACHE_SHIFT); + return boot_cpu_data.x86_clflush_size; } #define dma_is_consistent(d, h) (1)