← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to arch/s390/include/asm/pci.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/s390/include/asm/pci.h
63
63
};
64
64
 
65
65
struct zpci_bar_struct {
 
66
        struct resource *res;           /* bus resource */
66
67
        u32             val;            /* bar start & 3 flag bits */
 
68
        u16             map_idx;        /* index into bar mapping array */
67
69
        u8              size;           /* order 2 exponent */
68
 
        u16             map_idx;        /* index into bar mapping array */
69
70
};
70
71
 
71
72
/* Private data per function */
97
98
        unsigned long   iommu_pages;
98
99
        unsigned int    next_bit;
99
100
 
 
101
        char res_name[16];
100
102
        struct zpci_bar_struct bars[PCI_BAR_COUNT];
101
103
 
102
104
        u64             start_dma;      /* Start of available DMA addresses */
122
124
  Prototypes
123
125
----------------------------------------------------------------------------- */
124
126
/* Base stuff */
125
 
struct zpci_dev *zpci_alloc_device(void);
126
127
int zpci_create_device(struct zpci_dev *);
127
128
int zpci_enable_device(struct zpci_dev *);
128
129
int zpci_disable_device(struct zpci_dev *);
129
130
void zpci_stop_device(struct zpci_dev *);
130
 
void zpci_free_device(struct zpci_dev *);
131
131
int zpci_register_ioat(struct zpci_dev *, u8, u64, u64, u64);
132
132
int zpci_unregister_ioat(struct zpci_dev *, u8);
133
133