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

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index efe29924e058..e4fdcdad80d0 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1176,10 +1176,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
         /* Assume a 32bit DMA mask. */
         ha->flags.enable_64bit_addressing = 0;
 
-        if (!dma_set_mask(&ha->pdev->dev, DMA_64BIT_MASK)) {
+        if (!dma_set_mask(&ha->pdev->dev, DMA_BIT_MASK(64))) {
                 /* Any upper-dword bits set? */
                 if (MSD(dma_get_required_mask(&ha->pdev->dev)) &&
-                    !pci_set_consistent_dma_mask(ha->pdev, DMA_64BIT_MASK)) {
+                    !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
                         /* Ok, a 64bit DMA mask is applicable. */
                         ha->flags.enable_64bit_addressing = 1;
                         ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
@@ -1188,8 +1188,8 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
                 }
         }
 
-        dma_set_mask(&ha->pdev->dev, DMA_32BIT_MASK);
-        pci_set_consistent_dma_mask(ha->pdev, DMA_32BIT_MASK);
+        dma_set_mask(&ha->pdev->dev, DMA_BIT_MASK(32));
+        pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(32));
 }
 
 static void