diff options
| author | Chris Zankel <chris@zankel.net> | 2015-11-09 00:12:47 +0100 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-11-09 00:12:47 +0100 |
| commit | afaa7c542cc9c4d8a99ba252a8ea5e8bc7c897e2 (patch) | |
| tree | 29cb959bef3622113dfe2e5f15bbe7dfdd696ab1 /arch/xtensa/include/asm/asmmacro.h | |
| parent | Linux 4.3 (diff) | |
| parent | xtensa: implement dma_to_phys and phys_to_dma (diff) | |
| download | linux-afaa7c542cc9c4d8a99ba252a8ea5e8bc7c897e2.tar.xz linux-afaa7c542cc9c4d8a99ba252a8ea5e8bc7c897e2.zip | |
Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa
Xtensa improvements for 4.4:
- fix remaining issues with noMMU cores;
- fix build for cores w/o cache or zero overhead loop options;
- fix boot of secondary cores in SMP configuration;
- add support for DMA to high memory pages;
- add dma_to_phys and phys_to_dma functions.
Diffstat (limited to 'arch/xtensa/include/asm/asmmacro.h')
| -rw-r--r-- | arch/xtensa/include/asm/asmmacro.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/asmmacro.h b/arch/xtensa/include/asm/asmmacro.h index 755320f6e0bc..746dcc8b5abc 100644 --- a/arch/xtensa/include/asm/asmmacro.h +++ b/arch/xtensa/include/asm/asmmacro.h @@ -35,9 +35,10 @@ * __loop as * restart loop. 'as' register must not have been modified! * - * __endla ar, at, incr + * __endla ar, as, incr * ar start address (modified) - * as scratch register used by macro + * as scratch register used by __loops/__loopi macros or + * end address used by __loopt macro * inc increment */ @@ -97,7 +98,7 @@ .endm /* - * loop from ar to ax + * loop from ar to as */ .macro __loopt ar, as, at, incr_log2 |