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, 5 insertions, 5 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index a09e3a7cac4f..02330f3d5a55 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1530,7 +1530,7 @@ static void cp_get_ethtool_stats (struct net_device *dev,
 
         /* begin NIC statistics dump */
         cpw32(StatsAddr + 4, (u64)dma >> 32);
-        cpw32(StatsAddr, ((u64)dma & DMA_32BIT_MASK) | DumpStats);
+        cpw32(StatsAddr, ((u64)dma & DMA_BIT_MASK(32)) | DumpStats);
         cpr32(StatsAddr);
 
         for (i = 0; i < 1000; i++) {
@@ -1929,19 +1929,19 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* Configure DMA attributes. */
         if ((sizeof(dma_addr_t) > 4) &&
-            !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) &&
-            !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+            !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
         } else {
                 pci_using_dac = 0;
 
-                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         dev_err(&pdev->dev,
                                    "No usable DMA configuration, aborting.\n");
                         goto err_out_res;
                 }
-                rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         dev_err(&pdev->dev,
                                    "No usable consistent DMA configuration, "