0002-psmouse-back.c-fix-build-with-gcc-11.patch 5.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114
  1. From 0e07e82121697d99470a147eadad9a708889c4df Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Thu, 2 Sep 2021 18:13:03 +0200
  4. Subject: [PATCH] psmouse-back.c: fix build with gcc 11
  5. Fix the following build failures with gcc 11 by defining inline
  6. functions as static:
  7. /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/build/drivers/drivers.o: in function `psmouse_extensions':
  8. /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `lifebook_detect'
  9. /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `alps_detect'
  10. /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `ps2pp_init'
  11. /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `trackpoint_detect'
  12. /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `fsp_detect'
  13. Fixes:
  14. - http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295
  15. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  16. ---
  17. drivers/input/mouse/alps.h | 4 ++--
  18. drivers/input/mouse/lifebook.h | 6 +++---
  19. drivers/input/mouse/logips2pp.h | 2 +-
  20. drivers/input/mouse/sentelic.h | 4 ++--
  21. drivers/input/mouse/trackpoint.h | 2 +-
  22. 5 files changed, 9 insertions(+), 9 deletions(-)
  23. diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
  24. index ae1ac354..acc1e89e 100644
  25. --- a/drivers/input/mouse/alps.h
  26. +++ b/drivers/input/mouse/alps.h
  27. @@ -51,11 +51,11 @@ struct alps_data {
  28. int alps_detect(struct psmouse *psmouse, bool set_properties);
  29. int alps_init(struct psmouse *psmouse);
  30. #else
  31. -inline int alps_detect(struct psmouse *psmouse, bool set_properties)
  32. +static inline int alps_detect(struct psmouse *psmouse, bool set_properties)
  33. {
  34. return -ENOSYS;
  35. }
  36. -inline int alps_init(struct psmouse *psmouse)
  37. +static inline int alps_init(struct psmouse *psmouse)
  38. {
  39. return -ENOSYS;
  40. }
  41. diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h
  42. index 4c4326c6..0baf02a7 100644
  43. --- a/drivers/input/mouse/lifebook.h
  44. +++ b/drivers/input/mouse/lifebook.h
  45. @@ -16,14 +16,14 @@ void lifebook_module_init(void);
  46. int lifebook_detect(struct psmouse *psmouse, bool set_properties);
  47. int lifebook_init(struct psmouse *psmouse);
  48. #else
  49. -inline void lifebook_module_init(void)
  50. +static inline void lifebook_module_init(void)
  51. {
  52. }
  53. -inline int lifebook_detect(struct psmouse *psmouse, bool set_properties)
  54. +static inline int lifebook_detect(struct psmouse *psmouse, bool set_properties)
  55. {
  56. return -ENOSYS;
  57. }
  58. -inline int lifebook_init(struct psmouse *psmouse)
  59. +static inline int lifebook_init(struct psmouse *psmouse)
  60. {
  61. return -ENOSYS;
  62. }
  63. diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h
  64. index 0c186f02..439e9c58 100644
  65. --- a/drivers/input/mouse/logips2pp.h
  66. +++ b/drivers/input/mouse/logips2pp.h
  67. @@ -14,7 +14,7 @@
  68. #ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
  69. int ps2pp_init(struct psmouse *psmouse, bool set_properties);
  70. #else
  71. -inline int ps2pp_init(struct psmouse *psmouse, bool set_properties)
  72. +static inline int ps2pp_init(struct psmouse *psmouse, bool set_properties)
  73. {
  74. return -ENOSYS;
  75. }
  76. diff --git a/drivers/input/mouse/sentelic.h b/drivers/input/mouse/sentelic.h
  77. index aa697ece..42df9e3b 100644
  78. --- a/drivers/input/mouse/sentelic.h
  79. +++ b/drivers/input/mouse/sentelic.h
  80. @@ -123,11 +123,11 @@ struct fsp_data {
  81. extern int fsp_detect(struct psmouse *psmouse, bool set_properties);
  82. extern int fsp_init(struct psmouse *psmouse);
  83. #else
  84. -inline int fsp_detect(struct psmouse *psmouse, bool set_properties)
  85. +static inline int fsp_detect(struct psmouse *psmouse, bool set_properties)
  86. {
  87. return -ENOSYS;
  88. }
  89. -inline int fsp_init(struct psmouse *psmouse)
  90. +static inline int fsp_init(struct psmouse *psmouse)
  91. {
  92. return -ENOSYS;
  93. }
  94. diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
  95. index e558a709..f14e59c0 100644
  96. --- a/drivers/input/mouse/trackpoint.h
  97. +++ b/drivers/input/mouse/trackpoint.h
  98. @@ -145,7 +145,7 @@ struct trackpoint_data
  99. #ifdef CONFIG_MOUSE_PS2_TRACKPOINT
  100. int trackpoint_detect(struct psmouse *psmouse, bool set_properties);
  101. #else
  102. -inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
  103. +static inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
  104. {
  105. return -ENOSYS;
  106. }
  107. --
  108. 2.32.0