Commit b8c638ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'uninit-var' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 

* 'uninit-var' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  arch/i386/* fs/* ipc/*: mark variables with uninitialized_var()
  drivers/*: mark variables with uninitialized_var()
parents ef9efe43 8e1c091c

arch/i386/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ void efi_memmap_walk(efi_freemem_callback_t callback, void *arg) 
	struct range {

		unsigned long start;

		unsigned long end;

	} prev, curr;

	} uninitialized_var(prev), curr;

	efi_memory_desc_t *md;

	unsigned long start, end;

	void *p;

drivers/atm/zatm.c

+3 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static int open_tx_first(struct atm_vcc *vcc) 
	unsigned long flags;

	u32 *loop;

	unsigned short chan;

	int pcr,unlimited;

	int unlimited;



	DPRINTK("open_tx_first\n");

	zatm_dev = ZATM_DEV(vcc->dev);
@@ -936,6 +936,8 @@ static int open_tx_first(struct atm_vcc *vcc) 
	    vcc->qos.txtp.max_pcr >= ATM_OC3_PCR);

	if (unlimited && zatm_dev->ubr != -1) zatm_vcc->shaper = zatm_dev->ubr;

	else {

		int uninitialized_var(pcr);



		if (unlimited) vcc->qos.txtp.max_sdu = ATM_MAX_AAL5_PDU;

		if ((zatm_vcc->shaper = alloc_shaper(vcc->dev,&pcr,

		    vcc->qos.txtp.min_pcr,vcc->qos.txtp.max_pcr,unlimited))

drivers/char/cyclades.c

+2 −2
Original line number Diff line number Diff line
@@ -4466,10 +4466,10 @@ static void cy_hangup(struct tty_struct *tty) 
static int __devinit cy_init_card(struct cyclades_card *cinfo)

{

	struct cyclades_port *info;

	u32 mailbox;

	u32 uninitialized_var(mailbox);

	unsigned int nports;

	unsigned short chip_number;

	int index, port;

	int uninitialized_var(index), port;



	spin_lock_init(&cinfo->card_lock);

drivers/mtd/ubi/eba.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ int ubi_eba_read_leb(struct ubi_device *ubi, int vol_id, int lnum, void *buf, 
	int err, pnum, scrub = 0, idx = vol_id2idx(ubi, vol_id);

	struct ubi_vid_hdr *vid_hdr;

	struct ubi_volume *vol = ubi->volumes[idx];

	uint32_t crc;

	uint32_t uninitialized_var(crc);



	err = leb_read_lock(ubi, vol_id, lnum);

	if (err)

drivers/net/r8169.c

+1 −1
Original line number Diff line number Diff line
@@ -2338,7 +2338,7 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb, 
{

	struct skb_shared_info *info = skb_shinfo(skb);

	unsigned int cur_frag, entry;

	struct TxDesc *txd;

	struct TxDesc * uninitialized_var(txd);



	entry = tp->cur_tx;

	for (cur_frag = 0; cur_frag < info->nr_frags; cur_frag++) {