diff options
| author | Roman Kiryanov <rkir@google.com> | 2020-04-29 13:26:09 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2020-04-29 13:43:51 -0700 |
| commit | e92a07b6febc5e2d521d0b4068f6f4ac8271f6de (patch) | |
| tree | 2797423ee7264d414de49c277bbfae87947e2722 | |
| parent | da83ac244c7cb5ef6d86d2c85a7d737c947229cd (diff) | |
| download | goldfish-modules-e92a07b6febc5e2d521d0b4068f6f4ac8271f6de.tar.gz | |
Put explicitly options that goldfish depends on
Bug: 154346346
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Icc7088c9d3535233e2c99baae0f1b2767305580a
| -rw-r--r-- | defconfig_test.h | 33 | ||||
| -rw-r--r-- | goldfish_address_space.c | 2 | ||||
| -rw-r--r-- | goldfish_pipe_base.c | 2 | ||||
| -rw-r--r-- | goldfish_sync.c | 2 |
4 files changed, 39 insertions, 0 deletions
diff --git a/defconfig_test.h b/defconfig_test.h new file mode 100644 index 0000000..6b0dfb6 --- /dev/null +++ b/defconfig_test.h @@ -0,0 +1,33 @@ +/* Put all options we expect gki_defconfig to provide us here */ + +#ifndef CONFIG_BRIDGE +#error CONFIG_BRIDGE is required +#endif + +#ifndef CONFIG_VETH +#error CONFIG_VETH is required +#endif + +#ifndef CONFIG_CFG80211 +#error CONFIG_CFG80211 is required +#endif + +#ifndef CONFIG_NAMESPACES +#error CONFIG_NAMESPACES is required +#endif + +#ifndef CONFIG_PCI +#error CONFIG_PCI is required +#endif + +#ifndef CONFIG_ZRAM +#error CONFIG_ZRAM is required +#endif + +#ifndef CONFIG_ZSMALLOC +#error CONFIG_ZSMALLOC is required +#endif + +#ifndef CONFIG_COMPAT +#error CONFIG_COMPAT is required +#endif diff --git a/goldfish_address_space.c b/goldfish_address_space.c index 982960e..6eaaebf 100644 --- a/goldfish_address_space.c +++ b/goldfish_address_space.c @@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 +#include "defconfig_test.h" + #include <linux/init.h> #include <linux/module.h> #include <linux/kernel.h> diff --git a/goldfish_pipe_base.c b/goldfish_pipe_base.c index 33b7bcf..9a59f4f 100644 --- a/goldfish_pipe_base.c +++ b/goldfish_pipe_base.c @@ -47,6 +47,8 @@ * exchange is properly mapped during a transfer. */ +#include "defconfig_test.h" + #include <linux/module.h> #include <linux/mod_devicetable.h> #include <linux/interrupt.h> diff --git a/goldfish_sync.c b/goldfish_sync.c index 95ec41d..913f619 100644 --- a/goldfish_sync.c +++ b/goldfish_sync.c @@ -11,6 +11,8 @@ * Each time the interrupt trips, the driver may perform a sync operation. */ +#include "defconfig_test.h" + #include <linux/acpi.h> #include <linux/dma-fence.h> #include <linux/fdtable.h> |