diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-14 08:59:50 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-14 08:59:50 +0100 |
| commit | d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 (patch) | |
| tree | f4418610996064cab63600ca093de65356dcdfde /drivers/video/cfbcopyarea.c | |
| parent | Pull 5165 into release branch (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6 (diff) | |
| download | linux-d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997.tar.xz linux-d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997.zip | |
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 cdc71572cf35..74415325b016 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 |