diff options
author | David Rientjes <rientjes@google.com> | 2007-05-11 01:51:05 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-05-11 09:28:33 -0400 |
commit | e8b6d40a007774bde5110c110290f8090c7e48ad (patch) | |
tree | 633130b62ce77771d91368dd0022c71186de6806 /arch | |
parent | f6d376aac33ccdce95b42fdcc916d4ee98c05623 (diff) |
[MIPS] tlbex: use __maybe_unused
Replace function instances of __attribute__((unused)) with
__maybe_unused.
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/mm/tlbex.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 492c518e7ba5..e7149290d1cb 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
@@ -35,24 +35,24 @@ | |||
35 | #include <asm/smp.h> | 35 | #include <asm/smp.h> |
36 | #include <asm/war.h> | 36 | #include <asm/war.h> |
37 | 37 | ||
38 | static __init int __attribute__((unused)) r45k_bvahwbug(void) | 38 | static __init int __maybe_unused r45k_bvahwbug(void) |
39 | { | 39 | { |
40 | /* XXX: We should probe for the presence of this bug, but we don't. */ | 40 | /* XXX: We should probe for the presence of this bug, but we don't. */ |
41 | return 0; | 41 | return 0; |
42 | } | 42 | } |
43 | 43 | ||
44 | static __init int __attribute__((unused)) r4k_250MHZhwbug(void) | 44 | static __init int __maybe_unused r4k_250MHZhwbug(void) |
45 | { | 45 | { |
46 | /* XXX: We should probe for the presence of this bug, but we don't. */ | 46 | /* XXX: We should probe for the presence of this bug, but we don't. */ |
47 | return 0; | 47 | return 0; |
48 | } | 48 | } |
49 | 49 | ||
50 | static __init int __attribute__((unused)) bcm1250_m3_war(void) | 50 | static __init int __maybe_unused bcm1250_m3_war(void) |
51 | { | 51 | { |
52 | return BCM1250_M3_WAR; | 52 | return BCM1250_M3_WAR; |
53 | } | 53 | } |
54 | 54 | ||
55 | static __init int __attribute__((unused)) r10000_llsc_war(void) | 55 | static __init int __maybe_unused r10000_llsc_war(void) |
56 | { | 56 | { |
57 | return R10000_LLSC_WAR; | 57 | return R10000_LLSC_WAR; |
58 | } | 58 | } |
@@ -511,18 +511,18 @@ L_LA(_r3000_write_probe_fail) | |||
511 | #define i_ehb(buf) i_sll(buf, 0, 0, 3) | 511 | #define i_ehb(buf) i_sll(buf, 0, 0, 3) |
512 | 512 | ||
513 | #ifdef CONFIG_64BIT | 513 | #ifdef CONFIG_64BIT |
514 | static __init int __attribute__((unused)) in_compat_space_p(long addr) | 514 | static __init int __maybe_unused in_compat_space_p(long addr) |
515 | { | 515 | { |
516 | /* Is this address in 32bit compat space? */ | 516 | /* Is this address in 32bit compat space? */ |
517 | return (((addr) & 0xffffffff00000000L) == 0xffffffff00000000L); | 517 | return (((addr) & 0xffffffff00000000L) == 0xffffffff00000000L); |
518 | } | 518 | } |
519 | 519 | ||
520 | static __init int __attribute__((unused)) rel_highest(long val) | 520 | static __init int __maybe_unused rel_highest(long val) |
521 | { | 521 | { |
522 | return ((((val + 0x800080008000L) >> 48) & 0xffff) ^ 0x8000) - 0x8000; | 522 | return ((((val + 0x800080008000L) >> 48) & 0xffff) ^ 0x8000) - 0x8000; |
523 | } | 523 | } |
524 | 524 | ||
525 | static __init int __attribute__((unused)) rel_higher(long val) | 525 | static __init int __maybe_unused rel_higher(long val) |
526 | { | 526 | { |
527 | return ((((val + 0x80008000L) >> 32) & 0xffff) ^ 0x8000) - 0x8000; | 527 | return ((((val + 0x80008000L) >> 32) & 0xffff) ^ 0x8000) - 0x8000; |
528 | } | 528 | } |
@@ -556,8 +556,8 @@ static __init void i_LA_mostly(u32 **buf, unsigned int rs, long addr) | |||
556 | i_lui(buf, rs, rel_hi(addr)); | 556 | i_lui(buf, rs, rel_hi(addr)); |
557 | } | 557 | } |
558 | 558 | ||
559 | static __init void __attribute__((unused)) i_LA(u32 **buf, unsigned int rs, | 559 | static __init void __maybe_unused i_LA(u32 **buf, unsigned int rs, |
560 | long addr) | 560 | long addr) |
561 | { | 561 | { |
562 | i_LA_mostly(buf, rs, addr); | 562 | i_LA_mostly(buf, rs, addr); |
563 | if (rel_lo(addr)) | 563 | if (rel_lo(addr)) |
@@ -636,8 +636,8 @@ static __init void copy_handler(struct reloc *rel, struct label *lab, | |||
636 | move_labels(lab, first, end, off); | 636 | move_labels(lab, first, end, off); |
637 | } | 637 | } |
638 | 638 | ||
639 | static __init int __attribute__((unused)) insn_has_bdelay(struct reloc *rel, | 639 | static __init int __maybe_unused insn_has_bdelay(struct reloc *rel, |
640 | u32 *addr) | 640 | u32 *addr) |
641 | { | 641 | { |
642 | for (; rel->lab != label_invalid; rel++) { | 642 | for (; rel->lab != label_invalid; rel++) { |
643 | if (rel->addr == addr | 643 | if (rel->addr == addr |
@@ -650,15 +650,15 @@ static __init int __attribute__((unused)) insn_has_bdelay(struct reloc *rel, | |||
650 | } | 650 | } |
651 | 651 | ||
652 | /* convenience functions for labeled branches */ | 652 | /* convenience functions for labeled branches */ |
653 | static void __init __attribute__((unused)) | 653 | static void __init __maybe_unused |
654 | il_bltz(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) | 654 | il_bltz(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) |
655 | { | 655 | { |
656 | r_mips_pc16(r, *p, l); | 656 | r_mips_pc16(r, *p, l); |
657 | i_bltz(p, reg, 0); | 657 | i_bltz(p, reg, 0); |
658 | } | 658 | } |
659 | 659 | ||
660 | static void __init __attribute__((unused)) il_b(u32 **p, struct reloc **r, | 660 | static void __init __maybe_unused il_b(u32 **p, struct reloc **r, |
661 | enum label_id l) | 661 | enum label_id l) |
662 | { | 662 | { |
663 | r_mips_pc16(r, *p, l); | 663 | r_mips_pc16(r, *p, l); |
664 | i_b(p, 0); | 664 | i_b(p, 0); |
@@ -671,7 +671,7 @@ static void __init il_beqz(u32 **p, struct reloc **r, unsigned int reg, | |||
671 | i_beqz(p, reg, 0); | 671 | i_beqz(p, reg, 0); |
672 | } | 672 | } |
673 | 673 | ||
674 | static void __init __attribute__((unused)) | 674 | static void __init __maybe_unused |
675 | il_beqzl(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) | 675 | il_beqzl(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) |
676 | { | 676 | { |
677 | r_mips_pc16(r, *p, l); | 677 | r_mips_pc16(r, *p, l); |
@@ -692,7 +692,7 @@ static void __init il_bgezl(u32 **p, struct reloc **r, unsigned int reg, | |||
692 | i_bgezl(p, reg, 0); | 692 | i_bgezl(p, reg, 0); |
693 | } | 693 | } |
694 | 694 | ||
695 | static void __init __attribute__((unused)) | 695 | static void __init __maybe_unused |
696 | il_bgez(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) | 696 | il_bgez(u32 **p, struct reloc **r, unsigned int reg, enum label_id l) |
697 | { | 697 | { |
698 | r_mips_pc16(r, *p, l); | 698 | r_mips_pc16(r, *p, l); |
@@ -810,7 +810,7 @@ static __initdata u32 final_handler[64]; | |||
810 | * | 810 | * |
811 | * As if we MIPS hackers wouldn't know how to nop pipelines happy ... | 811 | * As if we MIPS hackers wouldn't know how to nop pipelines happy ... |
812 | */ | 812 | */ |
813 | static __init void __attribute__((unused)) build_tlb_probe_entry(u32 **p) | 813 | static __init void __maybe_unused build_tlb_probe_entry(u32 **p) |
814 | { | 814 | { |
815 | switch (current_cpu_data.cputype) { | 815 | switch (current_cpu_data.cputype) { |
816 | /* Found by experiment: R4600 v2.0 needs this, too. */ | 816 | /* Found by experiment: R4600 v2.0 needs this, too. */ |
@@ -1098,7 +1098,7 @@ build_get_pgd_vmalloc64(u32 **p, struct label **l, struct reloc **r, | |||
1098 | * TMP and PTR are scratch. | 1098 | * TMP and PTR are scratch. |
1099 | * TMP will be clobbered, PTR will hold the pgd entry. | 1099 | * TMP will be clobbered, PTR will hold the pgd entry. |
1100 | */ | 1100 | */ |
1101 | static __init void __attribute__((unused)) | 1101 | static __init void __maybe_unused |
1102 | build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr) | 1102 | build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr) |
1103 | { | 1103 | { |
1104 | long pgdc = (long)pgd_current; | 1104 | long pgdc = (long)pgd_current; |