1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/string_32.h b/include/asm-x86/string_32.h
index 55bfa308f900..c5d13a86dea7 100644
--- a/include/asm-x86/string_32.h
+++ b/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;
+                        *(unsigned short *)s = pattern & 0xffff;
-                        *(2+(unsigned char *)s) = pattern;
+                        *(2+(unsigned char *)s) = pattern & 0xff;
                        return s;
                case 4:
                        *(unsigned long *)s = pattern;

diff --git a/include/asm-x86/string_32.h b/include/asm-x86/string_32.h index 55bfa308f900..c5d13a86dea7 100644 --- a/include/asm-x86/string_32.h +++ b/include/asm-x86/string_32.h
@@ -213,14 +213,14 @@ static __always_inline void * __constant_c_and_count_memset(void * s, unsigned l
213	case 0:	213	case 0:
214	return s;	214	return s;
215	case 1:	215	case 1:
216	(unsigned char )s = pattern;	216	(unsigned char )s = pattern & 0xff;
217	return s;	217	return s;
218	case 2:	218	case 2:
219	(unsigned short )s = pattern;	219	(unsigned short )s = pattern & 0xffff;
220	return s;	220	return s;
221	case 3:	221	case 3:
222	(unsigned short )s = pattern;	222	(unsigned short )s = pattern & 0xffff;
223	(2+(unsigned char )s) = pattern;	223	(2+(unsigned char )s) = pattern & 0xff;
224	return s;	224	return s;
225	case 4:	225	case 4:
226	(unsigned long )s = pattern;	226	(unsigned long )s = pattern;