diff options
author | Len Brown <len.brown@intel.com> | 2005-12-14 02:59:50 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-12-14 02:59:50 -0500 |
commit | d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 (patch) | |
tree | f4418610996064cab63600ca093de65356dcdfde /drivers/video/cfbcopyarea.c | |
parent | 927fe18397b3b1194a5b26b1d388d97e391e5fd2 (diff) | |
parent | acd9b7b4e08a3f0f48afa922d8e371414cf2d3b2 (diff) |
Auto-update from upstream
Diffstat (limited to 'drivers/video/cfbcopyarea.c')
-rw-r--r-- | drivers/video/cfbcopyarea.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c index cdc71572cf3..74415325b01 100644 --- a/drivers/video/cfbcopyarea.c +++ b/drivers/video/cfbcopyarea.c @@ -64,8 +64,8 @@ bitcpy(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem *src int const shift = dst_idx-src_idx; int left, right; - first = ~0UL >> dst_idx; - last = ~(~0UL >> ((dst_idx+n) % bits)); + first = FB_SHIFT_HIGH(~0UL, dst_idx); + last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits)); if (!shift) { // Same alignment for source and dest @@ -216,8 +216,8 @@ bitcpy_rev(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem shift = dst_idx-src_idx; - first = ~0UL << (bits - 1 - dst_idx); - last = ~(~0UL << (bits - 1 - ((dst_idx-n) % bits))); + first = FB_SHIFT_LOW(~0UL, bits - 1 - dst_idx); + last = ~(FB_SHIFT_LOW(~0UL, bits - 1 - ((dst_idx-n) % bits))); if (!shift) { // Same alignment for source and dest |