Merge branch 'privatestaging' of https://github.com/AMDComputeLibraries/HIP-privatestaging into privatestaging

Conflicts:
	src/hip_hcc.cpp

include/hcc_detail/hip_runtime_api.h

@@ -688,10 +688,10 @@ hipError_t hipHostAlloc(void** ptr, size_t size, unsigned int flags) __attribute
  *
  *  @param[out]  dstPtr Device Pointer mapped to passed host pointer
  *  @param[in] hstPtr Host Pointer allocated through hipHostAlloc
- *  @param[in] size Requested memory size
+ *  @param[in] flags Flags to be passed for extension
  *  @return Error code
  */
-hipError_t hipHostGetDevicePointer(void** devPtr, void* hstPtr, size_t size) ;
+hipError_t hipHostGetDevicePointer(void** devPtr, void* hstPtr, unsigned int flags) ;
 
 /**
  *  @brief Get flags associated with host pointer

include/hip_runtime_api.h

@@ -149,6 +149,8 @@ typedef enum hipError_t {
     ,hipErrorInvalidResourceHandle    ///< Resource handle (hipEvent_t or hipStream_t) invalid.
     ,hipErrorInvalidDevice            ///< DeviceID must be in range 0...#compute-devices.
     ,hipErrorInvalidMemcpyDirection   ///< Invalid memory copy direction 
+    ,hipErrorInvalidDevicePointer     ///< Invalid Device Pointer
+    ,hipErrorInitializationError      ///< TODO comment from hipErrorInitializationError
 
     ,hipErrorNoDevice                 ///< Call to hipGetDeviceCount returned 0 devices
     ,hipErrorNotReady                 ///< Indicates that asynchronous operations enqueued earlier are not ready.  This is not actually an error, but is used to distinguish from hipSuccess (which indicates completion).  APIs that return this error include hipEventQuery and hipStreamQuery.

include/nvcc_detail/hip_runtime_api.h

@@ -50,10 +50,10 @@ hipMemcpyHostToHost
 } hipTextureFilterMode;*/
 #define hipFilterModePoint cudaFilterModePoint
 
-#define hipHostAllocDefault cudaHostAllocDefault
-#define hipHostAllocPortable cudaHostAllocPortable
-#define hipHostAllocMapped cudaHostAllocMapped
-#define hipHostAllocWriteCombined cudaHostAllocWriteCombined
+#define hipHostMallocDefault cudaHostAllocDefault
+#define hipHostMallocPortable cudaHostAllocPortable
+#define hipHostMallocMapped cudaHostAllocMapped
+#define hipHostMallocWriteCombined cudaHostAllocWriteCombined
 
 #define hipHostRegisterPortable cudaHostRegisterPortable
 #define hipHostRegisterMapped cudaHostRegisterMapped