From d69cc76e034b004679a8b674618ebe1d64ac72d7 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Wed, 15 Aug 2012 15:16:57 +0200
Subject: [PATCH] rename struct mem_range to minix_mem_range

	. avoid a name clash with gdb
---
 drivers/acpi/acpi.c        | 2 +-
 drivers/pci/pci.c          | 2 +-
 include/minix/type.h       | 2 +-
 kernel/priv.h              | 2 +-
 kernel/system/do_privctl.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/acpi/acpi.c b/drivers/acpi/acpi.c
index 2e00e5b2d..b1e5e1ca7 100644
--- 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 38fc42338..416993188 100644
--- 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 0f3a27ac8..6741b3091 100644
--- 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 c0651a3e9..c7eacf5a1 100644
--- 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 d4014dfb9..9bc2366de 100644
--- 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;