diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 11:36:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 11:36:18 -0500 |
| commit | d22a8ccff761c81f2930bd90fa5712e51a0e9a62 (patch) | |
| tree | 52a92cf1b9a65e4440276706c4b4e879d4008a87 /drivers/video/cfbcopyarea.c | |
| parent | 783e3385a134305d49d7b431df6e591265e7ec14 (diff) | |
| parent | 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 (diff) | |
Merge branch 'upstream-fixes'
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 |