| Message ID | 20190205081652.29600-1-oohall@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8ca46ad9700033b232bc30023c6a45cc3dcf88ba |
| Headers | show |
| Series | ndctl: Fixes for building without keyutils | expand |
On Tue, 2019-02-05 at 19:16 +1100, Oliver O'Halloran wrote: > Fixes for some build errors when ndctl is configured without > keyutils support. > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> > --- > Ran into this when making a test buildroot image. This is > probably not going to be an issue if you're compiling on > a real OS. > --- > ndctl/ndctl.c | 2 ++ > ndctl/util/keys.h | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) Thanks Oliver, applied.
diff --git a/ndctl/ndctl.c b/ndctl/ndctl.c index b5c3bf884d65..bd333b292743 100644 --- a/ndctl/ndctl.c +++ b/ndctl/ndctl.c @@ -93,7 +93,9 @@ static struct cmd_struct commands[] = { { "remove-passphrase", { cmd_remove_passphrase } }, { "freeze-security", { cmd_freeze_security } }, { "sanitize-dimm", { cmd_sanitize_dimm } }, +#ifdef ENABLE_KEYUTILS { "load-keys", { cmd_load_keys } }, +#endif { "wait-overwrite", { cmd_wait_overwrite } }, { "list", { cmd_list } }, { "monitor", { cmd_monitor } }, diff --git a/ndctl/util/keys.h b/ndctl/util/keys.h index c4d57eae1afc..30687a136512 100644 --- a/ndctl/util/keys.h +++ b/ndctl/util/keys.h @@ -46,7 +46,7 @@ static inline int ndctl_dimm_remove_key(struct ndctl_dimm *dimm) } static inline int ndctl_dimm_secure_erase_key(struct ndctl_dimm *dimm, - enum ndctl_key_type key_type); + enum ndctl_key_type key_type) { return -EOPNOTSUPP; }
Fixes for some build errors when ndctl is configured without keyutils support. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- Ran into this when making a test buildroot image. This is probably not going to be an issue if you're compiling on a real OS. --- ndctl/ndctl.c | 2 ++ ndctl/util/keys.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)