Index: kernel/arch/sparc64/include/sun4v/hypercall.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/hypercall.h	(revision 617652fa50b32207280104c49fe2bef5d68926fa)
+++ kernel/arch/sparc64/include/sun4v/hypercall.h	(revision b352895711d138fc0695d14b25c940944f72f888)
@@ -81,5 +81,5 @@
 #define EBADPGSZ	4	/**< Invalid pagesize encoding */
 #define EBADTSB		5	/**< Invalid TSB description */
-#define	EINVAL		6	/**< Invalid argument */
+#define	HV_EINVAL	6	/**< Invalid argument */
 #define EBADTRAP	7	/**< Invalid function number */
 #define EBADALIGN	8	/**< Invalid address alignment */
@@ -92,5 +92,5 @@
 #define ETOOMANY	15	/**< Too many items specified / limit reached */
 #define ECHANNEL	16	/**< Invalid LDC channel */
-#define EBUSY		17	/**< Operation failed as resource is otherwise busy */
+#define HV_EBUSY	17	/**< Operation failed as resource is otherwise busy */
 
 
Index: kernel/generic/include/errno.h
===================================================================
--- kernel/generic/include/errno.h	(revision 617652fa50b32207280104c49fe2bef5d68926fa)
+++ kernel/generic/include/errno.h	(revision b352895711d138fc0695d14b25c940944f72f888)
@@ -57,11 +57,6 @@
 #define EADDRNOTAVAIL	-12	/* Address not available. */
 #define ETIMEOUT        -13     /* Timeout expired */
-//MH
-#ifndef EINVAL
 #define EINVAL          -14     /* Invalid value */
-#endif
-#ifndef EBUSY
 #define EBUSY           -15     /* Resource is busy */
-#endif
 #define EOVERFLOW	-16	/* The result does not fit its size. */
 #define EINTR		-17	/* Operation was interrupted. */