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

Commit 9aec247d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents dce32c78 3a867b36

drivers/atm/fore200e.c

+4 −6
Original line number Diff line number Diff line
@@ -178,13 +178,11 @@ fore200e_irq_itoa(int irq) 




static void*

fore200e_kmalloc(int size, int flags)

fore200e_kmalloc(int size, unsigned int __nocast flags)

{

    void* chunk = kmalloc(size, flags);

    void *chunk = kzalloc(size, flags);



    if (chunk)

	memset(chunk, 0x00, size);

    else

    if (!chunk)

	printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n",			size, flags);

    

    return chunk;

drivers/connector/connector.c

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ int cn_already_initialized = 0; 
 * a new message.

 *

 */

int cn_netlink_send(struct cn_msg *msg, u32 __group, int gfp_mask)

int cn_netlink_send(struct cn_msg *msg, u32 __group,

		    unsigned int __nocast gfp_mask)

{

	struct cn_callback_entry *__cbq;

	unsigned int size;

drivers/net/bonding/bond_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1289,12 +1289,13 @@ static void bond_mc_list_destroy(struct bonding *bond) 
/*

 * Copy all the Multicast addresses from src to the bonding device dst

 */

static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond, int gpf_flag)

static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond,

			     unsigned int __nocast gfp_flag)

{

	struct dev_mc_list *dmi, *new_dmi;



	for (dmi = mc_list; dmi; dmi = dmi->next) {

		new_dmi = kmalloc(sizeof(struct dev_mc_list), gpf_flag);

		new_dmi = kmalloc(sizeof(struct dev_mc_list), gfp_flag);



		if (!new_dmi) {

			/* FIXME: Potential memory leak !!! */

include/linux/atmdev.h

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static inline void atm_dev_put(struct atm_dev *dev) 


int atm_charge(struct atm_vcc *vcc,int truesize);

struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,

    int gfp_flags);

    unsigned int __nocast gfp_flags);

int atm_pcr_goal(struct atm_trafprm *tp);



void vcc_release_async(struct atm_vcc *vcc, int reply);

include/linux/connector.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ struct cn_dev { 


int cn_add_callback(struct cb_id *, char *, void (*callback) (void *));

void cn_del_callback(struct cb_id *);

int cn_netlink_send(struct cn_msg *, u32, int);

int cn_netlink_send(struct cn_msg *, u32, unsigned int __nocast);



int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *));

void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);