diff options
author | Mark Salter <msalter@redhat.com> | 2012-03-16 09:27:57 -0400 |
---|---|---|
committer | Mark Salter <msalter@redhat.com> | 2012-03-16 09:27:57 -0400 |
commit | 6e780cf5c07ab85b9b1825ddd586a53ead10b579 (patch) | |
tree | 4e909e869cf6da4cbe88685f1012eccf9db99aca | |
parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) |
C6X: remove dead code from entry.S
The ENDPROC() on sys_fadvise64_c6x() in arch/c6x/kernel/entry.S is
outside of the conditional block with the matching ENTRY() macro. This
leads a newer (v2.22 vs. v2.20) assembler to complain:
/tmp/ccGZBaPT.s: Assembler messages:
/tmp/ccGZBaPT.s: Error: .size expression for sys_fadvise64_c6x does not evaluate to a constant
The conditional block became dead code when c6x switched to generic
unistd.h and should be removed along with the offending ENDPROC().
Signed-off-by: Mark Salter <msalter@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
-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) | |||
717 | #endif | 717 | #endif |
718 | ENDPROC(sys_ftruncate64_c6x) | 718 | ENDPROC(sys_ftruncate64_c6x) |
719 | 719 | ||
720 | #ifdef __ARCH_WANT_SYSCALL_OFF_T | ||
721 | ;; On Entry | ||
722 | ;; A4 - fd | ||
723 | ;; B4 - offset_lo (LE), offset_hi (BE) | ||
724 | ;; A6 - offset_lo (BE), offset_hi (LE) | ||
725 | ;; B6 - len | ||
726 | ;; A8 - advice | ||
727 | ENTRY(sys_fadvise64_c6x) | ||
728 | #ifdef CONFIG_C6X_BIG_KERNEL | ||
729 | MVKL .S1 sys_fadvise64,A0 | ||
730 | MVKH .S1 sys_fadvise64,A0 | ||
731 | BNOP .S2X A0,2 | ||
732 | #else | ||
733 | B .S2 sys_fadvise64 | ||
734 | NOP 2 | ||
735 | #endif | ||
736 | #ifdef CONFIG_CPU_BIG_ENDIAN | ||
737 | MV .L2 B4,B5 | ||
738 | || MV .D2X A6,B4 | ||
739 | #else | ||
740 | MV .D2X A6,B5 | ||
741 | #endif | ||
742 | MV .D1X B6,A6 | ||
743 | MV .D2X A8,B6 | ||
744 | #endif | ||
745 | ENDPROC(sys_fadvise64_c6x) | ||
746 | |||
747 | ;; On Entry | 720 | ;; On Entry |
748 | ;; A4 - fd | 721 | ;; A4 - fd |
749 | ;; B4 - offset_lo (LE), offset_hi (BE) | 722 | ;; B4 - offset_lo (LE), offset_hi (BE) |