diff for duplicates of <200705091821.59412.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index f6ce3f1..b460303 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,45 +4,30 @@ On Wednesday 09 May 2007, Stephen Rothwell wrote: > --- a/include/linux/compat.h > +++ b/include/linux/compat.h > @@ -253,5 +253,8 @@ asmlinkage long compat_sys_epoll_pwait(int epfd, -> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0c= -onst compat_sigset_t __user *sigmask, -> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0c= -ompat_size_t sigsetsize); -> =A0 -> +asmlinkage long compat_sys_utimensat(unsigned int dfd, char __user *file= -name, -> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= -=A0=A0=A0=A0=A0=A0=A0struct compat_timespec __user *t, int flags); +> const compat_sigset_t __user *sigmask, +> compat_size_t sigsetsize); +> +> +asmlinkage long compat_sys_utimensat(unsigned int dfd, char __user *filename, +> + struct compat_timespec __user *t, int flags); > + -> =A0#endif /* CONFIG_COMPAT */ -> =A0#endif /* _LINUX_COMPAT_H */ +> #endif /* CONFIG_COMPAT */ +> #endif /* _LINUX_COMPAT_H */ > diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h > index 1912c6c..3139f44 100644 > --- a/include/linux/syscalls.h > +++ b/include/linux/syscalls.h -> @@ -576,6 +576,8 @@ asmlinkage long sys_fstatat64(int dfd, char __user *f= -ilename, -> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 = -=A0 =A0 =A0 struct stat64 __user *statbuf, int flag); -> =A0asmlinkage long sys_readlinkat(int dfd, const char __user *path, char = -__user *buf, -> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 = -=A0 =A0 =A0 int bufsiz); +> @@ -576,6 +576,8 @@ asmlinkage long sys_fstatat64(int dfd, char __user *filename, +> struct stat64 __user *statbuf, int flag); +> asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf, +> int bufsiz); > +asmlinkage long sys_utimensat(int dfd, char __user *filename, -> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= -=A0=A0=A0=A0=A0=A0=A0struct timespec __user *utimes, int flags); -> =A0asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *fi= -lename, -> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= -=A0=A0=A0=A0=A0=A0=A0=A0 =A0 =A0 struct compat_timeval __user *t); -> =A0asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * = -filename, +> + struct timespec __user *utimes, int flags); +> asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, +> struct compat_timeval __user *t); +> asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename, -It seems bogus to declare compat_sys_futimesat in syscalls.h and compat_sys= -_utimensat -in compat.h. Your patch is fine, since there are precedents for both, but m= -aybe -we should agree on one place and then move all of the compat_sys_ declarati= -ons there. +It seems bogus to declare compat_sys_futimesat in syscalls.h and compat_sys_utimensat +in compat.h. Your patch is fine, since there are precedents for both, but maybe +we should agree on one place and then move all of the compat_sys_ declarations there. Arnd <>< diff --git a/a/content_digest b/N1/content_digest index 34d2567..5321bd6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,9 +4,9 @@ "Date\0Wed, 9 May 2007 18:21:58 +0200\0" "To\0linuxppc-dev@ozlabs.org\0" "Cc\0Stephen Rothwell <sfr@canb.auug.org.au>" + paulus@samba.org Andrew Morton <akpm@linux-foundation.org> Linus <torvalds@linux-foundation.org> - paulus@samba.org " LKML <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" @@ -16,47 +16,32 @@ "> --- a/include/linux/compat.h\n" "> +++ b/include/linux/compat.h\n" "> @@ -253,5 +253,8 @@ asmlinkage long compat_sys_epoll_pwait(int epfd,\n" - "> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0c=\n" - "onst compat_sigset_t __user *sigmask,\n" - "> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0c=\n" - "ompat_size_t sigsetsize);\n" - "> =A0\n" - "> +asmlinkage long compat_sys_utimensat(unsigned int dfd, char __user *file=\n" - "name,\n" - "> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=\n" - "=A0=A0=A0=A0=A0=A0=A0struct compat_timespec __user *t, int flags);\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240const compat_sigset_t __user *sigmask,\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240compat_size_t sigsetsize);\n" + "> \302\240\n" + "> +asmlinkage long compat_sys_utimensat(unsigned int dfd, char __user *filename,\n" + "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct compat_timespec __user *t, int flags);\n" "> +\n" - "> =A0#endif /* CONFIG_COMPAT */\n" - "> =A0#endif /* _LINUX_COMPAT_H */\n" + "> \302\240#endif /* CONFIG_COMPAT */\n" + "> \302\240#endif /* _LINUX_COMPAT_H */\n" "> diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h\n" "> index 1912c6c..3139f44 100644\n" "> --- a/include/linux/syscalls.h\n" "> +++ b/include/linux/syscalls.h\n" - "> @@ -576,6 +576,8 @@ asmlinkage long sys_fstatat64(int dfd, char __user *f=\n" - "ilename,\n" - "> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =\n" - "=A0 =A0 =A0 struct stat64 __user *statbuf, int flag);\n" - "> =A0asmlinkage long sys_readlinkat(int dfd, const char __user *path, char =\n" - "__user *buf,\n" - "> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =\n" - "=A0 =A0 =A0 int bufsiz);\n" + "> @@ -576,6 +576,8 @@ asmlinkage long sys_fstatat64(int dfd, char __user *filename,\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 \302\240 \302\240 \302\240 struct stat64 __user *statbuf, int flag);\n" + "> \302\240asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf,\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 \302\240 \302\240 \302\240 int bufsiz);\n" "> +asmlinkage long sys_utimensat(int dfd, char __user *filename,\n" - "> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=\n" - "=A0=A0=A0=A0=A0=A0=A0struct timespec __user *utimes, int flags);\n" - "> =A0asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *fi=\n" - "lename,\n" - "> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=\n" - "=A0=A0=A0=A0=A0=A0=A0=A0 =A0 =A0 struct compat_timeval __user *t);\n" - "> =A0asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * =\n" - "filename,\n" + "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct timespec __user *utimes, int flags);\n" + "> \302\240asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename,\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 \302\240 \302\240 struct compat_timeval __user *t);\n" + "> \302\240asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,\n" "\n" - "It seems bogus to declare compat_sys_futimesat in syscalls.h and compat_sys=\n" - "_utimensat\n" - "in compat.h. Your patch is fine, since there are precedents for both, but m=\n" - "aybe\n" - "we should agree on one place and then move all of the compat_sys_ declarati=\n" - "ons there.\n" + "It seems bogus to declare compat_sys_futimesat in syscalls.h and compat_sys_utimensat\n" + "in compat.h. Your patch is fine, since there are precedents for both, but maybe\n" + "we should agree on one place and then move all of the compat_sys_ declarations there.\n" "\n" "\tArnd <><" -1232bd32233825feb8e3f28f747359f193e72674bbfe4e24577f0d80bb567680 +50903eec7e52ff71023b0dbe47a910050f36be902083cccacecae39453577e1b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.