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

Commit 81c06b10 authored by James Bottomley's avatar James Bottomley
Browse files

[VOYAGER] fix up ptregs removal mess 



Apparently whoever converted voyager never actually checked that the
patch would compile ...

Remove as much of the pt_regs references as possible and move the
remaining ones into line with what's in x86 generic.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 58f07943

arch/i386/mach-voyager/voyager_basic.c

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct voyager_SUS *voyager_SUS = NULL; 


#ifdef CONFIG_SMP

static void

voyager_dump(int dummy1, struct pt_regs *dummy2, struct tty_struct *dummy3)

voyager_dump(int dummy1, struct tty_struct *dummy3)

{

	/* get here via a sysrq */

	voyager_smp_dump();
@@ -166,7 +166,7 @@ voyager_memory_detect(int region, __u32 *start, __u32 *length) 
 * off the timer tick to the SMP code, since the VIC doesn't have an

 * internal timer (The QIC does, but that's another story). */

void

voyager_timer_interrupt(struct pt_regs *regs)

voyager_timer_interrupt(void)

{

	if((jiffies & 0x3ff) == 0) {
@@ -202,7 +202,7 @@ voyager_timer_interrupt(struct pt_regs *regs) 
		}

	}

#ifdef CONFIG_SMP

	smp_vic_timer_interrupt(regs);

	smp_vic_timer_interrupt();

#endif

}

arch/i386/mach-voyager/voyager_smp.c

+4 −6
Original line number Diff line number Diff line
@@ -1141,9 +1141,9 @@ smp_apic_timer_interrupt(struct pt_regs *regs) 
fastcall void

smp_qic_timer_interrupt(struct pt_regs *regs)

{

	ack_QIC_CPI(QIC_TIMER_CPI);

	struct pt_regs *old_regs = set_irq_regs(regs);

	wrapper_smp_local_timer_interrupt(void);

	ack_QIC_CPI(QIC_TIMER_CPI);

	wrapper_smp_local_timer_interrupt();

	set_irq_regs(old_regs);

}
@@ -1267,12 +1267,10 @@ smp_send_stop(void) 
/* this function is triggered in time.c when a clock tick fires

 * we need to re-broadcast the tick to all CPUs */

void

smp_vic_timer_interrupt(struct pt_regs *regs)

smp_vic_timer_interrupt(void)

{

	struct pt_regs *old_regs = set_irq_regs(regs);

	send_CPI_allbutself(VIC_TIMER_CPI);

	smp_local_timer_interrupt();

	set_irq_regs(old_regs);

}



/* local (per CPU) timer interrupt.  It does both profiling and
@@ -1307,7 +1305,7 @@ smp_local_timer_interrupt(void) 
						per_cpu(prof_counter, cpu);

		}



		update_process_times(user_mode_vm(irq_regs));

		update_process_times(user_mode_vm(get_irq_regs()));

	}



	if( ((1<<cpu) & voyager_extended_vic_processors) == 0)

include/asm-i386/vic.h

+1 −1
Original line number Diff line number Diff line
@@ -58,4 +58,4 @@ static const int VIC_CPI_Registers[] = 


#define VIC_BOOT_INTERRUPT_MASK		0xfe



extern void smp_vic_timer_interrupt(struct pt_regs *regs);
 
extern void smp_vic_timer_interrupt(void);