Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4e3ca1a authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: remaining bits of drivers/* 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9e24974d

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer, 
static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)

{

	struct file *filp = lo->lo_backing_file;

	int gfp = lo->old_gfp_mask;

	gfp_t gfp = lo->old_gfp_mask;



	if (lo->lo_state != Lo_bound)

		return -ENXIO;

drivers/block/rd.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static int rd_open(struct inode *inode, struct file *filp) 
		struct block_device *bdev = inode->i_bdev;

		struct address_space *mapping;

		unsigned bsize;

		int gfp_mask;

		gfp_t gfp_mask;



		inode = igrab(bdev->bd_inode);

		rd_bdev[unit] = bdev;

drivers/char/n_tty.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 


static inline unsigned char *alloc_buf(void)

{

	unsigned int prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;

	gfp_t prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;



	if (PAGE_SIZE != N_TTY_BUF_SIZE)

		return kmalloc(N_TTY_BUF_SIZE, prio);

drivers/ieee1394/eth1394.c

+1 −1
Original line number Diff line number Diff line
@@ -1630,7 +1630,7 @@ static void ether1394_complete_cb(void *__ptask) 
/* Transmit a packet (called by kernel) */

static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)

{

	int kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;

	gfp_t kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;

	struct eth1394hdr *eth;

	struct eth1394_priv *priv = netdev_priv(dev);

	int proto;

drivers/md/bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int bitmap_active(struct bitmap *bitmap) 


#define WRITE_POOL_SIZE 256

/* mempool for queueing pending writes on the bitmap file */

static void *write_pool_alloc(unsigned int gfp_flags, void *data)

static void *write_pool_alloc(gfp_t gfp_flags, void *data)

{

	return kmalloc(sizeof(struct page_list), gfp_flags);

}