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

Commit 0a9da4bd authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate 3c59x.c disable_irq() 



3c59x.c's vortex_timer() function knows that vp->lock can only be used by an
irq context that it disabled - and can hence take the vp->lock without
disabling hardirqs.  Teach lockdep about this.

Has no effect on non-lockdep kernels.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e745165c

drivers/net/3c59x.c

+2 −2
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ vortex_timer(unsigned long data) 
		printk(KERN_DEBUG "dev->watchdog_timeo=%d\n", dev->watchdog_timeo);

	}



	disable_irq(dev->irq);

	disable_irq_lockdep(dev->irq);

	old_window = ioread16(ioaddr + EL3_CMD) >> 13;

	EL3WINDOW(4);

	media_status = ioread16(ioaddr + Wn4_Media);
@@ -1978,7 +1978,7 @@ leave_media_alone: 
			 dev->name, media_tbl[dev->if_port].name);



	EL3WINDOW(old_window);

	enable_irq(dev->irq);

	enable_irq_lockdep(dev->irq);

	mod_timer(&vp->timer, RUN_AT(next_tick));

	if (vp->deferred)

		iowrite16(FakeIntr, ioaddr + EL3_CMD);