diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /include/asm-sparc | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/ide.h | 7 | ||||
| -rw-r--r-- | include/asm-sparc/system.h | 44 |
2 files changed, 5 insertions, 46 deletions
diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h index bec4233e6..3a4ac776a 100644 --- a/include/asm-sparc/ide.h +++ b/include/asm-sparc/ide.h @@ -1,4 +1,4 @@ -/* $Id: ide.h,v 1.2 2000/01/21 04:56:27 zaitcev Exp $ +/* $Id: ide.h,v 1.3 2000/03/10 04:46:47 davem Exp $ * ide.h: SPARC PCI specific IDE glue. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) @@ -11,6 +11,7 @@ #ifdef __KERNEL__ +#include <linux/config.h> #include <asm/pgtable.h> #include <asm/io.h> #include <asm/hdreg.h> @@ -59,7 +60,7 @@ static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, */ static __inline__ void ide_init_default_hwifs(void) { -#ifdef __DO_I_NEED_THIS +#ifndef CONFIG_BLK_DEV_IDEPCI hw_regs_t hw; int index; @@ -68,7 +69,7 @@ static __inline__ void ide_init_default_hwifs(void) hw.irq = ide_default_irq(ide_default_io_base(index)); ide_register_hw(&hw, NULL); } -#endif /* __DO_I_NEED_THIS */ +#endif /* CONFIG_BLK_DEV_IDEPCI */ } typedef union { diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index de78c266c..112145b0b 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h @@ -1,4 +1,4 @@ -/* $Id: system.h,v 1.80 1999/12/16 12:58:31 anton Exp $ */ +/* $Id: system.h,v 1.81 2000/02/28 04:00:44 anton Exp $ */ #include <linux/config.h> #ifndef __SPARC_SYSTEM_H @@ -251,16 +251,10 @@ extern __inline__ unsigned long read_psr_and_cli(void) #ifdef __SMP__ -/* This goes away after lockups have been found... */ -#ifndef DEBUG_IRQLOCK -#define DEBUG_IRQLOCK -#endif - extern unsigned char global_irq_holder; #define save_and_cli(flags) do { save_flags(flags); cli(); } while(0) -#ifdef DEBUG_IRQLOCK extern void __global_cli(void); extern void __global_sti(void); extern unsigned long __global_save_flags(void); @@ -269,42 +263,6 @@ extern void __global_restore_flags(unsigned long flags); #define sti() __global_sti() #define save_flags(flags) ((flags)=__global_save_flags()) #define restore_flags(flags) __global_restore_flags(flags) -#else - -#error For combined sun4[md] smp, we need to get rid of the rdtbr. - -/* Visit arch/sparc/lib/irqlock.S for all the fun details... */ -#define cli() __asm__ __volatile__("mov %%o7, %%g4\n\t" \ - "call ___f_global_cli\n\t" \ - " rd %%tbr, %%g7" : : \ - : "g1", "g2", "g3", "g4", "g5", "g7", \ - "memory", "cc") - -#define sti() \ -do { register unsigned long bits asm("g7"); \ - bits = 0; \ - __asm__ __volatile__("mov %%o7, %%g4\n\t" \ - "call ___f_global_sti\n\t" \ - " rd %%tbr, %%g2" \ - : /* no outputs */ \ - : "r" (bits) \ - : "g1", "g2", "g3", "g4", "g5", \ - "memory", "cc"); \ -} while(0) - -#define restore_flags(flags) \ -do { register unsigned long bits asm("g7"); \ - bits = flags; \ - __asm__ __volatile__("mov %%o7, %%g4\n\t" \ - "call ___f_global_restore_flags\n\t" \ - " andcc %%g7, 0x1, %%g0" \ - : "=&r" (bits) \ - : "0" (bits) \ - : "g1", "g2", "g3", "g4", "g5", \ - "memory", "cc"); \ -} while(0) - -#endif /* DEBUG_IRQLOCK */ #else |