Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fallout from linux/gfp.h -> common.

This commit is contained in:
riastradh 2018-08-27 17:13:07 +00:00
parent 4f574380a4
commit d30cf88cc1
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/external/bsd/dwc2/dist/dwc2_hcd.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: dwc2_hcd.c,v 1.21 2018/08/08 07:20:44 simonb Exp $ */
/* $NetBSD: dwc2_hcd.c,v 1.22 2018/08/27 17:13:07 riastradh Exp $ */
/*
* hcd.c - DesignWare HS OTG Controller host-mode routines
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dwc2_hcd.c,v 1.21 2018/08/08 07:20:44 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: dwc2_hcd.c,v 1.22 2018/08/27 17:13:07 riastradh Exp $");
#include <sys/types.h>
#include <sys/kmem.h>
@ -1907,8 +1907,14 @@ dwc2_hcd_urb_alloc(struct dwc2_hsotg *hsotg, int iso_desc_count,
struct dwc2_hcd_urb *urb;
u32 size = sizeof(*urb) + iso_desc_count *
sizeof(struct dwc2_hcd_iso_packet_desc);
int kmem_flag;
urb = kmem_zalloc(size, mem_flags);
if ((mem_flags & __GFP_WAIT) == __GFP_WAIT)
kmem_flag = KM_SLEEP;
else
kmem_flag = KM_NOSLEEP;
urb = kmem_zalloc(size, kmem_flag);
if (urb)
urb->packet_count = iso_desc_count;
return urb;

6
sys/external/bsd/dwc2/dwc2.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: dwc2.h,v 1.9 2016/02/24 22:17:54 skrll Exp $ */
/* $NetBSD: dwc2.h,v 1.10 2018/08/27 17:13:07 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -108,10 +108,6 @@ extern int dwc2debug;
#define jiffies hardclock_ticks
#define msecs_to_jiffies mstohz
#define gfp_t int
#define GFP_KERNEL KM_SLEEP
#define GFP_ATOMIC KM_NOSLEEP
enum usb_otg_state {
OTG_STATE_RESERVED = 0,