diff --git a/[refs] b/[refs] index 1307e17439b6..2d9bd54699a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afe5df208e6ecd09b7d1acf36eb2cf945842bee5 +refs/heads/master: 62500d1f8eadff078cca462dc4df035a29180383 diff --git a/trunk/include/asm-arm/checksum.h b/trunk/include/asm-arm/checksum.h index d4256d5f3a7c..747bdd31a74b 100644 --- a/trunk/include/asm-arm/checksum.h +++ b/trunk/include/asm-arm/checksum.h @@ -77,7 +77,7 @@ ip_fast_csum(unsigned char * iph, unsigned int ihl) mov %0, %0, lsr #16" : "=r" (sum), "=r" (iph), "=r" (ihl), "=r" (tmp1) : "1" (iph), "2" (ihl) - : "cc"); + : "cc", "memory"); return sum; }