Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: add dummy pgprot_noncached()
  lib/checksum.c: fix endianess bug
  asm-generic: hook up new system calls
  asm-generic: list Arnd as asm-generic maintainer
  asm-generic: drop HARDIRQ_BITS definition from hardirq.h
  asm-generic: uaccess: fix up local access_ok() usage
  asm-generic: uaccess: add missing access_ok() check to strnlen_user()

6 files changed, 35 insertions, 21 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5ef3a16eb140..303129ab4b75 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
diff --git a/include/asm-generic/hardirq.h b/include/asm-generic/hardirq.h
index 3d5d2c906ab3..23bb4dad4962 100644
--- a/include/asm-generic/hardirq.h
+++ b/include/asm-generic/hardirq.h
@@ -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)
 {
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index e410f602cab1..e2bd73e8f9c0 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -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
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
index 6d8cab22e294..b218b8513d04 100644
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess.h
@@ -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);
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
index 5b34b6233d6d..1125e5a1ee5d 100644
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@ -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,
diff --git a/lib/checksum.c b/lib/checksum.c
index 12e5a1c91cda..b2e2fd468461 100644
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -55,7 +55,11 @@ static unsigned int do_csum(const unsigned char *buff, int len)
                 goto out;
         odd = 1 & (unsigned long) buff;
         if (odd) {
+#ifdef __LITTLE_ENDIAN
                 result = *buff;
+#else
+                result += (*buff << 8);
+#endif
                 len--;
                 buff++;
         }
@@ -71,7 +75,7 @@ static unsigned int do_csum(const unsigned char *buff, int len)
                 if (count) {
                         unsigned long carry = 0;
                         do {
-                                unsigned long w = *(unsigned long *) buff;
+                                unsigned long w = *(unsigned int *) buff;
                                 count--;
                                 buff += 4;
                                 result += carry;
@@ -87,7 +91,11 @@ static unsigned int do_csum(const unsigned char *buff, int len)
                 }
         }
         if (len & 1)
+#ifdef __LITTLE_ENDIAN
+                result += *buff;
+#else
                 result += (*buff << 8);
+#endif
         result = from32to16(result);
         if (odd)
                 result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);