diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-16 17:03:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-16 17:03:15 -0700 |
| commit | 9fc005c017101c498f336329c6bdf510bce8ef6e (patch) | |
| tree | 31ccea9241be8238096964a2bc6e2f3bb6c10628 /arch | |
| parent | c0173863528a8c9212c53e080d63a1aaae5ef4f4 (diff) | |
| parent | 6e780cf5c07ab85b9b1825ddd586a53ead10b579 (diff) | |
| download | talos-op-linux-9fc005c017101c498f336329c6bdf510bce8ef6e.tar.gz talos-op-linux-9fc005c017101c498f336329c6bdf510bce8ef6e.zip | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull c6x bugfix from Mark Salter:
"Remove dead code from entry.S which causes a build failure when using
a newer assembler (v2.22 complains about it, v2.20 ignores it)."
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
C6X: remove dead code from entry.S
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/c6x/kernel/entry.S | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/c6x/kernel/entry.S b/arch/c6x/kernel/entry.S index 3e977ccda827..30b37e5f4a61 100644 --- a/arch/c6x/kernel/entry.S +++ b/arch/c6x/kernel/entry.S @@ -717,33 +717,6 @@ ENTRY(sys_ftruncate64_c6x) #endif ENDPROC(sys_ftruncate64_c6x) -#ifdef __ARCH_WANT_SYSCALL_OFF_T -;; On Entry -;; A4 - fd -;; B4 - offset_lo (LE), offset_hi (BE) -;; A6 - offset_lo (BE), offset_hi (LE) -;; B6 - len -;; A8 - advice -ENTRY(sys_fadvise64_c6x) -#ifdef CONFIG_C6X_BIG_KERNEL - MVKL .S1 sys_fadvise64,A0 - MVKH .S1 sys_fadvise64,A0 - BNOP .S2X A0,2 -#else - B .S2 sys_fadvise64 - NOP 2 -#endif -#ifdef CONFIG_CPU_BIG_ENDIAN - MV .L2 B4,B5 - || MV .D2X A6,B4 -#else - MV .D2X A6,B5 -#endif - MV .D1X B6,A6 - MV .D2X A8,B6 -#endif -ENDPROC(sys_fadvise64_c6x) - ;; On Entry ;; A4 - fd ;; B4 - offset_lo (LE), offset_hi (BE) |
