diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 13:09:18 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 13:09:18 +0200 |
| commit | a2ab5fc41533c952706ebdfaa378bb746e535cc1 (patch) | |
| tree | 9fb86bb4e9ecb67f7e651d284c2f12c6c5d4378f /ipc/shm.c | |
| parent | a380f2edef65b2447a043251bb3c00a9d2153a8b (diff) | |
| parent | 0e708fc602531b8355b5de6ea7c98f09129b223f (diff) | |
| download | linux-next-a2ab5fc41533c952706ebdfaa378bb746e535cc1.tar.gz linux-next-a2ab5fc41533c952706ebdfaa378bb746e535cc1.zip | |
Merge branch 'pm-sleep' into pm-core
Diffstat (limited to 'ipc/shm.c')
| -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 1e2b1692ba2c..badac463e2c8 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1154,7 +1154,7 @@ static int put_compat_shm_info(struct shm_info *ip, info.shm_swp = ip->shm_swp; info.swap_attempts = ip->swap_attempts; info.swap_successes = ip->swap_successes; - return copy_to_user(up, &info, sizeof(info)); + return copy_to_user(uip, &info, sizeof(info)); } static int copy_compat_shmid_to_user(void __user *buf, struct shmid64_ds *in, |