From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 073A713832E for ; Wed, 17 Aug 2016 12:38:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68D3621C0AA; Wed, 17 Aug 2016 12:38:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 886BF21C0AA for ; Wed, 17 Aug 2016 12:38:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 190B7340D6F for ; Wed, 17 Aug 2016 12:38:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AC072444 for ; Wed, 17 Aug 2016 12:38:44 +0000 (UTC) From: "Fabio Rossi" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabio Rossi" Message-ID: <1471435690.f5e136467b79ef82f237004c60f5bc8dd4e486ef.fabio@gentoo> Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/ X-VCS-Repository: proj/vmware X-VCS-Files: app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild app-emulation/vmware-modules/vmware-modules-304.4.ebuild app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild X-VCS-Directories: app-emulation/vmware-modules/ app-emulation/vmware-modules/files/ X-VCS-Committer: fabio X-VCS-Committer-Name: Fabio Rossi X-VCS-Revision: f5e136467b79ef82f237004c60f5bc8dd4e486ef X-VCS-Branch: master Date: Wed, 17 Aug 2016 12:38:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0767feed-163b-4ca0-88d3-872253e83742 X-Archives-Hash: 0575cc84aa336f06f3eeb7794138dbe7 commit: f5e136467b79ef82f237004c60f5bc8dd4e486ef Author: Fabio Rossi inwind it> AuthorDate: Wed Aug 17 12:08:10 2016 +0000 Commit: Fabio Rossi inwind net> CommitDate: Wed Aug 17 12:08:10 2016 +0000 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f5e13646 app-emulation/vmware-modules: add support to kernel 4.8 upstream kernel commit 4b9d0fab7166c9323f06d708518a35cf3a90426c renamed a symbol, add a patch to fix the problem. This solves the bug #591284. .../vmware-modules/files/304-4.8-00-nr_anon_mapped.patch | 14 ++++++++++++++ .../vmware-modules/files/308-4.08-00-nr_anon_mapped.patch | 14 ++++++++++++++ .../vmware-modules/vmware-modules-304.3-r1.ebuild | 1 + app-emulation/vmware-modules/vmware-modules-304.4.ebuild | 1 + app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild | 1 + 5 files changed, 31 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch b/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch new file mode 100644 index 0000000..f806ccd --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch @@ -0,0 +1,14 @@ +diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c +--- a/vmmon-only/linux/hostif.c 2016-08-13 16:54:18.935207507 +0300 ++++ b/vmmon-only/linux/hostif.c 2016-08-13 16:53:52.981424256 +0300 +@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos + */ + #define LOCKED_PAGE_SLACK 10000 + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99) ++#define NR_ANON_PAGES NR_ANON_MAPPED ++#endif ++ + static struct { + Atomic_uint64 uptimeBase; + VersionedAtomic version; diff --git a/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch b/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch new file mode 100644 index 0000000..f806ccd --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch @@ -0,0 +1,14 @@ +diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c +--- a/vmmon-only/linux/hostif.c 2016-08-13 16:54:18.935207507 +0300 ++++ b/vmmon-only/linux/hostif.c 2016-08-13 16:53:52.981424256 +0300 +@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos + */ + #define LOCKED_PAGE_SLACK 10000 + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99) ++#define NR_ANON_PAGES NR_ANON_MAPPED ++#endif ++ + static struct { + Atomic_uint64 uptimeBase; + VersionedAtomic version; diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild index ba97b17..a10a9f4 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild @@ -104,6 +104,7 @@ src_prepare() { kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch" + kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user diff --git a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild index ba97b17..a10a9f4 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild @@ -104,6 +104,7 @@ src_prepare() { kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch" + kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild index da4a7a1..b3faaaf 100644 --- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild @@ -104,6 +104,7 @@ src_prepare() { kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch" + kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user