diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
| commit | ae38fd1e4c98588314a42097c5a5e77dcef23561 (patch) | |
| tree | f9f10c203bb9e5fbad4810d1f8774c08dfad20ff /include/asm-sparc64 | |
| parent | 466a823d79f41d0713b272e48fd73e494b0588e0 (diff) | |
Merge with Linux 2.3.50.
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/pgtable.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/system.h | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index b271dad95..056b60f6a 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h @@ -1,4 +1,4 @@ -/* $Id: pgtable.h,v 1.120 2000/02/16 07:34:54 davem Exp $ +/* $Id: pgtable.h,v 1.121 2000/03/02 20:37:41 davem Exp $ * pgtable.h: SpitFire page table operations. * * Copyright 1996,1997 David S. Miller (davem@caip.rutgers.edu) diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h index 5989d8c4a..87379139b 100644 --- a/include/asm-sparc64/system.h +++ b/include/asm-sparc64/system.h @@ -1,4 +1,4 @@ -/* $Id: system.h,v 1.55 1999/09/10 10:44:44 davem Exp $ */ +/* $Id: system.h,v 1.56 2000/03/06 22:33:45 davem Exp $ */ #ifndef __SPARC64_SYSTEM_H #define __SPARC64_SYSTEM_H @@ -116,7 +116,16 @@ extern void __global_restore_flags(unsigned long flags); #define read_pcr(__p) __asm__ __volatile__("rd %%pcr, %0" : "=r" (__p)) #define write_pcr(__p) __asm__ __volatile__("wr %0, 0x0, %%pcr" : : "r" (__p)); #define read_pic(__p) __asm__ __volatile__("rd %%pic, %0" : "=r" (__p)) -#define reset_pic() __asm__ __volatile__("wr %g0, 0x0, %pic"); + +/* Blackbird errata workaround. See commentary in + * arch/sparc64/kernel/smp.c:smp_percpu_timer_interrupt() + * for more information. + */ +#define reset_pic() \ + __asm__ __volatile__("ba,pt %xcc, 99f\n\t" \ + ".align 64\n" \ + "99:wr %g0, 0x0, %pic\n\t" \ + "rd %pic, %g0") #ifndef __ASSEMBLY__ |