diff --git a/projects/rocr-runtime/include/hsakmt.h b/projects/rocr-runtime/include/hsakmt.h
index 6d666a931c..78ef5827b1 100644
--- a/projects/rocr-runtime/include/hsakmt.h
+++ b/projects/rocr-runtime/include/hsakmt.h
@@ -578,7 +578,6 @@ hsaKmtUnmapGraphicHandle(
 HSAKMT_STATUS
 HSAKMTAPI
 hsaKmtAllocQueueGWS(
-                HSAuint32          NodeId,                      //IN
                 HSA_QUEUEID        QueueId,                     //IN
                 HSAuint32          nGWS,                        //IN
                 HSAuint32          *firstGWS                    //OUT
diff --git a/projects/rocr-runtime/include/linux/kfd_ioctl.h b/projects/rocr-runtime/include/linux/kfd_ioctl.h
index fe355090ee..76d8a96a02 100644
--- a/projects/rocr-runtime/include/linux/kfd_ioctl.h
+++ b/projects/rocr-runtime/include/linux/kfd_ioctl.h
@@ -470,17 +470,16 @@ struct kfd_ioctl_unmap_memory_from_gpu_args {
 
 /* Allocate GWS for specific queue
  *
- * @gpu_id:      device identifier
  * @queue_id:    queue's id that GWS is allocated for
  * @num_gws:     how many GWS to allocate
  * @first_gws:   index of the first GWS allocated.
  *               only support contiguous GWS allocation
  */
 struct kfd_ioctl_alloc_queue_gws_args {
-	__u32 gpu_id;		/* to KFD */
 	__u32 queue_id;		/* to KFD */
 	__u32 num_gws;		/* to KFD */
 	__u32 first_gws;	/* from KFD */
+	__u32 pad;		/* to KFD */
 };
 
 struct kfd_ioctl_get_dmabuf_info_args {
diff --git a/projects/rocr-runtime/src/queues.c b/projects/rocr-runtime/src/queues.c
index be3df8f733..f006d5ec2c 100644
--- a/projects/rocr-runtime/src/queues.c
+++ b/projects/rocr-runtime/src/queues.c
@@ -834,25 +834,15 @@ uint32_t *convert_queue_ids(HSAuint32 NumQueues, HSA_QUEUEID *Queues)
 HSAKMT_STATUS
 HSAKMTAPI
 hsaKmtAllocQueueGWS(
-                HSAuint32          NodeId,
                 HSA_QUEUEID        QueueId,
                 HSAuint32          nGWS,
                 HSAuint32          *firstGWS)
 {
 	struct kfd_ioctl_alloc_queue_gws_args args = {0};
 	struct queue *q = PORT_UINT64_TO_VPTR(QueueId);
-	HSAKMT_STATUS result;
-	uint32_t gpu_id;
 
 	CHECK_KFD_OPEN();
 
-	result = validate_nodeid(NodeId, &gpu_id);
-	if (result != HSAKMT_STATUS_SUCCESS) {
-		pr_err("[%s] invalid node ID: %d\n", __func__, NodeId);
-		return result;
-	}
-
-	args.gpu_id = gpu_id;
 	args.queue_id = (HSAuint32)q->queue_id;
 	args.num_gws = nGWS;