[MIPS] Revert [MIPS] tlbex.c: Cleanup __init usage.
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6f1ca1d2869814711bcf983cfc0803cfd0b29f27
Commit: 6f1ca1d2869814711bcf983cfc0803cfd0b29f27
Parent: 57f17e8e15a8e392312450e28f80d6a90470e066
Author: Ralf Baechle [EMAIL PROTECTED]
AuthorDate: Fri Oct 12 15:39:45 2007 +0100
Committer: Ralf Baechle [EMAIL PROTECTED]
CommitDate: Sat Oct 13 00:53:00 2007 +0100
[MIPS] Revert [MIPS] tlbex.c: Cleanup __init usage.
This reverts commit aaf76a3245c02faba51c96b9a340c14d6bb0dcc0.
As requested by ranck Bui-Huu [EMAIL PROTECTED].
Signed-off-by: Ralf Baechle [EMAIL PROTECTED]
---
arch/mips/mm/tlbex.c | 96 +-
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 01b0961..a61246d 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -66,7 +66,7 @@ static inline int __maybe_unused r1_llsc_war(void)
* why; it's not an issue caused by the core RTL.
*
*/
-static int __init m4kc_tlbp_war(void)
+static __init int __attribute__((unused)) m4kc_tlbp_war(void)
{
return (current_cpu_data.processor_id 0x00) ==
(PRID_COMP_MIPS | PRID_IMP_4KC);
@@ -140,7 +140,7 @@ struct insn {
| (e) RE_SH \
| (f) FUNC_SH)
-static struct insn insn_table[] __initdata = {
+static __initdata struct insn insn_table[] = {
{ insn_addiu, M(addiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_addu, M(spec_op, 0, 0, 0, 0, addu_op), RS | RT | RD },
{ insn_and, M(spec_op, 0, 0, 0, 0, and_op), RS | RT | RD },
@@ -193,7 +193,7 @@ static struct insn insn_table[] __initdata = {
#undef M
-static u32 __init build_rs(u32 arg)
+static __init u32 build_rs(u32 arg)
{
if (arg ~RS_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -201,7 +201,7 @@ static u32 __init build_rs(u32 arg)
return (arg RS_MASK) RS_SH;
}
-static u32 __init build_rt(u32 arg)
+static __init u32 build_rt(u32 arg)
{
if (arg ~RT_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -209,7 +209,7 @@ static u32 __init build_rt(u32 arg)
return (arg RT_MASK) RT_SH;
}
-static u32 __init build_rd(u32 arg)
+static __init u32 build_rd(u32 arg)
{
if (arg ~RD_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -217,7 +217,7 @@ static u32 __init build_rd(u32 arg)
return (arg RD_MASK) RD_SH;
}
-static u32 __init build_re(u32 arg)
+static __init u32 build_re(u32 arg)
{
if (arg ~RE_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -225,7 +225,7 @@ static u32 __init build_re(u32 arg)
return (arg RE_MASK) RE_SH;
}
-static u32 __init build_simm(s32 arg)
+static __init u32 build_simm(s32 arg)
{
if (arg 0x7fff || arg -0x8000)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -233,7 +233,7 @@ static u32 __init build_simm(s32 arg)
return arg 0x;
}
-static u32 __init build_uimm(u32 arg)
+static __init u32 build_uimm(u32 arg)
{
if (arg ~IMM_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -241,7 +241,7 @@ static u32 __init build_uimm(u32 arg)
return arg IMM_MASK;
}
-static u32 __init build_bimm(s32 arg)
+static __init u32 build_bimm(s32 arg)
{
if (arg 0x1 || arg -0x2)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -252,7 +252,7 @@ static u32 __init build_bimm(s32 arg)
return ((arg 0) ? (1 15) : 0) | ((arg 2) 0x7fff);
}
-static u32 __init build_jimm(u32 arg)
+static __init u32 build_jimm(u32 arg)
{
if (arg ~((JIMM_MASK) 2))
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -260,7 +260,7 @@ static u32 __init build_jimm(u32 arg)
return (arg 2) JIMM_MASK;
}
-static u32 __init build_func(u32 arg)
+static __init u32 build_func(u32 arg)
{
if (arg ~FUNC_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -268,7 +268,7 @@ static u32 __init build_func(u32 arg)
return arg FUNC_MASK;
}
-static u32 __init build_set(u32 arg)
+static __init u32 build_set(u32 arg)
{
if (arg ~SET_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -315,69 +315,69 @@ static void __init build_insn(u32 **buf, enum opcode opc,
...)
}
#define I_u1u2u3(op) \
- static inline void i##op(u32 **buf, unsigned int a, \
+ static inline void __init i##op(u32 **buf, unsigned int a, \
unsigned int b, unsigned int c) \
{ \
build_insn(buf, insn##op, a, b, c
[MIPS] tlbex.c: Cleanup __init usage.
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=aaf76a3245c02faba51c96b9a340c14d6bb0dcc0
Commit: aaf76a3245c02faba51c96b9a340c14d6bb0dcc0
Parent: 2c4d13570d8e512cca65d159502622e1666ad4bd
Author: Franck Bui-Huu [EMAIL PROTECTED]
AuthorDate: Tue Oct 9 22:34:26 2007 +0200
Committer: Ralf Baechle [EMAIL PROTECTED]
CommitDate: Thu Oct 11 23:46:19 2007 +0100
[MIPS] tlbex.c: Cleanup __init usage.
Signed-off-by: Franck Bui-Huu [EMAIL PROTECTED]
Signed-off-by: Ralf Baechle [EMAIL PROTECTED]
---
arch/mips/mm/tlbex.c | 96 +-
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index a61246d..01b0961 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -66,7 +66,7 @@ static inline int __maybe_unused r1_llsc_war(void)
* why; it's not an issue caused by the core RTL.
*
*/
-static __init int __attribute__((unused)) m4kc_tlbp_war(void)
+static int __init m4kc_tlbp_war(void)
{
return (current_cpu_data.processor_id 0x00) ==
(PRID_COMP_MIPS | PRID_IMP_4KC);
@@ -140,7 +140,7 @@ struct insn {
| (e) RE_SH \
| (f) FUNC_SH)
-static __initdata struct insn insn_table[] = {
+static struct insn insn_table[] __initdata = {
{ insn_addiu, M(addiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_addu, M(spec_op, 0, 0, 0, 0, addu_op), RS | RT | RD },
{ insn_and, M(spec_op, 0, 0, 0, 0, and_op), RS | RT | RD },
@@ -193,7 +193,7 @@ static __initdata struct insn insn_table[] = {
#undef M
-static __init u32 build_rs(u32 arg)
+static u32 __init build_rs(u32 arg)
{
if (arg ~RS_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -201,7 +201,7 @@ static __init u32 build_rs(u32 arg)
return (arg RS_MASK) RS_SH;
}
-static __init u32 build_rt(u32 arg)
+static u32 __init build_rt(u32 arg)
{
if (arg ~RT_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -209,7 +209,7 @@ static __init u32 build_rt(u32 arg)
return (arg RT_MASK) RT_SH;
}
-static __init u32 build_rd(u32 arg)
+static u32 __init build_rd(u32 arg)
{
if (arg ~RD_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -217,7 +217,7 @@ static __init u32 build_rd(u32 arg)
return (arg RD_MASK) RD_SH;
}
-static __init u32 build_re(u32 arg)
+static u32 __init build_re(u32 arg)
{
if (arg ~RE_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -225,7 +225,7 @@ static __init u32 build_re(u32 arg)
return (arg RE_MASK) RE_SH;
}
-static __init u32 build_simm(s32 arg)
+static u32 __init build_simm(s32 arg)
{
if (arg 0x7fff || arg -0x8000)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -233,7 +233,7 @@ static __init u32 build_simm(s32 arg)
return arg 0x;
}
-static __init u32 build_uimm(u32 arg)
+static u32 __init build_uimm(u32 arg)
{
if (arg ~IMM_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -241,7 +241,7 @@ static __init u32 build_uimm(u32 arg)
return arg IMM_MASK;
}
-static __init u32 build_bimm(s32 arg)
+static u32 __init build_bimm(s32 arg)
{
if (arg 0x1 || arg -0x2)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -252,7 +252,7 @@ static __init u32 build_bimm(s32 arg)
return ((arg 0) ? (1 15) : 0) | ((arg 2) 0x7fff);
}
-static __init u32 build_jimm(u32 arg)
+static u32 __init build_jimm(u32 arg)
{
if (arg ~((JIMM_MASK) 2))
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -260,7 +260,7 @@ static __init u32 build_jimm(u32 arg)
return (arg 2) JIMM_MASK;
}
-static __init u32 build_func(u32 arg)
+static u32 __init build_func(u32 arg)
{
if (arg ~FUNC_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -268,7 +268,7 @@ static __init u32 build_func(u32 arg)
return arg FUNC_MASK;
}
-static __init u32 build_set(u32 arg)
+static u32 __init build_set(u32 arg)
{
if (arg ~SET_MASK)
printk(KERN_WARNING TLB synthesizer field overflow\n);
@@ -315,69 +315,69 @@ static void __init build_insn(u32 **buf, enum opcode opc,
...)
}
#define I_u1u2u3(op) \
- static inline void __init i##op(u32 **buf, unsigned int a, \
+ static inline void i##op(u32 **buf, unsigned int a, \
unsigned int b, unsigned int c) \
{ \
build_insn(buf, insn##op, a, b, c); \
}
#define I_u2u1u3(op) \
- static
