diff --git a/[refs] b/[refs] index 291207eb0941..4159ff0ed0ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a6b344ea967efa0bb5ca4cb5405f840652b66c4 +refs/heads/master: 9b4239346136f1432e52d14ea88f4b2662876f4a diff --git a/trunk/include/asm-x86/string_32.h b/trunk/include/asm-x86/string_32.h index 55bfa308f900..c5d13a86dea7 100644 --- a/trunk/include/asm-x86/string_32.h +++ b/trunk/include/asm-x86/string_32.h @@ -213,14 +213,14 @@ static __always_inline void * __constant_c_and_count_memset(void * s, unsigned l case 0: return s; case 1: - *(unsigned char *)s = pattern; + *(unsigned char *)s = pattern & 0xff; return s; case 2: - *(unsigned short *)s = pattern; + *(unsigned short *)s = pattern & 0xffff; return s; case 3: - *(unsigned short *)s = pattern; - *(2+(unsigned char *)s) = pattern; + *(unsigned short *)s = pattern & 0xffff; + *(2+(unsigned char *)s) = pattern & 0xff; return s; case 4: *(unsigned long *)s = pattern;