← Back to branch summary

~ubuntu-branches/ubuntu/quantal/haproxy/quantal

« back to all changes in this revision

Viewing changes to examples/linux-2.4.21-40.EL-custom.diff

  • Committer: Bazaar Package Importer
  • Author(s): Arnaud Cornet
  • Date: 2007-08-17 09:33:41 UTC
  • Revision ID: james.westby@ubuntu.com-20070817093341-h0t6aeeoyzo25z3r
Tags: upstream-1.3.12.dfsg
Import upstream version 1.3.12.dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/linux-2.4.21-40.EL-custom.diff
 
1
diff -urN linux-2.4.21-40.EL/arch/i386/config.in linux-2.4.21-40.EL-epoll/arch/i386/config.in
 
2
--- linux-2.4.21-40.EL/arch/i386/config.in      2006-03-17 09:34:24.000000000 +0100
 
3
+++ linux-2.4.21-40.EL-epoll/arch/i386/config.in        2006-03-17 09:34:42.000000000 +0100
 
4
@@ -380,6 +380,7 @@
 
5
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 
6
 
 
7
 bool 'Kernel .config support' CONFIG_IKCONFIG
 
8
+bool 'Support for epoll' CONFIG_EPOLL
 
9
 
 
10
 tristate 'System call auditing' CONFIG_AUDIT
 
11
 
 
12
diff -urN linux-2.4.21-40.EL/arch/i386/kernel/entry.S linux-2.4.21-40.EL-epoll/arch/i386/kernel/entry.S
 
13
--- linux-2.4.21-40.EL/arch/i386/kernel/entry.S 2006-03-17 09:34:24.000000000 +0100
 
14
+++ linux-2.4.21-40.EL-epoll/arch/i386/kernel/entry.S   2006-03-17 09:34:42.000000000 +0100
 
15
@@ -816,9 +816,15 @@
 
16
        .long SYMBOL_NAME(sys_ni_syscall)       /* sys_free_hugepages */
 
17
        .long SYMBOL_NAME(sys_exit_group)
 
18
        .long SYMBOL_NAME(sys_lookup_dcookie)
 
19
+#ifdef CONFIG_EPOLL
 
20
+       .long SYMBOL_NAME(sys_epoll_create)
 
21
+       .long SYMBOL_NAME(sys_epoll_ctl)        /* 255 */
 
22
+       .long SYMBOL_NAME(sys_epoll_wait)
 
23
+#else
 
24
        .long SYMBOL_NAME(sys_ni_syscall)       /* sys_epoll_create */
 
25
        .long SYMBOL_NAME(sys_ni_syscall)       /* sys_epoll_ctl 255 */
 
26
        .long SYMBOL_NAME(sys_ni_syscall)       /* sys_epoll_wait */
 
27
+#endif /* CONFIG_EPOLL */
 
28
        .long sys_remap_file_pages
 
29
        .long SYMBOL_NAME(sys_set_tid_address)
 
30
        .long SYMBOL_NAME(sys_ni_syscall)       /* sys_timer_create */
 
31
diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-athlon.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-athlon.config
 
32
--- linux-2.4.21-40.EL/configs/kernel-2.4.21-athlon.config      2006-03-17 09:34:24.000000000 +0100
 
33
+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-athlon.config        2006-03-17 09:34:42.000000000 +0100
 
34
@@ -1575,7 +1575,7 @@
 
35
 CONFIG_QUOTA=y
 
36
 # CONFIG_QFMT_V1 is not set
 
37
 CONFIG_QFMT_V2=y
 
38
-# CONFIG_EPOLL is not set
 
39
+CONFIG_EPOLL=y
 
40
 
 
41
 # CONFIG_QIFACE_COMPAT is not set
 
42
 CONFIG_AFS_FS=m
 
43
diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-athlon-smp.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-athlon-smp.config
 
44
--- linux-2.4.21-40.EL/configs/kernel-2.4.21-athlon-smp.config  2006-03-17 09:34:24.000000000 +0100
 
45
+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-athlon-smp.config    2006-03-17 09:34:42.000000000 +0100
 
46
@@ -1575,7 +1575,7 @@
 
47
 CONFIG_QUOTA=y
 
48
 # CONFIG_QFMT_V1 is not set
 
49
 CONFIG_QFMT_V2=y
 
50
-# CONFIG_EPOLL is not set
 
51
+CONFIG_EPOLL=y
 
52
 
 
53
 # CONFIG_QIFACE_COMPAT is not set
 
54
 CONFIG_AFS_FS=m
 
55
diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i386.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i386.config
 
56
--- linux-2.4.21-40.EL/configs/kernel-2.4.21-i386.config        2006-03-17 09:34:24.000000000 +0100
 
57
+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i386.config  2006-03-17 09:34:42.000000000 +0100
 
58
@@ -1575,7 +1575,7 @@
 
59
 CONFIG_QUOTA=y
 
60
 # CONFIG_QFMT_V1 is not set
 
61
 CONFIG_QFMT_V2=y
 
62
-# CONFIG_EPOLL is not set
 
63
+CONFIG_EPOLL=y
 
64
 
 
65
 # CONFIG_QIFACE_COMPAT is not set
 
66
 # CONFIG_AFS_FS is not set
 
67
diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i586.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i586.config
 
68
--- linux-2.4.21-40.EL/configs/kernel-2.4.21-i586.config        2006-03-17 09:34:24.000000000 +0100
 
69
+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i586.config  2006-03-17 09:34:42.000000000 +0100
 
70
@@ -1575,7 +1575,7 @@
 
71
 CONFIG_QUOTA=y
 
72
 # CONFIG_QFMT_V1 is not set
 
73
 CONFIG_QFMT_V2=y
 
74
-# CONFIG_EPOLL is not set
 
75
+CONFIG_EPOLL=y
 
76
 
 
77
 # CONFIG_QIFACE_COMPAT is not set
 
78
 CONFIG_AFS_FS=m
 
79
diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i586-smp.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i586-smp.config
 
80
--- linux-2.4.21-40.EL/configs/kernel-2.4.21-i586-smp.config    2006-03-17 09:34:24.000000000 +0100
 
81
+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i586-smp.config      2006-03-17 09:34:42.000000000 +0100
 
82
@@ -1575,7 +1575,7 @@
 
83
 CONFIG_QUOTA=y
 
84
 # CONFIG_QFMT_V1 is not set
 
85
 CONFIG_QFMT_V2=y
 
86
-# CONFIG_EPOLL is not set
 
87
+CONFIG_EPOLL=y
 
88
 
 
89
 # CONFIG_QIFACE_COMPAT is not set
 
90
 CONFIG_AFS_FS=m
 
91
diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i686.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686.config
 
92
--- linux-2.4.21-40.EL/configs/kernel-2.4.21-i686.config        2006-03-17 09:34:24.000000000 +0100
 
93
+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686.config  2006-03-17 09:34:42.000000000 +0100
 
94
@@ -1575,7 +1575,7 @@
 
95
 CONFIG_QUOTA=y
 
96
 # CONFIG_QFMT_V1 is not set
 
97
 CONFIG_QFMT_V2=y
 
98
-# CONFIG_EPOLL is not set
 
99
+CONFIG_EPOLL=y
 
100
 
 
101
 # CONFIG_QIFACE_COMPAT is not set
 
102
 CONFIG_AFS_FS=m
 
103
diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i686-hugemem.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686-hugemem.config
 
104
--- linux-2.4.21-40.EL/configs/kernel-2.4.21-i686-hugemem.config        2006-03-17 09:34:24.000000000 +0100
 
105
+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686-hugemem.config  2006-03-17 09:34:42.000000000 +0100
 
106
@@ -1575,7 +1575,7 @@
 
107
 CONFIG_QUOTA=y
 
108
 # CONFIG_QFMT_V1 is not set
 
109
 CONFIG_QFMT_V2=y
 
110
-# CONFIG_EPOLL is not set
 
111
+CONFIG_EPOLL=y
 
112
 
 
113
 # CONFIG_QIFACE_COMPAT is not set
 
114
 CONFIG_AFS_FS=m
 
115
diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i686-smp.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686-smp.config
 
116
--- linux-2.4.21-40.EL/configs/kernel-2.4.21-i686-smp.config    2006-03-17 09:34:24.000000000 +0100
 
117
+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686-smp.config      2006-03-17 09:34:42.000000000 +0100
 
118
@@ -1575,7 +1575,7 @@
 
119
 CONFIG_QUOTA=y
 
120
 # CONFIG_QFMT_V1 is not set
 
121
 CONFIG_QFMT_V2=y
 
122
-# CONFIG_EPOLL is not set
 
123
+CONFIG_EPOLL=y
 
124
 
 
125
 # CONFIG_QIFACE_COMPAT is not set
 
126
 CONFIG_AFS_FS=m
 
127
diff -urN linux-2.4.21-40.EL/Makefile linux-2.4.21-40.EL-epoll/Makefile
 
128
--- linux-2.4.21-40.EL/Makefile 2006-03-17 09:34:24.000000000 +0100
 
129
+++ linux-2.4.21-40.EL-epoll/Makefile   2006-03-17 09:34:55.000000000 +0100
 
130
@@ -1,7 +1,7 @@
 
131
 VERSION = 2
 
132
 PATCHLEVEL = 4
 
133
 SUBLEVEL = 21
 
134
-EXTRAVERSION = -40.ELcustom
 
135
+EXTRAVERSION = -40.EL-epoll
 
136
 
 
137
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
138