diff -u --recursive ofa_kernel-1.4.2/kernel_addons/backport/2.6.18-EL5.3/include/linux/notifier.h ofa_kernel-1.4.2.new/kernel_addons/backport/2.6.18-EL5.3/include/linux/notifier.h --- ofa_kernel-1.4.2/kernel_addons/backport/2.6.18-EL5.3/include/linux/notifier.h 2009-08-02 09:57:41.000000000 +0200 +++ ofa_kernel-1.4.2.new/kernel_addons/backport/2.6.18-EL5.3/include/linux/notifier.h 2010-03-16 08:42:38.000000000 +0100 @@ -3,7 +3,7 @@ #include_next -#define NETDEV_BONDING_FAILOVER NETDEV_CHANGE +/* #define NETDEV_BONDING_FAILOVER NETDEV_CHANGE */ #define NOTIFY_DONE 0x0000 /* Don't care */ #endif /* __BACKPORT_LINUX_NOTIFIER_H_TO_2_6_26__ */ diff -u --recursive ofa_kernel-1.4.2/kernel_addons/backport/2.6.18-EL5.3/include/linux/sched.h ofa_kernel-1.4.2.new/kernel_addons/backport/2.6.18-EL5.3/include/linux/sched.h --- ofa_kernel-1.4.2/kernel_addons/backport/2.6.18-EL5.3/include/linux/sched.h 2009-08-02 09:57:41.000000000 +0200 +++ ofa_kernel-1.4.2.new/kernel_addons/backport/2.6.18-EL5.3/include/linux/sched.h 2010-03-16 08:40:52.000000000 +0100 @@ -9,7 +9,7 @@ #define schedule_timeout_killable(_arg) schedule_timeout_interruptible(_arg) -static inline int __fatal_signal_pending(struct task_struct *tsk) +/* static inline int __fatal_signal_pending(struct task_struct *tsk) { return sigismember(&tsk->pending.signal, SIGKILL); } @@ -22,5 +22,5 @@ static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -} +} */ #endif diff -u --recursive ofa_kernel-1.4.2/kernel_addons/backport/2.6.18-EL5.3/include/net/checksum.h ofa_kernel-1.4.2.new/kernel_addons/backport/2.6.18-EL5.3/include/net/checksum.h --- ofa_kernel-1.4.2/kernel_addons/backport/2.6.18-EL5.3/include/net/checksum.h 2009-08-02 09:57:41.000000000 +0200 +++ ofa_kernel-1.4.2.new/kernel_addons/backport/2.6.18-EL5.3/include/net/checksum.h 2010-03-16 08:39:54.000000000 +0100 @@ -3,9 +3,9 @@ #include_next -static inline __wsum csum_unfold(__sum16 n) +/* static inline __wsum csum_unfold(__sum16 n) { return (__force __wsum)n; } - +*/ #endif