linux-next: Tree for February 9

linux-next: Tree for February 9

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 8187 bytes --]

Hi all,

[I accidentally deleted the merge and quilt-import logs today :-( - I
wonder if any would have noticed :-).  The merge summary still appears
below.]

Changes since 20090206:

New tree:
	aoe

Undropped trees:
	ide
	security-testing

Dropped trees (temporarily):
	quota (build problem)
	audit (difficult conflicts)

Linus' tree has a build failure for (at least) powerpc allyesconfig in
btrfs.

The tip-core tree lost its conflict, but gained a conflict against each of
Linus' and the x86 trees.

The net tree lost its 2 conflicts.

The rr tree gained 2 conflicts against the x86 tree.

The kmemcheck tree lost a conflict.

The security-testing tree lost its conflict and build failure.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig,
ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 133 trees (counting Linus' and 18 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
CONFLICT (content): Merge conflict in drivers/char/tty_audit.c
CONFLICT (content): Merge conflict in kernel/auditsc.c
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
CONFLICT (content): Merge conflict in arch/arm/configs/magician_defconfig
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/setup.h
CONFLICT (content): Merge conflict in fs/btrfs/locking.c
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
$ git reset --hard HEAD^
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree.
CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree.
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
$ git rm -f arch/x86/include/asm/es7000/apic.h
$ git rm -f arch/x86/include/asm/numaq/apic.h
Applying: rr: fixup for cpumask:remove-address-of-CPU_MASK_ALL
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in mm/Makefile
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in include/linux/dma_remapping.h
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging quilt/staging
Merging scsi-post-merge/master

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: Tree for February 9 (infiniband)

[Randy Dunlap]

Stephen Rothwell wrote:
> Hi all,
> 
> [I accidentally deleted the merge and quilt-import logs today :-( - I
> wonder if any would have noticed :-).  The merge summary still appears
> below.]
> 
> Changes since 20090206:


allyesconfig build on i386 fails with:

drivers/built-in.o: In function `iwch_sgl2pbl_map':
/usr/builds/linux-next-20090209/drivers/infiniband/hw/cxgb3/iwch_qp.c:237: undefined reference to `__umoddi3'
make: *** [.tmp_vmlinux1] Error 1


or allmodconfig on i386 fails with:

ERROR: "__umoddi3" [drivers/infiniband/hw/cxgb3/iw_cxgb3.ko] undefined!

-- 
~Randy

[ofa-general] Re: linux-next: Tree for February 9 (infiniband)

[Randy Dunlap]

Stephen Rothwell wrote:
> Hi all,
> 
> [I accidentally deleted the merge and quilt-import logs today :-( - I
> wonder if any would have noticed :-).  The merge summary still appears
> below.]
> 
> Changes since 20090206:


allyesconfig build on i386 fails with:

drivers/built-in.o: In function `iwch_sgl2pbl_map':
/usr/builds/linux-next-20090209/drivers/infiniband/hw/cxgb3/iwch_qp.c:237: undefined reference to `__umoddi3'
make: *** [.tmp_vmlinux1] Error 1


or allmodconfig on i386 fails with:

ERROR: "__umoddi3" [drivers/infiniband/hw/cxgb3/iw_cxgb3.ko] undefined!

-- 
~Randy

Re: linux-next: Tree for February 9 (infiniband)

[Steve Wise]

Randy Dunlap wrote:
> Stephen Rothwell wrote:
>   
>> Hi all,
>>
>> [I accidentally deleted the merge and quilt-import logs today :-( - I
>> wonder if any would have noticed :-).  The merge summary still appears
>> below.]
>>
>> Changes since 20090206:
>>     
>
>
> allyesconfig build on i386 fails with:
>
> drivers/built-in.o: In function `iwch_sgl2pbl_map':
> /usr/builds/linux-next-20090209/drivers/infiniband/hw/cxgb3/iwch_qp.c:237: undefined reference to `__umoddi3'
> make: *** [.tmp_vmlinux1] Error 1
>
>
> or allmodconfig on i386 fails with:
>
> ERROR: "__umoddi3" [drivers/infiniband/hw/cxgb3/iw_cxgb3.ko] undefined!
>
>   

Somehow changing offset to a u64 must have caused this.  What is 
__umoddi3?  (it can't be good) :)

Steve

Re: linux-next: Tree for February 9 (infiniband)

[Randy Dunlap]

Steve Wise wrote:
> Randy Dunlap wrote:
>> Stephen Rothwell wrote:
>>  
>>> Hi all,
>>>
>>> [I accidentally deleted the merge and quilt-import logs today :-( - I
>>> wonder if any would have noticed :-).  The merge summary still appears
>>> below.]
>>>
>>> Changes since 20090206:
>>>     
>>
>>
>> allyesconfig build on i386 fails with:
>>
>> drivers/built-in.o: In function `iwch_sgl2pbl_map':
>> /usr/builds/linux-next-20090209/drivers/infiniband/hw/cxgb3/iwch_qp.c:237:
>> undefined reference to `__umoddi3'
>> make: *** [.tmp_vmlinux1] Error 1
>>
>>
>> or allmodconfig on i386 fails with:
>>
>> ERROR: "__umoddi3" [drivers/infiniband/hw/cxgb3/iw_cxgb3.ko] undefined!
>>
>>   
> 
> Somehow changing offset to a u64 must have caused this.  What is
> __umoddi3?  (it can't be good) :)

It's some kind of mod operation, like 64-bit % 32-bit or
64-bit % 64-bit.  Should be in a fairly recent change.


-- 
~Randy

[ofa-general] Re: linux-next: Tree for February 9 (infiniband)

[Randy Dunlap]

Steve Wise wrote:
> Randy Dunlap wrote:
>> Stephen Rothwell wrote:
>>  
>>> Hi all,
>>>
>>> [I accidentally deleted the merge and quilt-import logs today :-( - I
>>> wonder if any would have noticed :-).  The merge summary still appears
>>> below.]
>>>
>>> Changes since 20090206:
>>>     
>>
>>
>> allyesconfig build on i386 fails with:
>>
>> drivers/built-in.o: In function `iwch_sgl2pbl_map':
>> /usr/builds/linux-next-20090209/drivers/infiniband/hw/cxgb3/iwch_qp.c:237:
>> undefined reference to `__umoddi3'
>> make: *** [.tmp_vmlinux1] Error 1
>>
>>
>> or allmodconfig on i386 fails with:
>>
>> ERROR: "__umoddi3" [drivers/infiniband/hw/cxgb3/iw_cxgb3.ko] undefined!
>>
>>   
> 
> Somehow changing offset to a u64 must have caused this.  What is
> __umoddi3?  (it can't be good) :)

It's some kind of mod operation, like 64-bit % 32-bit or
64-bit % 64-bit.  Should be in a fairly recent change.


-- 
~Randy

Re: linux-next: Tree for February 9 (ide-dma)

[Randy Dunlap]

Stephen Rothwell wrote:
> Hi all,
> 
> [I accidentally deleted the merge and quilt-import logs today :-( - I
> wonder if any would have noticed :-).  The merge summary still appears
> below.]
> 
> Changes since 20090206:
> 
> New tree:
> 	aoe
> 
> Undropped trees:
> 	ide


When CONFIG_BLK_DEV_IDEDMA=n:

drivers/ide/ide-taskfile.c:104: error: implicit declaration of function 'ide_build_sglist'

-- 
~Randy

Re: linux-next: Tree for February 9 (ide-dma)

[Bartlomiej Zolnierkiewicz]

On Monday 09 February 2009, Randy Dunlap wrote:
> Stephen Rothwell wrote:
> > Hi all,
> > 
> > [I accidentally deleted the merge and quilt-import logs today :-( - I
> > wonder if any would have noticed :-).  The merge summary still appears
> > below.]
> > 
> > Changes since 20090206:
> > 
> > New tree:
> > 	aoe
> > 
> > Undropped trees:
> > 	ide
> 
> 
> When CONFIG_BLK_DEV_IDEDMA=n:
> 
> drivers/ide/ide-taskfile.c:104: error: implicit declaration of function 'ide_build_sglist'

Thanks.  Should be fixed with new revision of the guilty patch
(fix part is in <linux/ide.h> chunk):

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] ide: call ide_build_sglist() prior to ->dma_setup (v2)

* Re-map sg table if needed in ide_build_sglist().

* Move ide_build_sglist() call from ->dma_setup to its users.

* Un-export ide_build_sglist().

v2:
* Build fix for CONFIG_BLK_DEV_IDEDMA=n (noticed by Randy Dunlap).

There should be no functional changes caused by this patch.

Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/au1xxx-ide.c   |    7 +------
 drivers/ide/icside.c       |    6 ------
 drivers/ide/ide-atapi.c    |   19 ++++++++++++++-----
 drivers/ide/ide-dma-sff.c  |    4 ----
 drivers/ide/ide-dma.c      |    9 ++++++---
 drivers/ide/ide-taskfile.c |    1 +
 drivers/ide/pmac.c         |    7 +------
 drivers/ide/sgiioc4.c      |   10 ++--------
 drivers/ide/tx4939ide.c    |    4 ----
 include/linux/ide.h        |    2 ++
 10 files changed, 27 insertions(+), 42 deletions(-)

Index: b/drivers/ide/au1xxx-ide.c
===================================================================
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -211,21 +211,16 @@ static void auide_set_dma_mode(ide_drive
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
 static int auide_build_dmatable(ide_drive_t *drive)
 {
-	int i, iswrite, count = 0;
 	ide_hwif_t *hwif = drive->hwif;
 	struct request *rq = hwif->rq;
 	_auide_hwif *ahwif = &auide_hwif;
 	struct scatterlist *sg;
+	int i = hwif->sg_nents, iswrite, count = 0;
 
 	iswrite = (rq_data_dir(rq) == WRITE);
 	/* Save for interrupt context */
 	ahwif->drive = drive;
 
-	hwif->sg_nents = i = ide_build_sglist(drive, rq);
-
-	if (!i)
-		return 0;
-
 	/* fill the descriptors */
 	sg = hwif->sg_table;
 	while (i && sg_dma_len(sg)) {
Index: b/drivers/ide/icside.c
===================================================================
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -325,12 +325,6 @@ static int icside_dma_setup(ide_drive_t 
 	 */
 	BUG_ON(dma_channel_active(ec->dma));
 
-	hwif->sg_nents = ide_build_sglist(drive, rq);
-	if (hwif->sg_nents == 0) {
-		ide_map_sg(drive, rq);
-		return 1;
-	}
-
 	/*
 	 * Ensure that we have the right interrupt routed.
 	 */
Index: b/drivers/ide/ide-atapi.c
===================================================================
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -619,18 +619,23 @@ ide_startstop_t ide_issue_pc(ide_drive_t
 	struct ide_atapi_pc *pc;
 	ide_hwif_t *hwif = drive->hwif;
 	ide_expiry_t *expiry = NULL;
+	struct request *rq = hwif->rq;
 	unsigned int timeout;
 	u32 tf_flags;
 	u16 bcount;
 
 	if (dev_is_idecd(drive)) {
 		tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
-		bcount = ide_cd_get_xferlen(hwif->rq);
+		bcount = ide_cd_get_xferlen(rq);
 		expiry = ide_cd_expiry;
 		timeout = ATAPI_WAIT_PC;
 
-		if (drive->dma)
-			drive->dma = !hwif->dma_ops->dma_setup(drive);
+		if (drive->dma) {
+			if (ide_build_sglist(drive, rq))
+				drive->dma = !hwif->dma_ops->dma_setup(drive);
+			else
+				drive->dma = 0;
+		}
 	} else {
 		pc = drive->pc;
 
@@ -649,8 +654,12 @@ ide_startstop_t ide_issue_pc(ide_drive_t
 		}
 
 		if ((pc->flags & PC_FLAG_DMA_OK) &&
-		     (drive->dev_flags & IDE_DFLAG_USING_DMA))
-			drive->dma = !hwif->dma_ops->dma_setup(drive);
+		     (drive->dev_flags & IDE_DFLAG_USING_DMA)) {
+			if (ide_build_sglist(drive, rq))
+				drive->dma = !hwif->dma_ops->dma_setup(drive);
+			else
+				drive->dma = 0;
+		}
 
 		if (!drive->dma)
 			pc->flags &= ~PC_FLAG_DMA_OK;
Index: b/drivers/ide/ide-dma-sff.c
===================================================================
--- a/drivers/ide/ide-dma-sff.c
+++ b/drivers/ide/ide-dma-sff.c
@@ -120,10 +120,6 @@ int ide_build_dmatable(ide_drive_t *driv
 	struct scatterlist *sg;
 	u8 is_trm290 = !!(hwif->host_flags & IDE_HFLAG_TRM290);
 
-	hwif->sg_nents = ide_build_sglist(drive, rq);
-	if (hwif->sg_nents == 0)
-		return 0;
-
 	for_each_sg(hwif->sg_table, sg, hwif->sg_nents, i) {
 		u32 cur_addr, cur_len, xcount, bcount;
 
Index: b/drivers/ide/ide-dma.c
===================================================================
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -128,6 +128,7 @@ int ide_build_sglist(ide_drive_t *drive,
 {
 	ide_hwif_t *hwif = drive->hwif;
 	struct scatterlist *sg = hwif->sg_table;
+	int i;
 
 	ide_map_sg(drive, rq);
 
@@ -136,10 +137,12 @@ int ide_build_sglist(ide_drive_t *drive,
 	else
 		hwif->sg_dma_direction = DMA_TO_DEVICE;
 
-	return dma_map_sg(hwif->dev, sg, hwif->sg_nents,
-			  hwif->sg_dma_direction);
+	i = dma_map_sg(hwif->dev, sg, hwif->sg_nents, hwif->sg_dma_direction);
+	if (i == 0)
+		ide_map_sg(drive, rq);
+
+	return i;
 }
-EXPORT_SYMBOL_GPL(ide_build_sglist);
 
 /**
  *	ide_destroy_dmatable	-	clean up DMA mapping
Index: b/drivers/ide/ide-taskfile.c
===================================================================
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -103,6 +103,7 @@ ide_startstop_t do_rw_taskfile (ide_driv
 		return ide_started;
 	default:
 		if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 ||
+		    ide_build_sglist(drive, hwif->rq) == 0 ||
 		    dma_ops->dma_setup(drive))
 			return ide_stopped;
 		dma_ops->dma_exec_cmd(drive, tf->command);
Index: b/drivers/ide/pmac.c
===================================================================
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -1429,10 +1429,10 @@ pmac_ide_build_dmatable(ide_drive_t *dri
 	pmac_ide_hwif_t *pmif =
 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
 	struct dbdma_cmd *table;
-	int i, count = 0;
 	volatile struct dbdma_regs __iomem *dma = pmif->dma_regs;
 	struct scatterlist *sg;
 	int wr = (rq_data_dir(rq) == WRITE);
+	int i = hwif->sg_nents, count = 0;
 
 	/* DMA table is already aligned */
 	table = (struct dbdma_cmd *) pmif->dma_table_cpu;
@@ -1442,11 +1442,6 @@ pmac_ide_build_dmatable(ide_drive_t *dri
 	while (readl(&dma->status) & RUN)
 		udelay(1);
 
-	hwif->sg_nents = i = ide_build_sglist(drive, rq);
-
-	if (!i)
-		return 0;
-
 	/* Build DBDMA commands list */
 	sg = hwif->sg_table;
 	while (i && sg_dma_len(sg)) {
Index: b/drivers/ide/sgiioc4.c
===================================================================
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -429,15 +429,9 @@ sgiioc4_build_dma_table(ide_drive_t * dr
 {
 	ide_hwif_t *hwif = drive->hwif;
 	unsigned int *table = hwif->dmatable_cpu;
-	unsigned int count = 0, i = 1;
-	struct scatterlist *sg;
+	unsigned int count = 0, i = hwif->sg_nents;
+	struct scatterlist *sg = hwif->sg_table;
 
-	hwif->sg_nents = i = ide_build_sglist(drive, rq);
-
-	if (!i)
-		return 0;	/* sglist of length Zero */
-
-	sg = hwif->sg_table;
 	while (i && sg_dma_len(sg)) {
 		dma_addr_t cur_addr;
 		int cur_len;
Index: b/drivers/ide/tx4939ide.c
===================================================================
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -240,10 +240,6 @@ static int tx4939ide_build_dmatable(ide_
 	int i;
 	struct scatterlist *sg;
 
-	hwif->sg_nents = ide_build_sglist(drive, rq);
-	if (hwif->sg_nents == 0)
-		return 0;
-
 	for_each_sg(hwif->sg_table, sg, hwif->sg_nents, i) {
 		u32 cur_addr, cur_len, bcount;
 
Index: b/include/linux/ide.h
===================================================================
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1474,6 +1474,8 @@ static inline int ide_set_dma(ide_drive_
 static inline void ide_check_dma_crc(ide_drive_t *drive) { ; }
 static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) { return ide_stopped; }
 static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; }
+static inline int ide_build_sglist(ide_drive_t *drive,
+				   struct request *rq) { return 0; }
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 
 #ifdef CONFIG_BLK_DEV_IDEACPI

[PATCH -next] alpha: fix link error re stacktrace

[Alexey Dobriyan]

Please, fold this into 32c0bd9624115041cfec31c0436995418083090a
"blktrace: the ftrace interface needs CONFIG_TRACING"
to fix link error on alpha (which doesn't implenent stacktrace support)

--- a/block/Kconfig
+++ b/block/Kconfig
@@ -51,7 +51,7 @@ config BLK_DEV_IO_TRACE
 	select DEBUG_FS
 	select TRACEPOINTS
 	select TRACING
-	select STACKTRACE
+	select STACKTRACE if STACKTRACE_SUPPORT
 	help
 	  Say Y here if you want to be able to trace the block layer actions
 	  on a given queue. Tracing allows you to see any traffic happening

Re: linux-next: Tree for February 9 (ide-dma)

[Randy Dunlap]

Bartlomiej Zolnierkiewicz wrote:
> On Monday 09 February 2009, Randy Dunlap wrote:
>> Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> [I accidentally deleted the merge and quilt-import logs today :-( - I
>>> wonder if any would have noticed :-).  The merge summary still appears
>>> below.]
>>>
>>> Changes since 20090206:
>>>
>>> New tree:
>>> 	aoe
>>>
>>> Undropped trees:
>>> 	ide
>>
>> When CONFIG_BLK_DEV_IDEDMA=n:
>>
>> drivers/ide/ide-taskfile.c:104: error: implicit declaration of function 'ide_build_sglist'
> 
> Thanks.  Should be fixed with new revision of the guilty patch
> (fix part is in <linux/ide.h> chunk):

Ack.  That works.  Thanks.

> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Subject: [PATCH] ide: call ide_build_sglist() prior to ->dma_setup (v2)
> 
> * Re-map sg table if needed in ide_build_sglist().
> 
> * Move ide_build_sglist() call from ->dma_setup to its users.
> 
> * Un-export ide_build_sglist().
> 
> v2:
> * Build fix for CONFIG_BLK_DEV_IDEDMA=n (noticed by Randy Dunlap).
> 
> There should be no functional changes caused by this patch.
> 
> Cc: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>


> Index: b/include/linux/ide.h
> ===================================================================
> --- a/include/linux/ide.h
> +++ b/include/linux/ide.h
> @@ -1474,6 +1474,8 @@ static inline int ide_set_dma(ide_drive_
>  static inline void ide_check_dma_crc(ide_drive_t *drive) { ; }
>  static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) { return ide_stopped; }
>  static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; }
> +static inline int ide_build_sglist(ide_drive_t *drive,
> +				   struct request *rq) { return 0; }
>  #endif /* CONFIG_BLK_DEV_IDEDMA */
>  
>  #ifdef CONFIG_BLK_DEV_IDEACPI
> 
> 
> 
> 


-- 
~Randy

Re: [PATCH -next] alpha: fix link error re stacktrace

[Arnaldo Carvalho de Melo]

Em Tue, Feb 10, 2009 at 12:38:36AM +0300, Alexey Dobriyan escreveu:
> Please, fold this into 32c0bd9624115041cfec31c0436995418083090a
> "blktrace: the ftrace interface needs CONFIG_TRACING"
> to fix link error on alpha (which doesn't implenent stacktrace support)
> 
> --- a/block/Kconfig
> +++ b/block/Kconfig
> @@ -51,7 +51,7 @@ config BLK_DEV_IO_TRACE
>  	select DEBUG_FS
>  	select TRACEPOINTS
>  	select TRACING
> -	select STACKTRACE
> +	select STACKTRACE if STACKTRACE_SUPPORT
>  	help
>  	  Say Y here if you want to be able to trace the block layer actions
>  	  on a given queue. Tracing allows you to see any traffic happening

Well, with 51a763dd84253bab1d0a1e68e11a7753d1b702ca this can as well be
reverted :-)

- Arnaldo

Re: [PATCH -next] alpha: fix link error re stacktrace

[Ingo Molnar]

* Alexey Dobriyan <adobriyan@gmail.com> wrote:

> Please, fold this into 32c0bd9624115041cfec31c0436995418083090a
> "blktrace: the ftrace interface needs CONFIG_TRACING"
> to fix link error on alpha (which doesn't implenent stacktrace support)
> 
> --- a/block/Kconfig
> +++ b/block/Kconfig
> @@ -51,7 +51,7 @@ config BLK_DEV_IO_TRACE
>  	select DEBUG_FS
>  	select TRACEPOINTS
>  	select TRACING
> -	select STACKTRACE
> +	select STACKTRACE if STACKTRACE_SUPPORT
>  	help
>  	  Say Y here if you want to be able to trace the block layer actions
>  	  on a given queue. Tracing allows you to see any traffic happening

This didnt apply to the latest tracing tree due to other, interacting changes - i 
have applied the commit below - thanks Alexey!

	Ingo

----------------->
>From 510223da040cb7a7d6f524b12eeed03b3845aea1 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue, 10 Feb 2009 00:38:36 +0300
Subject: [PATCH] alpha: fix link error re stacktrace

Fix link error on alpha (which doesn't implenent stacktrace support).

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 kernel/trace/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 3a33128..79be773 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -310,7 +310,7 @@ config BLK_DEV_IO_TRACE
 	select DEBUG_FS
 	select TRACEPOINTS
 	select TRACING
-	select STACKTRACE
+	select STACKTRACE if STACKTRACE_SUPPORT
 	help
 	  Say Y here if you want to be able to trace the block layer actions
 	  on a given queue. Tracing allows you to see any traffic happening

Re: [PATCH -next] alpha: fix link error re stacktrace

[Ingo Molnar]

* Arnaldo Carvalho de Melo <acme@redhat.com> wrote:

> Em Tue, Feb 10, 2009 at 12:38:36AM +0300, Alexey Dobriyan escreveu:
> > Please, fold this into 32c0bd9624115041cfec31c0436995418083090a
> > "blktrace: the ftrace interface needs CONFIG_TRACING"
> > to fix link error on alpha (which doesn't implenent stacktrace support)
> > 
> > --- a/block/Kconfig
> > +++ b/block/Kconfig
> > @@ -51,7 +51,7 @@ config BLK_DEV_IO_TRACE
> >  	select DEBUG_FS
> >  	select TRACEPOINTS
> >  	select TRACING
> > -	select STACKTRACE
> > +	select STACKTRACE if STACKTRACE_SUPPORT
> >  	help
> >  	  Say Y here if you want to be able to trace the block layer actions
> >  	  on a given queue. Tracing allows you to see any traffic happening
> 
> Well, with 51a763dd84253bab1d0a1e68e11a7753d1b702ca this can as well be
> reverted :-)

ok, done - thanks Arnaldo!

	Ingo