diff options
| author |   Wolfram Sang <wsa@the-dreams.de> | 2018-10-11 23:07:30 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-10-11 23:07:30 +0200 |
| commit | 90fb814b6c025da45f71db1703cffe3fe87f575c (patch) | |
| tree | 5fd739d407654df6f9d6e82900a45e027dd8b9f0 /ipc | |
| parent | i2c: designware: Set IRQF_NO_SUSPEND flag for all BYT and CHT controllers (diff) | |
| parent | Linux 4.19-rc7 (diff) | |
| download | linux-dev-90fb814b6c025da45f71db1703cffe3fe87f575c.tar.xz linux-dev-90fb814b6c025da45f71db1703cffe3fe87f575c.zip | |
Merge tag 'v4.19-rc7' into i2c/for-4.20
This is the 4.19-rc7 release
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 4cd402e4cfeb..1c65fb357395 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -206,7 +206,7 @@ err: * Callers of shm_lock() must validate the status of the returned ipc * object pointer and error out as appropriate. */ - return (void *)ipcp; + return ERR_CAST(ipcp); } static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp) |