Merge git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull MIPS fixes from Ralf Baechle:

- Fix a comment

- A small cleanup the main purpose of which is to work around an
internal compiler error bug in certain Codesource toolchains.

* git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: mm: Move some checks out of 'for' loop in DMA operations
MIPS: cpu-features.h: s/MIPS53/MIPS64/

Linus Torvalds 12 years ago b4820416 06367d58

+5 -9

2 changed files

expand all

arch

mips

include

asm

cpu-features.h

dma-default.c

+1 -1

arch/mips/include/asm/cpu-features.h

··· 187 187 188 188 /* 189 189 * MIPS32, MIPS64, VR5500, IDT32332, IDT32334 and maybe a few other 190 - * pre-MIPS32/MIPS53 processors have CLO, CLZ. The IDT RC64574 is 64-bit and 190 + * pre-MIPS32/MIPS64 processors have CLO, CLZ. The IDT RC64574 is 64-bit and 191 191 * has CLO and CLZ but not DCLO nor DCLZ. For 64-bit kernels 192 192 * cpu_has_clo_clz also indicates the availability of DCLO and DCLZ. 193 193 */

+4 -8

arch/mips/mm/dma-default.c

··· 308 308 { 309 309 int i; 310 310 311 - /* Make sure that gcc doesn't leave the empty loop body. */ 312 - for (i = 0; i < nelems; i++, sg++) { 313 - if (cpu_needs_post_dma_flush(dev)) 311 + if (cpu_needs_post_dma_flush(dev)) 312 + for (i = 0; i < nelems; i++, sg++) 314 313 __dma_sync(sg_page(sg), sg->offset, sg->length, 315 314 direction); 316 - } 317 315 } 318 316 319 317 static void mips_dma_sync_sg_for_device(struct device *dev, ··· 319 321 { 320 322 int i; 321 323 322 - /* Make sure that gcc doesn't leave the empty loop body. */ 323 - for (i = 0; i < nelems; i++, sg++) { 324 - if (!plat_device_is_coherent(dev)) 324 + if (!plat_device_is_coherent(dev)) 325 + for (i = 0; i < nelems; i++, sg++) 325 326 __dma_sync(sg_page(sg), sg->offset, sg->length, 326 327 direction); 327 - } 328 328 } 329 329 330 330 int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)