diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-09-10 16:39:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-09-10 16:39:51 +0100 |
| commit | 824723ccf53fc53ecf896753c562b00a5d6307eb (patch) | |
| tree | c0ec150c4510eb161ba57a7fd39a1393f3b77cdd /include/linux/security.h | |
| parent | spi: Group cs_change and cs_off flags together in struct spi_transfer (diff) | |
| parent | Linux 6.0-rc4 (diff) | |
| download | linux-dev-824723ccf53fc53ecf896753c562b00a5d6307eb.tar.xz linux-dev-824723ccf53fc53ecf896753c562b00a5d6307eb.zip | |
spi: Merge tag 'v6.0-rc4' into spi-6.1
Linux 6.0-rc4 so we can test on BeagleBone again.
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 1bc362cb413f..7bd0c490703d 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2060,6 +2060,7 @@ static inline int security_perf_event_write(struct perf_event *event) #ifdef CONFIG_SECURITY extern int security_uring_override_creds(const struct cred *new); extern int security_uring_sqpoll(void); +extern int security_uring_cmd(struct io_uring_cmd *ioucmd); #else static inline int security_uring_override_creds(const struct cred *new) { @@ -2069,6 +2070,10 @@ static inline int security_uring_sqpoll(void) { return 0; } +static inline int security_uring_cmd(struct io_uring_cmd *ioucmd) +{ + return 0; +} #endif /* CONFIG_SECURITY */ #endif /* CONFIG_IO_URING */ |