Skip to contentSkip to conversation

fbdev: Make fb_modesetting_disabled() static inline

PATCH In review Thomas Zimmermann 1 participant 2 messages Nov 17, 2022 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbdev: Make fb_modesetting_disabled() static inline

Make fb_modesetting_disabled() a static-inline function when it is defined in the header file. Avoid the linker error shown below.

ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here

A bug report is at [1].

Fixes 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
Cc Javier Martinez Canillas <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Helge Deller <[email protected]>
---
 include/linux/fb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/fb.h +1 -1
index 3a822e4357b12..ea421724f7338 100644
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
 #if defined(CONFIG_VIDEO_NOMODESET)
 bool fb_modesetting_disabled(const char *drvname);
 #else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
 {
 	return false;
 }
Signature · 1 line
2.38.1
#1 lore raw

Am 17.11.22 um 12:47 schrieb Thomas Zimmermann:

Quoted 6 lines

Make fb_modesetting_disabled() a static-inline function when it is defined in the header file. Avoid the linker error shown below.

ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here

Quoted 7 lines

A bug report is at [1].

Fixes 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
Cc Javier Martinez Canillas <[email protected]>

Javier gave his r-b via irc.

Quoted 22 lines
---
  include/linux/fb.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/fb.h +1 -1
index 3a822e4357b12..ea421724f7338 100644
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
  #if defined(CONFIG_VIDEO_NOMODESET)
  bool fb_modesetting_disabled(const char *drvname);
  #else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
  {
  	return false;
  }
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev