Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6

[linux-2.6-omap-h63xx.git] / drivers / parisc / iosapic.c

diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 7a57c1b8373f04438a996f05242c8070651c481b..a39fbfef789a9ad6783d4da67f47eef6b4eb2d68 100644 (file)
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -244,7 +244,7 @@ static struct irt_entry *iosapic_alloc_irt(int num_entries)
         * 4-byte alignment on 32-bit kernels
         */
        a = (unsigned long)kmalloc(sizeof(struct irt_entry) * num_entries + 8, GFP_KERNEL);
-       a = (a + 7) & ~7;
+       a = (a + 7UL) & ~7UL;
        return (struct irt_entry *)a;
 }