diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:22:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 11:16:51 -0400 |
| commit | 9e24974db6b01ec067c24de09588282b6a1407f0 (patch) | |
| tree | 5ed1cc85738f76bfab07e61df84f55e35d642aca /drivers/net/sunbmac.c | |
| parent | 53f9fc93f90a43701d6aaf3919be0614bb088b83 (diff) | |
[PATCH] gfp_t: drivers/net
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/sunbmac.c')
| -rw-r--r-- | drivers/net/sunbmac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index f88f5e32b714..cfaf47c63c58 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
| @@ -214,7 +214,8 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq) | |||
| 214 | { | 214 | { |
| 215 | struct bmac_init_block *bb = bp->bmac_block; | 215 | struct bmac_init_block *bb = bp->bmac_block; |
| 216 | struct net_device *dev = bp->dev; | 216 | struct net_device *dev = bp->dev; |
| 217 | int i, gfp_flags = GFP_KERNEL; | 217 | int i; |
| 218 | gfp_t gfp_flags = GFP_KERNEL; | ||
| 218 | 219 | ||
| 219 | if (from_irq || in_interrupt()) | 220 | if (from_irq || in_interrupt()) |
| 220 | gfp_flags = GFP_ATOMIC; | 221 | gfp_flags = GFP_ATOMIC; |