Skip to contentSkip to conversation

PPC compile fixes for 2.6.5-rc1

PATCH Colin Leroy 1 participant 1 message Mar 16, 2004 Sound

lore
Share & tools
lore
#0 lore raw

Hi,

I had trouble compiling 2.6.5-rc1 on ppc32. For information and people interested in testing it, here are the changes I needed to make it work.
No doubt these little glitches will be ironed out for 2.6.5, anyway :)

hth,

Signature · 1 line
Colin
sound/pcm.h renamed from sound/pcm.h.orig +2 -0
@@ -904,6 +904,8 @@
  *  Memory
  */
 
+#define snd_pcm_dma_flags(x) ((void *)(unsigned long)(x))
+
 int snd_pcm_lib_preallocate_free(snd_pcm_substream_t *substream);
 int snd_pcm_lib_preallocate_free_for_all(snd_pcm_t *pcm);
 int snd_pcm_lib_preallocate_pages(snd_pcm_substream_t *substream,
ppc/syslib/indirect_pci.c renamed from ppc/syslib/indirect_pci.c.orig +4 -4
@@ -44,8 +44,8 @@
 			cfg_type = 1;
 
 	PCI_CFG_OUT(hose->cfg_addr, 					 
-		 (0x80000000 | ((dev->bus->number - hose->bus_offset) << 16) 
-		  | (dev->devfn << 8) | ((offset & 0xfc) | cfg_type)));	
+		 (0x80000000 | ((bus->number - hose->bus_offset) << 16) 
+		  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));	
 
 	/*
 	 * Note: the caller has already checked that offset is
@@ -83,8 +83,8 @@
 			cfg_type = 1;
 
 	PCI_CFG_OUT(hose->cfg_addr, 					 
-		 (0x80000000 | ((dev->bus->number - hose->bus_offset) << 16) 
-		  | (dev->devfn << 8) | ((offset & 0xfc) | cfg_type)));	
+		 (0x80000000 | ((bus->number - hose->bus_offset) << 16) 
+		  | (devfn << 8) | ((offset & 0xfc) | cfg_type)));	
 
 	/*
 	 * Note: the caller has already checked that offset is
asm-ppc/pci.h renamed from asm-ppc/pci.h.orig +5 -0
@@ -10,6 +10,11 @@
 #include <asm/io.h>
 #include <asm/pci-bridge.h>
 
+#define consistent_sync_for_cpu consistent_sync
+#define consistent_sync_for_device consistent_sync
+#define consistent_sync_page_for_cpu consistent_sync_page
+#define consistent_sync_page_for_device consistent_sync_page
+
 struct pci_dev;
 
 /* Values for the `which' argument to sys_pciconfig_iobase syscall.  */