Merge pull request torvalds#136 from pscollins/hijack-eventfd-only-sometimes

Octavian Purdila · Octavian Purdila · commit c4e50c251d6c · 2016-03-22T13:28:17.000+02:00
lkl: Hijack eventfd only when COFNIG_EVENTFD
diff --git a/tools/lkl/lib/hijack/hijack.c b/tools/lkl/lib/hijack/hijack.c
@@ -280,6 +280,8 @@ int epoll_ctl(int epollfd, int op, int fd, struct epoll_event *event)
 	return lkl_call(__lkl__NR_epoll_ctl, 4, epollfd, op, fd, event);
 }
 
+#ifdef CONFIG_EVENTFD
+/* Hijack eventfd only if we turned it on in our config files */
 int eventfd(unsigned int count, int flags)
 {
 	return lkl_sys_eventfd2(count, flags);
@@ -308,3 +310,4 @@ int eventfd_write(int fd, uint64_t value)
 	return lkl_sys_write(fd, (void *) &value,
 			     sizeof(value)) != sizeof(value) ? -1 : 0;
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,8 @@ int epoll_ctl(int epollfd, int op, int fd, struct epoll_event *event)`
`280`	`280`	`return lkl_call(__lkl__NR_epoll_ctl, 4, epollfd, op, fd, event);`
`281`	`281`	`}`
`282`	`282`
	`283`	`+#ifdef CONFIG_EVENTFD`
	`284`	`+/* Hijack eventfd only if we turned it on in our config files */`
`283`	`285`	`int eventfd(unsigned int count, int flags)`
`284`	`286`	`{`
`285`	`287`	`return lkl_sys_eventfd2(count, flags);`
`@@ -308,3 +310,4 @@ int eventfd_write(int fd, uint64_t value)`
`308`	`310`	`return lkl_sys_write(fd, (void *) &value,`
`309`	`311`	`sizeof(value)) != sizeof(value) ? -1 : 0;`
`310`	`312`	`}`
	`313`	`+#endif`