diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-12 09:27:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-12 09:27:18 +0800 |
| commit | 334ca3ed18ded942e0220719f70b80eb20fa48ec (patch) | |
| tree | 16e6d4a8342db2ff94505cb0dba60cd2fa1587bf /include/asm-generic/fixmap.h | |
| parent | bab15641824ad77e5f3af9cc4b84308cba32aa7d (diff) | |
| parent | 9ba733e2628196c5f211875122c8fc6de108c19e (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'include/asm-generic/fixmap.h')
| -rw-r--r-- | include/asm-generic/fixmap.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h index 1cbb8338edf3..827e4d3bbc7a 100644 --- a/include/asm-generic/fixmap.h +++ b/include/asm-generic/fixmap.h @@ -70,12 +70,12 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr) #endif /* Return a pointer with offset calculated */ -#define __set_fixmap_offset(idx, phys, flags) \ -({ \ - unsigned long addr; \ - __set_fixmap(idx, phys, flags); \ - addr = fix_to_virt(idx) + ((phys) & (PAGE_SIZE - 1)); \ - addr; \ +#define __set_fixmap_offset(idx, phys, flags) \ +({ \ + unsigned long ________addr; \ + __set_fixmap(idx, phys, flags); \ + ________addr = fix_to_virt(idx) + ((phys) & (PAGE_SIZE - 1)); \ + ________addr; \ }) #define set_fixmap_offset(idx, phys) \ |