linux-next: Tree for February 12
Subsystems (8)
Hi all,
Changes since 20090211:
The net tree gained 2 conflicts against the net-current tree.
The kmemcheck tree gained 2 conflicts against the x86 tree.
The wireless tree gained a build failure that caused me to revert several of its commits.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://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.
Signature · 180 lines
Cheers, Stephen Rothwell [email protected] $ 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 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 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 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 CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c Merging mtd/master Merging wireless/master Merging crypto/master Merging vfs/for-next Merging sound/for-next CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c 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 arch/x86/include/asm/pgtable_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable_64.h 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 CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_memory.c 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 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 audit/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 Created commit b6349c2: Revert "orinoco: Storage class should be before const qualifier" Created commit ed58c78: Revert "orinoco: hermes doesn't need to be a separate module" Created commit c52856e: Revert "orinoco: hermes_dld does not need to be a module" Created commit ee9a469: Revert "orinoco: Move WEXT handlers into a separate file" Created commit e668502: Revert "orinoco: Move hardware functions into separate file" Created commit d8d7390: Revert "orinoco: Add hardware function to set multicast mode" Created commit 6a4d487: Revert "orinoco: Use accessor functions for bitrate tables" Created commit ecac0c1: Revert "orinoco: Move firmware handling into a separate file" Created commit d2cf8c5: Revert "orinoco: Move MIC helpers into new file"
next-20090212: drivers/watchdog/ks8695_wdt.c:68: error: 'CLOCK_TICK_RATE' undeclared (first use in this function)
On arm-acs5k_tiny:
drivers/watchdog/ks8695_wdt.c:68: error: 'CLOCK_TICK_RATE' undeclared (first use in this function)
drivers/watchdog/ks8695_wdt.c +1 -0
@@ -21,6 +21,7 @@#include <linux/watchdog.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <mach/timex.h> #include <mach/regs-timer.h> #define WDT_DEFAULT_TIME 5/* seconds */
Re: linux-next: Tree for February 12 (ide)
In reply to Stephen RothwellQuoted 3 lines · Stephen Rothwell
Hi all,
Changes since 20090211:
When
# CONFIG_BLK_DEV_IDEDMA is not set
linux-next-20090212/drivers/ide/ide-taskfile.c:108: error: 'ide_dma_intr' undeclared (first use in this function)
Signature · 1 line
~Randy
Re: linux-next: Tree for February 12 (ide)
Quoted 10 lines · Randy Dunlap
Quoted 3 lines · Stephen Rothwell
Hi all,
Changes since 20090211:
When
#CONFIG_BLK_DEV_IDEDMAis not set
linux-next-20090212/drivers/ide/ide-taskfile.c:108: error: 'ide_dma_intr' undeclared (first use in this function)
Thanks for spotting this, I fixed it in the revised patch:
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2)
* Rename dma_timer_expiry() to ide_dma_sff_timer_expiry() and export it.
* Add ->dma_timer_expiry method and use it to set hwif->expiry for ATA_PROT_DMA protocol in do_rw_taskfile().
* Initialize ->dma_timer_expiry to ide_dma_sff_timer_expiry() for SFF hosts.
* Move setting hwif->expiry from ide_execute_command() to its users and drop 'expiry' argument.
* Use ide_execute_command() instead of ->dma_exec_cmd in do_rw_taskfile().
* Remove ->dma_exec_cmd method and its implementations.
* Unexport ide_execute_command() and ide_dma_intr().
v2:
* Fix CONFIG_BLK_DEV_IDEDMA=n build (noticed by Randy Dunlap).
* Fix *dma_expiry naming (suggested by Sergei Shtylyov).
There should be no functional changes caused by this patch.
--- drivers/ide/alim15x3.c | 2 +- drivers/ide/au1xxx-ide.c | 8 -------- drivers/ide/cmd64x.c | 6 +++--- drivers/ide/cs5536.c | 2 +- drivers/ide/hpt366.c | 6 +++--- drivers/ide/icside.c | 7 ------- drivers/ide/ide-atapi.c | 3 ++- drivers/ide/ide-dma-sff.c | 15 ++++----------- drivers/ide/ide-dma.c | 1 - drivers/ide/ide-iops.c | 6 +----- drivers/ide/ide-taskfile.c | 6 ++++-- drivers/ide/it821x.c | 2 +- drivers/ide/ns87415.c | 2 +- drivers/ide/pdc202xx_old.c | 4 ++-- drivers/ide/pmac.c | 8 -------- drivers/ide/sc1200.c | 2 +- drivers/ide/scc_pata.c | 2 +- drivers/ide/siimage.c | 2 +- drivers/ide/sl82c105.c | 2 +- drivers/ide/tc86c001.c | 2 +- drivers/ide/trm290.c | 6 ------ drivers/ide/tx4939ide.c | 2 +- include/linux/ide.h | 8 ++++---- 23 files changed, 33 insertions(+), 71 deletions(-)
drivers/ide/alim15x3.c +1 -1
@@ -504,11 +504,11 @@ static const struct ide_port_ops ali_porstatic const struct ide_dma_ops ali_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ali15x3_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = ide_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
drivers/ide/au1xxx-ide.c +0 -8
@@ -290,13 +290,6 @@ static void auide_dma_start(ide_drive_t } -static void auide_dma_exec_cmd (ide_drive_t *drive,u8 command) -{ -/* issue cmd to drive */ -ide_execute_command (drive, command, &ide_dma_intr, - (2 *WAIT_CMD ),NULL ); -} -static int auide_dma_setup (ide_drive_t *drive,struct ide_cmd *cmd) {if (auide_build_dmatable (drive, cmd) ==0 ) {
@@ -356,7 +349,6 @@ static void auide_init_dbdma_dev(dbdev_tstatic const struct ide_dma_ops au1xxx_dma_ops = { .dma_host_set = auide_dma_host_set, .dma_setup = auide_dma_setup, - .dma_exec_cmd = auide_dma_exec_cmd, .dma_start = auide_dma_start, .dma_end = auide_dma_end, .dma_test_irq = auide_dma_test_irq,
drivers/ide/cmd64x.c +3 -3
@@ -379,11 +379,11 @@ static const struct ide_port_ops cmd64x_static const struct ide_dma_ops cmd64x_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = cmd64x_dma_end, .dma_test_irq = cmd64x_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
@@ -391,11 +391,11 @@ static const struct ide_dma_ops cmd64x_dstatic const struct ide_dma_ops cmd646_rev1_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = cmd646_1_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
@@ -403,11 +403,11 @@ static const struct ide_dma_ops cmd646_rstatic const struct ide_dma_ops cmd648_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = cmd648_dma_end, .dma_test_irq = cmd648_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
drivers/ide/cs5536.c +1 -1
@@ -231,11 +231,11 @@ static const struct ide_port_ops cs5536_static const struct ide_dma_ops cs5536_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = cs5536_dma_start, .dma_end = cs5536_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, };
drivers/ide/hpt366.c +3 -3
@@ -1418,11 +1418,11 @@ static const struct ide_port_ops hpt3xx_static const struct ide_dma_ops hpt37x_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = hpt374_dma_end, .dma_test_irq = hpt374_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
@@ -1430,11 +1430,11 @@ static const struct ide_dma_ops hpt37x_dstatic const struct ide_dma_ops hpt370_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = hpt370_dma_start, .dma_end = hpt370_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = hpt370_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
@@ -1442,11 +1442,11 @@ static const struct ide_dma_ops hpt370_dstatic const struct ide_dma_ops hpt36x_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = ide_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = hpt366_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
drivers/ide/icside.c +0 -7
@@ -351,12 +351,6 @@ static int icside_dma_setup(ide_drive_treturn 0 ; } -static void icside_dma_exec_cmd (ide_drive_t *drive,u8 cmd) -{ -/* issue cmd to drive */ -ide_execute_command (drive, cmd, ide_dma_intr,2 *WAIT_CMD ,NULL ); -} -static int icside_dma_test_irq (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif;
@@ -380,7 +374,6 @@ static int icside_dma_init(ide_hwif_t *hstatic const struct ide_dma_ops icside_v6_dma_ops = { .dma_host_set = icside_dma_host_set, .dma_setup = icside_dma_setup, - .dma_exec_cmd = icside_dma_exec_cmd, .dma_start = icside_dma_start, .dma_end = icside_dma_end, .dma_test_irq = icside_dma_test_irq,
drivers/ide/ide-atapi.c +2 -1
@@ -679,8 +679,9 @@ ide_startstop_t ide_issue_pc(ide_drive_tif (drive->atapi_flags &IDE_AFLAG_DRQ_INTERRUPT ) {if (drive->dma) drive->waiting_for_dma =0 ; + hwif->expiry = expiry;ide_execute_command (drive,ATA_CMD_PACKET , ide_transfer_pc, - timeout, expiry); + timeout);return ide_started; }else {ide_execute_pkt_cmd (drive);
drivers/ide/ide-dma-sff.c +4 -11
@@ -224,7 +224,7 @@ int ide_dma_setup(ide_drive_t *drive, stEXPORT_SYMBOL_GPL (ide_dma_setup);/** -* dma_timer_expiry - handle a DMA timeout +* ide_dma_sff_timer_expiry - handle a DMA timeout * @drive: Drive that timed out * * An IDE DMA transfer timed out. In the event of an error we ask
@@ -237,7 +237,7 @@ EXPORT_SYMBOL_GPL(ide_dma_setup);* This can occur if an interrupt is lost or due to hang or bugs. */ -static int dma_timer_expiry (ide_drive_t *drive) +int ide_dma_sff_timer_expiry (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif;u8 dma_stat = hwif->dma_ops->dma_sff_read_status (hwif);
@@ -261,14 +261,7 @@ static int dma_timer_expiry(ide_drive_treturn 0 ;/* Status is unknown -- reset the bus */ } - -void ide_dma_exec_cmd (ide_drive_t *drive,u8 command) -{ -/* issue cmd to drive */ -ide_execute_command (drive, command, &ide_dma_intr,2 *WAIT_CMD , - dma_timer_expiry); -} -EXPORT_SYMBOL_GPL (ide_dma_exec_cmd); +EXPORT_SYMBOL_GPL (ide_dma_sff_timer_expiry);void ide_dma_start (ide_drive_t *drive) {
@@ -342,10 +335,10 @@ EXPORT_SYMBOL_GPL(ide_dma_test_irq);const struct ide_dma_ops sff_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = ide_dma_end, .dma_test_irq = ide_dma_test_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_lost_irq = ide_dma_lost_irq, .dma_sff_read_status = ide_dma_sff_read_status,
drivers/ide/ide-dma.c +0 -1
@@ -110,7 +110,6 @@ ide_startstop_t ide_dma_intr(ide_drive_t }return ide_error (drive,"dma_intr" , stat); } -EXPORT_SYMBOL_GPL (ide_dma_intr);int ide_dma_good_drive (ide_drive_t *drive) {
drivers/ide/ide-iops.c +1 -5
@@ -454,7 +454,6 @@ EXPORT_SYMBOL(ide_set_handler);* @command: command byte to write * @handler: handler for next phase * @timeout: timeout for command -* @expiry: handler to run on timeout * * Helper function to issue an IDE command. This handles the * atomicity requirements, command timing and ensures that the
@@ -463,13 +462,11 @@ EXPORT_SYMBOL(ide_set_handler);*/ void ide_execute_command (ide_drive_t *drive,u8 cmd,ide_handler_t *handler, -unsigned timeout,ide_expiry_t *expiry) +unsigned timeout) {ide_hwif_t *hwif = drive->hwif;unsigned long flags; - hwif->expiry = expiry; -spin_lock_irqsave (&hwif->lock, flags);__ide_set_handler (drive, handler, timeout); hwif->tp_ops->exec_command (hwif, cmd);
@@ -482,7 +479,6 @@ void ide_execute_command(ide_drive_t *drndelay (400 );spin_unlock_irqrestore (&hwif->lock, flags); } -EXPORT_SYMBOL (ide_execute_command);void ide_execute_pkt_cmd (ide_drive_t *drive) {
drivers/ide/ide-taskfile.c +4 -2
@@ -98,14 +98,16 @@ ide_startstop_t do_rw_taskfile(ide_driveif (handler ==NULL ) handler = task_no_data_intr;ide_execute_command (drive, tf->command, handler, -WAIT_WORSTCASE ,NULL ); +WAIT_WORSTCASE );return ide_started;case ATA_PROT_DMA :if ((drive->dev_flags &IDE_DFLAG_USING_DMA ) ==0 ||ide_build_sglist (drive, cmd) ==0 || dma_ops->dma_setup (drive, cmd))return ide_stopped; - dma_ops->dma_exec_cmd (drive, tf->command); + hwif->expiry = dma_ops->dma_timer_expiry; +ide_execute_command (drive, tf->command, ide_dma_intr, +2 *WAIT_CMD ); dma_ops->dma_start (drive);default :return ide_started;
drivers/ide/it821x.c +1 -1
@@ -509,10 +509,10 @@ static void it821x_quirkproc(ide_drive_tstatic struct ide_dma_ops it821x_pass_through_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = it821x_dma_start, .dma_end = it821x_dma_end, .dma_test_irq = ide_dma_test_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_lost_irq = ide_dma_lost_irq, .dma_sff_read_status = ide_dma_sff_read_status,
drivers/ide/ns87415.c +1 -1
@@ -301,11 +301,11 @@ static const struct ide_port_ops ns87415static const struct ide_dma_ops ns87415_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ns87415_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = ns87415_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = superio_dma_sff_read_status, };
drivers/ide/pdc202xx_old.c +2 -2
@@ -331,11 +331,11 @@ static const struct ide_port_ops pdc2026static const struct ide_dma_ops pdc20246_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = ide_dma_end, .dma_test_irq = pdc202xx_dma_test_irq, .dma_lost_irq = pdc202xx_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = pdc202xx_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
@@ -343,11 +343,11 @@ static const struct ide_dma_ops pdc20246static const struct ide_dma_ops pdc2026x_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = pdc202xx_dma_start, .dma_end = pdc202xx_dma_end, .dma_test_irq = pdc202xx_dma_test_irq, .dma_lost_irq = pdc202xx_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = pdc202xx_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
drivers/ide/pmac.c +0 -8
@@ -1527,13 +1527,6 @@ static int pmac_ide_dma_setup(ide_drive_return 0 ; } -static void -pmac_ide_dma_exec_cmd (ide_drive_t *drive,u8 command) -{ -/* issue cmd to drive */ -ide_execute_command (drive, command, &ide_dma_intr,2 *WAIT_CMD ,NULL ); -} -/* * Kick the DMA controller into life after the DMA command has been issued * to the drive.
@@ -1654,7 +1647,6 @@ pmac_ide_dma_lost_irq (ide_drive_t *drivstatic const struct ide_dma_ops pmac_dma_ops = { .dma_host_set = pmac_ide_dma_host_set, .dma_setup = pmac_ide_dma_setup, - .dma_exec_cmd = pmac_ide_dma_exec_cmd, .dma_start = pmac_ide_dma_start, .dma_end = pmac_ide_dma_end, .dma_test_irq = pmac_ide_dma_test_irq,
drivers/ide/sc1200.c +1 -1
@@ -286,11 +286,11 @@ static const struct ide_port_ops sc1200_static const struct ide_dma_ops sc1200_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = sc1200_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
drivers/ide/scc_pata.c +1 -1
@@ -868,12 +868,12 @@ static const struct ide_port_ops scc_porstatic const struct ide_dma_ops scc_dma_ops = { .dma_host_set = scc_dma_host_set, .dma_setup = scc_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = scc_dma_start, .dma_end = scc_dma_end, .dma_test_irq = scc_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, .dma_timeout = ide_dma_timeout, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_sff_read_status = scc_dma_sff_read_status, };
drivers/ide/siimage.c +1 -1
@@ -711,10 +711,10 @@ static const struct ide_port_ops sil_satstatic const struct ide_dma_ops sil_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = ide_dma_end, .dma_test_irq = siimage_dma_test_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_lost_irq = ide_dma_lost_irq, .dma_sff_read_status = ide_dma_sff_read_status,
drivers/ide/sl82c105.c +1 -1
@@ -293,11 +293,11 @@ static const struct ide_port_ops sl82c10static const struct ide_dma_ops sl82c105_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = sl82c105_dma_start, .dma_end = sl82c105_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = sl82c105_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = sl82c105_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
drivers/ide/tc86c001.c +1 -1
@@ -182,11 +182,11 @@ static const struct ide_port_ops tc86c00static const struct ide_dma_ops tc86c001_dma_ops = { .dma_host_set = ide_dma_host_set, .dma_setup = ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = tc86c001_dma_start, .dma_end = ide_dma_end, .dma_test_irq = ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = ide_dma_sff_read_status, };
drivers/ide/trm290.c +0 -6
@@ -176,11 +176,6 @@ static void trm290_selectproc (ide_drivetrm290_prepare_drive (drive, !!(drive->dev_flags &IDE_DFLAG_USING_DMA )); } -static void trm290_dma_exec_cmd (ide_drive_t *drive,u8 command) -{ -ide_execute_command (drive, command, &ide_dma_intr,WAIT_CMD ,NULL ); -} -static int trm290_dma_setup (ide_drive_t *drive,struct ide_cmd *cmd) {ide_hwif_t *hwif = drive->hwif;
@@ -315,7 +310,6 @@ static const struct ide_port_ops trm290_static struct ide_dma_ops trm290_dma_ops = { .dma_host_set = trm290_dma_host_set, .dma_setup = trm290_dma_setup, - .dma_exec_cmd = trm290_dma_exec_cmd, .dma_start = trm290_dma_start, .dma_end = trm290_dma_end, .dma_test_irq = trm290_dma_test_irq,
drivers/ide/tx4939ide.c +1 -1
@@ -627,11 +627,11 @@ static const struct ide_port_ops tx4939istatic const struct ide_dma_ops tx4939ide_dma_ops = { .dma_host_set = tx4939ide_dma_host_set, .dma_setup = tx4939ide_dma_setup, - .dma_exec_cmd = ide_dma_exec_cmd, .dma_start = ide_dma_start, .dma_end = tx4939ide_dma_end, .dma_test_irq = tx4939ide_dma_test_irq, .dma_lost_irq = ide_dma_lost_irq, + .dma_timer_expiry = ide_dma_sff_timer_expiry, .dma_timeout = ide_dma_timeout, .dma_sff_read_status = tx4939ide_dma_sff_read_status, };
include/linux/ide.h +4 -4
@@ -714,11 +714,11 @@ struct ide_port_ops {struct ide_dma_ops {void (*dma_host_set)(struct ide_drive_s *,int );int (*dma_setup)(struct ide_drive_s *,struct ide_cmd *); -void (*dma_exec_cmd)(struct ide_drive_s *,u8 );void (*dma_start)(struct ide_drive_s *);int (*dma_end)(struct ide_drive_s *);int (*dma_test_irq)(struct ide_drive_s *);void (*dma_lost_irq)(struct ide_drive_s *); +int (*dma_timer_expiry)(struct ide_drive_s *);void (*dma_timeout)(struct ide_drive_s *);/* * The following method is optional and only required to be
@@ -1135,8 +1135,7 @@ void ide_kill_rq(ide_drive_t *, struct rvoid __ide_set_handler (ide_drive_t *,ide_handler_t *,unsigned int );void ide_set_handler (ide_drive_t *,ide_handler_t *,unsigned int ); -void ide_execute_command (ide_drive_t *,u8 ,ide_handler_t *,unsigned int , -ide_expiry_t *); +void ide_execute_command (ide_drive_t *,u8 ,ide_handler_t *,unsigned int );void ide_execute_pkt_cmd (ide_drive_t *);
@@ -1450,10 +1449,10 @@ int config_drive_for_dma(ide_drive_t *);int ide_build_dmatable (ide_drive_t *,struct ide_cmd *);void ide_dma_host_set (ide_drive_t *,int );int ide_dma_setup (ide_drive_t *,struct ide_cmd *); -void ide_dma_exec_cmd (ide_drive_t *,u8 );extern void ide_dma_start (ide_drive_t *);int ide_dma_end (ide_drive_t *);int ide_dma_test_irq (ide_drive_t *); +int ide_dma_sff_timer_expiry (ide_drive_t *);u8 ide_dma_sff_read_status (ide_hwif_t *);extern const struct ide_dma_ops sff_dma_ops;#else
@@ -1474,6 +1473,7 @@ static inline void ide_dma_on(ide_drive_static inline void ide_dma_verbose (ide_drive_t *drive) { ; }static inline int ide_set_dma (ide_drive_t *drive) {return 1 ; }static inline void ide_check_dma_crc (ide_drive_t *drive) { ; } +static inline ide_startstop_t ide_dma_intr (ide_drive_t *drive) {return ide_stopped; }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,
Re: linux-next: Tree for February 12 (ide)
Quoted 4 lines · Bartlomiej Zolnierkiewicz
Quoted 3 lines · Randy Dunlap
Quoted 2 lines · Stephen Rothwell
Hi all,
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Changes since 20090211:
When
#CONFIG_BLK_DEV_IDEDMAis not set
linux-next-20090212/drivers/ide/ide-taskfile.c:108: error: 'ide_dma_intr' undeclared (first use in this function)Thanks for spotting this, I fixed it in the revised patch:
Hi Bart,
Have you pushed this patch yet?
linux-next (20090218) is still getting this IDE build error.
Thanks.
Quoted 54 lines
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2)* Rename
dma_timer_expiry()toide_dma_sff_timer_expiry()and export it.* Add ->dma_timer_expiry method and use it to set
hwif->expiryforATA_PROT_DMAprotocol indo_rw_taskfile().* Initialize ->dma_timer_expiry to
ide_dma_sff_timer_expiry()for SFF hosts.* Move setting
hwif->expiryfromide_execute_command()to its users and drop 'expiry' argument.* Use
ide_execute_command()instead of ->dma_exec_cmd indo_rw_taskfile().* Remove ->dma_exec_cmd method and its implementations.
* Unexport
ide_execute_command()andide_dma_intr().v2:
* FixCONFIG_BLK_DEV_IDEDMA=nbuild (noticed by Randy Dunlap).* Fix
*dma_expirynaming (suggested by Sergei Shtylyov).There should be no functional changes caused by this patch.
Cc Randy Dunlap <[email protected]>Cc Sergei Shtylyov <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>--- drivers/ide/alim15x3.c | 2 +- drivers/ide/au1xxx-ide.c | 8 -------- drivers/ide/cmd64x.c | 6 +++--- drivers/ide/cs5536.c | 2 +- drivers/ide/hpt366.c | 6 +++--- drivers/ide/icside.c | 7 ------- drivers/ide/ide-atapi.c | 3 ++- drivers/ide/ide-dma-sff.c | 15 ++++----------- drivers/ide/ide-dma.c | 1 - drivers/ide/ide-iops.c | 6 +----- drivers/ide/ide-taskfile.c | 6 ++++-- drivers/ide/it821x.c | 2 +- drivers/ide/ns87415.c | 2 +- drivers/ide/pdc202xx_old.c | 4 ++-- drivers/ide/pmac.c | 8 -------- drivers/ide/sc1200.c | 2 +- drivers/ide/scc_pata.c | 2 +- drivers/ide/siimage.c | 2 +- drivers/ide/sl82c105.c | 2 +- drivers/ide/tc86c001.c | 2 +- drivers/ide/trm290.c | 6 ------ drivers/ide/tx4939ide.c | 2 +- include/linux/ide.h | 8 ++++---- 23 files changed, 33 insertions(+), 71 deletions(-)
Signature · 1 line
~Randy
Re: linux-next: Tree for February 12 (ide)
Quoted 12 lines · Randy Dunlap
Quoted 11 lines · Bartlomiej Zolnierkiewicz
Quoted 9 lines · Randy Dunlap
Quoted 3 lines · Stephen Rothwell
Hi all,
Changes since 20090211:
When
#CONFIG_BLK_DEV_IDEDMAis not set
linux-next-20090212/drivers/ide/ide-taskfile.c:108: error: 'ide_dma_intr' undeclared (first use in this function)
Quoted 7 lines
Quoted 1 line
Thanks for spotting this, I fixed it in the revised patch:
Hi Bart,
Have you pushed this patch yet?
linux-next (20090218) is still getting this IDE build error.
I got caught by some other things yesterday so this was pushed out today. Sorry about confusion/delay.
Thanks,
Bart
PATCH 1/1 wireless: fix for CONFIG_NL80211=n
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Add empty function for case of CONFIG_NL80211=n:
net/wireless/scan.c:35: error: implicit declaration of function 'nl80211_send_scan_aborted'
--- net/wireless/nl80211.h | 4 ++++ 1 file changed, 4 insertions(+)
net/wireless/nl80211.h +4 -0
@@ -27,6 +27,10 @@ static inline void nl80211_send_scan_done(struct cfg80211_registered_device *rdev, struct net_device *netdev) {} +static inline void nl80211_send_scan_aborted ( +struct cfg80211_registered_device *rdev, +struct net_device *netdev) +{}#endif /* CONFIG_NL80211 */ #endif /* __NET_WIRELESS_NL80211_H */
PATCH 1/1 media/zoran: fix printk format
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix printk format warning:
drivers/media/video/zoran/zoran_driver.c:345: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'phys_addr_t'
--- drivers/media/video/zoran/zoran_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/video/zoran/zoran_driver.c +2 -2
@@ -344,9 +344,9 @@ v4l_fbuffer_alloc (struct file *file)SetPageReserved (MAP_NR (mem + off));dprintk (4 ,KERN_INFO -"%s: v4l_fbuffer_alloc() - V4L frame %d mem 0x%lx (bus: 0x%lx)\n" , +"%s: v4l_fbuffer_alloc() - V4L frame %d mem 0x%lx (bus: 0x%llx)\n" ,ZR_DEVNAME (zr), i, (unsigned long ) mem, -virt_to_bus (mem)); + (unsigned long long )virt_to_bus (mem)); }else {/* Use high memory which has been left at boot time */
PATCH 1/1 x86_32: fix printk formats
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix printk format warnings and also change 2 %ld to %lu for unsigned long variables.
arch/x86/mm/init_32.c:727: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int' arch/x86/mm/init_32.c:735: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
--- arch/x86/mm/init_32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/mm/init_32.c +4 -4
@@ -721,7 +721,7 @@ void __init find_low_pfn_range(void) highmem_pages =0 ;#ifdef CONFIG_HIGHMEM if (highmem_pages >= max_pfn) { -printk (KERN_ERR "highmem size specified (%uMB) is " +printk (KERN_ERR "highmem size specified (%luMB) is " "bigger than pages available (%luMB)!.\n" ,pages_to_mb (highmem_pages),pages_to_mb (max_pfn));
@@ -730,7 +730,7 @@ void __init find_low_pfn_range(void)if (highmem_pages) {if (max_low_pfn - highmem_pages <64 *1024 *1024 /PAGE_SIZE ){ -printk (KERN_ERR "highmem size %uMB results in " +printk (KERN_ERR "highmem size %luMB results in " "smaller than 64MB lowmem, ignoring it.\n" ,pages_to_mb (highmem_pages)); highmem_pages =0 ;
@@ -755,7 +755,7 @@ void __init initmem_init(unsigned long s highstart_pfn = max_low_pfn;memory_present (0 ,0 , highend_pfn);e820_register_active_regions (0 ,0 , highend_pfn); -printk (KERN_NOTICE "%ldMB HIGHMEM available.\n" , +printk (KERN_NOTICE "%luMB HIGHMEM available.\n" ,pages_to_mb (highend_pfn - highstart_pfn)); num_physpages = highend_pfn; high_memory = (void *)__va (highstart_pfn *PAGE_SIZE -1 ) +1 ;
@@ -768,7 +768,7 @@ void __init initmem_init(unsigned long s#ifdef CONFIG_FLATMEM max_mapnr = num_physpages;#endif -printk (KERN_NOTICE "%ldMB LOWMEM available.\n" , +printk (KERN_NOTICE "%luMB LOWMEM available.\n" ,pages_to_mb (max_low_pfn));setup_bootmem_allocator ();
Re: [PATCH -next] x86_32: fix printk formats
Quoted 5 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix printk format warnings and also change 2 %ld to %lu for unsigned long variables.
Quoted 7 lines
arch/x86/mm/init_32.c:727: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'arch/x86/mm/init_32.c:735: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'Signed-off-by Randy Dunlap <[email protected]>--- arch/x86/mm/init_32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Already fixed in the x86 tree, but thanks.
Ingo
Re: [PATCH -next] x86_32: fix printk formats
Quoted 10 lines · Ingo Molnar
Quoted 8 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix printk format warnings and also change 2 %ld to %lu for unsigned long variables.
arch/x86/mm/init_32.c:727: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'arch/x86/mm/init_32.c:735: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
Quoted 6 lines
Quoted 4 lines
Signed-off-by Randy Dunlap <[email protected]>--- arch/x86/mm/init_32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)Already fixed in the x86 tree, but thanks.
OK, but this still shows up in linux-next of 20090213.
Did the fix just miss the today's pull or is there a git #branch issue or what?
Thanks,
Signature · 1 line
~Randy
Re: [PATCH -next] x86_32: fix printk formats
Quoted 16 lines · Randy Dunlap
Quoted 15 lines · Ingo Molnar
Quoted 12 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix printk format warnings and also change 2 %ld to %lu for unsigned long variables.
arch/x86/mm/init_32.c:727: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'arch/x86/mm/init_32.c:735: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'Signed-off-by Randy Dunlap <[email protected]>--- arch/x86/mm/init_32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Quoted 6 lines
Quoted 1 line
Already fixed in the x86 tree, but thanks.
OK, but this still shows up in linux-next of 20090213.
Did the fix just miss the today's pull or is there a git #branch issue or what?
Ahh, because I fixed for :
arch/x86/mm/init_32.c:696: warning: format '%u' expects type
'unsigned int', but
This part was remaining.
Thanks Randy,
--
JSR