[PATCH] m32r pt_regs fixes

... 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>

[PATCH] m32r pt_regs fixes
... 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>
Al Viro · Linus Torvalds
1 parent 8774cb815f
Showing 7 changed files with 21 additions and 14 deletions Side-by-side Diff
arch/m32r/kernel/irq.c
arch/m32r/kernel/smp.c
arch/m32r/kernel/time.c
drivers/net/smc91x.c
drivers/pcmcia/m32r_pcc.c
drivers/serial/m32r_sio.c
include/asm-m32r/irq_regs.h
@@ -77,13 +77,16 @@
  */
 asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
 {
+	struct pt_regs *old_regs;
+	old_regs = set_irq_regs(regs);
 	irq_enter();
  
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
 	/* FIXME M32R */
 #endif
-	__do_IRQ(irq, regs);
+	__do_IRQ(irq);
 	irq_exit();
+	set_irq_regs(old_regs);
  
 	return 1;
 }
@@ -101,7 +101,7 @@
  
 void smp_send_timer(void);
 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);
 static void send_IPI_mask(cpumask_t, int, int);
  
  
@@ -734,9 +734,12 @@
  *==========================================================================*/
 void smp_ipi_timer_interrupt(struct pt_regs *regs)
 {
+	struct pt_regs *old_regs;
+	old_regs = set_irq_regs(regs);
 	irq_enter();
-	smp_local_timer_interrupt(regs);
+	smp_local_timer_interrupt();
 	irq_exit();
+	set_irq_regs(old_regs);
 }
  
 /*==========================================================================*
  
@@ -762,9 +765,9 @@
  * ---------- --- --------------------------------------------------------
  * 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();
  
 	/*
@@ -774,7 +777,7 @@
 	 * useful with a profiling multiplier != 1
 	 */
  
-	profile_tick(CPU_PROFILING, regs);
+	profile_tick(CPU_PROFILING);
  
 	if (--per_cpu(prof_counter, cpu_id) <= 0) {
 		/*
@@ -35,7 +35,7 @@
  
 #ifdef CONFIG_SMP
 extern void send_IPI_allbutself(int, int);
-extern void smp_local_timer_interrupt(struct pt_regs *);
+extern void smp_local_timer_interrupt(void);
 #endif
  
 #define TICK_SIZE	(tick_nsec / 1000)
  
  
@@ -188,15 +188,15 @@
  * timer_interrupt() needs to keep up the real-time clock,
  * 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
-	profile_tick(CPU_PROFILING, regs);
+	profile_tick(CPU_PROFILING);
 #endif
 	do_timer(1);
  
 #ifndef CONFIG_SMP
-	update_process_times(user_mode(regs));
+	update_process_times(user_mode(get_irq_regs()));
 #endif
 	/*
 	 * If we have an externally synchronized Linux clock, then update
@@ -221,7 +221,7 @@
 	   a hack, so don't look closely for now.. */
  
 #ifdef CONFIG_SMP
-	smp_local_timer_interrupt(regs);
+	smp_local_timer_interrupt();
 	smp_send_timer();
 #endif
  
@@ -1400,7 +1400,7 @@
 static void smc_poll_controller(struct net_device *dev)
 {
 	disable_irq(dev->irq);
-	smc_interrupt(dev->irq, dev, NULL);
+	smc_interrupt(dev->irq, dev);
 	enable_irq(dev->irq);
 }
 #endif
@@ -395,7 +395,7 @@
  
 static void pcc_interrupt_wrapper(u_long data)
 {
-	pcc_interrupt(0, NULL, NULL);
+	pcc_interrupt(0, NULL);
 	init_timer(&poll_timer);
 	poll_timer.expires = jiffies + poll_interval;
 	add_timer(&poll_timer);
@@ -590,7 +590,7 @@
 	sts = sio_in(up, SIOSTS);
 	if (sts & 0x5) {
 		spin_lock(&up->port.lock);
-		m32r_sio_handle_port(up, sts, NULL);
+		m32r_sio_handle_port(up, sts);
 		spin_unlock(&up->port.lock);
 	}
  
+#include <asm-generic/irq_regs.h>
...	...	@@ -77,13 +77,16 @@
77	77	*/
78	78	asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
79	79	{
	80	+ struct pt_regs *old_regs;
	81	+ old_regs = set_irq_regs(regs);
80	82	irq_enter();
81	83
82	84	#ifdef CONFIG_DEBUG_STACKOVERFLOW
83	85	/* FIXME M32R */
84	86	#endif
85		- __do_IRQ(irq, regs);
	87	+ __do_IRQ(irq);
86	88	irq_exit();
	89	+ set_irq_regs(old_regs);
87	90
88	91	return 1;
89	92	}
...	...	@@ -101,7 +101,7 @@
101	101
102	102	void smp_send_timer(void);
103	103	void smp_ipi_timer_interrupt(struct pt_regs *);
104		-void smp_local_timer_interrupt(struct pt_regs *);
	104	+void smp_local_timer_interrupt(void);
105	105
106	106	void send_IPI_allbutself(int, int);
107	107	static void send_IPI_mask(cpumask_t, int, int);
108	108
109	109
...	...	@@ -734,9 +734,12 @@
734	734	==========================================================================/
735	735	void smp_ipi_timer_interrupt(struct pt_regs *regs)
736	736	{
	737	+ struct pt_regs *old_regs;
	738	+ old_regs = set_irq_regs(regs);
737	739	irq_enter();
738		- smp_local_timer_interrupt(regs);
	740	+ smp_local_timer_interrupt();
739	741	irq_exit();
	742	+ set_irq_regs(old_regs);
740	743	}
741	744
742	745	/==========================================================================
743	746
...	...	@@ -762,9 +765,9 @@
762	765	* ---------- --- --------------------------------------------------------
763	766	* 2003-06-24 hy use per_cpu structure.
764	767	==========================================================================/
765		-void smp_local_timer_interrupt(struct pt_regs *regs)
	768	+void smp_local_timer_interrupt(void)
766	769	{
767		- int user = user_mode(regs);
	770	+ int user = user_mode(get_irq_regs());
768	771	int cpu_id = smp_processor_id();
769	772
770	773	/*
...	...	@@ -774,7 +777,7 @@
774	777	* useful with a profiling multiplier != 1
775	778	*/
776	779
777		- profile_tick(CPU_PROFILING, regs);
	780	+ profile_tick(CPU_PROFILING);
778	781
779	782	if (--per_cpu(prof_counter, cpu_id) <= 0) {
780	783	/*
...	...	@@ -35,7 +35,7 @@
35	35
36	36	#ifdef CONFIG_SMP
37	37	extern void send_IPI_allbutself(int, int);
38		-extern void smp_local_timer_interrupt(struct pt_regs *);
	38	+extern void smp_local_timer_interrupt(void);
39	39	#endif
40	40
41	41	#define TICK_SIZE (tick_nsec / 1000)
42	42
43	43
...	...	@@ -188,15 +188,15 @@
188	188	* timer_interrupt() needs to keep up the real-time clock,
189	189	* as well as call the "do_timer()" routine every clocktick
190	190	*/
191		-irqreturn_t timer_interrupt(int irq, void dev_id, struct pt_regs regs)
	191	+irqreturn_t timer_interrupt(int irq, void *dev_id)
192	192	{
193	193	#ifndef CONFIG_SMP
194		- profile_tick(CPU_PROFILING, regs);
	194	+ profile_tick(CPU_PROFILING);
195	195	#endif
196	196	do_timer(1);
197	197
198	198	#ifndef CONFIG_SMP
199		- update_process_times(user_mode(regs));
	199	+ update_process_times(user_mode(get_irq_regs()));
200	200	#endif
201	201	/*
202	202	* If we have an externally synchronized Linux clock, then update
...	...	@@ -221,7 +221,7 @@
221	221	a hack, so don't look closely for now.. */
222	222
223	223	#ifdef CONFIG_SMP
224		- smp_local_timer_interrupt(regs);
	224	+ smp_local_timer_interrupt();
225	225	smp_send_timer();
226	226	#endif
227	227
...	...	@@ -1400,7 +1400,7 @@
1400	1400	static void smc_poll_controller(struct net_device *dev)
1401	1401	{
1402	1402	disable_irq(dev->irq);
1403		- smc_interrupt(dev->irq, dev, NULL);
	1403	+ smc_interrupt(dev->irq, dev);
1404	1404	enable_irq(dev->irq);
1405	1405	}
1406	1406	#endif
...	...	@@ -395,7 +395,7 @@
395	395
396	396	static void pcc_interrupt_wrapper(u_long data)
397	397	{
398		- pcc_interrupt(0, NULL, NULL);
	398	+ pcc_interrupt(0, NULL);
399	399	init_timer(&poll_timer);
400	400	poll_timer.expires = jiffies + poll_interval;
401	401	add_timer(&poll_timer);
...	...	@@ -590,7 +590,7 @@
590	590	sts = sio_in(up, SIOSTS);
591	591	if (sts & 0x5) {
592	592	spin_lock(&up->port.lock);
593		- m32r_sio_handle_port(up, sts, NULL);
	593	+ m32r_sio_handle_port(up, sts);
594	594	spin_unlock(&up->port.lock);
595	595	}
596	596