Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic (defe9104) · Commits · 戴 / test

MAINTAINERS

+8 −0

Original line number	Diff line number	Diff line
		@@ -2482,6 +2482,14 @@ F: drivers/net/wan/pc300too.c
		F: drivers/net/wan/pci200syn.c
		F: drivers/net/wan/wanxl*

		GENERIC INCLUDE/ASM HEADER FILES
		P: Arnd Bergmann
		M: arnd@arndb.de
		L: linux-arch@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
		S: Maintained
		F: include/asm-generic

		GFS2 FILE SYSTEM
		P: Steven Whitehouse
		M: swhiteho@redhat.com

include/asm-generic/hardirq.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -11,19 +11,6 @@ typedef struct {

		#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */

		#ifndef HARDIRQ_BITS
		#define HARDIRQ_BITS 8
		#endif

		/*
		* The hardirq mask has to be large enough to have
		* space for potentially all IRQ sources in the system
		* nesting on a single CPU:
		*/
		#if (1 << HARDIRQ_BITS) < NR_IRQS
		# error HARDIRQ_BITS is too low!
		#endif

		#ifndef ack_bad_irq
		static inline void ack_bad_irq(unsigned int irq)
		{

include/asm-generic/pgtable.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
		#define move_pte(pte, prot, old_addr, new_addr) (pte)
		#endif

		#ifndef pgprot_noncached
		#define pgprot_noncached(prot) (prot)
		#endif

		#ifndef pgprot_writecombine
		#define pgprot_writecombine pgprot_noncached
		#endif

include/asm-generic/uaccess.h

+8 −6

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ static inline __must_check long __copy_to_user(void __user *to,
		#define put_user(x, ptr) \
		({ \
		might_sleep(); \
		__access_ok(ptr, sizeof (*ptr)) ? \
		access_ok(VERIFY_WRITE, ptr, sizeof(*ptr)) ? \
		__put_user(x, ptr) : \
		-EFAULT; \
		})
		@@ -219,7 +219,7 @@ extern int __put_user_bad(void) __attribute__((noreturn));
		#define get_user(x, ptr) \
		({ \
		might_sleep(); \
		__access_ok(ptr, sizeof (*ptr)) ? \
		access_ok(VERIFY_READ, ptr, sizeof(*ptr)) ? \
		__get_user(x, ptr) : \
		-EFAULT; \
		})
		@@ -244,7 +244,7 @@ static inline long copy_from_user(void *to,
		const void __user * from, unsigned long n)
		{
		might_sleep();
		if (__access_ok(from, n))
		if (access_ok(VERIFY_READ, from, n))
		return __copy_from_user(to, from, n);
		else
		return n;
		@@ -254,7 +254,7 @@ static inline long copy_to_user(void __user *to,
		const void *from, unsigned long n)
		{
		might_sleep();
		if (__access_ok(to, n))
		if (access_ok(VERIFY_WRITE, to, n))
		return __copy_to_user(to, from, n);
		else
		return n;
		@@ -278,7 +278,7 @@ __strncpy_from_user(char dst, const char __user src, long count)
		static inline long
		strncpy_from_user(char dst, const char __user src, long count)
		{
		if (!__access_ok(src, 1))
		if (!access_ok(VERIFY_READ, src, 1))
		return -EFAULT;
		return __strncpy_from_user(dst, src, count);
		}
		@@ -291,6 +291,8 @@ strncpy_from_user(char dst, const char __user src, long count)
		#ifndef strnlen_user
		static inline long strnlen_user(const char __user *src, long n)
		{
		if (!access_ok(VERIFY_READ, src, 1))
		return 0;
		return strlen((void * __force)src) + 1;
		}
		#endif
		@@ -316,7 +318,7 @@ static inline __must_check unsigned long
		clear_user(void __user *to, unsigned long n)
		{
		might_sleep();
		if (!__access_ok(to, n))
		if (!access_ok(VERIFY_WRITE, to, n))
		return n;

		return __clear_user(to, n);

include/asm-generic/unistd.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -618,8 +618,13 @@ __SYSCALL(__NR_migrate_pages, sys_migrate_pages)
		__SYSCALL(__NR_move_pages, sys_move_pages)
		#endif

		#define __NR_rt_tgsigqueueinfo 240
		__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
		#define __NR_perf_counter_open 241
		__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)

		#undef __NR_syscalls
		#define __NR_syscalls 240
		#define __NR_syscalls 242

		/*
		* All syscalls below here should go away really,

Admin message