small documentation fixes

Signed-off-by: Adrian Bunk <[email protected]>

Fix compiler warning in smount example program from sharedsubtree.txt

If one compiles the example smount program, found in
Documentation/sharedsubtree.txt, with -Wall then there's a small
compiler warning rearing its ugly head :

 smount.c: In function 'main':
 smount.c:45: warning: implicit declaration of function 'strcmp'

Easily fixed by just including string.h

Signed-off-by: Jesper Juhl <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

docs/sysfs: add missing word to sysfs attribute explanation

Add the obvious missing word.

Signed-off-by: Shaun Zinck <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

documentation/ext3: grammar fixes

Fix some grammar in the explanation of the Journal Block Device layer.

Signed-off-by: Shaun Zinck <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Documentation/java.txt: typo and grammar fixes

This fixes a typo and rearranges the sentence to make more sense.

Signed-off-by: Shaun Zinck <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Documentation/filesystems/vfs.txt: typo fix

Signed-off-by: Shaun Zinck <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros

These don't appear anywhere else in the kernel anymore.

Signed-off-by: Stefan Richter <[email protected]>
Acked-by: Paul Mundt <[email protected]>
Acked-by: Greg Ungerer <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

trivial copy_data_pages() tidy up

Change the loop style of copy_data_pages() to remove a duplicate condition.

Signed-off-by: Fengguang Wu <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Fix typo in arch/x86/kernel/tsc_32.c

Signed-off-by: Josh Triplett <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

file link fix for Pegasus USB net driver help

Update the file link in the Pegasus USB network driver's help text.

Signed-off-by: Cal Peake <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

remove unused return within void return function

Signed-off-by: Denis Cheng <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Typo fixes retrun -> return

Typo fixes retrun -> return

Signed-off-by: Gabriel Craciunescu <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

x86 hpet.h: remove broken links

Signed-off-by: Dave Young <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Update 2.4 maintainer in document

Update the maintainer of 2.4 kernel in Documentations/SubmittingPatches.

Signed-off-by: Li Yang <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

fix comment: unlock_hrtimer_base is the counterpart of lock_hrtimer_base

Signed-off-by: Uwe Kleine-König <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

fix typo "sort" -> "short"

Signed-off-by: Uwe Kleine-König <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

fix typo "insted" -> "instead"

Signed-off-by: Uwe Kleine-König <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Documentation/filesystems/files.txt: remove rcuref_inc_lf() reverences

rcuref_inc_lf() is not used anymore. Replace it by atomic_inc_not_zero()

Signed-off-by: Eric Dumazet <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

kernel/sched.c: remove bogus comment from account_user_time

hardirq_offset is no longer needed.

Signed-off-by: Michael Neuling <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

typo fixes

Most of these fixes were already submitted for old kernel versions, and were
approved, but for some reason they never made it into the releases.

Because this is a consolidation of a couple old missed patches, it touches both
Kconfigs and documentation texts.

Signed-off-by: Matt LaPlante <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: Documentation/

Spelling fixes in Documentation/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: lib/

Spelling fix in lib/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: init/

Spelling fix in init/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: mm/

Spelling fixes in mm/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/x86_64/

Spelling fixes in arch/x86_64/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/v850/

Spelling fixes in arch/v850/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/um/

Spelling fixes in arch/um/.

Signed-off-by: Simon Arlott <[email protected]>
Acked-by: Jeff Dike <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/m68k/

Spelling fixes in arch/m68k/.

Signed-off-by: Simon Arlott <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/m32r/

Spelling fixes in arch/m32r/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/i386/

Spelling fixes in arch/i386/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/h8300/

Spelling fixes in arch/h8300/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/frv/

Spelling fixes in arch/frv/.

Signed-off-by: Simon Arlott <[email protected]>
Acked-By: David Howells <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/cris/

Spelling fixes in arch/cris/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

spelling fixes: arch/alpha/

Spelling fixes in arch/alpha/.

Signed-off-by: Simon Arlott <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

pata_cmd64x.c typo fix

Spotted by David Miller <[email protected]>.

Signed-off-by: Adrian Bunk <[email protected]>

remove duplicate MMAPPER Kconfig option

This option is already in arch/um/Kconfig.char

Signed-off-by: Adrian Bunk <[email protected]>
Acked-by: Jeff Dike <[email protected]>

fix up security_socket_getpeersec_* documentation

Update the security_socket_peersec documentation in
include/linux/security.h.  security_socket_peersec has been split
into two functions - _stream and _dgram, with new capabilities.

Signed-off-by: Serge Hallyn <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

changed email

Changed email address of Johann Deneux (myself)
Also removed CVS tags in comments (no longer using cvs)

Signed-off-by: Johann Deneux <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

powerpc: Remove obsolete prototype

The include/asm-powerpc/paca.h file has a prototype for a function that
does not exist any more; its name is setup_boot_paca.  This function was
removed in commit 4ba99b97dadd35b9ce1438b2bc7c992a4a14a8b1, so its
prototype should have been removed at that time too.

Signed-off-by: Julio M. Merino Vidal <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

ide: remove inclusion of non-existent io_trace.h

Signed-off-by: Robert P. J. Day <[email protected]>
Cc: [email protected]
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide-disk: add get_smart_data() helper

Merge get_smart_values() and get_smart_thresholds()
into get_smart_data() helper.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: fix ->data_phase in taskfile_load_raw()

It should be TASKFILE_NO_DATA, not TASKFILE_IN.  Luckily ATM ->data_phase is
unused if ->command_type == IDE_DRIVE_TASK_NO_DATA but this may change in the
future.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: check drive->using_dma in flagged_taskfile()

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: check ->dma_setup() return value in flagged_taskfile()

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

dtc2278: note on docs

Signed-off-by: Alan Cox <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

qd65xx: remove pointless qd_{read,write}_reg() (take 2)

These functions are atomic so locking is pointless (noticed by Sergei).

v2:
We can now just use local_irq_save/restore() in qd_testreg() (noticed by Jeff).

Cc: Sergei Shtylyov <[email protected]>
Acked-by: Jeff Garzik <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: PCI BMDMA initialization fixes (take 2)

* Set hwif->dma_base only if allocation of extra ports succeeds.

While at it:

* Move setting of hwif->dma_{base,master} from ide_{mapped_mmio,iomio}_dma()
  to ide_setup_dma().

* Rename 'dma_base' argument to 'base' in ide_setup_dma() (to make the code
  obey 80-columns limit and increase its readability).

* Remove stale ide_setup_dma() comment.

v2:
* Change to allocate hwif->dmatable_cpu before reserving I/O ports missed
  teardown code (spotted by Sergei).  On the second thought this change is
  actually unnecessary so revert it in v2.

* Make ide_release_dma_engine() void and remove needless comment.

Cc: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: remove stale comments from ide-taskfile.c

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: remove dead code from ide_driveid_update()

* Remove dead code from ide_driveid_update().

While at it:

* Remove useless comment.

* s/HWIF(drive)/drive->hwif/

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: use __ide_end_request() in ide_end_dequeued_request()

* Remove dead code for handling IDE TCQ from ide_end_dequeued_request().

* Add 'dequeue' parameter to __ide_end_request().

* Use __ide_end_request() in ide_end_dequeued_request().

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: enhance ide_setup_pci_noise()

* Print PCI device Vendor ID, Device ID and revision in
  ide_setup_pci_noise().

* Remove no longer needed PCI device revision printing from
  ide_setup_pci_controller().

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

cs5530: remove needless ide_lock taking

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: take ide_lock for prefetch disable/enable in do_special()

Take ide_lock for prefetch disable/enable in do_special(),
then cleanup cmd640 and ht6560b host drivers.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ht6560b: fix deadlock on error handling

Stop abusing ide_lock lock (switch to a private locking).

Fixes same issue as fixed by Alan Cox in atiixp host driver with
commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.

ht6560b is a bit special cause we still need to leave ide_lock for
->set_pio_mode with 'pio' argument == 8/9 (prefetch disable/enable).

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

cmd640: fix deadlock on error handling

Stop abusing ide_lock lock (switch to a private locking).

Fixes same issue as fixed by Alan Cox in atiixp host driver with
commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.

cmd640 is a bit special cause we still need to leave ide_lock for
->set_pio_mode with 'pio' argument == 8/9 (prefetch disable/enable).

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

slc90e66: fix deadlock on error handling

* Stop abusing ide_lock lock (switch to a private locking).

  Fixes same issue as fixed by Alan Cox in atiixp host driver with
  commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.

* Bump driver version.

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

opti621: fix deadlock on error handling

* Stop abusing ide_lock lock (switch to a private locking).

  Fixes same issue as fixed by Alan Cox in atiixp host driver with
  commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.

* Bump driver version.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

qd65xx: fix deadlock on error handling

Stop abusing ide_lock lock (switch to a private locking).

Fixes same issue as fixed by Alan Cox in atiixp host driver with
commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.

Cc: Sergei Shtylyov <[email protected]>
Cc: Jeff Garzik <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

dtc2278: fix deadlock on error handling

Stop abusing ide_lock lock (switch to a private locking).

Fixes same issue as fixed by Alan Cox in atiixp host driver with
commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ali14xx: fix deadlock on error handling

Stop abusing ide_lock lock by switching to a private locking.

Fixes same issue as fixed by Alan Cox in atiixp host driver with
commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: constify struct ide_port_info

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: replace ide_pci_device_t by struct ide_port_info

* Rename struct ide_pci_device_s to struct ide_port_info.

* Remove ide_pci_device_t typedef.

While at it:

* Fix __ide_pci_register_driver() comment.

* Fix aec62xx_init_one() comment.

* Remove unused 'cds' field from ide_hwgroup_t.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

via82cxxx: keep local ide_pci_device_t copy

* Keep local ide_pci_device_t copy in via_init_one().

* Adjust ide_pci_device_t copy according to id->driver_data in via_init_one()
  and remove no longer needed second via82cxxx_chipsets[] entry.

* via82cxxx_chipsets[] -> via82cxxx_chipset.

* Remove IDE_HFLAGS_VIA define.

* Bump driver version.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

dtc2278: set ->pio_mask also for the second port

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

au1xxx-ide: set ->autotune and ->no_io_32bit also for the slave device

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: remove write-only hwif->hw

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add hwif->ack_intr hook

* Add hwif->ack_intr hook and use it instead of hwif->hw.ack_intr.

* Add missing brackets to cris-v32 and powerpc ide_ack_intr() macros.

Cc: Roman Zippel <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Andrew Morton <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

icside: use ec->dma directly

* hwif->hwif_data contains pointer to struct expansion_card so use ec->dma
  directly instead of caching it in hwif->hw.dma.

* Remove no longer needed hw_regs_t.dma and NO_DMA define.

Cc: Russell King <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: fix ide_register_hw() to check hwif->io_ports[]

hwif->hw.io_ports[] and hwif->io_ports[] should be the same but "4drives"
support and scc_pata host driver set only hwif->io_ports[].

To compensate for this check hwif->io_ports[] instead of hwif->hw.io_ports[]
in ide_register_hw() (instead of fixing "4drives" and scc_pata because hwif->hw
is to be removed).

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add CONFIG_IDE_ARCH_OBSOLETE_INIT

Add CONFIG_IDE_ARCH_OBSOLETE_INIT to drivers/ide/Kconfig and use it instead
of defining IDE_ARCH_OBSOLETE_INIT in <arch/ide.h>.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: remove redundant comments from ide.h

There is better documentation for these functions in drivers/ide/.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add ide_find_port() helper

* Add ide_find_port() helper.

* Convert icside, rapide and ide_platform host drivers to use it.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add ide_device_add()

* Add ide_device_add() helper and convert host drivers to use it
  instead of open-coded variants.

* Make ide_pci_setup_ports() and do_ide_setup_pci_device()
  take 'u8 *idx' argument instead of 'ata_index_t *index'.

* Remove no longer needed ata_index_t.

* Unexport probe_hwif_init() and make it static.

* Unexport ide_proc_register_port().

There should be no functionality changes caused by this patch
(sgiioc4.c: ide_proc_register_port() requires hwif->present
 to be set and it won't be set if probe_hwif_init() fails).

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add ->fixup method to ide_hwif_t

* Add ->fixup method to ide_hwif_t.

* Set hwif->fixup in ide_pci_setup_ports() to d->fixup.

* Use hwif->fixup in probe_hwif().

* Use probe_hwif_init() instead of probe_hwif_init_with_fixup() in
  ide_setup_pci_device().

* Add 'fixup' argument to ide_register_hw() and use it to set hwif->fixup,
  update all ide_register_hw() users accordingly.

* Convert ide-cs/delkin_cb host drivers to use ide_register_hw().

* Restore hwif->fixup in ide_hwif_restore().

* Remove ide_register_hw_with_fixup(), probe_hwif_init_with_fixup()
  and 'fixup' argument from probe_hwif().

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

siimage: separate PATA and SATA methods

* Split off sil_sata_udma_filter() from sil_udma_filter()
  and rename sil_udma_filter() to sil_pata_udma_filter().

* Rename siimage_busproc() to sil_sata_busproc().

* Rename siimage_reset_poll() to sil_sata_reset_poll()
  and in init_hwif_siimage() set ->reset_poll method only
  for SATA controllers.

* Rename siimage_pre_reset() to sil_sata_pre_reset(),
  in init_hwif_siimage() set ->pre_reset method only for
  SATA controllers and remove redundant is_sata() call.

* Add CONFIG_BLK_DEV_IDE_SATA #ifdef/#endif to pdev_is_sata()
  so compiler will know to throw out unused SATA code for
  CONFIG_BLK_DEV_IDE_SATA=n case (830 bytes saved on x86-32).

* Bump driver version.

Some minor cleanups while at it:

* Convert sil_{pata,sata}_udma_filter() to use ATA_UDMA* defines.

* In siimage_mmio_ide_dma_test_irq() move 'base' variable
  under 'if (SATA_ERROR_REG)' block.

* Simplify sil_sata_reset_poll() a bit.

* Cache is_sata() result in init_hwif_siimage()

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

aec62xx: remove aec62xx_dma_lost_irq()

* Remove aec62xx_dma_lost_irq() (generic ide_dma_lost_irq() will be used now).

* Bump driver version.

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

alim15x3: use ->host_flags and ->udma_mask fields from ide_pci_device_t

* Make a local copy of ali15x3_chipset in alim15x3_init_one() and set
  ->host_flags / ->udma_mask according to the controller capabilities.

* Cleanup init_hwif_common_ali15x3().

* Bump driver version.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

alim15x3: fix CD_ROM DMA and PIO FIFO settings setup

* Setup CD_ROM DMA and PIO FIFO settings in init_chipset_ali15x3() instead
  of ata66_ali15x3().  The latter is called from init_hwif_common_ali15x3()
  only if DMA base exists (which insists m5529_revision > 0x20).

  This changes makes CD_ROM DMA / PIO FIFO bits being set only once
  and also when "idex=ata66" kernel parameter is used.

* While at it move also chip_is_1543c_e setup from ata66_ali15x3() to
  init_chipset_ali15x3() and check if isa_dev exists before accessing it.

* Bump driver version.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add IDE_HFLAG_{IO_32BIT,UNMASK_IRQS} host flags

Add IDE_HFLAG_{IO_32BIT,UNMASK_IRQS} host flag to tell ide_pci_setup_ports()
to set drive->{io_32bit,unmask} for both drives on the interface.  Convert
amd74xx, sl82c105 and via82cxxx host drivers to use these new host flags.

While at it:

* Add IDE_HFLAGS_AMD define (amd74xx host driver).

* Add IDE_HFLAGS_VIA define (via82cxxx host driver).

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add IDE_HFLAG_RQSIZE_256 host flag

Add IDE_HFLAG_RQSIZE_256 host flag to tell ide_pci_setup_ports() to set
hwif->rqsize to 256 sectors.  Convert pdc202xx_old host driver to use it.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add IDE_HFLAG_FORCE_LEGACY_IRQS host flag

Add IDE_HFLAG_FORCE_LEGACY_IRQS host flag to tell ide_pci_setup_ports()
to always set hwif->irq to legacy IRQ 14/15 and convert generic IDE PCI
and via82cxxx host drivers to use it.

While at it:

* Add IDE_HFLAGS_UMC define (generic IDE PCI host driver).

* Remove no longer needed init_hwif_generic() (generic IDE PCI host driver).

* Set d->udma_mask instead of hwif->ultra_mask (via82cxxx host driver).

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add ->chipset field to ide_pci_device_t

Add ->chipset field to ide_pci_device_t and use it in ide_hwif_configure()
to set hwif->chipset.  Convert cmd64x, cy82c693, rz1000 and trm290 host
drivers to use this new ability.

While at it define hwif_chipset_t as u8 to save some space in hw_regs_t,
ide_hwif_t and ide_pci_device_t instances.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: remove unused ->next field from ide_pci_device_t

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: add hwif_register_devices() helper

Add hwif_register_devices() helper to fix code duplication between
probe_hwif_init_with_fixup() and ideprobe_init().  Also remove stale
comment while at it.

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

serverworks: remove dead code from svwks_set_dma_mode()

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

rz1000: set serialized flag only if mate interface exists

Setting hwif->serialized makes sense only if the mate interface exists.

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide: fix disabled ports reporting for PCI controllers

Report all disabled ports in ide_pci_setup_ports() (prevents the bogus
warning when ide_hwif_configure()->ide_match_hwif() fails to find free
ide_hwifs[] slots).

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

cmd64x: always set hwif->chipset for CMD646

hwif->chipset should be set to ide_cmd646 also when DMA base is invalid.

Acked-by: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

ide/pci/sis5513.c: add missing "else"

This patch adds a missing "else" that was missing in
commit c77a89cd98d99819f23a4a08e5e17ee1f13f6e4d.

Spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <[email protected]>
Cc: Sergei Shtylyov <[email protected]>,
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

trivial comment wording/typo fix regarding taint flags

Signed-off-by: Daniel Roesen <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

LIB: Replace inappropriate include of <linux/bug.h>

Replace an irrelevant include of bug.h with the more appropriate
includes of slab.h and module.h.

it's not as if the original inclusion is an error, it's simply not
related to the contents of that source file, while the other two are.

compile-tested on i386.

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

H8300: Typo: "buildin" -> "builtin"

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Documentation: Remove unreferenced "blkmtd_*" parms

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

XTENSA: Emphasize that the "eth" boot-time parm takes a value

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

BOOT: Show that no_ipi_broadcast() takes a parameter.

a rather obvious fix given the opening of the function:

...
static __init int no_ipi_broadcast(char *str)
{
        get_option(&str, &no_broadcast);
...

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Documentation: Add nested versions of mutex locks to docs

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Documentation: Remove reference to non-existent "unwind_debug" kernel parm

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Documentation: Fix erroneous "dmascc=" documentation

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (33 commits)
  x86: convert cpuinfo_x86 array to a per_cpu array
  x86: introduce frame_pointer() and stack_pointer()
  x86 & generic: change to __builtin_prefetch()
  i386: do not BUG_ON() when MSR is unknown
  x86: acpi use cpu_physical_id
  x86: convert cpu_llc_id to be a per cpu variable
  x86: convert cpu_to_apicid to be a per cpu variable
  i386: introduce "used_vectors" bitmap which can be used to reserve vectors.
  x86: use raw locks during oopses
  x86: honor _PAGE_PSE bit on page walks
  i386: do cpuid_device_create() in CPU_UP_PREPARE instead of CPU_ONLINE.
  x86: implement missing x86_64 function smp_call_function_mask()
  x86: use descriptor's functions instead of inline assembly
  i386: consolidate show_regs and show_registers for i386
  i386: make callgraph use dump_trace() on i386/x86_64
  x86: enable iommu_merge by default
  i386: i386 add AMD64 Barcelona PMU MSR definitions to msr.h
  x86: Unify i386 and x86-64 early quirks
  x86: enable HPET on ICH3 and ICH4
  x86: force enable HPET on VT8235/8237 chipsets
  ...

Manually fix trivial conflict with task pid container helper changes in
arch/x86/kernel/process_32.c

Documentation: Remove references to dead "eda" and "edb" kernel parms

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>