Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: Fix linker script to include .literal sections
  xtensa: update s6105_defconfig for ccount calibration
  xtensa: implement ccount calibration for s6000
  xtensa: fix wrong extern declaration renamed in code using it
  xtensa: register gpio chip before use
  xtensa: always use correct stack pointer for stack traces
  xtensa: Fix checksum header file
  xtensa: Fix architecture specific Kconfig

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/xtensa/include/asm/checksum.h b/arch/xtensa/include/asm/checksum.h
index f84d3f00774a..e4d831a30772 100644
--- a/arch/xtensa/include/asm/checksum.h
+++ b/arch/xtensa/include/asm/checksum.h
@@ -113,7 +113,8 @@ static __inline__ __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
            are modified, we must also specify them as outputs, or gcc
            will assume they contain their original values. */
                 : "=r" (sum), "=r" (iph), "=r" (ihl), "=&r" (tmp), "=&r" (endaddr)
-                : "1" (iph), "2" (ihl));
+                : "1" (iph), "2" (ihl)
+                : "memory");
 
         return  csum_fold(sum);
 }
@@ -227,7 +228,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
                 "1:\t"
                 : "=r" (sum), "=&r" (__dummy)
                 : "r" (saddr), "r" (daddr),
-                  "r" (htonl(len)), "r" (htonl(proto)), "0" (sum));
+                  "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)
+                : "memory");
 
         return csum_fold(sum);
 }