3 files changed, 12 insertions, 8 deletions

diff --git a/include/litmus/fifo_lock.h b/include/litmus/fifo_lock.h
index 4b970806117f..7f13863f11e6 100644
--- a/include/litmus/fifo_lock.h
+++ b/include/litmus/fifo_lock.h
@@ -1,5 +1,5 @@
-#ifndef LITMUS_fifo_H
-#define LITMUS_fifo_H
+#ifndef LITMUS_FIFO_H
+#define LITMUS_FIFO_H
 
 #include <litmus/litmus.h>
 #include <litmus/binheap.h>
diff --git a/include/litmus/ikglp_lock.h b/include/litmus/ikglp_lock.h
index af155eadbb35..f9178d3dfba9 100644
--- a/include/litmus/ikglp_lock.h
+++ b/include/litmus/ikglp_lock.h
@@ -107,7 +107,7 @@ struct litmus_lock* ikglp_new(int m, struct litmus_lock_ops*, void* __user arg);
 
 
 
-#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
+#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
 
 struct ikglp_queue_info
 {
@@ -153,12 +153,15 @@ static inline struct ikglp_affinity* ikglp_aff_obs_from_aff_obs(struct affinity_
 
 int ikglp_aff_obs_close(struct affinity_observer*);
 void ikglp_aff_obs_free(struct affinity_observer*);
+
+#ifdef CONFIG_LITMUS_NVIDIA
 struct affinity_observer* ikglp_gpu_aff_obs_new(struct affinity_observer_ops*,
                                                                                                 void* __user arg);
 struct affinity_observer* ikglp_simple_gpu_aff_obs_new(struct affinity_observer_ops*,
                                                                                                 void* __user arg);
 #endif
 
-
+#endif /* end affinity */
 
 #endif
+
diff --git a/include/litmus/kfmlp_lock.h b/include/litmus/kfmlp_lock.h
index 5f0aae6e6f42..3609a3a20424 100644
--- a/include/litmus/kfmlp_lock.h
+++ b/include/litmus/kfmlp_lock.h
@@ -46,7 +46,7 @@ int kfmlp_close(struct litmus_lock* l);
 void kfmlp_free(struct litmus_lock* l);
 struct litmus_lock* kfmlp_new(struct litmus_lock_ops*, void* __user arg);
 
-#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
+#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
 
 struct kfmlp_queue_info
 {
@@ -84,14 +84,15 @@ static inline struct kfmlp_affinity* kfmlp_aff_obs_from_aff_obs(struct affinity_
 
 int kfmlp_aff_obs_close(struct affinity_observer*);
 void kfmlp_aff_obs_free(struct affinity_observer*);
+
+#ifdef CONFIG_LITMUS_NVIDIA
 struct affinity_observer* kfmlp_gpu_aff_obs_new(struct affinity_observer_ops*,
                                                                                         void* __user arg);
 struct affinity_observer* kfmlp_simple_gpu_aff_obs_new(struct affinity_observer_ops*,
                                                                                                 void* __user arg);
-
-
 #endif
 
-#endif
+#endif  /* end affinity */
 
+#endif