16 Jul, 2008
40 commits
-
fix more API change fallout in recently merged upstream changes.
Signed-off-by: Ingo Molnar
-
fix merge fallout:
arch/x86/pci/amd_bus.c: In function ‘enable_pci_io_ecs':
arch/x86/pci/amd_bus.c:581: error: too many arguments to function ‘on_each_cpu'Signed-off-by: Ingo Molnar
-
Conflicts:
arch/powerpc/Kconfig
arch/s390/kernel/time.c
arch/x86/kernel/apic_32.c
arch/x86/kernel/cpu/perfctr-watchdog.c
arch/x86/kernel/i8259_64.c
arch/x86/kernel/ldt.c
arch/x86/kernel/nmi_64.c
arch/x86/kernel/smpboot.c
arch/x86/xen/smp.c
include/asm-x86/hw_irq_32.h
include/asm-x86/hw_irq_64.h
include/asm-x86/mach-default/irq_vectors.h
include/asm-x86/mach-voyager/irq_vectors.h
include/asm-x86/smp.h
kernel/MakefileSigned-off-by: Ingo Molnar
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slab: rename slab_destroy_objs
slub: current is always valid
slub: Add check for kfree() of non slab objects. -
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
AHCI: Remove an unnecessary flush from ahci_qc_issue
AHCI: speed up resume
[libata] Add support for VPD page b1
ata: endianness annotations in pata drivers
libata-eh: update atapi_eh_request_sense() to take @dev instead of @qc
[libata] sata_svw: update code comments relating to data corruption
libata/ahci: enclosure management support
libata: improve EH internal command timeout handling
libata: use ULONG_MAX to terminate reset timeout table
libata: improve EH retry delay handling
libata: consistently use msecs for time durations -
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (56 commits)
i2c: Add detection capability to new-style drivers
i2c: Call client_unregister for new-style devices too
i2c: Clean up old chip drivers
i2c-ibm_iic: Register child nodes
i2c: New-style EEPROM driver using device IDs
i2c: Export the i2c_bus_type symbol
i2c-au1550: Fix PM support
i2c-dev: Delete empty detach_client callback
i2c: Drop stray references to lm_sensors
i2c: Check for ACPI resource conflicts
i2c-ocores: basic PM support
i2c-sibyte: SWARM I2C board initialization
i2c-i801: Fix handling of error conditions
i2c-i801: Rename local variable temp to status
i2c-i801: Properly report bus arbitration loss
i2c-i801: Remove verbose debugging messages
i2c-algo-pcf: Drop unused struct members
i2c-algo-pcf: Multi-master lost-arbitration improvement
i2c: Deprecate the legacy gpio drivers
i2c-pxa: Initialize early
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (80 commits)
ide-floppy: fix unfortunate function naming
ide-tape: unify idetape_create_read/write_cmd
ide: add ide_pc_intr() helper
ide-{floppy,scsi}: read Status Register before stopping DMA engine
ide-scsi: add more debugging to idescsi_pc_intr()
ide-scsi: use pc->callback
ide-floppy: add more debugging to idefloppy_pc_intr()
ide-tape: always log debug info in idetape_pc_intr() if debugging is enabled
ide-tape: add ide_tape_io_buffers() helper
ide-tape: factor out DSC handling from idetape_pc_intr()
ide-{floppy,tape}: move checking of ->failed_pc to ->callback
ide: add ide_issue_pc() helper
ide: add PC_FLAG_DRQ_INTERRUPT pc flag
ide-scsi: move idescsi_map_sg() call out from idescsi_issue_pc()
ide: add ide_transfer_pc() helper
ide-scsi: set drive->scsi flag for devices handled by the driver
ide-{cd,floppy,tape}: remove checking for drive->scsi
ide: add PC_FLAG_ZIP_DRIVE pc flag
ide-tape: factor out waiting for good ireason from idetape_transfer_pc()
ide-tape: set PC_FLAG_DMA_IN_PROGRESS flag in idetape_transfer_pc()
... -
mv idefloppy_transfer_pc1 idefloppy_start_pc_transfer
mv idefloppy_transfer_pc2 idefloppy_transfer_pcwhich describes their functionality and disambiguates them. There should be no
functionality change introduced by this patch.Signed-off-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
A straightforward one. There should be no functional change resulting from this
change.[bart: minor fixups]
Signed-off-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* ide-tape.c: add 'drive' argument to idetape_update_buffers().
* Add generic ide_pc_intr() helper to ide-atapi.c and then
convert ide-{floppy,tape,scsi} device drivers to use it.* ide-tape.c: remove no longer needed DBG_PC_INTR.
There should be no functional changes caused by this patch
(unless the debugging is explicitely compiled in).Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Read Status Register before stopping DMA engine to match ide-tape
device driver - it should be safe and shouldn't affect anything.This is a preparation for adding generic ide_pc_intr() helper.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add more debugging to idescsi_pc_intr() to match ide-tape's
idetape_pc_intr().While at it:
* Correct the first debug message.
This is a preparation for adding generic ide_pc_intr() helper.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add ide_scsi_callback() pc->callback implementation, then update
idescsi_check_condition() and idescsi_queue() to setup ->callback.* Convert idescsi_pc_intr() to use pc->callback.
This is a preparation for adding generic ide_pc_intr() helper.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add more debugging to idefloppy_pc_intr() to match ide-tape's
idetape_pc_intr().While at it:
* Correct the first debug message.
* Log device name with "DMA finished" message.
This is a preparation for adding generic ide_pc_intr() helper.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add DBG_PC_INTR debug level and use it to always log debug info
in idetape_pc_intr() if debugging is enabled.While at it:
* Use drive->name instead of tape->name.
* Log device name with "DMA finished" message.
This is a preparation for adding generic ide_pc_intr() helper.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add ide_tape_io_buffers() helper which is a wrapper for
idetape_{in,out}put_buffers() and convert idetape_pc_intr()
to use it.* Remove no longer used idetape_io_buf typedef.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz --- -
Factor out DSC handling from idetape_pc_intr() to ide_tape_handle_dsc()
helper as a preparation for adding generic ide_pc_intr() helper.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Move checking/resetting of ->failed_pc from ide*_pc_intr() to ->callback
as a preparation for adding generic ide_pc_intr() helper.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz --- -
Add generic ide_issue_pc() helper to ide-atapi.c and then
convert ide-{floppy,tape,scsi} device drivers to use it.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add PC_FLAG_DRQ_INTERRUPT pc flag, set it in ide*_do_request()
and check for it (instead of checking for IDE*_FLAG_DRQ_INTERRUPT)
in ide*_issue_pc(). This is a preparation for adding generic
ide_issue_pc() helper.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Move idescsi_map_sg() call out from idescsi_issue_pc()
to idescsi_do_request() as a preparation to adding generic
ide_issue_pc() helper.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add ide-atapi.c file for generic ATAPI support together with
CONFIG_IDE_ATAPI config option.* Add generic ide_transfer_pc() helper to ide-atapi.c and then
convert ide-{floppy,tape,scsi} device drivers to use it.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
This is a preparation for adding generic ide_transfer_pc() helper.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Remove checking for drive->scsi which is no longer set by IDE core code
(leave the flag since it will be re-used for generic ATAPI support).Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add PC_FLAG_ZIP_DRIVE pc flag, set it in idefloppy_do_request()
and check for it (instead of checking for IDEFLOPPY_FLAG_ZIP_DRIVE)
in idefloppy_transfer_pc(). This is a preparation for adding
generic ide_transfer_pc() helper.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Factor out waiting for good ireason from idetape_transfer_pc()
to ide_tape_wait_ireason() as a preparation for adding generic
ide_transfer_pc() helper.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Set PC_FLAG_DMA_IN_PROGRESS flag in idetape_transfer_pc() instead of
idetape_issue_pc() to match the other ATAPI device drivers.Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Start DMA engine and set PC_FLAG_DMA_IN_PROGRESS flag in
idefloppy_transfer_pc1() instead of idefloppy_issue_pc()
so the Status Register and the Interrupt Reason Register
are checked first.Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Use PC_FLAG_DMA_OK flag instead of PC_FLAG_DMA_RECOMMENDED one.
* Remove no longer used PC_FLAG_DMA_RECOMMENDED flag.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Merge pc->idefloppy_callback and pc->idetape_callback into pc->callback.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
The appropriate functionality of the callback is established through querying
the ATAPI packet command in pc->c[0].While at it, simplify if (floppy->failed_pc)-branch to be found in the original
idefloppy_request_sense_callback().Bart:
- keep handling for blk_pc_request() requests unchanged + add FIXME
- add uptodate variable + leave just one idefloppy_end_request() call
- add newline to the debug messageSigned-off-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
The appropriate functionality of the callback is established through querying
the ATAPI packet command in pc->c[0].While at it:
- add uptodate variable + leave just one idetape_end_request() call
- don't use HWGROUP() macroCc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
idetape_retry_pc() always returns ide_stopped so make it void.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Log device name instead of driver name in *_pc_intr() and *_transfer_pc*().
While at it:
* Merge two consecutive printk()-s in *_pc_intr() together.
* Replace "floppy"/"tape"/"scsi" references in printk()-s by "device".
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Check IDEFLOPPY_FLAG_ZIP_DRIVE flag in idefloppy_transfer_pc1()
and skip idefloppy_transfer_pc2()-phase if the flag is not set.* Always use idefloppy_transfer_pc1() in idefloppy_issue_pc()
and remove no longer needed idefloppy_transfer_pc().There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
PC_FLAG_DMA_IN_PROGRESS flag is never set if DMA support is disabled.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
ide_dma_off() prints info about DMA being disabled.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz