diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-15 10:03:32 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-15 11:25:50 +0200 |
| commit | 0f582bc1f2cccacd613c411fbea55873d17c3429 (patch) | |
| tree | 83fc9e579bb520a876ffd75910861c811a0eac14 /arch/powerpc | |
| parent | powerpc: Use 64k pages without needing cache-inhibited large pages (diff) | |
| download | linux-0f582bc1f2cccacd613c411fbea55873d17c3429.tar.xz linux-0f582bc1f2cccacd613c411fbea55873d17c3429.zip | |
powerpc: Simplify push_end definition in pci_32.c
The push_end macro in arch/powerpc/kernel/pci_32.c uses integer
division and multiplication to achieve the effect of rounding a
resource end address up and then advancing it to the end of a
power-of-2 sized region. This changes it to an equivalent computation
that only needs an integer add and OR. This is partly based on an
earlier patch by Mel Gorman.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/pci_32.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index b129d2e4b759..c858eb4bef17 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c @@ -1113,9 +1113,10 @@ check_for_io_childs(struct pci_bus *bus, struct resource* res, int *found_vga) int i; int rc = 0; -#define push_end(res, size) do { unsigned long __sz = (size) ; \ - res->end = ((res->end + __sz) / (__sz + 1)) * (__sz + 1) + __sz; \ - } while (0) +#define push_end(res, mask) do { \ + BUG_ON((mask+1) & mask); \ + res->end = (res->end + mask) | mask; \ +} while (0) list_for_each_entry(dev, &bus->devices, bus_list) { u16 class = dev->class >> 8; |