Date: Sat, 23 Feb 2013 18:59:15 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r247196 - user/dchagin/lemul/sys/compat/linux Message-ID: <201302231859.r1NIxF21012551@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Sat Feb 23 18:59:14 2013 New Revision: 247196 URL: http://svnweb.freebsd.org/changeset/base/247196 Log: Introduce LINUX_VERSION_STR, LINUX_VERSION_CODE macro for use instead of harcoded pr_osrelease, pr_osrel values. This will be used later in the VDSO. Modified: user/dchagin/lemul/sys/compat/linux/linux_mib.c user/dchagin/lemul/sys/compat/linux/linux_mib.h Modified: user/dchagin/lemul/sys/compat/linux/linux_mib.c ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_mib.c Sat Feb 23 18:32:42 2013 (r247195) +++ user/dchagin/lemul/sys/compat/linux/linux_mib.c Sat Feb 23 18:59:14 2013 (r247196) @@ -130,9 +130,9 @@ struct linux_prison { static struct linux_prison lprison0 = { .pr_osname = "Linux", - .pr_osrelease = "2.6.16", + .pr_osrelease = LINUX_VERSION_STR, .pr_oss_version = 0x030600, - .pr_osrel = 2006016 + .pr_osrel = LINUX_VERSION_CODE }; static unsigned linux_osd_jail_slot; Modified: user/dchagin/lemul/sys/compat/linux/linux_mib.h ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_mib.h Sat Feb 23 18:32:42 2013 (r247195) +++ user/dchagin/lemul/sys/compat/linux/linux_mib.h Sat Feb 23 18:59:14 2013 (r247196) @@ -42,8 +42,19 @@ int linux_get_oss_version(struct thread int linux_kernver(struct thread *td); -#define LINUX_KERNVER_2004000 2004000 -#define LINUX_KERNVER_2006000 2006000 +#define LINUX_KVERSION 2 +#define LINUX_KPATCHLEVEL 6 +#define LINUX_KSUBLEVEL 16 + +#define LINUX_KERNVER(a,b,c) (((a) << 16) + ((b) << 8) + (c)) +#define LINUX_VERSION_CODE LINUX_KERNVER(LINUX_KVERSION, \ + LINUX_KPATCHLEVEL, LINUX_KSUBLEVEL) +#define LINUX_KERNVERSTR(x) #x +#define LINUX_XKERNVERSTR(x) LINUX_KERNVERSTR(x) +#define LINUX_VERSION_STR LINUX_XKERNVERSTR(LINUX_KVERSION.LINUX_KPATCHLEVEL.LINUX_KSUBLEVEL) + +#define LINUX_KERNVER_2004000 LINUX_KERNVER(2,4,0) +#define LINUX_KERNVER_2006000 LINUX_KERNVER(2,6,0) #define linux_use26(t) (linux_kernver(t) >= LINUX_KERNVER_2006000)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302231859.r1NIxF21012551>