Re: [uml-devel] Making sure 2.6.11-rc2-bk* works

[Frank Sorenson <frank@tuxrocks.com>]

[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Blaisorblade wrote:
| Jeff, now we need actively to make sure everything we think is crucial is
| merged in 2.6.11 - release is approaching (after -rc2 only a handful of
| patches is being merged, and the announce says "Make sure I have
| everything"), so you should make sure to send Andrew anything needed
on top
| of 2.6.11-rc2-bk3 (I say the -bk tree on purpose, because that's what
becomes
| the real released tree) to make it compile.
<snip>

With a stable and working -um kernel in mind, here is a patch needed to
make 2.6.11-rc2-bk* compile (patch is against -bk4).  Without it, the
build fails with errors like "error: `__NR_vperfctr_open' undeclared
here (not in a function)"

I think we need to get this in soon if we want to make sure they get
into 2.6.11


This patch removes some invalid entries from the syscall table
(arch/um/kernel/sys_call_table.c), allowing ARCH=um to compile for
2.6.11-rc2-bk*

Signed-off-by: Frank Sorenson <frank@tuxrocks.com>

Frank
- --
Frank Sorenson - KD7TZK
Systems Manager, Computer Science Department
Brigham Young University
frank@tuxrocks.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFB+JfYaI0dwg4A47wRAmbCAJwKJ5k9Sghhxwjv3PJx3mYYNn6xQACgvbBV
d0p116AeQzwnizlnZSMiEHk=
=RJF2
-----END PGP SIGNATURE-----

[-- Attachment #2: make_um_compile_for_2.6.11 --]
[-- Type: text/plain, Size: 1430 bytes --]

diff -Naur linux-2.6.11-rc2-bk4/arch/um/kernel/sys_call_table.c linux-2.6.11-rc2-bk4_fixed/arch/um/kernel/sys_call_table.c
--- linux-2.6.11-rc2-bk4/arch/um/kernel/sys_call_table.c	2005-01-26 23:51:51.000000000 -0700
+++ linux-2.6.11-rc2-bk4_fixed/arch/um/kernel/sys_call_table.c	2005-01-26 20:52:13.000000000 -0700
@@ -54,11 +54,6 @@
 extern syscall_handler_t sys_set_mempolicy;
 extern syscall_handler_t sys_sys_kexec_load;
 extern syscall_handler_t sys_sys_setaltroot;
-extern syscall_handler_t sys_vperfctr_open;
-extern syscall_handler_t sys_vperfctr_control;
-extern syscall_handler_t sys_vperfctr_unlink;
-extern syscall_handler_t sys_vperfctr_iresume;
-extern syscall_handler_t sys_vperfctr_read;
 
 syscall_handler_t *sys_call_table[] = {
 	[ __NR_restart_syscall ] = (syscall_handler_t *) sys_restart_syscall,
@@ -281,11 +276,6 @@
 	[ __NR_add_key ] = (syscall_handler_t *) sys_add_key,
 	[ __NR_request_key ] = (syscall_handler_t *) sys_request_key,
 	[ __NR_keyctl ] = (syscall_handler_t *) sys_keyctl,
-	[ __NR_vperfctr_open ] = (syscall_handler_t *) sys_vperfctr_open,
-	[ __NR_vperfctr_control ] = (syscall_handler_t *) sys_vperfctr_control,
-	[ __NR_vperfctr_unlink ] = (syscall_handler_t *) sys_vperfctr_unlink,
-	[ __NR_vperfctr_iresume ] = (syscall_handler_t *) sys_vperfctr_iresume,
-	[ __NR_vperfctr_read ] = (syscall_handler_t *) sys_vperfctr_read,
 
 	ARCH_SYSCALLS
 	[ LAST_SYSCALL + 1 ... NR_syscalls ] =