PERFORCE change 103857 for review
Roman Divacky
rdivacky at FreeBSD.org
Mon Aug 14 15:21:28 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103857
Change 103857 by rdivacky at rdivacky_witten on 2006/08/14 15:21:01
Backout the LINUX_NPTL change. It never worked in the first place (I made a typo)
and its sufficient to set osrelease=2.4.2 to get working linuxolator.
Affected files ...
.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#7 edit
.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#13 edit
.. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.amd64#4 edit
.. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.i386#4 edit
Differences ...
==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#7 (text+ko) ====
@@ -81,11 +81,7 @@
0, 0, linux_sysctl_osname, "A",
"Linux kernel OS name");
-#ifdef LINUX_NPTL
static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.6.16";
-#else
-static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2";
-#endif
static int
linux_sysctl_osrelease(SYSCTL_HANDLER_ARGS)
==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#13 (text+ko) ====
@@ -1334,7 +1334,6 @@
int
linux_getpid(struct thread *td, struct linux_getpid_args *args)
{
-#ifdef LINUX_NTPL
struct linux_emuldata *em;
em = em_find(td->td_proc, EMUL_UNLOCKED);
@@ -1343,9 +1342,6 @@
td->td_retval[0] = em->shared->group_pid;
EMUL_UNLOCK(&emul_lock);
-#else
- td->td_retval[0] = td->td_proc->p_pid;
-#endif
return (0);
}
@@ -1365,7 +1361,6 @@
int
linux_getppid(struct thread *td, struct linux_getppid_args *args)
{
-#ifdef LINUX_NTPL
struct linux_emuldata *em;
struct proc *p, *pp;
@@ -1400,9 +1395,6 @@
PROC_UNLOCK(pp);
return (0);
-#else
- return getppid(td, (struct getppid_args *) args);
-#endif
}
int
==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options.amd64#4 (text+ko) ====
@@ -20,7 +20,6 @@
LINPROCFS opt_dontuse.h
LINSYSFS opt_dontuse.h
NDISAPI opt_dontuse.h
-LINUX_NPTL opt_compat.h
CLK_CALIBRATION_LOOP opt_clock.h
CLK_USE_I8254_CALIBRATION opt_clock.h
==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options.i386#4 (text+ko) ====
@@ -29,7 +29,6 @@
NDISAPI opt_dontuse.h
PECOFF_DEBUG opt_pecoff.h
PECOFF_SUPPORT opt_dontuse.h
-LINUX_NPTL opt_compat.h
# Change KVM size. Changes things all over the kernel.
KVA_PAGES opt_global.h
More information about the p4-projects
mailing list