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

Commit e317c8cc authored by Frederik Deweerdt's avatar Frederik Deweerdt Committed by Linus Torvalds
Browse files

[PATCH] ixp4xxdefconfig arm fixes 



With the following patch, the ixp4xxdefconfig builds correctly.  I'll
test some more configs if I get some time.

Signed-off-by: default avatarFrederik Deweerdt <frederik.deweerdt@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b7696ee3

arch/arm/kernel/time.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/profile.h>

#include <linux/sysdev.h>

#include <linux/timer.h>

#include <linux/irq.h>



#include <asm/leds.h>

#include <asm/thread_info.h>
@@ -327,7 +328,7 @@ EXPORT_SYMBOL(restore_time_delta); 
void timer_tick(void)

{

	struct pt_regs *regs = get_irq_regs();

	profile_tick(CPU_PROFILING, regs);

	profile_tick(CPU_PROFILING);

	do_leds();

	do_set_rtc();

	do_timer(1);

kernel/irq/resend.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static void resend_irqs(unsigned long arg) 
		clear_bit(irq, irqs_resend);

		desc = irq_desc + irq;

		local_irq_disable();

		desc->handle_irq(irq, desc, NULL);

		desc->handle_irq(irq, desc);

		local_irq_enable();

	}

}