diff --git a/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp b/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
index 7b487e6191659487ac9b2d78f1afa9a145707bee..14a284ef1b29ff3d027d3fa82e602daf028e5185 100644
--- a/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
+++ b/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
@@ -920,6 +920,8 @@ namespace {
     SmallVector<Value*,8> KernelMD;
     KernelMD.push_back(F);
 
+  //TODO: For now, we don not add any additional metadata
+/*
     // MDNode for the kernel argument address space qualifiers.
     SmallVector<llvm::Value*, 8> addressQuals;
     addressQuals.push_back(MDString::get(KernelM.getContext(), "kernel_arg_addr_space"));
@@ -973,14 +975,17 @@ namespace {
     KernelMD.push_back(MDNode::get(KernelM.getContext(), argTypeNames));
 //    KernelMD.push_back(MDNode::get(KernelM.getContext(), argTypeQuals));
     KernelMD.push_back(MDNode::get(KernelM.getContext(), argNames));
-
+*/
     MDNode *MDKernelNode = MDNode::get(KernelM.getContext(), KernelMD);
     NamedMDNode *MDN_kernels = KernelM.getOrInsertNamedMetadata("opencl.kernels");
     MDN_kernels->addOperand(MDKernelNode);
 
     KernelMD.push_back(MDNode::get(KernelM.getContext(),
-                       MDString::get(KernelM.getContext(), "kernel")));
-
+                                   MDString::get(KernelM.getContext(), "kernel")));
+    // TODO: Replace 1 with the number of the kernel.
+    // Add when support for multiple launces is added
+    KernelMD.push_back(MDNode::get(KernelM.getContext(),
+                                   ConstantInt::get(Type::getInt32Ty(KernelM.getContext()),1)));
     MDNode *MDNvvmAnnotationsNode = MDNode::get(KernelM.getContext(), KernelMD);
     NamedMDNode *MDN_annotations = KernelM.getOrInsertNamedMetadata("nvvm.annotations");
     MDN_annotations->addOperand(MDNvvmAnnotationsNode);