Add support for CUDA 5.0 (release candidate)

2 files changed, 14 insertions, 3 deletions

diff --git a/litmus/Kconfig b/litmus/Kconfig
index c5dbc4a176ae..b28fe2c09acd 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -435,11 +435,17 @@ config NV_MAX_SIMULT_USERS
 
 choice
           prompt "CUDA/Driver Version Support"
-          default CUDA_4_0
+          default CUDA_5_0
           depends on LITMUS_NVIDIA
           help
                 Select the version of CUDA/driver to support.
-        
+
+config CUDA_5_0
+          bool "CUDA 5.0"
+          depends on LITMUS_NVIDIA && REALTIME_AUX_TASKS
+          help
+            Support CUDA 5.0 RCx (dev. driver version: x86_64-304.33)
+
 config CUDA_4_0
           bool "CUDA 4.0"
           depends on LITMUS_NVIDIA
diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index b6ead58802f6..d04c6efa5f05 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -31,6 +31,9 @@ typedef union
 typedef struct
 {
     NvU64 address;
+#ifdef CONFIG_CUDA_5_0
+        NvU64 strapped_size;
+#endif
     NvU64 size;
     NvU32 offset;
     NvU32 *map;
@@ -42,7 +45,9 @@ typedef struct
     void  *priv;                    /* private data */
     void  *os_state;                /* os-specific device state */
 
+#ifndef CONFIG_CUDA_5_0
     int    rmInitialized;
+#endif
     int    flags;
 
     /* PCI config info */
@@ -101,7 +106,7 @@ typedef struct litmus_nv_linux_state_s {
     void *pci_cfgchk_sp;
     void *isr_bh_sp;
 
-#ifdef CONFIG_CUDA_4_0
+#if defined(CONFIG_CUDA_4_0) || defined(CONFIG_CUDA_5_0)
         char registry_keys[512];
 #endif