Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88998
b: refs/heads/master
c: 3cb47d7
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Ingo Molnar committed Apr 17, 2008
1 parent 4cea8b0 commit 9b3c6e1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5269354231c6e960941f6e1fd0737acc003d2353
refs/heads/master: 3cb47d79e99ad7b3a02badd7f64fbb57a1b125b3
14 changes: 5 additions & 9 deletions trunk/include/asm-x86/pci_64.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#ifndef __x8664_PCI_H
#define __x8664_PCI_H


#ifdef __KERNEL__


#ifdef CONFIG_CALGARY_IOMMU
static inline void* pci_iommu(struct pci_bus *bus)
static inline void *pci_iommu(struct pci_bus *bus)
{
struct pci_sysdata *sd = bus->sysdata;
return sd->iommu;
Expand All @@ -19,11 +17,10 @@ static inline void set_pci_iommu(struct pci_bus *bus, void *val)
}
#endif /* CONFIG_CALGARY_IOMMU */


extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value);
extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value);


extern int (*pci_config_read)(int seg, int bus, int dev, int fn,
int reg, int len, u32 *value);
extern int (*pci_config_write)(int seg, int bus, int dev, int fn,
int reg, int len, u32 value);

extern void pci_iommu_alloc(void);

Expand Down Expand Up @@ -65,5 +62,4 @@ extern void pci_iommu_alloc(void);

#endif /* __KERNEL__ */


#endif /* __x8664_PCI_H */

0 comments on commit 9b3c6e1

Please sign in to comment.