backports: fix typo "TIMKEEPING" and fix gfp.h

There is a typo in the timekeeping.h backport, fix that.
Additionally, fix the gfp.h file tha has a copy/paste issue where
__BACKPORT_TIMKEEPING_H is used instead of __BACKPORT_LINUX_GFP_H.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/backport/backport-include/linux/gfp.h b/backport/backport-include/linux/gfp.h
index b4db7bb9066e7166a9abfc1e499fc99d9860381a..42f818f1fee351ef19fad6c12c738dd3e2cda7e7 100644 (file)
--- a/backport/backport-include/linux/gfp.h
+++ b/backport/backport-include/linux/gfp.h
@@ -10,4 +10,4 @@
 #define __GFP_KSWAPD_RECLAIM   ((__force gfp_t)___GFP_KSWAPD_RECLAIM) /* kswapd can wake */
 #endif
 
-#endif /* __BACKPORT_TIMKEEPING_H */
+#endif /* __BACKPORT_LINUX_GFP_H */

diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h
index b683d129833603e716d95cd7da10df98c596c321..0b9c649a3395b32b793f46455d026eb59670ad66 100644 (file)
--- a/backport/backport-include/linux/timekeeping.h
+++ b/backport/backport-include/linux/timekeeping.h
@@ -1,5 +1,5 @@
-#ifndef __BACKPORT_TIMKEEPING_H
-#define __BACKPORT_TIMKEEPING_H
+#ifndef __BACKPORT_TIMEKEEPING_H
+#define __BACKPORT_TIMEKEEPING_H
 #include <linux/version.h>
 #include <linux/types.h>
 
@@ -35,4 +35,4 @@ static inline time64_t ktime_get_seconds(void)
 }
 #endif
 
-#endif /* __BACKPORT_TIMKEEPING_H */
+#endif /* __BACKPORT_TIMEKEEPING_H */