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

Commit 1c10bbee authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-conversion-next4' of... 

Merge tag 'timers-conversion-next4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core

Pull the 4th timer conversion batch from Kees Cook

 - A couple fixes for less common build configurations

 - More stragglers that have either been reviewed or gone
   long enough on list
parents c7c2f3d9 5ea22086

arch/arm/mach-footbridge/dc21285.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static void dc21285_enable_error(struct timer_list *timer) 
	del_timer(timer);



	if (timer == &serr_timer)

		enable_irq(IRQ_PCI_SERR)

		enable_irq(IRQ_PCI_SERR);

	else if (timer == &perr_timer)

		enable_irq(IRQ_PCI_PERR);

}

drivers/block/aoe/aoemain.c

+8 −36
Original line number Diff line number Diff line
@@ -15,49 +15,19 @@ MODULE_AUTHOR("Sam Hopkins <sah@coraid.com>"); 
MODULE_DESCRIPTION("AoE block/char driver for 2.6.2 and newer 2.6 kernels");

MODULE_VERSION(VERSION);



enum { TINIT, TRUN, TKILL };

static struct timer_list timer;



static void

discover_timer(ulong vp)

static void discover_timer(struct timer_list *t)

{

	static struct timer_list t;

	static volatile ulong die;

	static spinlock_t lock;

	ulong flags;

	enum { DTIMERTICK = HZ * 60 }; /* one minute */



	switch (vp) {

	case TINIT:

		init_timer(&t);

		spin_lock_init(&lock);

		t.data = TRUN;

		t.function = discover_timer;

		die = 0;

	case TRUN:

		spin_lock_irqsave(&lock, flags);

		if (!die) {

			t.expires = jiffies + DTIMERTICK;

			add_timer(&t);

		}

		spin_unlock_irqrestore(&lock, flags);

	mod_timer(t, jiffies + HZ * 60); /* one minute */



	aoecmd_cfg(0xffff, 0xff);

		return;

	case TKILL:

		spin_lock_irqsave(&lock, flags);

		die = 1;

		spin_unlock_irqrestore(&lock, flags);



		del_timer_sync(&t);

	default:

		return;

	}

}



static void

aoe_exit(void)

{

	discover_timer(TKILL);

	del_timer_sync(&timer);



	aoenet_exit();

	unregister_blkdev(AOE_MAJOR, DEVICE_NAME);
@@ -93,7 +63,9 @@ aoe_init(void) 
		goto blkreg_fail;

	}

	printk(KERN_INFO "aoe: AoE v%s initialised.\n", VERSION);

	discover_timer(TINIT);



	timer_setup(&timer, discover_timer, 0);

	discover_timer(&timer);

	return 0;

 blkreg_fail:

	aoecmd_exit();

drivers/block/drbd/drbd_int.h

+2 −2
Original line number Diff line number Diff line
@@ -1551,8 +1551,8 @@ extern int w_restart_disk_io(struct drbd_work *, int); 
extern int w_send_out_of_sync(struct drbd_work *, int);

extern int w_start_resync(struct drbd_work *, int);



extern void resync_timer_fn(unsigned long data);

extern void start_resync_timer_fn(unsigned long data);

extern void resync_timer_fn(struct timer_list *t);

extern void start_resync_timer_fn(struct timer_list *t);



extern void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req);

drivers/block/drbd/drbd_main.c

+7 −11
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
static DEFINE_MUTEX(drbd_main_mutex);

static int drbd_open(struct block_device *bdev, fmode_t mode);

static void drbd_release(struct gendisk *gd, fmode_t mode);

static void md_sync_timer_fn(unsigned long data);

static void md_sync_timer_fn(struct timer_list *t);

static int w_bitmap_io(struct drbd_work *w, int unused);



MODULE_AUTHOR("Philipp Reisner <phil@linbit.com>, "
@@ -2023,14 +2023,10 @@ void drbd_init_set_defaults(struct drbd_device *device) 
	device->unplug_work.cb  = w_send_write_hint;

	device->bm_io_work.w.cb = w_bitmap_io;



	setup_timer(&device->resync_timer, resync_timer_fn,

			(unsigned long)device);

	setup_timer(&device->md_sync_timer, md_sync_timer_fn,

			(unsigned long)device);

	setup_timer(&device->start_resync_timer, start_resync_timer_fn,

			(unsigned long)device);

	setup_timer(&device->request_timer, request_timer_fn,

			(unsigned long)device);

	timer_setup(&device->resync_timer, resync_timer_fn, 0);

	timer_setup(&device->md_sync_timer, md_sync_timer_fn, 0);

	timer_setup(&device->start_resync_timer, start_resync_timer_fn, 0);

	timer_setup(&device->request_timer, request_timer_fn, 0);



	init_waitqueue_head(&device->misc_wait);

	init_waitqueue_head(&device->state_wait);
@@ -3721,9 +3717,9 @@ int drbd_md_test_flag(struct drbd_backing_dev *bdev, int flag) 
	return (bdev->md.flags & flag) != 0;

}



static void md_sync_timer_fn(unsigned long data)

static void md_sync_timer_fn(struct timer_list *t)

{

	struct drbd_device *device = (struct drbd_device *) data;

	struct drbd_device *device = from_timer(device, t, md_sync_timer);

	drbd_device_post_work(device, MD_SYNC);

}

drivers/block/drbd/drbd_receiver.c

+1 −1
Original line number Diff line number Diff line
@@ -5056,7 +5056,7 @@ static int drbd_disconnected(struct drbd_peer_device *peer_device) 
	wake_up(&device->misc_wait);



	del_timer_sync(&device->resync_timer);

	resync_timer_fn((unsigned long)device);

	resync_timer_fn(&device->resync_timer);



	/* wait for all w_e_end_data_req, w_e_end_rsdata_req, w_send_barrier,

	 * w_make_resync_request etc. which may still be on the worker queue