android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[VOYAGER] fix up ptregs removal mess

Browse Source 
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: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley 2006-10-12 22:25:03 -05:00
parent 58f07943b0
commit 81c06b10bc
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/i386/mach-voyager/voyager_basic.c
View File

@ -44,7 +44,7 @@ struct voyager_SUS *voyager_SUS = NULL;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static void 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 */ /* get here via a sysrq */
voyager_smp_dump(); 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 * 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). */ * internal timer (The QIC does, but that's another story). */
void void
voyager_timer_interrupt(struct pt_regs *regs) voyager_timer_interrupt(void)
{ {
if((jiffies & 0x3ff) == 0) { if((jiffies & 0x3ff) == 0) {
@ -202,7 +202,7 @@ voyager_timer_interrupt(struct pt_regs *regs)
} }
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
smp_vic_timer_interrupt(regs); smp_vic_timer_interrupt();
#endif #endif
} }

10
arch/i386/mach-voyager/voyager_smp.c
View File

@ -1141,9 +1141,9 @@ smp_apic_timer_interrupt(struct pt_regs *regs)
fastcall void fastcall void
smp_qic_timer_interrupt(struct pt_regs *regs) smp_qic_timer_interrupt(struct pt_regs *regs)
{ {
ack_QIC_CPI(QIC_TIMER_CPI);
struct pt_regs *old_regs = set_irq_regs(regs); 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); 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 /* this function is triggered in time.c when a clock tick fires
* we need to re-broadcast the tick to all CPUs */ * we need to re-broadcast the tick to all CPUs */
void 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); send_CPI_allbutself(VIC_TIMER_CPI);
smp_local_timer_interrupt(); smp_local_timer_interrupt();
set_irq_regs(old_regs);
} }
/* local (per CPU) timer interrupt. It does both profiling and /* local (per CPU) timer interrupt. It does both profiling and
@ -1307,7 +1305,7 @@ smp_local_timer_interrupt(void)
per_cpu(prof_counter, cpu); 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) if( ((1<<cpu) & voyager_extended_vic_processors) == 0)

2
include/asm-i386/vic.h
View File

@ -58,4 +58,4 @@ static const int VIC_CPI_Registers[] =
#define VIC_BOOT_INTERRUPT_MASK 0xfe #define VIC_BOOT_INTERRUPT_MASK 0xfe
extern void smp_vic_timer_interrupt(struct pt_regs *regs); extern void smp_vic_timer_interrupt(void);