rename struct mem_range to minix_mem_range
. avoid a name clash with gdb
This commit is contained in:
parent
8e116b71a1
commit
d69cc76e03
|
@ -11,7 +11,7 @@ struct machine machine;
|
||||||
/* don't know where ACPI tables are, we may need to access any memory */
|
/* don't know where ACPI tables are, we may need to access any memory */
|
||||||
static int init_mem_priv(void)
|
static int init_mem_priv(void)
|
||||||
{
|
{
|
||||||
struct mem_range mr;
|
struct minix_mem_range mr;
|
||||||
|
|
||||||
mr.mr_base = 0;
|
mr.mr_base = 0;
|
||||||
mr.mr_limit = 0xffffffff;
|
mr.mr_limit = 0xffffffff;
|
||||||
|
|
|
@ -364,7 +364,7 @@ struct rs_pci *aclp;
|
||||||
int i, r;
|
int i, r;
|
||||||
int ilr;
|
int ilr;
|
||||||
struct io_range ior;
|
struct io_range ior;
|
||||||
struct mem_range mr;
|
struct minix_mem_range mr;
|
||||||
|
|
||||||
if (devind < 0 || devind >= nr_pcidev)
|
if (devind < 0 || devind >= nr_pcidev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -113,7 +113,7 @@ struct io_range
|
||||||
unsigned ior_limit; /* Highest I/O port in range */
|
unsigned ior_limit; /* Highest I/O port in range */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct mem_range
|
struct minix_mem_range
|
||||||
{
|
{
|
||||||
phys_bytes mr_base; /* Lowest memory address in range */
|
phys_bytes mr_base; /* Lowest memory address in range */
|
||||||
phys_bytes mr_limit; /* Highest memory address in range */
|
phys_bytes mr_limit; /* Highest memory address in range */
|
||||||
|
|
|
@ -49,7 +49,7 @@ struct priv {
|
||||||
struct io_range s_io_tab[NR_IO_RANGE];
|
struct io_range s_io_tab[NR_IO_RANGE];
|
||||||
|
|
||||||
int s_nr_mem_range; /* allowed memory ranges */
|
int s_nr_mem_range; /* allowed memory ranges */
|
||||||
struct mem_range s_mem_tab[NR_MEM_RANGE];
|
struct minix_mem_range s_mem_tab[NR_MEM_RANGE];
|
||||||
|
|
||||||
int s_nr_irq; /* allowed IRQ lines */
|
int s_nr_irq; /* allowed IRQ lines */
|
||||||
int s_irq_tab[NR_IRQ];
|
int s_irq_tab[NR_IRQ];
|
||||||
|
|
|
@ -34,7 +34,7 @@ int do_privctl(struct proc * caller, message * m_ptr)
|
||||||
int ipc_to_m, kcalls;
|
int ipc_to_m, kcalls;
|
||||||
int i, r;
|
int i, r;
|
||||||
struct io_range io_range;
|
struct io_range io_range;
|
||||||
struct mem_range mem_range;
|
struct minix_mem_range mem_range;
|
||||||
struct priv priv;
|
struct priv priv;
|
||||||
int irq;
|
int irq;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue