patch-2.2.18 linux/arch/sparc64/kernel/psycho.c

• Lines: 34
• Date: Thu Nov 2 13:05:35 2000
• Orig file: v2.2.17/arch/sparc64/kernel/psycho.c
• Orig date: Sat Sep 9 18:42:34 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/arch/sparc64/kernel/psycho.c linux/arch/sparc64/kernel/psycho.c
@@ -1,4 +1,4 @@
-/* $Id: psycho.c,v 1.85.2.10 2000/06/14 07:41:19 davem Exp $
+/* $Id: psycho.c,v 1.85.2.11 2000/10/24 21:00:53 davem Exp $
  * psycho.c: Ultra/AX U2P PCI controller support.
  *
  * Copyright (C) 1997 David S. Miller (davem@caipfs.rutgers.edu)
@@ -30,13 +30,6 @@
 #define dprintf printk
 #endif
 
-unsigned long pci_dvma_offset = 0x00000000UL;
-unsigned long pci_dvma_mask = 0xffffffffUL;
-
-#define PCI_DVMA_HASH_NONE	0xffffffffffffffffUL
-unsigned long pci_dvma_v2p_hash[PCI_DVMA_HASHSZ];
-unsigned long pci_dvma_p2v_hash[PCI_DVMA_HASHSZ];
-
 /* If this is non-NULL it points to Sabre's DMA write-sync register
  * which is used by drivers of devices behind bridges other than APB
  * to synchronize DMA write streams with interrupt delivery.
@@ -69,6 +62,13 @@
 }
 
 #else
+
+unsigned long pci_dvma_offset = 0x00000000UL;
+unsigned long pci_dvma_mask = 0xffffffffUL;
+
+#define PCI_DVMA_HASH_NONE	0xffffffffffffffffUL
+unsigned long pci_dvma_v2p_hash[PCI_DVMA_HASHSZ];
+unsigned long pci_dvma_p2v_hash[PCI_DVMA_HASHSZ];
 
 #include <linux/smp.h>
 #include <linux/smp_lock.h>