GitHub pull request #2999 of commit 350e53cc4a1f5e9422eb91c563b47e07ffdb999d, no merge conflicts.sha1origin/pr/2999/mergeghprbActualCommit350e53cc4a1f5e9422eb91c563b47e07ffdb999dghprbActualCommitAuthorghprbActualCommitAuthorEmailghprbAuthorRepoGitUrlhttps://github.com/lcp/bcc.gitghprbTriggerAuthorghprbTriggerAuthorEmailghprbTriggerAuthorLoginyonghong-songghprbTriggerAuthorLoginMention@yonghong-songghprbPullId2999ghprbTargetBranchmasterghprbSourceBranchchange-headers-orderGIT_BRANCHchange-headers-orderghprbPullAuthorEmailchingpang@gmail.comghprbPullAuthorLoginlcpghprbPullAuthorLoginMention@lcpghprbPullDescriptionGitHub pull request #2999 of commit 350e53cc4a1f5e9422eb91c563b47e07ffdb999d, no merge conflicts.ghprbPullTitleAdjust the order of linux kernel header include pathsghprbPullLinkhttps://github.com/iovisor/bcc/pull/2999ghprbPullLongDescriptionThe current order of include paths could cause the following error:\r\n\r\nIn file included from /virtual/main.c:3:\r\nIn file included from include/linux/sched.h:13:\r\nIn file included from include/linux/pid.h:4:\r\nIn file included from include/linux/rculist.h:10:\r\nIn file included from include/linux/rcupdate.h:38:\r\nIn file included from include/linux/spinlock.h:50:\r\nIn file included from include/linux/preempt.h:80:\r\nIn file included from /lib/modules/4.12.14-197.45-default/build/arch/s390/include/generated/asm/preempt.h:1:\r\ninclude/asm-generic/preempt.h:10:42: error: no member named 'preempt_count' in 'struct thread_info'\r\n return READ_ONCE(current_thread_info()->preempt_count);\r\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~\r\ninclude/linux/compiler.h:349:34: note: expanded from macro 'READ_ONCE'\r\n ~~~~~~~~~~~~^~~~~\r\ninclude/linux/compiler.h:342:17: note: expanded from macro '__READ_ONCE'\r\n union { typeof(x) __val; char __c[1]; } __u;\r\n\\r\n...\r\n7 errors generated.\r\n\r\nIt's supposed to load \"asm/preempt.h\" from \"source/\"(*) but accidentally\r\nloaded the one from \"build/\", so the error showed.\r\n(x86_64 didn't suffer this error because it didn't install the extra\r\n \"asm/preempt.h\" to \"build/\".)\r\n\r\nFor the distros, e.g. SUSE/openSUSE and debian, with separate \"build/\"\r\nand \"source/\", all those \"generated/\" paths only exist in \"build/\". To\r\navoid the potential compilation issue, this commit moves down all those\r\n\"generated/\" paths in \"build/\" and adds them conditionally.\r\n\r\n(*) /lib/modules/4.12.14-197.45-default/source/arch/s390/include/\r\n\r\nSigned-off-by: Gary Lin <glin@suse.com>ghprbCommentBody[buildbot, ok to test]ghprbGhRepositoryiovisor/bccghprbCredentialsId6d3daf13-69b8-48b1-9c8f-ec5353264113false<a title="Adjust the order of linux kernel header include paths" href="https://github.com/iovisor/bcc/pull/2999">PR #2999</a>: Adjust the order of linux k...#61012590127460664bcc-pr #610610false6104874SUCCESS1595319213303https://buildbot.iovisor.org/jenkins/user/yonghong-song/my-views/view/all/job/bcc-pr/610/git610https://buildbot.iovisor.org/jenkins/user/yonghong-song/my-views/view/all/job/bcc-pr/label=fc25/610/610https://buildbot.iovisor.org/jenkins/user/yonghong-song/my-views/view/all/job/bcc-pr/label=fc26/610/610https://buildbot.iovisor.org/jenkins/user/yonghong-song/my-views/view/all/job/bcc-pr/label=fc27/610/610https://buildbot.iovisor.org/jenkins/user/yonghong-song/my-views/view/all/job/bcc-pr/label=fc28/610/610https://buildbot.iovisor.org/jenkins/user/yonghong-song/my-views/view/all/job/bcc-pr/label=ubuntu1604/610/610https://buildbot.iovisor.org/jenkins/user/yonghong-song/my-views/view/all/job/bcc-pr/label=ubuntu1710/610/610https://buildbot.iovisor.org/jenkins/user/yonghong-song/my-views/view/all/job/bcc-pr/label=ubuntu1804/610/