diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 21:11:41 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 21:11:41 +1000 |
| commit | 952ecef7a0479049c8abb7c34a688ec2981ceadd (patch) | |
| tree | 74377080bb1fe12e874d18cb77461341a904f854 /arch/ppc64/kernel/misc.S | |
| parent | beeca08738c4c4024c81a591812bfe38f8c436c0 (diff) | |
| parent | 252e75a51d40757928d692b3d339e66838294b4b (diff) | |
Merge Stephen Rothwell's patches
Diffstat (limited to 'arch/ppc64/kernel/misc.S')
| -rw-r--r-- | arch/ppc64/kernel/misc.S | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S index a25b59759dd..d069bbd7f81 100644 --- a/arch/ppc64/kernel/misc.S +++ b/arch/ppc64/kernel/misc.S @@ -64,44 +64,6 @@ _GLOBAL(get_srr1) _GLOBAL(get_sp) mr r3,r1 blr - -#ifdef CONFIG_PPC_ISERIES -/* unsigned long local_save_flags(void) */ -_GLOBAL(local_get_flags) - lbz r3,PACAPROCENABLED(r13) - blr - -/* unsigned long local_irq_disable(void) */ -_GLOBAL(local_irq_disable) - lbz r3,PACAPROCENABLED(r13) - li r4,0 - stb r4,PACAPROCENABLED(r13) - blr /* Done */ - -/* void local_irq_restore(unsigned long flags) */ -_GLOBAL(local_irq_restore) - lbz r5,PACAPROCENABLED(r13) - /* Check if things are setup the way we want _already_. */ - cmpw 0,r3,r5 - beqlr - /* are we enabling interrupts? */ - cmpdi 0,r3,0 - stb r3,PACAPROCENABLED(r13) - beqlr - /* Check pending interrupts */ - /* A decrementer, IPI or PMC interrupt may have occurred - * while we were in the hypervisor (which enables) */ - ld r4,PACALPPACA+LPPACAANYINT(r13) - cmpdi r4,0 - beqlr - - /* - * Handle pending interrupts in interrupt context - */ - li r0,0x5555 - sc - blr -#endif /* CONFIG_PPC_ISERIES */ #ifdef CONFIG_IRQSTACKS _GLOBAL(call_do_softirq) |