Skip to contentSkip to conversation

include/asm-ppc/btext.h: add prototype of btext_init function.

PATCH In review Otavio Salvador 5 participants 8 messages Dec 3, 2005 – Dec 4, 2005

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

PATCH 1/1 include/asm-ppc/btext.h: add prototype of btext_init function.

The prototype of btext_init function was missing and then caused a compile warning.

---

 include/asm-ppc/btext.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 60e8ae37378de2772b6b0768b12a49f923710152 786b869f9cfd4c1f82fbc8b20fa8cafb9188e12f

include/asm-ppc/btext.h +1 -0
index ccaefab..2329331 100644
@@ -18,6 +18,7 @@ extern boot_infos_t disp_bi;
 extern int boot_text_mapped;
 
 extern void init_boot_display(void);
+extern void __init btext_init(boot_infos_t *bi);
 extern void btext_welcome(void);
 extern void btext_prepare_BAT(void);
 extern void btext_setup_display(int width, int height, int depth, int pitch,

---
0.99.9k

#1 lore raw
Quoted 15 lines · Otavio Salvador

The prototype of btext_init function was missing and then caused a compile warning.

---

 include/asm-ppc/btext.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 60e8ae37378de2772b6b0768b12a49f923710152 786b869f9cfd4c1f82fbc8b20fa8cafb9188e12f

include/asm-ppc/btext.h +0 -0
index ccaefab..2329331 100644

include/asm-ppc/btext.h extern boot_infos_t disp_bi; · line 24

Quoted 7 lines
include/asm-ppc/btext.h +1 -0
@@ -18,6 +18,7 @@ extern boot_infos_t disp_bi;
 extern int boot_text_mapped;
 
 extern void init_boot_display(void);
+extern void __init btext_init(boot_infos_t *bi);
 extern void btext_welcome(void);
 extern void btext_prepare_BAT(void);
 extern void btext_setup_display(int width, int height, int depth, int pitch,

"__init" should be placed between closing brace and semicolon. For more info, see include/linux/init.h

Signature · 1 line
Eugene
author
#2 lore raw

Eugene Surovegin <[email protected]> writes:

...

Quoted 1 line
Quoted 1 line

+extern void __init btext_init(boot_infos_t *bi);

...

Quoted 3 lines

"__init" should be placed between closing brace and semicolon. For more info, see include/linux/init.h

Ok. Thanks, I'll resend the patch.

Signature · 8 lines
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: [email protected]      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://www.freedom.ind.br/otavio
---------------------------------------------
"Microsoft gives you Windows ... Linux gives
 you the whole house."
author
#3 lore raw

PATCH 1/1 include/asm-ppc/btext.h: add prototype of btext_init function.

In reply to Eugene Surovegin

The prototype of btext_init function was missing and then caused a compile warning.

---

 include/asm-ppc/btext.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 60e8ae37378de2772b6b0768b12a49f923710152 19174aa31fd85e4410e99deb82c3b7ff2424fa55

include/asm-ppc/btext.h +1 -0
index ccaefab..2cf437c 100644
@@ -18,6 +18,7 @@ extern boot_infos_t disp_bi;
 extern int boot_text_mapped;
 
 extern void init_boot_display(void);
+extern void btext_init(boot_infos_t *bi) __init;
 extern void btext_welcome(void);
 extern void btext_prepare_BAT(void);
 extern void btext_setup_display(int width, int height, int depth, int pitch,

---
0.99.9k

#4 lore raw
In reply to Eugene Surovegin
Quoted 8 lines · Eugene Surovegin
Quoted 5 lines

+extern void __init btext_init(boot_infos_t *bi);
extern void btext_welcome(void);
extern void btext_prepare_BAT(void);
extern void btext_setup_display(int width, int height, int depth, int pitch,

"__init" should be placed between closing brace and semicolon. For more info, see include/linux/init.h

I don't think it matters much. Often we just omit it from the declaration
- it's only required at the definition site

#5 lore raw
Quoted 7 lines · Andrew Morton
Quoted 6 lines · Eugene Surovegin
Quoted 5 lines

+extern void __init btext_init(boot_infos_t *bi);
extern void btext_welcome(void);
extern void btext_prepare_BAT(void);
extern void btext_setup_display(int width, int height, int depth, int pitch,

Quoted 5 lines
Quoted 2 lines

"__init" should be placed between closing brace and semicolon. For more info, see include/linux/init.h

I don't think it matters much. Often we just omit it from the declaration
- it's only required at the definition site

Quite likely it doesn't matter, but I think we should follow existing style, if not for correctness, but at least for consistency (it actually caught my eye exactly because it _looked_ different). I'm pretty sure original poster have tested original version :).

Signature · 1 line
Eugene
#6 lore raw
In reply to Andrew Morton
Quoted 11 lines · Andrew Morton
Quoted 7 lines · Eugene Surovegin
Quoted 4 lines

+extern void __init btext_init(boot_infos_t *bi);
extern void btext_welcome(void);
extern void btext_prepare_BAT(void);
extern void btext_setup_display(int width, int height, int depth, int pitch,

"__init" should be placed between closing brace and semicolon. For more info, see include/linux/init.h

I don't think it matters much. Often we just omit it from the declaration
- it's only required at the definition site

IIRC, on Alpha it's needed/recommended on both, to allow the compiler to optimize jumps to the same section?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#7 lore raw
In reply to Eugene Surovegin
Quoted 2 lines · Eugene Surovegin

"__init" should be placed between closing brace and semicolon. For more info, see include/linux/init.h

Actually, there's no point putting __init in an extern declaration.

Paul.