Skip to contentSkip to conversation

Fix warnings for kernel 2.4 builds

PATCH Applied Jan Kiszka 2 participants 2 messages Feb 9, 2007

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 Fix warnings for kernel 2.4 builds

asm-generic/wrappers.h +2 -2
Index: include/asm-generic/wrappers.h
===================================================================
@@ -257,8 +257,6 @@ unsigned long __va_to_kva(unsigned long 
 					   &(p)->pending.signal, \
 					   &(p)->signal->shared_pending.signal)
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) */
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
 #define DECLARE_WORK_NODATA(f, n)	DECLARE_WORK(f, n, NULL)
 #define DECLARE_WORK_FUNC(f)		void f(void *cookie)
@@ -267,4 +265,6 @@ unsigned long __va_to_kva(unsigned long 
 #define DECLARE_WORK_FUNC(f)		void f(struct work_struct *work)
 #endif /* >= 2.6.20 */
 
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) */
+
 #endif /* _XENO_ASM_GENERIC_WRAPPERS_H */
#1 lore raw
Quoted 15 lines · Jan Kiszka

Index: include/asm-generic/wrappers.h
===================================================================

asm-generic/wrappers.h +0 -2
@@ -257,8 +257,6 @@ unsigned long __va_to_kva(unsigned long 
 					   &(p)->pending.signal, \
 					   &(p)->signal->shared_pending.signal)
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) */
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
 #define DECLARE_WORK_NODATA(f, n)	DECLARE_WORK(f, n, NULL)
 #define DECLARE_WORK_FUNC(f)		void f(void *cookie)

asm-generic/wrappers.h unsigned long __va_to_kva(unsigned long · line 270

Quoted 6 lines
asm-generic/wrappers.h +2 -0
@@ -267,4 +265,6 @@ unsigned long __va_to_kva(unsigned long 
 #define DECLARE_WORK_FUNC(f)		void f(struct work_struct *work)
 #endif /* >= 2.6.20 */
 
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) */
+
 #endif /* _XENO_ASM_GENERIC_WRAPPERS_H */

Merged, thanks.

Signature · 1 line
Philippe.