locking/semaphore: Resolve some shadow warnings

static noinline void __down(struct semaphore *sem);

static noinline int __down_interruptible(struct semaphore *sem);

static noinline int __down_killable(struct semaphore *sem);

static noinline int __down_timeout(struct semaphore *sem, long jiffies);

static noinline int __down_timeout(struct semaphore *sem, long timeout);

static noinline void __up(struct semaphore *sem);

/**

/**

 * down_timeout - acquire the semaphore within a specified time

 * @sem: the semaphore to be acquired

 * @jiffies: how long to wait before failing

 * @timeout: how long to wait before failing

 *

 * Attempts to acquire the semaphore.  If no more tasks are allowed to

 * acquire the semaphore, calling this function will put the task to sleep.

 * If the semaphore is not released within the specified number of jiffies,

 * this function returns -ETIME.  It returns 0 if the semaphore was acquired.

 */

int down_timeout(struct semaphore *sem, long jiffies)

int down_timeout(struct semaphore *sem, long timeout)

{

	unsigned long flags;

	int result = 0;

	if (likely(sem->count > 0))

		sem->count--;

	else

		result = __down_timeout(sem, jiffies);

		result = __down_timeout(sem, timeout);

	raw_spin_unlock_irqrestore(&sem->lock, flags);

	return result;

	return __down_common(sem, TASK_KILLABLE, MAX_SCHEDULE_TIMEOUT);

}

static noinline int __sched __down_timeout(struct semaphore *sem, long jiffies)

static noinline int __sched __down_timeout(struct semaphore *sem, long timeout)

{

	return __down_common(sem, TASK_UNINTERRUPTIBLE, jiffies);

	return __down_common(sem, TASK_UNINTERRUPTIBLE, timeout);

}

static noinline void __sched __up(struct semaphore *sem)