rename struct mem_range to minix_mem_range

	. avoid a name clash with gdb

diff --git a/drivers/acpi/acpi.c b/drivers/acpi/acpi.c
index 2e00e5b2d90c96558102d08acb944b153ffa4d01..b1e5e1ca7cde60ff09de68f837c2e2bdb15ce611 100644 (file)
--- a/drivers/acpi/acpi.c
+++ b/drivers/acpi/acpi.c
@@ -11,7 +11,7 @@ struct machine machine;
 /* don't know where ACPI tables are, we may need to access any memory */
 static int init_mem_priv(void)
 {
-       struct mem_range mr;
+       struct minix_mem_range mr;
 
        mr.mr_base = 0;
        mr.mr_limit = 0xffffffff;

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 38fc4233808315751ce8db6dce5f897809e541b7..41699318833957c8de5fe65c81288d15a8afe561 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -364,7 +364,7 @@ struct rs_pci *aclp;
        int i, r;
        int ilr;
        struct io_range ior;
-       struct mem_range mr;
+       struct minix_mem_range mr;
 
        if (devind < 0 || devind >= nr_pcidev)
        {

diff --git a/include/minix/type.h b/include/minix/type.h
index 0f3a27ac85ed8350b2a6f4443749079e8783f667..6741b30916a35df9372018b9ea17214b33197082 100644 (file)
--- a/include/minix/type.h
+++ b/include/minix/type.h
@@ -113,7 +113,7 @@ struct io_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_limit;    /* Highest memory address in range */

diff --git a/kernel/priv.h b/kernel/priv.h
index c0651a3e9fa986c064993987ea5cfd96404242ea..c7eacf5a14cb0183fc4c4b8139909059aaf3ba03 100644 (file)
--- a/kernel/priv.h
+++ b/kernel/priv.h
@@ -49,7 +49,7 @@ struct priv {
   struct io_range s_io_tab[NR_IO_RANGE];
 
   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_irq_tab[NR_IRQ];

diff --git a/kernel/system/do_privctl.c b/kernel/system/do_privctl.c
index d4014dfb9795d25e880c280efdc3ddbc34a1e51c..9bc2366de290f0859a931164531dff32b2177217 100644 (file)
--- a/kernel/system/do_privctl.c
+++ b/kernel/system/do_privctl.c
@@ -34,7 +34,7 @@ int do_privctl(struct proc * caller, message * m_ptr)
   int ipc_to_m, kcalls;
   int i, r;
   struct io_range io_range;
-  struct mem_range mem_range;
+  struct minix_mem_range mem_range;
   struct priv priv;
   int irq;