On 2005.06.18 12:28:41 +0200, Christian Heim wrote:
On Saturday 18 June 2005 12:13, Kilian Krause ( KK )wrote:
Hi guys,
i was just about to try new VS2.00 and found the latest available patch
(against 2.6.11.11) not applying cleanly to 2.6.12...
Is there one in the make for 2.6.12 now it's out? ;)
Thanks!
You could use Michal's / Bjoerns patch against 2.6.12-rc4, which (with a bit
of cleanups) works for me.
I hope you didn't have too much trouble porting that one, as I already
had a patch against 2.6.12-rc6 done and available on 13thfloor (maybe I
should start and announce such stuff?)
Alternatively you could also use my patch[1], which is against 2.6.12
and is currently running here.
[1] http://phreak.xnull.de/kernel/patches/vserver/patch-2.6.12-vs2.0-rc4.diff
Good job! Looks like mine, except for a missing semicolon and a missing
virtualization in the ppc64 code. I'll sent the patch against your
version with this mail as it is small enough to do so.
My patch is at:
http://www.13thfloor.at/~doener/vserver/patches/patch-2.6.12-vs2.0-rc4.diff
Bjoern
diff -NurpP --minimal cheim/arch/ppc64/kernel/sys_ppc32.c
linux-2.6.12-vs2.0-rc4/arch/ppc64/kernel/sys_ppc32.c
--- cheim/arch/ppc64/kernel/sys_ppc32.c 2005-06-18 13:39:21.0 +0200
+++ linux-2.6.12-vs2.0-rc4/arch/ppc64/kernel/sys_ppc32.c2005-06-18
13:27:17.0 +0200
@@ -1138,7 +1138,7 @@ asmlinkage int sys32_uname(struct old_ut
int err = 0;
down_read(uts_sem);
- if (copy_to_user(name, system_utsname, sizeof(*name)))
+ if (copy_to_user(name, vx_new_utsname(), sizeof(*name)))
err = -EFAULT;
up_read(uts_sem);
if (!err personality(current-personality) == PER_LINUX32) {
@@ -1157,12 +1157,12 @@ asmlinkage int sys32_olduname(struct old
if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
return -EFAULT;
-
+
down_read(uts_sem);
ptr = vx_new_utsname();
error = __copy_to_user(name-sysname,ptr-sysname,__OLD_UTS_LEN);
error |= __put_user(0,name-sysname+__OLD_UTS_LEN);
- error |= __copy_to_user(name-nodename,ptr-nodename,__OLD_UTS_LEN)
+ error |= __copy_to_user(name-nodename,ptr-nodename,__OLD_UTS_LEN);
error |= __put_user(0,name-nodename+__OLD_UTS_LEN);
error |= __copy_to_user(name-release,ptr-release,__OLD_UTS_LEN);
error |= __put_user(0,name-release+__OLD_UTS_LEN);
___
Vserver mailing list
Vserver@list.linux-vserver.org
http://list.linux-vserver.org/mailman/listinfo/vserver
