iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] m32r pt_regs fixes

Browse Source 
... and now with irq_regs.h not forgotten...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-10-07 16:29:18 +01:00 committed by Linus Torvalds
parent 8774cb815f
commit 9c8e7f5cc9
7 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/m32r/kernel/irq.c
View File

@ -77,13 +77,16 @@ skip:
*/ */
asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs) asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
{ {
struct pt_regs *old_regs;
old_regs = set_irq_regs(regs);
irq_enter(); irq_enter();
#ifdef CONFIG_DEBUG_STACKOVERFLOW #ifdef CONFIG_DEBUG_STACKOVERFLOW
/* FIXME M32R */ /* FIXME M32R */
#endif #endif
__do_IRQ(irq, regs); __do_IRQ(irq);
irq_exit(); irq_exit();
set_irq_regs(old_regs);
return 1; return 1;
} }

13
arch/m32r/kernel/smp.c
View File

@ -101,7 +101,7 @@ void smp_call_function_interrupt(void);
void smp_send_timer(void); void smp_send_timer(void);
void smp_ipi_timer_interrupt(struct pt_regs *); void smp_ipi_timer_interrupt(struct pt_regs *);
void smp_local_timer_interrupt(struct pt_regs *); void smp_local_timer_interrupt(void);
void send_IPI_allbutself(int, int); void send_IPI_allbutself(int, int);
static void send_IPI_mask(cpumask_t, int, int); static void send_IPI_mask(cpumask_t, int, int);
@ -734,9 +734,12 @@ void smp_send_timer(void)
*==========================================================================*/ *==========================================================================*/
void smp_ipi_timer_interrupt(struct pt_regs *regs) void smp_ipi_timer_interrupt(struct pt_regs *regs)
{ {
struct pt_regs *old_regs;
old_regs = set_irq_regs(regs);
irq_enter(); irq_enter();
smp_local_timer_interrupt(regs); smp_local_timer_interrupt();
irq_exit(); irq_exit();
set_irq_regs(old_regs);
} }
/*==========================================================================* /*==========================================================================*
@ -762,9 +765,9 @@ void smp_ipi_timer_interrupt(struct pt_regs *regs)
* ---------- --- -------------------------------------------------------- * ---------- --- --------------------------------------------------------
* 2003-06-24 hy use per_cpu structure. * 2003-06-24 hy use per_cpu structure.
*==========================================================================*/ *==========================================================================*/
void smp_local_timer_interrupt(struct pt_regs *regs) void smp_local_timer_interrupt(void)
{ {
int user = user_mode(regs); int user = user_mode(get_irq_regs());
int cpu_id = smp_processor_id(); int cpu_id = smp_processor_id();
/* /*
@ -774,7 +777,7 @@ void smp_local_timer_interrupt(struct pt_regs *regs)
* useful with a profiling multiplier != 1 * useful with a profiling multiplier != 1
*/ */
profile_tick(CPU_PROFILING, regs); profile_tick(CPU_PROFILING);
if (--per_cpu(prof_counter, cpu_id) <= 0) { if (--per_cpu(prof_counter, cpu_id) <= 0) {
/* /*

10
arch/m32r/kernel/time.c
View File

@ -35,7 +35,7 @@
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
extern void send_IPI_allbutself(int, int); extern void send_IPI_allbutself(int, int);
extern void smp_local_timer_interrupt(struct pt_regs *); extern void smp_local_timer_interrupt(void);
#endif #endif
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)
@ -188,15 +188,15 @@ static long last_rtc_update = 0;
* timer_interrupt() needs to keep up the real-time clock, * timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick * as well as call the "do_timer()" routine every clocktick
*/ */
irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) irqreturn_t timer_interrupt(int irq, void *dev_id)
{ {
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
profile_tick(CPU_PROFILING, regs); profile_tick(CPU_PROFILING);
#endif #endif
do_timer(1); do_timer(1);
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
update_process_times(user_mode(regs)); update_process_times(user_mode(get_irq_regs()));
#endif #endif
/* /*
* If we have an externally synchronized Linux clock, then update * If we have an externally synchronized Linux clock, then update
@ -221,7 +221,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
a hack, so don't look closely for now.. */ a hack, so don't look closely for now.. */
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
smp_local_timer_interrupt(regs); smp_local_timer_interrupt();
smp_send_timer(); smp_send_timer();
#endif #endif

2
drivers/net/smc91x.c
View File

@ -1400,7 +1400,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
static void smc_poll_controller(struct net_device *dev) static void smc_poll_controller(struct net_device *dev)
{ {
disable_irq(dev->irq); disable_irq(dev->irq);
smc_interrupt(dev->irq, dev, NULL); smc_interrupt(dev->irq, dev);
enable_irq(dev->irq); enable_irq(dev->irq);
} }
#endif #endif

2
drivers/pcmcia/m32r_pcc.c
View File

@ -395,7 +395,7 @@ static irqreturn_t pcc_interrupt(int irq, void *dev)
static void pcc_interrupt_wrapper(u_long data) static void pcc_interrupt_wrapper(u_long data)
{ {
pcc_interrupt(0, NULL, NULL); pcc_interrupt(0, NULL);
init_timer(&poll_timer); init_timer(&poll_timer);
poll_timer.expires = jiffies + poll_interval; poll_timer.expires = jiffies + poll_interval;
add_timer(&poll_timer); add_timer(&poll_timer);

2
drivers/serial/m32r_sio.c
View File

@ -590,7 +590,7 @@ static void m32r_sio_timeout(unsigned long data)
sts = sio_in(up, SIOSTS); sts = sio_in(up, SIOSTS);
if (sts & 0x5) { if (sts & 0x5) {
spin_lock(&up->port.lock); spin_lock(&up->port.lock);
m32r_sio_handle_port(up, sts, NULL); m32r_sio_handle_port(up, sts);
spin_unlock(&up->port.lock); spin_unlock(&up->port.lock);
} }

1
include/asm-m32r/irq_regs.h Normal file
View File

@ -0,0 +1 @@
#include <asm-generic/irq_regs.h>