--- linux-2.4.21-32.0.1.EL/arch/i386/config.in.orig	2005-06-13 13:35:55.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/arch/i386/config.in	2005-06-13 10:59:54.000000000 +0200
@@ -380,6 +380,7 @@ tristate 'Kernel support for ELF binarie
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 
 bool 'Kernel .config support' CONFIG_IKCONFIG
+bool 'Support for epoll' CONFIG_EPOLL
 
 tristate 'System call auditing' CONFIG_AUDIT
 
--- linux-2.4.21-32.0.1.EL/arch/i386/kernel/entry.S.orig	2005-06-13 13:27:42.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/arch/i386/kernel/entry.S	2005-06-13 13:28:36.000000000 +0200
@@ -816,9 +816,15 @@ sys_call_table:
 	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_free_hugepages */
 	.long SYMBOL_NAME(sys_exit_group)
 	.long SYMBOL_NAME(sys_lookup_dcookie)
+#ifdef CONFIG_EPOLL
+	.long SYMBOL_NAME(sys_epoll_create)
+	.long SYMBOL_NAME(sys_epoll_ctl)	/* 255 */
+	.long SYMBOL_NAME(sys_epoll_wait)
+#else
 	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_epoll_create */
 	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_epoll_ctl 255 */
 	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_epoll_wait */
+#endif /* CONFIG_EPOLL */
  	.long sys_remap_file_pages
  	.long SYMBOL_NAME(sys_set_tid_address)
  	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_timer_create */
--- linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-athlon-smp.config.orig	2005-06-13 13:38:52.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-athlon-smp.config	2005-06-13 13:39:31.000000000 +0200
@@ -1570,7 +1570,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y is not set
 
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AFS_FS=m
--- linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-athlon.config.orig	2005-06-13 13:38:44.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-athlon.config	2005-06-13 13:39:37.000000000 +0200
@@ -1570,7 +1570,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y is not set
 
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AFS_FS=m
--- linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i386.config.orig	2005-06-13 13:38:17.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i386.config	2005-06-13 13:39:38.000000000 +0200
@@ -1570,7 +1570,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y is not set
 
 # CONFIG_QIFACE_COMPAT is not set
 # CONFIG_AFS_FS is not set
--- linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i586-smp.config.orig	2005-06-13 13:37:55.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i586-smp.config	2005-06-13 13:39:38.000000000 +0200
@@ -1570,7 +1570,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y is not set
 
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AFS_FS=m
--- linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i586.config.orig	2005-06-13 13:38:08.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i586.config	2005-06-13 13:39:39.000000000 +0200
@@ -1570,7 +1570,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y is not set
 
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AFS_FS=m
--- linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i686-hugemem.config.orig	2005-06-13 13:38:32.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i686-hugemem.config	2005-06-13 13:39:39.000000000 +0200
@@ -1570,7 +1570,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y is not set
 
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AFS_FS=m
--- linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i686-smp.config.orig	2005-06-13 13:37:42.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i686-smp.config	2005-06-13 13:39:40.000000000 +0200
@@ -1570,7 +1570,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y is not set
 
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AFS_FS=m
--- linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i686.config.orig	2005-06-13 13:37:34.000000000 +0200
+++ linux-2.4.21-32.0.1.EL/configs/kernel-2.4.21-i686.config	2005-06-13 13:39:40.000000000 +0200
@@ -1570,7 +1570,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y is not set
 
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AFS_FS=m