lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'core/softlockup', 'core/softirq', 'core/resources', 'core/printk' and 'core/misc' into core-v28-for-linus

Browse Source
This commit is contained in:
Ingo Molnar
2008-10-15 12:48:44 +02:00
parent 278429cff8 3b7ecb5d2f 77af7e3403 15160716ee 1fa63a817d 8546232355
commit 6b2ada8210
26 changed files with 144 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pci/setup-bus.c
View File

@@ -378,11 +378,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long
align = 0;
min_align = 0;
for (order = 0; order <= max_order; order++) {
#ifdef CONFIG_RESOURCES_64BIT
resource_size_t align1 = 1ULL << (order + 20);
#else
resource_size_t align1 = 1U << (order + 20);
#endif
resource_size_t align1 = 1;
align1 <<= (order + 20);
if (!align)
min_align = align1;
else if (ALIGN(align + min_align, min_align) < align1)