Merge commit 'v2.6.30-rc1' into perfcounters/core

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 437683aab32c..6a736dda3ee2 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4975,7 +4975,7 @@ static inline int tg3_40bit_overflow_test(struct tg3 *tp, dma_addr_t mapping,
 {
 #if defined(CONFIG_HIGHMEM) && (BITS_PER_LONG == 64)
         if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG)
-                return (((u64) mapping + len) > DMA_40BIT_MASK);
+                return (((u64) mapping + len) > DMA_BIT_MASK(40));
         return 0;
 #else
         return 0;
@@ -13228,17 +13228,17 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
          * do DMA address check in tg3_start_xmit().
          */
         if (tp->tg3_flags2 & TG3_FLG2_IS_5788)
-                persist_dma_mask = dma_mask = DMA_32BIT_MASK;
+                persist_dma_mask = dma_mask = DMA_BIT_MASK(32);
         else if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG) {
-                persist_dma_mask = dma_mask = DMA_40BIT_MASK;
+                persist_dma_mask = dma_mask = DMA_BIT_MASK(40);
 #ifdef CONFIG_HIGHMEM
-                dma_mask = DMA_64BIT_MASK;
+                dma_mask = DMA_BIT_MASK(64);
 #endif
         } else
-                persist_dma_mask = dma_mask = DMA_64BIT_MASK;
+                persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
 
         /* Configure DMA attributes. */
-        if (dma_mask > DMA_32BIT_MASK) {
+        if (dma_mask > DMA_BIT_MASK(32)) {
                 err = pci_set_dma_mask(pdev, dma_mask);
                 if (!err) {
                         dev->features |= NETIF_F_HIGHDMA;
@@ -13251,8 +13251,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                         }
                 }
         }
-        if (err || dma_mask == DMA_32BIT_MASK) {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        if (err || dma_mask == DMA_BIT_MASK(32)) {
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         printk(KERN_ERR PFX "No usable DMA configuration, "
                                "aborting.\n");
@@ -13393,8 +13393,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) != 0);
         printk(KERN_INFO "%s: dma_rwctrl[%08x] dma_mask[%d-bit]\n",
                dev->name, tp->dma_rwctrl,
-               (pdev->dma_mask == DMA_32BIT_MASK) ? 32 :
-                (((u64) pdev->dma_mask == DMA_40BIT_MASK) ? 40 : 64));
+               (pdev->dma_mask == DMA_BIT_MASK(32)) ? 32 :
+                (((u64) pdev->dma_mask == DMA_BIT_MASK(40)) ? 40 : 64));
 
         return 0;