Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull compat fix from Al Viro:
 "I really wish gcc warned about conversions from pointer to function
  into void *..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a typo in put_compat_shm_info()

parents 19240e6b b776e4b1

ipc/shm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,