2 files changed, 9 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 0b57b88d..1e4065ba 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -31,6 +31,7 @@
 #include <nvgpu/barrier.h>
 #include <nvgpu/vidmem.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/types.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/include/nvgpu/posix/types.h b/drivers/gpu/nvgpu/include/nvgpu/posix/types.h
index 10754a09..71bac1d0 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/posix/types.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/posix/types.h
@@ -55,16 +55,22 @@ typedef long long		s64;
                 __a < __b ? __a : __b;  \
         })
 
+#if defined(min)
+#undef min
+#endif
+#if defined(max)
+#undef max
+#endif
+
 #define min(a, b)                       \
         ({                              \
                 (a) < (b) ? a : b;      \
         })
-#define min3(a, b, c)                   min(min(a, b), c)
-
 #define max(a, b)                       \
         ({                              \
                 (a) > (b) ? a : b;      \
         })
+#define min3(a, b, c)                   min(min(a, b), c)
 
 #define PAGE_SIZE       4096