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

Commit 31b7eab2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-locking-for-linus' of... 

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Check the depth of subclass
  lockdep: Add improved subclass caching
  affs: Use sema_init instead of init_MUTEX
  hfs: Convert tree_lock to mutex
  arm: Bcmring: semaphore cleanup
  printk: Make console_sem a semaphore not a pseudo mutex
  drivers/macintosh/adb: Do not claim that the semaphore is a mutex
  parport: Semaphore cleanup
  irda: Semaphore cleanup
  net: Wan/cosa.c: Convert "mutex" to semaphore
  net: Ppp_async: semaphore cleanup
  hamradio: Mkiss: semaphore cleanup
  hamradio: 6pack: semaphore cleanup
  net: 3c527: semaphore cleanup
  input: Serio/hp_sdc: semaphore cleanup
  input: Serio/hil_mlc: semaphore cleanup
  input: Misc/hp_sdc_rtc: semaphore cleanup
  lockup_detector: Make callback function static
  lockup detector: Fix grammar by adding a missing "to" in the comments
  lockdep: Remove __debug_show_held_locks
parents 1053e6bb 4ba053c0

arch/arm/mach-bcmring/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ int dma_init(void) 


	memset(&gDMA, 0, sizeof(gDMA));



	init_MUTEX_LOCKED(&gDMA.lock);

	sema_init(&gDMA.lock, 0);

	init_waitqueue_head(&gDMA.freeChannelQ);



	/* Initialize the Hardware */
@@ -1574,7 +1574,7 @@ int dma_init_mem_map(DMA_MemMap_t *memMap) 
{

	memset(memMap, 0, sizeof(*memMap));



	init_MUTEX(&memMap->lock);

	sema_init(&memMap->lock, 1);



	return 0;

}

drivers/input/misc/hp_sdc_rtc.c

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int hp_sdc_rtc_do_read_bbrtc (struct rtc_time *rtctm) 
	t.endidx =		91;

	t.seq =			tseq;

	t.act.semaphore =	&tsem;

	init_MUTEX_LOCKED(&tsem);

	sema_init(&tsem, 0);

	

	if (hp_sdc_enqueue_transaction(&t)) return -1;
@@ -698,7 +698,7 @@ static int __init hp_sdc_rtc_init(void) 
		return -ENODEV;

#endif



	init_MUTEX(&i8042tregs);

	sema_init(&i8042tregs, 1);



	if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))

		return ret;

drivers/input/serio/hil_mlc.c

+3 −3
Original line number Diff line number Diff line
@@ -915,15 +915,15 @@ int hil_mlc_register(hil_mlc *mlc) 
	mlc->ostarted = 0;



	rwlock_init(&mlc->lock);

	init_MUTEX(&mlc->osem);

	sema_init(&mlc->osem, 1);



	init_MUTEX(&mlc->isem);

	sema_init(&mlc->isem, 1);

	mlc->icount = -1;

	mlc->imatch = 0;



	mlc->opercnt = 0;



	init_MUTEX_LOCKED(&(mlc->csem));

	sema_init(&(mlc->csem), 0);



	hil_mlc_clear_di_scratch(mlc);

	hil_mlc_clear_di_map(mlc, 0);

drivers/input/serio/hp_sdc.c

+2 −2
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static int __init hp_sdc_init(void) 
	ts_sync[1]	= 0x0f;

	ts_sync[2] = ts_sync[3]	= ts_sync[4] = ts_sync[5] = 0;

	t_sync.act.semaphore = &s_sync;

	init_MUTEX_LOCKED(&s_sync);

	sema_init(&s_sync, 0);

	hp_sdc_enqueue_transaction(&t_sync);

	down(&s_sync); /* Wait for t_sync to complete */
@@ -1039,7 +1039,7 @@ static int __init hp_sdc_register(void) 
		return hp_sdc.dev_err;

	}



	init_MUTEX_LOCKED(&tq_init_sem);

	sema_init(&tq_init_sem, 0);



	tq_init.actidx		= 0;

	tq_init.idx		= 1;

drivers/macintosh/adb.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static struct adb_driver *adb_controller; 
BLOCKING_NOTIFIER_HEAD(adb_client_list);

static int adb_got_sleep;

static int adb_inited;

static DECLARE_MUTEX(adb_probe_mutex);

static DEFINE_SEMAPHORE(adb_probe_mutex);

static int sleepy_trackpad;

static int autopoll_devs;

int __adb_probe_sync;