Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -365,7 +365,7 @@ static inline map_word map_word_load_partial(struct map_info *map, map_word orig
|
||||
bitpos = (map_bankwidth(map)-1-i)*8;
|
||||
#endif
|
||||
orig.x[0] &= ~(0xff << bitpos);
|
||||
orig.x[0] |= buf[i-start] << bitpos;
|
||||
orig.x[0] |= (unsigned long)buf[i-start] << bitpos;
|
||||
}
|
||||
}
|
||||
return orig;
|
||||
@@ -384,7 +384,7 @@ static inline map_word map_word_ff(struct map_info *map)
|
||||
|
||||
if (map_bankwidth(map) < MAP_FF_LIMIT) {
|
||||
int bw = 8 * map_bankwidth(map);
|
||||
r.x[0] = (1 << bw) - 1;
|
||||
r.x[0] = (1UL << bw) - 1;
|
||||
} else {
|
||||
for (i=0; i<map_words(map); i++)
|
||||
r.x[i] = ~0UL;
|
||||
|
||||
Reference in New Issue
Block a user