GitHub pull request #3109 of commit 6220584f89c5dc4c43247025998866bc1a8a172f, no merge conflicts.sha1origin/pr/3109/mergeghprbActualCommit6220584f89c5dc4c43247025998866bc1a8a172fghprbActualCommitAuthorghprbActualCommitAuthorEmailghprbAuthorRepoGitUrlhttps://github.com/dwrank/bcc.gitghprbTriggerAuthorghprbTriggerAuthorEmailghprbTriggerAuthorLoginyonghong-songghprbTriggerAuthorLoginMention@yonghong-songghprbPullId3109ghprbTargetBranchmasterghprbSourceBranch2955_fix_incomplete_typeGIT_BRANCH2955_fix_incomplete_typeghprbPullAuthorEmailghprbPullAuthorLogindwrankghprbPullAuthorLoginMention@dwrankghprbPullDescriptionGitHub pull request #3109 of commit 6220584f89c5dc4c43247025998866bc1a8a172f, no merge conflicts.ghprbPullTitleslabratetop: Add memcg_cache_params struct defghprbPullLinkhttps://github.com/iovisor/bcc/pull/3109ghprbPullLongDescriptionThe following kernel commit moves struct memcg_cache_params from\r\n include/linux/slab.h to mm/slab.h.\r\n\r\n commit 9adeaa226988b97bc15928e12f40a9863134467c\r\n Author: Waiman Long <longman@redhat.com>\r\n Date: Mon Sep 23 15:33:49 2019 -0700\r\n\r\n mm, slab: move memcg_cache_params structure to mm/slab.h\r\n\r\n The memcg_cache_params structure is only embedded into the kmem_cache of\r\n slab and slub allocators as defined in slab_def.h and slub_def.h and used\r\n internally by mm code. There is no needed to expose it in a public\r\n header. So move it from include/linux/slab.h to mm/slab.h. It is just a\r\n refactoring patch with no code change.\r\n\r\n ...\r\n\r\nThe commit is in kernel v5.4, causing a compiler error when including\r\nslub_def.h or slab_def.h in slabratetop's bpf program.\r\n\r\nAdd an empty definition of the struct in slabratetop's bpf\r\nprogram so it will compile with kernel version >= v5.4.\r\nThe actual struct definition is not required for slabratetop's bpf program.\r\n\r\nTested with kernel v5.8.8 and v5.3.7.\r\n\r\nFixes: https://github.com/iovisor/bcc/issues/2955\r\n\r\nSigned-off-by: Daniel Rank dwrank@gmail.comghprbCommentBody[buildbot, ok to test]ghprbGhRepositoryiovisor/bccghprbCredentialsId6d3daf13-69b8-48b1-9c8f-ec5353264113false<a title="slabratetop: Add memcg_cache_params struct def" href="https://github.com/iovisor/bcc/pull/3109">PR #3109</a>: slabratetop: Add memcg_cach...#69212399417460664bcc-pr #692692false6925544SUCCESS1601332964724https://buildbot.iovisor.org/jenkins/user/ethercflow/my-views/view/all/job/bcc-pr/692/git692https://buildbot.iovisor.org/jenkins/user/ethercflow/my-views/view/all/job/bcc-pr/label=fc25/692/692https://buildbot.iovisor.org/jenkins/user/ethercflow/my-views/view/all/job/bcc-pr/label=fc26/692/692https://buildbot.iovisor.org/jenkins/user/ethercflow/my-views/view/all/job/bcc-pr/label=fc27/692/692https://buildbot.iovisor.org/jenkins/user/ethercflow/my-views/view/all/job/bcc-pr/label=fc28/692/692https://buildbot.iovisor.org/jenkins/user/ethercflow/my-views/view/all/job/bcc-pr/label=ubuntu1604/692/692https://buildbot.iovisor.org/jenkins/user/ethercflow/my-views/view/all/job/bcc-pr/label=ubuntu1710/692/692https://buildbot.iovisor.org/jenkins/user/ethercflow/my-views/view/all/job/bcc-pr/label=ubuntu1804/692/