Skip to contentSkip to conversation

staging: r8188eu: os_dep: Hoist vmalloc.h include into osdep_service.h

PATCH In review Nathan Chancellor 2 participants 2 messages Aug 11, 2021 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: r8188eu: os_dep: Hoist vmalloc.h include into osdep_service.h

After commit 71f09c5ae9d2 ("staging: r8188eu: Remove wrapper around vfree"), the driver fails to build on Hexagon due to an implicit declaration in several different files:

drivers/staging/r8188eu/core/rtw_mlme.c:129:3: error: implicit declaration of function 'vfree' [-Werror,-Wimplicit-function-declaration]

                vfree(pmlmepriv->free_bss_buf);
                ^

1 error generated.

Previously, vfree() was only called in osdep_service.c, which includes vmalloc.h for vmalloc() and vfree(). Now, the driver relies on vfree() getting implicitly included from another file.

Hoist the vmalloc.h include from osdep_service.c to osdep_service.h so that the driver continues to build fine on all architectures.

Fixes 71f09c5ae9d2 ("staging: r8188eu: Remove wrapper around vfree")
---
 drivers/staging/r8188eu/include/osdep_service.h | 1 +
 drivers/staging/r8188eu/os_dep/osdep_service.c  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
drivers/staging/r8188eu/include/osdep_service.h +1 -0
index 7e002009f9a0..0d1419af8274 100644
@@ -39,6 +39,7 @@
 #include <linux/interrupt.h>	/*  for struct tasklet_struct */
 #include <linux/ip.h>
 #include <linux/kthread.h>
+#include <linux/vmalloc.h>
 
 #include <linux/usb.h>
 #include <linux/usb/ch9.h>
drivers/staging/r8188eu/os_dep/osdep_service.c +0 -1
index 910da0f0004a..9ea4e1a7c45f 100644
@@ -6,7 +6,6 @@
 #include "../include/osdep_service.h"
 #include "../include/drv_types.h"
 #include "../include/recv_osdep.h"
-#include "../include/linux/vmalloc.h"
 #include "../include/rtw_ioctl_set.h"
 
 /*

base-commit: ae7471cae00a432d1c9692452b1b9175a8f3c1b3

Signature · 1 line
2.33.0.rc1
Acked-by on v1 1/1
#1 lore raw
Quoted 50 lines · Nathan Chancellor

After commit 71f09c5ae9d2 ("staging: r8188eu: Remove wrapper around vfree"), the driver fails to build on Hexagon due to an implicit declaration in several different files:

drivers/staging/r8188eu/core/rtw_mlme.c:129:3: error: implicit declaration of function 'vfree' [-Werror,-Wimplicit-function-declaration]

                 vfree(pmlmepriv->free_bss_buf);
                 ^

1 error generated.

Previously, vfree() was only called in osdep_service.c, which includes vmalloc.h for vmalloc() and vfree(). Now, the driver relies on vfree() getting implicitly included from another file.

Hoist the vmalloc.h include from osdep_service.c to osdep_service.h so that the driver continues to build fine on all architectures.

Fixes 71f09c5ae9d2 ("staging: r8188eu: Remove wrapper around vfree")
---
  drivers/staging/r8188eu/include/osdep_service.h | 1 +
  drivers/staging/r8188eu/os_dep/osdep_service.c  | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)
drivers/staging/r8188eu/include/osdep_service.h +1 -0
index 7e002009f9a0..0d1419af8274 100644
@@ -39,6 +39,7 @@
  #include <linux/interrupt.h>	/*  for struct tasklet_struct */
  #include <linux/ip.h>
  #include <linux/kthread.h>
+#include <linux/vmalloc.h>
 
  #include <linux/usb.h>
  #include <linux/usb/ch9.h>
drivers/staging/r8188eu/os_dep/osdep_service.c +0 -1
index 910da0f0004a..9ea4e1a7c45f 100644
@@ -6,7 +6,6 @@
  #include "../include/osdep_service.h"
  #include "../include/drv_types.h"
  #include "../include/recv_osdep.h"
-#include "../include/linux/vmalloc.h"
  #include "../include/rtw_ioctl_set.h"
 
  /*
Quoted 2 lines

base-commit: ae7471cae00a432d1c9692452b1b9175a8f3c1b3

For some reason this header is pulled in on x86_64. What CPU does Hexagon use?

Larry