diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/microblaze/lib/fastcopy.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 @@ | |||
| 29 | * between mem locations with size of xfer spec'd in bytes | 29 | * between mem locations with size of xfer spec'd in bytes |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #ifdef __MICROBLAZEEL__ | ||
| 33 | #error Microblaze LE not support ASM optimized lib func. Disable OPT_LIB_ASM. | ||
| 34 | #endif | ||
| 35 | |||
| 32 | #include <linux/linkage.h> | 36 | #include <linux/linkage.h> |
| 33 | .text | 37 | .text |
| 34 | .globl memcpy | 38 | .globl memcpy |