diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 15:33:35 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 15:33:41 +0300 |
commit | a3ec4a603faf4244e275bf11b467aad092dfbd8a (patch) | |
tree | 1c15009716b37629070ea221a00eb9fe2303a317 /arch/microblaze/lib/fastcopy.S | |
parent | 51563cd53c4b1c1790fccd2e0af0e2b756589af9 (diff) | |
parent | 85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff) | |
download | linux-a3ec4a603faf4244e275bf11b467aad092dfbd8a.tar.xz |
Merge commit 'v2.6.38-rc5' into core/locking
Merge reason: pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/microblaze/lib/fastcopy.S')
-rw-r--r-- | arch/microblaze/lib/fastcopy.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/microblaze/lib/fastcopy.S b/arch/microblaze/lib/fastcopy.S index fdc48bb065d8..62021d7e249e 100644 --- a/arch/microblaze/lib/fastcopy.S +++ b/arch/microblaze/lib/fastcopy.S @@ -29,6 +29,10 @@ * between mem locations with size of xfer spec'd in bytes */ +#ifdef __MICROBLAZEEL__ +#error Microblaze LE not support ASM optimized lib func. Disable OPT_LIB_ASM. +#endif + #include <linux/linkage.h> .text .globl memcpy |