Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4800a5bb authored by Chris Metcalf's avatar Chris Metcalf
Browse files

include/linux/compat.h: coding-style fixes 



I touched this file when adding support for the "tilegx" sub-architecture,
and Andrew Morton observed "The file's a mismash of old-style, wrong-style
and right-style.  There's no point in doing mishmash preservation!
May as well fix things up when we touch them."

Accordingly, this change makes <linux/compat.h> as checkpatch-clean
as possible.  It makes no semantic changes whatsoever.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent dd196a2b

include/linux/compat.h

+41 −33
Original line number Diff line number Diff line
@@ -82,8 +82,10 @@ typedef struct { 
	compat_sigset_word	sig[_COMPAT_NSIG_WORDS];

} compat_sigset_t;



extern int get_compat_timespec(struct timespec *, const struct compat_timespec __user *);

extern int put_compat_timespec(const struct timespec *, struct compat_timespec __user *);

extern int get_compat_timespec(struct timespec *,

			       const struct compat_timespec __user *);

extern int put_compat_timespec(const struct timespec *,

			       struct compat_timespec __user *);



struct compat_iovec {

	compat_uptr_t	iov_base;
@@ -114,7 +116,8 @@ struct compat_rusage { 
	compat_long_t	ru_nivcsw;

};



extern int put_compat_rusage(const struct rusage *, struct compat_rusage __user *);

extern int put_compat_rusage(const struct rusage *,

			     struct compat_rusage __user *);



struct compat_siginfo;
@@ -167,8 +170,7 @@ struct compat_ifmap { 
	unsigned char port;

};



struct compat_if_settings

{

struct compat_if_settings {

	unsigned int type;	/* Type of physical device or protocol */

	unsigned int size;	/* Size of the data allocated by the caller */

	compat_uptr_t ifs_ifsu;	/* union of pointers */
@@ -346,8 +348,10 @@ asmlinkage long compat_sys_epoll_pwait(int epfd, 


asmlinkage long compat_sys_utime(const char __user *filename,

				 struct compat_utimbuf __user *t);

asmlinkage long compat_sys_utimensat(unsigned int dfd, const char __user *filename,

				struct compat_timespec __user *t, int flags);

asmlinkage long compat_sys_utimensat(unsigned int dfd,

				     const char __user *filename,

				     struct compat_timespec __user *t,

				     int flags);



asmlinkage long compat_sys_time(compat_time_t __user *tloc);

asmlinkage long compat_sys_stime(compat_time_t __user *tptr);
@@ -365,7 +369,8 @@ asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_page, 
				      const int __user *nodes,

				      int __user *status,

				      int flags);

asmlinkage long compat_sys_futimesat(unsigned int dfd, const char __user *filename,

asmlinkage long compat_sys_futimesat(unsigned int dfd,

				     const char __user *filename,

				     struct compat_timeval __user *t);

asmlinkage long compat_sys_utimes(const char __user *filename,

				  struct compat_timeval __user *t);
@@ -373,7 +378,8 @@ asmlinkage long compat_sys_newstat(const char __user * filename, 
				   struct compat_stat __user *statbuf);

asmlinkage long compat_sys_newlstat(const char __user *filename,

				    struct compat_stat __user *statbuf);

asmlinkage long compat_sys_newfstatat(unsigned int dfd, const char __user * filename,

asmlinkage long compat_sys_newfstatat(unsigned int dfd,

				      const char __user *filename,

				      struct compat_stat __user *statbuf,

				      int flag);

asmlinkage long compat_sys_newfstat(unsigned int fd,
@@ -431,14 +437,15 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, 
				 struct compat_timespec __user *tsp,

				 const compat_sigset_t __user *sigmask,

				 compat_size_t sigsetsize);

#if (defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)) && !defined(CONFIG_NFSD_DEPRECATED)

#if (defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)) && \

	!defined(CONFIG_NFSD_DEPRECATED)

union compat_nfsctl_res;

struct compat_nfsctl_arg;

asmlinkage long compat_sys_nfsservctl(int cmd,

				      struct compat_nfsctl_arg __user *arg,

				      union compat_nfsctl_res __user *res);

#else

long asmlinkage compat_sys_nfsservctl(int cmd, void *notused, void *notused2);

asmlinkage long compat_sys_nfsservctl(int cmd, void *notused, void *notused2);

#endif

asmlinkage long compat_sys_signalfd4(int ufd,

				     const compat_sigset_t __user *sigmask,
@@ -544,7 +551,8 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args); 
asmlinkage long compat_sys_sysctl(struct compat_sysctl_args __user *args);



extern ssize_t compat_rw_copy_check_uvector(int type,

		const struct compat_iovec __user *uvector, unsigned long nr_segs,

		const struct compat_iovec __user *uvector,

		unsigned long nr_segs,

		unsigned long fast_segs, struct iovec *fast_pointer,

		struct iovec **ret_pointer);