]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/suse-2.6.27.25/patches.suse/perfmon2-remove_syscalls.patch
Updated xen patches taken from suse.
[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.suse / perfmon2-remove_syscalls.patch
1 From: Tony Jones <tonyj@suse.de>
2 Subject: drop additional perfmon2 syscalls
3 Patch-mainline: never
4
5 Patch accepted from SGI (bnc#430298, FATE #303968) added 12 new syscalls
6 which have been replaced (for SLES11) with an ioctl based interface.
7
8 Remove the relevant syscalls.
9
10 Signed-off-by: Tony Jones <tonyj@suse.de>
11
12 ---
13 arch/ia64/include/asm/unistd.h | 14 -----------
14 arch/ia64/kernel/entry.S | 12 ---------
15 arch/mips/kernel/scall32-o32.S | 12 ---------
16 arch/mips/kernel/scall64-64.S | 12 ---------
17 arch/mips/kernel/scall64-n32.S | 16 +-----------
18 arch/mips/kernel/scall64-o32.S | 12 ---------
19 arch/powerpc/include/asm/systbl.h | 12 ---------
20 arch/powerpc/include/asm/unistd.h | 14 -----------
21 arch/sparc/include/asm/unistd_32.h | 14 -----------
22 arch/sparc/include/asm/unistd_64.h | 14 -----------
23 arch/sparc/kernel/systbls.S | 4 ---
24 arch/sparc64/kernel/systbls.S | 8 +-----
25 arch/x86/ia32/ia32entry.S | 12 ---------
26 arch/x86/kernel/syscall_table_32.S | 12 ---------
27 include/asm-mips/unistd.h | 46 ++++---------------------------------
28 include/asm-x86/ia32_unistd.h | 13 ++++------
29 include/asm-x86/unistd_32.h | 14 -----------
30 include/asm-x86/unistd_64.h | 25 --------------------
31 kernel/sys_ni.c | 13 ----------
32 19 files changed, 21 insertions(+), 258 deletions(-)
33
34 --- a/arch/ia64/include/asm/unistd.h
35 +++ b/arch/ia64/include/asm/unistd.h
36 @@ -308,23 +308,11 @@
37 #define __NR_dup3 1316
38 #define __NR_pipe2 1317
39 #define __NR_inotify_init1 1318
40 -#define __NR_pfm_create_context 1319
41 -#define __NR_pfm_write_pmcs (__NR_pfm_create_context+1)
42 -#define __NR_pfm_write_pmds (__NR_pfm_create_context+2)
43 -#define __NR_pfm_read_pmds (__NR_pfm_create_context+3)
44 -#define __NR_pfm_load_context (__NR_pfm_create_context+4)
45 -#define __NR_pfm_start (__NR_pfm_create_context+5)
46 -#define __NR_pfm_stop (__NR_pfm_create_context+6)
47 -#define __NR_pfm_restart (__NR_pfm_create_context+7)
48 -#define __NR_pfm_create_evtsets (__NR_pfm_create_context+8)
49 -#define __NR_pfm_getinfo_evtsets (__NR_pfm_create_context+9)
50 -#define __NR_pfm_delete_evtsets (__NR_pfm_create_context+10)
51 -#define __NR_pfm_unload_context (__NR_pfm_create_context+11)
52
53 #ifdef __KERNEL__
54
55
56 -#define NR_syscalls 307 /* length of syscall table */
57 +#define NR_syscalls 295 /* length of syscall table */
58
59 /*
60 * The following defines stop scripts/checksyscalls.sh from complaining about
61 --- a/arch/ia64/kernel/entry.S
62 +++ b/arch/ia64/kernel/entry.S
63 @@ -1697,18 +1697,6 @@ sys_call_table:
64 data8 sys_dup3
65 data8 sys_pipe2
66 data8 sys_inotify_init1
67 - data8 sys_pfm_create_context
68 - data8 sys_pfm_write_pmcs // 1320
69 - data8 sys_pfm_write_pmds
70 - data8 sys_pfm_read_pmds
71 - data8 sys_pfm_load_context
72 - data8 sys_pfm_start
73 - data8 sys_pfm_stop // 1325
74 - data8 sys_pfm_restart
75 - data8 sys_pfm_create_evtsets
76 - data8 sys_pfm_getinfo_evtsets
77 - data8 sys_pfm_delete_evtsets
78 - data8 sys_pfm_unload_context // 1330
79
80 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
81 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
82 --- a/arch/mips/kernel/scall32-o32.S
83 +++ b/arch/mips/kernel/scall32-o32.S
84 @@ -653,18 +653,6 @@ einval: li v0, -EINVAL
85 sys sys_dup3 3
86 sys sys_pipe2 2
87 sys sys_inotify_init1 1
88 - sys sys_pfm_create_context 4 /* 4330 */
89 - sys sys_pfm_write_pmcs 3
90 - sys sys_pfm_write_pmds 4
91 - sys sys_pfm_read_pmds 3
92 - sys sys_pfm_load_context 2
93 - sys sys_pfm_start 2 /* 4335 */
94 - sys sys_pfm_stop 1
95 - sys sys_pfm_restart 1
96 - sys sys_pfm_create_evtsets 3
97 - sys sys_pfm_getinfo_evtsets 3
98 - sys sys_pfm_delete_evtsets 3 /* 4340 */
99 - sys sys_pfm_unload_context 1
100 .endm
101
102 /* We pre-compute the number of _instruction_ bytes needed to
103 --- a/arch/mips/kernel/scall64-64.S
104 +++ b/arch/mips/kernel/scall64-64.S
105 @@ -487,16 +487,4 @@ sys_call_table:
106 PTR sys_dup3
107 PTR sys_pipe2
108 PTR sys_inotify_init1
109 - PTR sys_pfm_create_context
110 - PTR sys_pfm_write_pmcs /* 5290 */
111 - PTR sys_pfm_write_pmds
112 - PTR sys_pfm_read_pmds
113 - PTR sys_pfm_load_context
114 - PTR sys_pfm_start
115 - PTR sys_pfm_stop /* 5295 */
116 - PTR sys_pfm_restart
117 - PTR sys_pfm_create_evtsets
118 - PTR sys_pfm_getinfo_evtsets
119 - PTR sys_pfm_delete_evtsets
120 - PTR sys_pfm_unload_context /* 5300 */
121 .size sys_call_table,.-sys_call_table
122 --- a/arch/mips/kernel/scall64-n32.S
123 +++ b/arch/mips/kernel/scall64-n32.S
124 @@ -400,12 +400,12 @@ EXPORT(sysn32_call_table)
125 PTR sys_ioprio_set
126 PTR sys_ioprio_get
127 PTR compat_sys_utimensat
128 - PTR compat_sys_signalfd /* 6280 */
129 + PTR compat_sys_signalfd /* 5280 */
130 PTR sys_ni_syscall
131 PTR sys_eventfd
132 PTR sys_fallocate
133 PTR sys_timerfd_create
134 - PTR sys_timerfd_gettime /* 6285 */
135 + PTR sys_timerfd_gettime /* 5285 */
136 PTR sys_timerfd_settime
137 PTR sys_signalfd4
138 PTR sys_eventfd2
139 @@ -413,16 +413,4 @@ EXPORT(sysn32_call_table)
140 PTR sys_dup3 /* 5290 */
141 PTR sys_pipe2
142 PTR sys_inotify_init1
143 - PTR sys_pfm_create_context
144 - PTR sys_pfm_write_pmcs
145 - PTR sys_pfm_write_pmds /* 6295 */
146 - PTR sys_pfm_read_pmds
147 - PTR sys_pfm_load_context
148 - PTR sys_pfm_start
149 - PTR sys_pfm_stop
150 - PTR sys_pfm_restart /* 6300 */
151 - PTR sys_pfm_create_evtsets
152 - PTR sys_pfm_getinfo_evtsets
153 - PTR sys_pfm_delete_evtsets
154 - PTR sys_pfm_unload_context
155 .size sysn32_call_table,.-sysn32_call_table
156 --- a/arch/mips/kernel/scall64-o32.S
157 +++ b/arch/mips/kernel/scall64-o32.S
158 @@ -535,16 +535,4 @@ sys_call_table:
159 PTR sys_dup3
160 PTR sys_pipe2
161 PTR sys_inotify_init1
162 - PTR sys_pfm_create_context /* 4330 */
163 - PTR sys_pfm_write_pmcs
164 - PTR sys_pfm_write_pmds
165 - PTR sys_pfm_read_pmds
166 - PTR sys_pfm_load_context
167 - PTR sys_pfm_start /* 4335 */
168 - PTR sys_pfm_stop
169 - PTR sys_pfm_restart
170 - PTR sys_pfm_create_evtsets
171 - PTR sys_pfm_getinfo_evtsets
172 - PTR sys_pfm_delete_evtsets /* 4340 */
173 - PTR sys_pfm_unload_context
174 .size sys_call_table,.-sys_call_table
175 --- a/arch/powerpc/include/asm/systbl.h
176 +++ b/arch/powerpc/include/asm/systbl.h
177 @@ -322,15 +322,3 @@ SYSCALL_SPU(epoll_create1)
178 SYSCALL_SPU(dup3)
179 SYSCALL_SPU(pipe2)
180 SYSCALL(inotify_init1)
181 -SYSCALL(pfm_create_context)
182 -SYSCALL(pfm_write_pmcs)
183 -SYSCALL(pfm_write_pmds)
184 -SYSCALL(pfm_read_pmds)
185 -SYSCALL(pfm_load_context)
186 -SYSCALL(pfm_start)
187 -SYSCALL(pfm_stop)
188 -SYSCALL(pfm_restart)
189 -SYSCALL(pfm_create_evtsets)
190 -SYSCALL(pfm_getinfo_evtsets)
191 -SYSCALL(pfm_delete_evtsets)
192 -SYSCALL(pfm_unload_context)
193 --- a/arch/powerpc/include/asm/unistd.h
194 +++ b/arch/powerpc/include/asm/unistd.h
195 @@ -341,22 +341,10 @@
196 #define __NR_dup3 316
197 #define __NR_pipe2 317
198 #define __NR_inotify_init1 318
199 -#define __NR_pfm_create_context 319
200 -#define __NR_pfm_write_pmcs 320
201 -#define __NR_pfm_write_pmds 321
202 -#define __NR_pfm_read_pmds 322
203 -#define __NR_pfm_load_context 323
204 -#define __NR_pfm_start 324
205 -#define __NR_pfm_stop 325
206 -#define __NR_pfm_restart 326
207 -#define __NR_pfm_create_evtsets 327
208 -#define __NR_pfm_getinfo_evtsets 328
209 -#define __NR_pfm_delete_evtsets 329
210 -#define __NR_pfm_unload_context 330
211
212 #ifdef __KERNEL__
213
214 -#define __NR_syscalls 331
215 +#define __NR_syscalls 319
216
217 #define __NR__exit __NR_exit
218 #define NR_syscalls __NR_syscalls
219 --- a/arch/sparc64/kernel/systbls.S
220 +++ b/arch/sparc64/kernel/systbls.S
221 @@ -82,9 +82,7 @@ sys_call_table32:
222 .word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait
223 /*310*/ .word compat_sys_utimensat, compat_sys_signalfd, sys_timerfd_create, sys_eventfd, compat_sys_fallocate
224 .word compat_sys_timerfd_settime, compat_sys_timerfd_gettime, compat_sys_signalfd4, sys_eventfd2, sys_epoll_create1
225 -/*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_pfm_create_context, sys_pfm_write_pmcs
226 - .word sys_pfm_write_pmds, sys_pfm_read_pmds, sys_pfm_load_context, sys_pfm_start, sys_pfm_stop
227 -/*330*/ .word sys_pfm_restart, sys_pfm_create_evtsets, sys_pfm_getinfo_evtsets, sys_pfm_delete_evtsets, sys_pfm_unload_context
228 +/*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1
229
230 #endif /* CONFIG_COMPAT */
231
232 @@ -158,6 +156,4 @@ sys_call_table:
233 .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait
234 /*310*/ .word sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate
235 .word sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1
236 -/*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_pfm_create_context, sys_pfm_write_pmcs
237 - .word sys_pfm_write_pmds, sys_pfm_read_pmds, sys_pfm_load_context, sys_pfm_start, sys_pfm_stop
238 -/*330*/ .word sys_pfm_restart, sys_pfm_create_evtsets, sys_pfm_getinfo_evtsets, sys_pfm_delete_evtsets, sys_pfm_unload_context
239 +/*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1
240 --- a/arch/sparc/include/asm/unistd_32.h
241 +++ b/arch/sparc/include/asm/unistd_32.h
242 @@ -338,20 +338,8 @@
243 #define __NR_dup3 320
244 #define __NR_pipe2 321
245 #define __NR_inotify_init1 322
246 -#define __NR_pfm_create_context 323
247 -#define __NR_pfm_write_pmcs 324
248 -#define __NR_pfm_write_pmds 325
249 -#define __NR_pfm_read_pmds 326
250 -#define __NR_pfm_load_context 327
251 -#define __NR_pfm_start 328
252 -#define __NR_pfm_stop 329
253 -#define __NR_pfm_restart 330
254 -#define __NR_pfm_create_evtsets 331
255 -#define __NR_pfm_getinfo_evtsets 332
256 -#define __NR_pfm_delete_evtsets 333
257 -#define __NR_pfm_unload_context 334
258
259 -#define NR_SYSCALLS 325
260 +#define NR_SYSCALLS 323
261
262 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,
263 * it never had the plain ones and there is no value to adding those
264 --- a/arch/sparc/include/asm/unistd_64.h
265 +++ b/arch/sparc/include/asm/unistd_64.h
266 @@ -340,20 +340,8 @@
267 #define __NR_dup3 320
268 #define __NR_pipe2 321
269 #define __NR_inotify_init1 322
270 -#define __NR_pfm_create_context 323
271 -#define __NR_pfm_write_pmcs 324
272 -#define __NR_pfm_write_pmds 325
273 -#define __NR_pfm_read_pmds 326
274 -#define __NR_pfm_load_context 327
275 -#define __NR_pfm_start 328
276 -#define __NR_pfm_stop 329
277 -#define __NR_pfm_restart 330
278 -#define __NR_pfm_create_evtsets 331
279 -#define __NR_pfm_getinfo_evtsets 332
280 -#define __NR_pfm_delete_evtsets 333
281 -#define __NR_pfm_unload_context 334
282
283 -#define NR_SYSCALLS 335
284 +#define NR_SYSCALLS 323
285
286 #ifdef __KERNEL__
287 #define __ARCH_WANT_IPC_PARSE_VERSION
288 --- a/arch/sparc/kernel/systbls.S
289 +++ b/arch/sparc/kernel/systbls.S
290 @@ -81,6 +81,4 @@ sys_call_table:
291 /*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait
292 /*310*/ .long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate
293 /*315*/ .long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1
294 -/*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_pfm_create_context, sys_pfm_write_pmcs, sys_pfm_write_pmds
295 -/*325*/ .long sys_pfm_write_pmds, sys_pfm_read_pmds, sys_pfm_load_context, sys_pfm_start, sys_pfm_stop
296 -/*330*/ .long sys_pfm_restart, sys_pfm_create_evtsets, sys_pfm_getinfo_evtsets, sys_pfm_delete_evtsets, sys_pfm_unload_context
297 +/*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1
298 --- a/arch/x86/ia32/ia32entry.S
299 +++ b/arch/x86/ia32/ia32entry.S
300 @@ -834,16 +834,4 @@ ia32_sys_call_table:
301 .quad sys_dup3 /* 330 */
302 .quad sys_pipe2
303 .quad sys_inotify_init1
304 - .quad sys_pfm_create_context
305 - .quad sys_pfm_write_pmcs
306 - .quad sys_pfm_write_pmds /* 335 */
307 - .quad sys_pfm_read_pmds
308 - .quad sys_pfm_load_context
309 - .quad sys_pfm_start
310 - .quad sys_pfm_stop
311 - .quad sys_pfm_restart /* 340 */
312 - .quad sys_pfm_create_evtsets
313 - .quad sys_pfm_getinfo_evtsets
314 - .quad sys_pfm_delete_evtsets
315 - .quad sys_pfm_unload_context
316 ia32_syscall_end:
317 --- a/arch/x86/kernel/syscall_table_32.S
318 +++ b/arch/x86/kernel/syscall_table_32.S
319 @@ -332,15 +332,3 @@ ENTRY(sys_call_table)
320 .long sys_dup3 /* 330 */
321 .long sys_pipe2
322 .long sys_inotify_init1
323 - .long sys_pfm_create_context
324 - .long sys_pfm_write_pmcs
325 - .long sys_pfm_write_pmds /* 335 */
326 - .long sys_pfm_read_pmds
327 - .long sys_pfm_load_context
328 - .long sys_pfm_start
329 - .long sys_pfm_stop
330 - .long sys_pfm_restart /* 340 */
331 - .long sys_pfm_create_evtsets
332 - .long sys_pfm_getinfo_evtsets
333 - .long sys_pfm_delete_evtsets
334 - .long sys_pfm_unload_context
335 --- a/include/asm-mips/unistd.h
336 +++ b/include/asm-mips/unistd.h
337 @@ -350,23 +350,11 @@
338 #define __NR_dup3 (__NR_Linux + 327)
339 #define __NR_pipe2 (__NR_Linux + 328)
340 #define __NR_inotify_init1 (__NR_Linux + 329)
341 -#define __NR_pfm_create_context (__NR_Linux + 330)
342 -#define __NR_pfm_write_pmcs (__NR_pfm_create_context+1)
343 -#define __NR_pfm_write_pmds (__NR_pfm_create_context+2)
344 -#define __NR_pfm_read_pmds (__NR_pfm_create_context+3)
345 -#define __NR_pfm_load_context (__NR_pfm_create_context+4)
346 -#define __NR_pfm_start (__NR_pfm_create_context+5)
347 -#define __NR_pfm_stop (__NR_pfm_create_context+6)
348 -#define __NR_pfm_restart (__NR_pfm_create_context+7)
349 -#define __NR_pfm_create_evtsets (__NR_pfm_create_context+8)
350 -#define __NR_pfm_getinfo_evtsets (__NR_pfm_create_context+9)
351 -#define __NR_pfm_delete_evtsets (__NR_pfm_create_context+10)
352 -#define __NR_pfm_unload_context (__NR_pfm_create_context+11)
353
354 /*
355 * Offset of the last Linux o32 flavoured syscall
356 */
357 -#define __NR_Linux_syscalls 341
358 +#define __NR_Linux_syscalls 329
359
360 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
361
362 @@ -668,28 +656,16 @@
363 #define __NR_dup3 (__NR_Linux + 286)
364 #define __NR_pipe2 (__NR_Linux + 287)
365 #define __NR_inotify_init1 (__NR_Linux + 288)
366 -#define __NR_pfm_create_context (__NR_Linux + 289)
367 -#define __NR_pfm_write_pmcs (__NR_pfm_create_context+1)
368 -#define __NR_pfm_write_pmds (__NR_pfm_create_context+2)
369 -#define __NR_pfm_read_pmds (__NR_pfm_create_context+3)
370 -#define __NR_pfm_load_context (__NR_pfm_create_context+4)
371 -#define __NR_pfm_start (__NR_pfm_create_context+5)
372 -#define __NR_pfm_stop (__NR_pfm_create_context+6)
373 -#define __NR_pfm_restart (__NR_pfm_create_context+7)
374 -#define __NR_pfm_create_evtsets (__NR_pfm_create_context+8)
375 -#define __NR_pfm_getinfo_evtsets (__NR_pfm_create_context+9)
376 -#define __NR_pfm_delete_evtsets (__NR_pfm_create_context+10)
377 -#define __NR_pfm_unload_context (__NR_pfm_create_context+11)
378
379 /*
380 * Offset of the last Linux 64-bit flavoured syscall
381 */
382 -#define __NR_Linux_syscalls 300
383 +#define __NR_Linux_syscalls 288
384
385 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
386
387 #define __NR_64_Linux 5000
388 -#define __NR_64_Linux_syscalls 300
389 +#define __NR_64_Linux_syscalls 288
390
391 #if _MIPS_SIM == _MIPS_SIM_NABI32
392
393 @@ -990,28 +966,16 @@
394 #define __NR_dup3 (__NR_Linux + 290)
395 #define __NR_pipe2 (__NR_Linux + 291)
396 #define __NR_inotify_init1 (__NR_Linux + 292)
397 -#define __NR_pfm_create_context (__NR_Linux + 293)
398 -#define __NR_pfm_write_pmcs (__NR_pfm_create_context+1)
399 -#define __NR_pfm_write_pmds (__NR_pfm_create_context+2)
400 -#define __NR_pfm_read_pmds (__NR_pfm_create_context+3)
401 -#define __NR_pfm_load_context (__NR_pfm_create_context+4)
402 -#define __NR_pfm_start (__NR_pfm_create_context+5)
403 -#define __NR_pfm_stop (__NR_pfm_create_context+6)
404 -#define __NR_pfm_restart (__NR_pfm_create_context+7)
405 -#define __NR_pfm_create_evtsets (__NR_pfm_create_context+8)
406 -#define __NR_pfm_getinfo_evtsets (__NR_pfm_create_context+9)
407 -#define __NR_pfm_delete_evtsets (__NR_pfm_create_context+10)
408 -#define __NR_pfm_unload_context (__NR_pfm_create_context+11)
409
410 /*
411 * Offset of the last N32 flavoured syscall
412 */
413 -#define __NR_Linux_syscalls 304
414 +#define __NR_Linux_syscalls 292
415
416 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
417
418 #define __NR_N32_Linux 6000
419 -#define __NR_N32_Linux_syscalls 304
420 +#define __NR_N32_Linux_syscalls 292
421
422 #ifdef __KERNEL__
423
424 --- a/include/asm-x86/ia32_unistd.h
425 +++ b/include/asm-x86/ia32_unistd.h
426 @@ -8,12 +8,11 @@
427 * the number. This should be otherwise in sync with asm-x86/unistd_32.h. -AK
428 */
429
430 -#define __NR_ia32_restart_syscall 0
431 -#define __NR_ia32_exit 1
432 -#define __NR_ia32_read 3
433 -#define __NR_ia32_write 4
434 -#define __NR_ia32_sigreturn 119
435 -#define __NR_ia32_rt_sigreturn 173
436 -#define __NR_ia32_pfm_create_context 333
437 +#define __NR_ia32_restart_syscall 0
438 +#define __NR_ia32_exit 1
439 +#define __NR_ia32_read 3
440 +#define __NR_ia32_write 4
441 +#define __NR_ia32_sigreturn 119
442 +#define __NR_ia32_rt_sigreturn 173
443
444 #endif /* _ASM_X86_64_IA32_UNISTD_H_ */
445 --- a/include/asm-x86/unistd_32.h
446 +++ b/include/asm-x86/unistd_32.h
447 @@ -338,23 +338,9 @@
448 #define __NR_dup3 330
449 #define __NR_pipe2 331
450 #define __NR_inotify_init1 332
451 -#define __NR_pfm_create_context 333
452 -#define __NR_pfm_write_pmcs (__NR_pfm_create_context+1)
453 -#define __NR_pfm_write_pmds (__NR_pfm_create_context+2)
454 -#define __NR_pfm_read_pmds (__NR_pfm_create_context+3)
455 -#define __NR_pfm_load_context (__NR_pfm_create_context+4)
456 -#define __NR_pfm_start (__NR_pfm_create_context+5)
457 -#define __NR_pfm_stop (__NR_pfm_create_context+6)
458 -#define __NR_pfm_restart (__NR_pfm_create_context+7)
459 -#define __NR_pfm_create_evtsets (__NR_pfm_create_context+8)
460 -#define __NR_pfm_getinfo_evtsets (__NR_pfm_create_context+9)
461 -#define __NR_pfm_delete_evtsets (__NR_pfm_create_context+10)
462 -#define __NR_pfm_unload_context (__NR_pfm_create_context+11)
463
464 #ifdef __KERNEL__
465
466 -#define NR_syscalls 345
467 -
468 #define __ARCH_WANT_IPC_PARSE_VERSION
469 #define __ARCH_WANT_OLD_READDIR
470 #define __ARCH_WANT_OLD_STAT
471 --- a/include/asm-x86/unistd_64.h
472 +++ b/include/asm-x86/unistd_64.h
473 @@ -653,30 +653,7 @@ __SYSCALL(__NR_dup3, sys_dup3)
474 __SYSCALL(__NR_pipe2, sys_pipe2)
475 #define __NR_inotify_init1 294
476 __SYSCALL(__NR_inotify_init1, sys_inotify_init1)
477 -#define __NR_pfm_create_context 295
478 -__SYSCALL(__NR_pfm_create_context, sys_pfm_create_context)
479 -#define __NR_pfm_write_pmcs (__NR_pfm_create_context+1)
480 -__SYSCALL(__NR_pfm_write_pmcs, sys_pfm_write_pmcs)
481 -#define __NR_pfm_write_pmds (__NR_pfm_create_context+2)
482 -__SYSCALL(__NR_pfm_write_pmds, sys_pfm_write_pmds)
483 -#define __NR_pfm_read_pmds (__NR_pfm_create_context+3)
484 - __SYSCALL(__NR_pfm_read_pmds, sys_pfm_read_pmds)
485 -#define __NR_pfm_load_context (__NR_pfm_create_context+4)
486 -__SYSCALL(__NR_pfm_load_context, sys_pfm_load_context)
487 -#define __NR_pfm_start (__NR_pfm_create_context+5)
488 -__SYSCALL(__NR_pfm_start, sys_pfm_start)
489 -#define __NR_pfm_stop (__NR_pfm_create_context+6)
490 -__SYSCALL(__NR_pfm_stop, sys_pfm_stop)
491 -#define __NR_pfm_restart (__NR_pfm_create_context+7)
492 -__SYSCALL(__NR_pfm_restart, sys_pfm_restart)
493 -#define __NR_pfm_create_evtsets (__NR_pfm_create_context+8)
494 -__SYSCALL(__NR_pfm_create_evtsets, sys_pfm_create_evtsets)
495 -#define __NR_pfm_getinfo_evtsets (__NR_pfm_create_context+9)
496 -__SYSCALL(__NR_pfm_getinfo_evtsets, sys_pfm_getinfo_evtsets)
497 -#define __NR_pfm_delete_evtsets (__NR_pfm_create_context+10)
498 -__SYSCALL(__NR_pfm_delete_evtsets, sys_pfm_delete_evtsets)
499 -#define __NR_pfm_unload_context (__NR_pfm_create_context+11)
500 -__SYSCALL(__NR_pfm_unload_context, sys_pfm_unload_context)
501 +
502
503 #ifndef __NO_STUBS
504 #define __ARCH_WANT_OLD_READDIR
505 --- a/kernel/sys_ni.c
506 +++ b/kernel/sys_ni.c
507 @@ -127,19 +127,6 @@ cond_syscall(compat_sys_ipc);
508 cond_syscall(compat_sys_sysctl);
509 cond_syscall(sys_syslog);
510
511 -cond_syscall(sys_pfm_create_context);
512 -cond_syscall(sys_pfm_write_pmcs);
513 -cond_syscall(sys_pfm_write_pmds);
514 -cond_syscall(sys_pfm_read_pmds);
515 -cond_syscall(sys_pfm_restart);
516 -cond_syscall(sys_pfm_start);
517 -cond_syscall(sys_pfm_stop);
518 -cond_syscall(sys_pfm_load_context);
519 -cond_syscall(sys_pfm_unload_context);
520 -cond_syscall(sys_pfm_create_evtsets);
521 -cond_syscall(sys_pfm_delete_evtsets);
522 -cond_syscall(sys_pfm_getinfo_evtsets);
523 -
524 /* arch-specific weak syscall entries */
525 cond_syscall(sys_pciconfig_read);
526 cond_syscall(sys_pciconfig_write);