sh: Shut up some trivial build warnings. (43081e18) · Commits · e / devices / android_kernel_teracube_emerald

arch/sh/kernel/cpu/irq/intc-sh5.c

+12 −15

Original line number	Diff line number	Diff line
		@@ -75,21 +75,6 @@ int intc_evt_to_irq[(0xE20/0x20)+1] = {
		-1, -1 /* 0xE00 - 0xE20 */
		};

		/*
		* Opposite mapper.
		*/
		static int IRQ_to_vectorN[NR_INTC_IRQS] = {
		0x12, 0x15, 0x18, 0x1B, 0x40, 0x41, 0x42, 0x43, /* 0- 7 */
		-1, -1, -1, -1, 0x50, 0x51, 0x52, 0x53, /* 8-15 */
		0x54, 0x55, 0x32, 0x33, 0x34, 0x35, 0x36, -1, /* 16-23 */
		-1, -1, -1, -1, -1, -1, -1, -1, /* 24-31 */
		0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x38, /* 32-39 */
		0x39, 0x3A, 0x3B, -1, -1, -1, -1, -1, /* 40-47 */
		-1, -1, -1, -1, -1, -1, -1, -1, /* 48-55 */
		-1, -1, -1, -1, -1, -1, -1, 0x2B, /* 56-63 */

		};

		static unsigned long intc_virt;

		static unsigned int startup_intc_irq(unsigned int irq);
		@@ -176,6 +161,18 @@ void make_intc_irq(unsigned int irq)
		}

		#if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL)
		static int IRQ_to_vectorN[NR_INTC_IRQS] = {
		0x12, 0x15, 0x18, 0x1B, 0x40, 0x41, 0x42, 0x43, /* 0- 7 */
		-1, -1, -1, -1, 0x50, 0x51, 0x52, 0x53, /* 8-15 */
		0x54, 0x55, 0x32, 0x33, 0x34, 0x35, 0x36, -1, /* 16-23 */
		-1, -1, -1, -1, -1, -1, -1, -1, /* 24-31 */
		0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x38, /* 32-39 */
		0x39, 0x3A, 0x3B, -1, -1, -1, -1, -1, /* 40-47 */
		-1, -1, -1, -1, -1, -1, -1, -1, /* 48-55 */
		-1, -1, -1, -1, -1, -1, -1, 0x2B, /* 56-63 */

		};

		int intc_irq_describe(char* p, int irq)
		{
		if (irq < NR_INTC_IRQS)

+6 −3

Original line number	Diff line number	Diff line
		@@ -623,6 +623,7 @@ extern void interruptible_sleep_on(wait_queue_head_t *q);

		#define mid_sched ((unsigned long) interruptible_sleep_on)

		#ifdef CONFIG_FRAME_POINTER
		static int in_sh64_switch_to(unsigned long pc)
		{
		extern char __sh64_switch_to_end;
		@@ -631,12 +632,10 @@ static int in_sh64_switch_to(unsigned long pc)
		return (pc >= (unsigned long) sh64_switch_to) &&
		(pc < (unsigned long) &__sh64_switch_to_end);
		}
		#endif

		unsigned long get_wchan(struct task_struct *p)
		{
		unsigned long schedule_fp;
		unsigned long sh64_switch_to_fp;
		unsigned long schedule_caller_pc;
		unsigned long pc;

		if (!p \|\| p == current \|\| p->state == TASK_RUNNING)
		@@ -649,6 +648,10 @@ unsigned long get_wchan(struct task_struct *p)

		#ifdef CONFIG_FRAME_POINTER
		if (in_sh64_switch_to(pc)) {
		unsigned long schedule_fp;
		unsigned long sh64_switch_to_fp;
		unsigned long schedule_caller_pc;

		sh64_switch_to_fp = (long) p->thread.sp;
		/* r14 is saved at offset 4 in the sh64_switch_to frame */
		schedule_fp = (unsigned long ) (long)(sh64_switch_to_fp + 4);

+0 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,6 @@ static int mtu2_timer_stop(void)

		static int mtu2_timer_init(void)
		{
		u8 tmp;
		unsigned long interval;

		setup_irq(CONFIG_SH_TIMER_IRQ, &mtu2_irq);