13 years ago[ARM] 4004/1: S3C24XX: UDC remove implict addition of VA to regs
Ben Dooks [Thu, 7 Dec 2006 23:08:33 +0000]
[ARM] 4004/1: S3C24XX: UDC remove implict addition of VA to regs

Remove the implicit addition of a virtual address
to the UDC registers. This should have been done
by ioremap() in the driver, not by a static map.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[ARM] Formalise the ARMv6 processor name string
Russell King [Fri, 8 Dec 2006 15:32:25 +0000]
[ARM] Formalise the ARMv6 processor name string

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[ARM] Handle HWCAP_VFP in VFP support code
Russell King [Fri, 8 Dec 2006 15:22:20 +0000]
[ARM] Handle HWCAP_VFP in VFP support code

Don't set HWCAP_VFP in the processor support file; not only does it
depend on the processor features, but it also depends on the support
code being present.  Therefore, only set it if the support code
detects that we have a VFP coprocessor attached.

Also, move the VFP handling of the coprocessor access register into
the VFP support code.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
Linus Torvalds [Fri, 8 Dec 2006 00:18:46 +0000]
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (55 commits)
  ieee1394: sbp2: code formatting around work_struct stuff
  ieee1394: nodemgr: remove a kcalloc
  ieee1394: conditionally export ieee1394_bus_type
  ieee1394: Consolidate driver registering
  ieee1394: sbp2: convert from PCI DMA to generic DMA
  ieee1394: nodemgr: spaces to tabs
  ieee1394: nodemgr: fix deadlock in shutdown
  ieee1394: nodemgr: remove duplicate assignment
  sbp2: make 1bit bitfield unsigned
  ieee1394: schedule *_oui sysfs attributes for removal
  ieee1394: schedule unused symbol exports for removal
  ieee1394: dv1394: schedule for feature removal
  ieee1394: raw1394: defer feature removal of old isoch interface
  ieee1394: ohci1394: call PMac code in shutdown only for proper machines
  ieee1394: ohci1394: reformat PPC_PMAC platform code
  ieee1394: ohci1394: add PPC_PMAC platform code to driver probe
  ieee1394: sbp2: wrap two functions into one
  ieee1394: sbp2: update comment on things to do
  ieee1394: sbp2: use list_move_tail()
  ieee1394: sbp2: more concise names for types and variables
  ...

13 years agoMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 7 Dec 2006 23:40:39 +0000]
Merge branch 'for-linus' of /home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
  [ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
  [ARM] 4001/1: S3C24XX: shorten reboot time
  [ARM] 3983/2: remove unused argument to __bug()
  [ARM] 4000/1: Osiris: add third serial port in
  [ARM] 3999/1: RX3715: suspend to RAM support
  [ARM] 3998/1: VR1000: LED platform devices
  [ARM] 3995/1: iop13xx: add iop13xx support
  [ARM] 3968/1: iop13xx: add iop13xx_defconfig
  [ARM] Update mach-types
  [ARM] Allow gcc to optimise arm_add_memory a little more
  [ARM] 3991/1: i.MX/MX1 high resolution time source
  [ARM] 3990/1: i.MX/MX1 more precise PLL decode
  [ARM] 3986/1: H1940: suspend to RAM support
  [ARM] 3985/1: ixp4xx clocksource cleanup
  [ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
  [ARM] 3994/1: ixp23xx: fix handling of pci master aborts
  [ARM] 3981/1: sched_clock for PXA2xx
  [ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
  [ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
  [ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
  ...

13 years agoMerge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Thu, 7 Dec 2006 23:39:22 +0000]
Merge branch 'release' of /linux/kernel/git/aegl/linux-2.6

* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] replace kmalloc+memset with kzalloc
  [IA64] resolve name clash by renaming is_available_memory()
  [IA64] Need export for csum_ipv6_magic
  [IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP
  [PATCH] Add support for type argument in PAL_GET_PSTATE
  [IA64] tidy up return value of ip_fast_csum
  [IA64] implement csum_ipv6_magic for ia64.
  [IA64] More Itanium PAL spec updates
  [IA64] Update processor_info features
  [IA64] Add se bit to Processor State Parameter structure
  [IA64] Add dp bit to cache and bus check structs
  [IA64] SN: Correctly update smp_affinty mask
  [IA64] sparse cleanups
  [IA64] IA64 Kexec/kdump

13 years ago[ARM] Merge individual ARM sub-trees
Russell King [Thu, 7 Dec 2006 23:07:26 +0000]
[ARM] Merge individual ARM sub-trees

Merge:
 Atmel AT91RM9200 and AT91SAM9260 changes
 General ARM developments
 Disconfiguous memory cleanups
 64-bit/32-bit division and sched_clock extension patches
 EP93xx support changes
 IOP support changes

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years agoMerge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Linus Torvalds [Thu, 7 Dec 2006 23:04:20 +0000]
Merge branch 'intx' of /linux/kernel/git/jgarzik/misc-2.6

* 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  PCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit

13 years ago[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
Ben Dooks [Thu, 7 Dec 2006 22:59:05 +0000]
[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked

Do not bother masking/unmasking the parent IRQ
for the mulitplexed EINT irqs, as masking the
leaf seems to be fine.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[ARM] 4001/1: S3C24XX: shorten reboot time
Ben Dooks [Thu, 7 Dec 2006 22:53:21 +0000]
[ARM] 4001/1: S3C24XX: shorten reboot time

Cut down the time between requesting a reboot
and actually getting the reboot to happen by
a quarter.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years agoPCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit
Jeff Garzik [Thu, 7 Dec 2006 22:56:06 +0000]
PCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit

The current code (prior to this change) would disable the PCI INTx
legacy interrupt when enabling MSI... but only on PCI Express.  We
should do this for all MSI devices, for safety's sake.

Signed-off-by: Jeff Garzik <jeff@garzik.org>

13 years ago[ARM] 3983/2: remove unused argument to __bug()
Nicolas Pitre [Thu, 7 Dec 2006 18:09:20 +0000]
[ARM] 3983/2: remove unused argument to __bug()

It appears that include/asm-arm/bug.h requires include/linux/stddef.h
for the definition of NULL. It seems that stddef.h was always included
indirectly in most cases, and that issue was properly fixed a while ago.

Then commit 5047f09b56d0bc3c21aec9cb16de60283da645c6 incorrectly reverted
change from commit ff10952a547dad934d9ed9afc5cf579ed1ccb53a (bad dwmw2)
and the problem recently resurfaced.

Because the third argument to __bug() is never used anyway, RMK suggested
getting rid of it entirely instead of readding #include <linux/stddef.h>
which this patch does.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[ARM] 4000/1: Osiris: add third serial port in
Ben Dooks [Thu, 7 Dec 2006 19:49:01 +0000]
[ARM] 4000/1: Osiris: add third serial port in

Add the mapping for the third S3C2440 serial
port into the default serial devices for the
Osiris.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[ARM] 3999/1: RX3715: suspend to RAM support
Ben Dooks [Thu, 7 Dec 2006 19:47:58 +0000]
[ARM] 3999/1: RX3715: suspend to RAM support

The RX3715 is similar to the H1940 in the way
that suspend to RAM works, so we can use most
of the extant support for the H1940 with only
a few modifictions

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[ARM] 3998/1: VR1000: LED platform devices
Ben Dooks [Thu, 7 Dec 2006 19:28:23 +0000]
[ARM] 3998/1: VR1000: LED platform devices

Support for the GPIO attached LEDs on the VR1000

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years agoieee1394: sbp2: code formatting around work_struct stuff
Stefan Richter [Thu, 7 Dec 2006 22:23:25 +0000]
ieee1394: sbp2: code formatting around work_struct stuff

Merge is finished, can bring the code in readable style again.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: nodemgr: remove a kcalloc
Stefan Richter [Sat, 2 Dec 2006 21:23:34 +0000]
ieee1394: nodemgr: remove a kcalloc

Was I sleepwalking when I wrote this?

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: conditionally export ieee1394_bus_type
Stefan Richter [Fri, 24 Nov 2006 19:19:09 +0000]
ieee1394: conditionally export ieee1394_bus_type

Follow-up to patch "Consolidate driver registering":
Since I plan the lifetime of Linux 2.6.20 to be the deprecation phase
of CONFIG_IEEE1394_EXPORT_FULL_API, it seems fair to keep all previously
exported symbols available with this option until this phase is over.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: Consolidate driver registering
Ben Collins [Thu, 23 Nov 2006 18:59:48 +0000]
ieee1394: Consolidate driver registering

This patch consolidates some bookkeeping for driver registering. It
closely models what pci_register_driver() does. The main addition is
that the owner of the driver is set, so we get a proper symlink
for /sys/bus/ieee1394/driver/*/module.

Also moves setting of name and bus type into nodemgr. Because of this,
we can remove the EXPORT_SYMBOL for ieee1394_bus_type, since it's now
only used in ieee1394.ko.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: convert from PCI DMA to generic DMA
Stefan Richter [Wed, 22 Nov 2006 20:44:34 +0000]
ieee1394: sbp2: convert from PCI DMA to generic DMA

API conversion without change in functionality

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: nodemgr: spaces to tabs
Stefan Richter [Wed, 22 Nov 2006 20:28:19 +0000]
ieee1394: nodemgr: spaces to tabs

whitespace pedantry

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: nodemgr: fix deadlock in shutdown
Stefan Richter [Wed, 22 Nov 2006 20:09:42 +0000]
ieee1394: nodemgr: fix deadlock in shutdown

If "modprobe ohci1394" was quickly followed by "modprobe -r ohci1394",
say with 1 second pause in between, the modprobe -r got stuck in
uninterruptible sleep in kthread_stop.  At the same time the knodemgrd
slept uninterruptibly in bus_rescan_devices_helper.  That's because
driver_detach took the semaphore of the PCI device and
bus_rescan_devices_helper wanted to take the semaphore of the FireWire
host device's parent, which is the same semaphore. This was a regression
since Linux 2.6.16, commit bf74ad5bc41727d5f2f1c6bedb2c1fac394de731,
"Hold the device's parent's lock during probe and remove".

The fix (or workaround) adds a dummy driver to the hpsb_host device. Now
bus_rescan_devices_helper won't scan the host device anymore.  This
doesn't hurt since we have no drivers which will bind to these devices
and it is unlikely that there will ever be such a driver.  The dummy
driver is befittingly presented as a representation of ieee1394 itself.

Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=6706

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: nodemgr: remove duplicate assignment
Stefan Richter [Sat, 18 Nov 2006 22:16:11 +0000]
ieee1394: nodemgr: remove duplicate assignment

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agosbp2: make 1bit bitfield unsigned
Luca Tettamanti [Wed, 15 Nov 2006 18:14:15 +0000]
sbp2: make 1bit bitfield unsigned

A signed single-bit bitfield doesn't make much sense. Make it unsigned.

Signed-off-by: Luca Tettamanti <kronos.it@gmail.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: schedule *_oui sysfs attributes for removal
Stefan Richter [Sun, 19 Nov 2006 22:04:31 +0000]
ieee1394: schedule *_oui sysfs attributes for removal

There is no manpower available to reform oui.db into a library for use
in more kernel subsystems.  The low ratio of usefulness to size and the
occasional need to update oui.db from IEEE's official list suggest to
drop oui.db.  I plan to make a userspace script available which
translates the remaining numeric sysfs attributes to names of
organizations.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: schedule unused symbol exports for removal
Stefan Richter [Sun, 19 Nov 2006 22:03:09 +0000]
ieee1394: schedule unused symbol exports for removal

This also means that former parts of ieee1394's API will be subject to
change or removal.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: dv1394: schedule for feature removal
Stefan Richter [Sun, 19 Nov 2006 23:07:26 +0000]
ieee1394: dv1394: schedule for feature removal

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: raw1394: defer feature removal of old isoch interface
Stefan Richter [Sun, 19 Nov 2006 23:05:05 +0000]
ieee1394: raw1394: defer feature removal of old isoch interface

Known to be affected:
 - libdc1394: prefers video1394 for now, old-style raw1394 support might
   be dropped eventually
 - OpenH323 PWLib, AVC video input module: uses libraw1394's old API

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: ohci1394: call PMac code in shutdown only for proper machines
Stefan Richter [Fri, 10 Nov 2006 23:26:24 +0000]
ieee1394: ohci1394: call PMac code in shutdown only for proper machines

There has been an if(...) missing, for ages.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: ohci1394: reformat PPC_PMAC platform code
Stefan Richter [Fri, 10 Nov 2006 23:23:50 +0000]
ieee1394: ohci1394: reformat PPC_PMAC platform code

Adjust whitespace and line lengths

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: ohci1394: add PPC_PMAC platform code to driver probe
Stefan Richter [Fri, 10 Nov 2006 23:22:35 +0000]
ieee1394: ohci1394: add PPC_PMAC platform code to driver probe

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7431
iBook G3 threw a machine check exception and put the display backlight
to full brightness after ohci1394 was unloaded and reloaded.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: wrap two functions into one
Stefan Richter [Sat, 4 Nov 2006 08:55:33 +0000]
ieee1394: sbp2: wrap two functions into one

Move the body of a function into its only caller.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: update comment on things to do
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: update comment on things to do

Some people actually look at those comments.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: use list_move_tail()
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: use list_move_tail()

It's OK to reorder list_del() and sbp2util_free_command_dma() here.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: more concise names for types and variables
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: more concise names for types and variables

"struct scsi_id_instance_data" represents a logical unit.
Rename it to "struct sbp2_lu", and "scsi_id" to "lu".
Rename some other variables too.
Wrap almost all lines after at most 80 columns.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: remove unused struct members
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: remove unused struct members

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: proper unit in module parameter description
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: proper unit in module parameter description

It's 2^20 bit/s, not 0.001 bit.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: clean up sbp2_ namespace
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: clean up sbp2_ namespace

Prepend sbp2*_ to anything globally defined in sbp2.c except for some
macros.  Strip sbp2_ from names of struct members.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: some conditions in queue_command are unlikely
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: some conditions in queue_command are unlikely

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years ago[IA64] replace kmalloc+memset with kzalloc
Yan Burman [Mon, 4 Dec 2006 22:58:35 +0000]
[IA64] replace kmalloc+memset with kzalloc

Replace kmalloc+memset with kzalloc

Signed-off-by: Yan Burman <burman.yan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] resolve name clash by renaming is_available_memory()
Christoph Lameter [Mon, 4 Dec 2006 22:58:35 +0000]
[IA64] resolve name clash by renaming is_available_memory()

There is a name clash with ia64 arch code in Andrew's tree. Rename
is_avialable_memory() to is_memory_available() to avoid the clash.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years agoieee1394: sbp2: remove superfluous comments
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: remove superfluous comments

And update and reformat remaining comments.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: delayed_work -> work_struct
Stefan Richter [Thu, 7 Dec 2006 21:40:33 +0000]
ieee1394: sbp2: delayed_work -> work_struct

This work is not delayed.

Also bring the code format in a state which reduces my work to merge
pending sbp2 patchs.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoMerge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Trond Myklebust [Thu, 7 Dec 2006 21:35:17 +0000]
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

13 years ago[IA64] Need export for csum_ipv6_magic
Tony Luck [Thu, 7 Dec 2006 21:18:57 +0000]
[IA64] Need export for csum_ipv6_magic

Now we have our own highly optimized assembly code version of
this routine (Thanks Ken!) we should export it so that it can
be used.

Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years agoMerge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Trond Myklebust [Thu, 7 Dec 2006 20:48:15 +0000]
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

Conflicts:

include/linux/sunrpc/xprt.h
net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.

13 years agoieee1394: sbp2: coding style of some macros
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: coding style of some macros

Adjust parentheses, indentation, line lengths.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: remove debug macros
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: remove debug macros

No need to keep them in released sources.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: consolidate log levels
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: consolidate log levels

Replace some calls to SBP2_ERR and SBP2_WARN by SBP2_INFO.
Remove logging macros SBP2_NOTICE and SBP2_WARN.
Remove direct usage of HPSB_ logging macros.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: remove duplicate code
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: remove duplicate code

The same case is handled further below in sbp2scsi_complete_command.
Note, the second version behaves slightly different but looks
preferable.  It's an extremely unlikely case by the way.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: remove dead code
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: remove dead code

This has been within #if 0 for a long time and is wrong anyway.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: clean up function declarations
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: clean up function declarations

Remove unnecessary function prototypes.
Remove variable names from function prototypes.
Move declarations from sbp2.h to sbp2.c.
Move definitions of driver templates together near the top of sbp2.c.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: remove irritating log message
Stefan Richter [Thu, 2 Nov 2006 20:16:08 +0000]
ieee1394: sbp2: remove irritating log message

The queue depth can be read from /sys/bus/scsi/devices/*/queue_depth,
so don't log it.  And the hint about speed improvements is misleading,
at least under current kernels.  If serialization is switched off, read
performance is typically increased by less than 10%.  (I did not test
write performance recently.)  On the other hand, serialize_io=0 is not
yet safe due to some implementation issues that are not trivial to fix.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoohci1394: shortcut irq printing
Alexey Dobriyan [Mon, 30 Oct 2006 12:51:52 +0000]
ohci1394: shortcut irq printing

To print irq number no need to transform to string using %d, then print
using %s. Just use %d.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

13 years agoieee1394: nodemgr: take it easy if bus_rescan_devices fails
Stefan Richter [Sun, 29 Oct 2006 22:09:11 +0000]
ieee1394: nodemgr: take it easy if bus_rescan_devices fails

This happens.  No need to log a BUG trace.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agodrivers/ieee1394/*: use kmemdup()
Eric Sesterhenn [Sun, 29 Oct 2006 20:13:40 +0000]
drivers/ieee1394/*: use kmemdup()

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: ohci1394: proper log messages in suspend and resume
Stefan Richter [Sun, 29 Oct 2006 18:58:25 +0000]
ieee1394: ohci1394: proper log messages in suspend and resume

 - correct thinko in one of my last commits: cannot use PRINT macro with
   ohci == NULL
 - add log messages on ohci == NULL and on pci_enable_device != 0
 - update log macros from patch "revert fail on error in suspend" to use
   PRINT and DBGMSG where possible

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: ohci1394: revert fail on error in suspend
Stefan Richter [Sun, 29 Oct 2006 18:52:49 +0000]
ieee1394: ohci1394: revert fail on error in suspend

Some errors during preparation for suspended state can be skipped with a
warning instead of a failure of the whole suspend transition, notably an
error in pci_set_power_state.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: only build OUI database files if config enabled
Randy Dunlap [Tue, 24 Oct 2006 18:19:11 +0000]
ieee1394: only build OUI database files if config enabled

Only build IEEE1394 OUI database files if the config option is enabled.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: fix printk format warning
Randy Dunlap [Tue, 24 Oct 2006 04:44:36 +0000]
ieee1394: fix printk format warning

Fix printk format warning:
drivers/ieee1394/nodemgr.c:364: warning: long long unsigned int format, u64 arg (arg 3)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: nodemgr: revise semaphore protection of driver core data
Stefan Richter [Sun, 22 Oct 2006 14:16:27 +0000]
ieee1394: nodemgr: revise semaphore protection of driver core data

 - The list "struct class.children" is supposed to be protected by
   class.sem, not by class.subsys.rwsem.

 - nodemgr_remove_uds() iterated over nodemgr_ud_class.children without
   proper protection.  This was never observed as a bug since the code
   is usually only accessed by knodemgrd.  All knodemgrds are currently
   globally serialized.  But userspace can trigger this code too by
   writing to /sys/bus/ieee1394/destroy_node.

 - Clean up access to the FireWire bus type's subsys.rwsem:  Access it
   uniformly via ieee1394_bus_type.  Shrink rwsem protected regions
   where possible.  Expand them where necessary.  The latter wasn't a
   problem so far because knodemgr is globally serialized.

This should harden the interaction of ieee1394 with sysfs and lay ground
for deserialized operation of multiple knodemgrds and for implementation
of subthreads for parallelized scanning and probing.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: nodemgr: reflect which return values are errors
Stefan Richter [Fri, 20 Oct 2006 23:23:56 +0000]
ieee1394: nodemgr: reflect which return values are errors

Give better names to local variables.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: nodemgr: small fix after sysfs errors patch
Stefan Richter [Fri, 20 Oct 2006 23:22:36 +0000]
ieee1394: nodemgr: small fix after sysfs errors patch

One hunk in "ieee1394: handle sysfs errors" was wrong.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agodv1394: remove BKL contention
Stefan Richter [Fri, 20 Oct 2006 19:01:58 +0000]
dv1394: remove BKL contention

Purges the one remaining call to lock_kernel() from the 1394 subsystem.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agovideo1394: remove BKL contention
Daniel Drake [Fri, 20 Oct 2006 13:56:01 +0000]
video1394: remove BKL contention

video1394 does not need to take the BKL. The data structures shared between
file_operations and interrupts are already protected through context-specific
spinlocks.

The only other danger is video1394_release() being called during another
operation, however this cannot happen because release is only ever invoked
when the last thread has closed the fd.

Signed-off-by: Daniel Drake <ddrake@brontes3d.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agovideo1394: small optimizations to frame retrieval codepath
Daniel Drake [Wed, 18 Oct 2006 20:37:14 +0000]
video1394: small optimizations to frame retrieval codepath

Add some GCC branch prediction optimizations to unlikely error/safety
conditions in the ioctl handling code commonly called during an application's
capture loop.

Signed-off-by: Daniel Drake <ddrake@brontes3d.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: handle sysfs errors
Stefan Richter [Tue, 10 Oct 2006 19:19:21 +0000]
ieee1394: handle sysfs errors

Handle driver core errors with as much care as appropriate.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: coding style in hosts.c
Stefan Richter [Tue, 10 Oct 2006 19:12:39 +0000]
ieee1394: coding style in hosts.c

Some 80-columns pedantry, and touch up of a // comment.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: lock smaller region by host_num_alloc mutex
Stefan Richter [Tue, 10 Oct 2006 19:11:43 +0000]
ieee1394: lock smaller region by host_num_alloc mutex

We need the mutex only around the iteration over existing hosts.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: usecs_to_jiffies takes unsigned int argument
Stefan Richter [Sun, 8 Oct 2006 09:45:13 +0000]
ieee1394: usecs_to_jiffies takes unsigned int argument

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: ohci1394: suspend/resume cosmetics
Stefan Richter [Sun, 24 Sep 2006 09:01:00 +0000]
ieee1394: ohci1394: suspend/resume cosmetics

Reorder the definitions of ohci1394_pci_suspend and _resume.  Remove
redundant comments.  Beautify return statements.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoohci1394: steps to implement suspend/resume
Bernhard Kaindl [Wed, 6 Sep 2006 12:58:30 +0000]
ohci1394: steps to implement suspend/resume

I did a quick shot on what I described and the appended patch
does the first thing needed for working suspend/resume
in ohci1394 which is HW de- and re-initialisation.

It works with suspend2disk on my Ricoh R5C552 IEEE 1394 Controller
with the 2.6.17 kernel to the extent that if I call dvgrab --interactive
after suspend2disk without unloading ohci1394, it does not lock up
dvgrab with 100% CPU but properly connects to the camera, given
that I first unplug and plug the camera after coming back from
suspend.

I guess that could be fixed by forcing a bus reset in the resume
function.

I cannot test suspend to RAM here at the moment and should
follow the guidelines in Documentation/power/pci.txt also,
so this is rather a quick report than a finished patch and
there are some rough edges:

However, with this patch, I have to unload at least some in-kernel
users of ohci1394 like dv1394 or video1394 before suspending.

Not doing that caused an Oops and a bad tasklet error, probably from
not handling ISO tasklets during suspend/resume properly.

Maybe these can be temporarily cleared or unregistered and
re-registered for suspend/resume with help from the other
layers or from the highlevel 1394 core, but I do not really
know what these do.

But this patch provides a useful base to start from and is
already of much help for people which do not need dv1394
and video1394 or can unload them at least during suspend.

I cannot test function with sbp2 at the moment, but raw1394
seems to work fine.

Signed-off-by: Bernhard Kaindl <bk@fsfe.org>

Update 1: merge with previous two ohci1394 suspend/resume patches
Update 2: version for application on top of Linux 2.6.19-rc4

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: raw1394: add comments on lock usage
Stefan Richter [Thu, 14 Sep 2006 20:06:48 +0000]
ieee1394: raw1394: add comments on lock usage

Add a who-is-who about some locks and list heads in raw1394's struct
definitions.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: sbp2: slightly reorder sbp2scsi_abort
Stefan Richter [Mon, 11 Sep 2006 18:17:14 +0000]
ieee1394: sbp2: slightly reorder sbp2scsi_abort

Put the target's fetch agent into reset state before the underlying ORB
DMA is unmapped and the ->done handler is called.  It is highly unlikely
but the target could access that ORB right before sbp2 sends the reset
request.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years agoieee1394: remove unused struct member from highlevel API
Stefan Richter [Thu, 7 Sep 2006 23:30:04 +0000]
ieee1394: remove unused struct member from highlevel API

struct hpsb_highlevel's struct module *owner is neither used by the IEEE
1394 core nor set by any of the in-tree drivers or the two out-of-tree
highlevel drivers I know about (dfg1394, mem1394) --- nor is this member
documented.  An unscheduled removal seems acceptable.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

13 years ago[IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP
Matthew Wilcox [Thu, 16 Nov 2006 20:40:53 +0000]
[IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP

make allnoconfig currently fails to build because it selects DISCONTIGMEM
without VIRTUAL_MEM_MAP.  I see no particular reason this combination
ought to fail, so I fixed it by:

 - Including memory_model.h in all circumstances, except when both
   DISCONTIGMEM and VIRTUAL_MEM_MAP are enabled.
 - Defining ia64_pfn_valid() to 1 unless VIRTUAL_MEM_MAP is enabled

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[PATCH] Add support for type argument in PAL_GET_PSTATE
Venkatesh Pallipadi [Fri, 1 Dec 2006 23:28:14 +0000]
[PATCH] Add support for type argument in PAL_GET_PSTATE

PAL_GET_PSTATE accepts a type argument to return different kinds of
frequency information.
Refer: Intel Itanium®Architecture Software Developer's Manual -
Volume 2: System Architecture, Revision 2.2
(http://developer.intel.com/design/itanium/manuals/245318.htm)

Add the support for type argument and use Instantaneous frequency
in the acpi driver.

Also fix a bug, where in return value of PAL_GET_PSTATE was getting compared
with 'control' bits instead of 'status' bits.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] tidy up return value of ip_fast_csum
Chen, Kenneth W [Thu, 9 Nov 2006 00:29:25 +0000]
[IA64] tidy up return value of ip_fast_csum

While working on implementing csum_ipv6_magic, I noticed that current
version of ip_fast_csum will potentially return bits above "unsigned
short" as 1.  While no harm is done right now because all call sites
will chop off the upper bits when it uses the return value.  However,
this is still dangerous and buggy.  Here is a patch to enforce that the
function really returns unsigned short in the native register format.

The fix is free as there are plenty open slot to add one more asm instruction.

Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] implement csum_ipv6_magic for ia64.
Chen, Kenneth W [Fri, 10 Nov 2006 21:17:50 +0000]
[IA64] implement csum_ipv6_magic for ia64.

The asm version is 4.4 times faster than the generic C version and
10X smaller in code size.

Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] More Itanium PAL spec updates
Russ Anderson [Mon, 6 Nov 2006 22:45:18 +0000]
[IA64] More Itanium PAL spec updates

Additional updates to conform with Rev 2.2 of Volume 2 of "Intel
Itanium Architecture Software Developer's Manual" (January 2006).

Add pal_bus_features_s bits 52 & 53 (page 2:347)
Add pal_vm_info_2_s field max_purges (page 2:2:451)
Add PAL_GET_HW_POLICY call (page 2:381)
Add PAL_SET_HW_POLICY call (page 2:439)

Sample output before:
---------------------------------------------------------------------
cobra:~ # cat /proc/pal/cpu0/vm_info
Physical Address Space         : 50 bits
Virtual Address Space          : 61 bits
Protection Key Registers(PKR)  : 16
Implemented bits in PKR.key    : 24
Hash Tag ID                    : 0x2
Size of RR.rid                 : 24
Supported memory attributes    : WB, UC, UCE, WC, NaTPage
---------------------------------------------------------------------

Sample output after:
---------------------------------------------------------------------
cobra:~ # cat /proc/pal/cpu0/vm_info
Physical Address Space         : 50 bits
Virtual Address Space          : 61 bits
Protection Key Registers(PKR)  : 16
Implemented bits in PKR.key    : 24
Hash Tag ID                    : 0x2
Max Purges                     : 1
Size of RR.rid                 : 24
Supported memory attributes    : WB, UC, UCE, WC, NaTPage
---------------------------------------------------------------------

Signed-off-by: Russ Anderson (rja@sgi.com)
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] Update processor_info features
Russ Anderson [Thu, 7 Dec 2006 19:06:35 +0000]
[IA64] Update processor_info features

Add the printing of additional processor features to proc_features.

Based on Rev 2.2 of Volume 2 of "Intel Itanium Architecture Software
Developer's Manual" (January 2006) fields (pages 2:430-2:432).
This patch gets the features back in sync with the spec.

Sample output before:
--------------------------------------------------------------
cobra:~ # cat /proc/pal/cpu0/processor_info
XIP,XPSR,XFS implemented                 : On NoCtrl
XR1-XR3 implemented                      : On NoCtrl
Disable dynamic predicate prediction     : NotImpl
Disable processor physical number        : NotImpl
Disable dynamic data cache prefetch      : NotImpl
Disable dynamic inst cache prefetch      : NotImpl
Disable dynamic branch prediction        : NotImpl
Disable BINIT on processor time-out      : On Ctrl
Disable dynamic power management (DPM)   : NotImpl
Disable coherency                        : NotImpl
Disable cache                            : NotImpl
Enable CMCI promotion                    : Off Ctrl
Enable MCA to BINIT promotion            : Off Ctrl
Enable MCA promotion                     : NotImpl
Enable BERR promotion                    : NotImpl
cobra:~ #
--------------------------------------------------------------

Sample output after:
--------------------------------------------------------------
cobra:~ # cat /proc/pal/cpu0/processor_info
Unimplemented instruction address fault  : NotImpl
INIT, PMI, and LINT pins                 : NotImpl
Simple unimplimented instr addresses     : On NoCtrl
Variable P-state performance             : NotImpl
Virtual machine features implemeted      : On NoCtrl
XIP,XPSR,XFS implemented                 : On NoCtrl
XR1-XR3 implemented                      : On NoCtrl
Disable dynamic predicate prediction     : NotImpl
Disable processor physical number        : NotImpl
Disable dynamic data cache prefetch      : NotImpl
Disable dynamic inst cache prefetch      : NotImpl
Disable dynamic branch prediction        : NotImpl
Disable P-states                         : Off Ctrl
Enable MCA on Data Poisoning             : Off Ctrl
Enable vmsw instruction                  : On Ctrl
Enable extern environmental notification : NotImpl
Disable BINIT on processor time-out      : On Ctrl
Disable dynamic power management (DPM)   : NotImpl
Disable coherency                        : NotImpl
Disable cache                            : NotImpl
Enable CMCI promotion                    : Off Ctrl
Enable MCA to BINIT promotion            : Off Ctrl
Enable MCA promotion                     : NotImpl
Enable BERR promotion                    : NotImpl
cobra:~ #
--------------------------------------------------------------

Signed-off-by: Russ Anderson (rja@sgi.com)
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] Add se bit to Processor State Parameter structure
Russ Anderson [Thu, 26 Oct 2006 16:53:17 +0000]
[IA64] Add se bit to Processor State Parameter structure

Rev 2.2 of Volume 2 of "Intel Itanium Architecture Software Developer's
Manual" (January 2006) adds a se bit to the Processor State Parameter
fields (pages 2:299).  This patch gets the structs back in sync
with the spec.

Signed-off-by: Russ Anderson (rja@sgi.com)
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] Add dp bit to cache and bus check structs
Russ Anderson [Wed, 25 Oct 2006 19:18:27 +0000]
[IA64] Add dp bit to cache and bus check structs

Rev 2.2 of Volume 2 of "Intel Itanium Architecture Software Developer's
Manual" (January 2006) adds a dp bit to the cache_check and bus_check
fields (pages 2:401-2:404).  This patch gets the structs back in sync
with the spec.

Signed-off-by: Russ Anderson (rja@sgi.com)
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] SN: Correctly update smp_affinty mask
John Keller [Mon, 6 Nov 2006 20:10:50 +0000]
[IA64] SN: Correctly update smp_affinty mask

On Altix systems, the /proc/irq/nn/smp_affinity mask is not being setup
at device iniitalization, or updated after an interrupt redirection.
This patch resolves those issues.

Signed-off-by: John Keller <jpk@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] sparse cleanups
Matthew Wilcox [Thu, 26 Oct 2006 18:22:32 +0000]
[IA64] sparse cleanups

0/NULL confusion and some missing UL on constants.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years ago[IA64] IA64 Kexec/kdump
Zou Nan hai [Thu, 7 Dec 2006 17:51:35 +0000]
[IA64] IA64 Kexec/kdump

Changes and updates.

1. Remove fake rendz path and related code according to discuss with Khalid Aziz.
2. fc.i offset fix in relocate_kernel.S.
3. iospic shutdown code eoi and mask race fix from Fujitsu.
4. Warm boot hook in machine_kexec to SN SAL code from Jack Steiner.
5. Send slave to SAL slave loop patch from Jay Lan.
6. Kdump on non-recoverable MCA event patch from Jay Lan
7. Use CTL_UNNUMBERED in kdump_on_init sysctl.

Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

13 years agoAdd "run_scheduled_work()" workqueue function
Linus Torvalds [Thu, 7 Dec 2006 17:28:19 +0000]
Add "run_scheduled_work()" workqueue function

This allows workqueue users to run just their own pending work, rather
than wait for the whole workqueue to finish running.  This solves the
deadlock with networking libphy that was due to other workqueue entries
possibly needing a lock that was held by the routine that wanted to
flush its own work.

It's not wonderful: if you absolutely need to synchronize with the work
function having been executed, any user strictly speaking should have
its own completion tracking logic, since when we run things explicitly
by hand, the generic workqueue layer can no longer help us synchronize.

Also, this is strictly only usable for work that has been scheduled
without any delayed timers.  You can not mix the new interface with
schedule_delayed_work().

But it's better than what we had currently.

Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[ARM] 3995/1: iop13xx: add iop13xx support
Dan Williams [Thu, 7 Dec 2006 01:59:39 +0000]
[ARM] 3995/1: iop13xx: add iop13xx support

The iop348 processor integrates an Xscale (XSC3 512KB L2 Cache) core with a
Serial Attached SCSI (SAS) controller, multi-ported DDR2 memory
controller, 3 Application Direct Memory Access (DMA) controllers, a 133Mhz
PCI-X interface, a x8 PCI-Express interface, and other peripherals to form
a system-on-a-chip RAID subsystem engine.

The iop342 processor replaces the SAS controller with a second Xscale core
for dual core embedded applications.

The iop341 processor is the single core version of iop342.

This patch supports the two Intel customer reference platforms iq81340mc
for external storage and iq81340sc for direct attach (HBA) development.

The developer's manual is available here:
ftp://download.intel.com/design/iio/docs/31503701.pdf

Changelog:
* removed virtual addresses from resource definitions
* cleaned up some unnecessary #include's

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[ARM] 3968/1: iop13xx: add iop13xx_defconfig
Dan Williams [Fri, 1 Dec 2006 20:40:37 +0000]
[ARM] 3968/1: iop13xx: add iop13xx_defconfig

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years ago[ARM] Update mach-types
Russell King [Thu, 7 Dec 2006 17:19:58 +0000]
[ARM] Update mach-types

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Thu, 7 Dec 2006 17:16:07 +0000]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: Incorrect timing computation for PIO5/6
  [PATCH] sata_promise: new EH conversion, take 2
  [PATCH] libata: let ATA_FLAG_PIO_POLLING use polling pio for ATA_PROT_NODATA
  [PATCH] sata_promise: cleanups, take 2

13 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
Linus Torvalds [Thu, 7 Dec 2006 17:13:20 +0000]
Merge /pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

* master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (73 commits)
  [DLM] Clean up lowcomms
  [GFS2] Change gfs2_fsync() to use write_inode_now()
  [GFS2] Fix indent in recovery.c
  [GFS2] Don't flush everything on fdatasync
  [GFS2] Add a comment about reading the super block
  [GFS2] Mount problem with the GFS2 code
  [GFS2] Remove gfs2_check_acl()
  [DLM] fix format warnings in rcom.c and recoverd.c
  [GFS2] lock function parameter
  [DLM] don't accept replies to old recovery messages
  [DLM] fix size of STATUS_REPLY message
  [GFS2] fs/gfs2/log.c:log_bmap() fix printk format warning
  [DLM] fix add_requestqueue checking nodes list
  [GFS2] Fix recursive locking in gfs2_getattr
  [GFS2] Fix recursive locking in gfs2_permission
  [GFS2] Reduce number of arguments to meta_io.c:getbuf()
  [GFS2] Move gfs2_meta_syncfs() into log.c
  [GFS2] Fix journal flush problem
  [GFS2] mark_inode_dirty after write to stuffed file
  [GFS2] Fix glock ordering on inode creation
  ...

13 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Thu, 7 Dec 2006 17:09:52 +0000]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (43 commits)
  [wireless] zd1211rw: workqueue-related build fixes
  [netdrvr] netxen: workqueue-related build fixes
  [PATCH] sky2: sparse warnings
  [PATCH] skge: fix sparse warnings
  [PATCH] myri10ge: write as 2 32-byte blocks in myri10ge_submit_8rx
  [PATCH] sky2: receive queue watermark tweak
  [PATCH] sky2: beter ram buffer partitioning
  [PATCH] sky2: add comments to PCI ids
  [PATCH] sky2: add PCI for 88ec033
  [PATCH] AT91RM9200 Ethernet: Use dev_alloc_skb()
  [PATCH] AT91RM9200 Ethernet: Add netpoll / netconsole support
  [PATCH] AT91RM9200 Ethernet: Move check_timer variable and use mod_timer()
  [PATCH] AT91RM9200 Ethernet: Remove 'at91_dev' and use netdev_priv()
  [PATCH] ipw2200: Fix debug output endian issue
  [PATCH] ipw2200: Fix a typo
  [PATCH] ipw2200: Update version stamp to 1.2.0
  [PATCH] ipw2200: Add IEEE80211_RADIOTAP_TSFT for promiscuous mode
  [PATCH] softmac: fix unbalanced mutex_lock/unlock in ieee80211softmac_wx_set_mlme
  [PATCH] softmac: Fixed handling of deassociation from AP
  [PATCH] ipw2200: replace kmalloc+memset with kcalloc
  ...

13 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 7 Dec 2006 17:05:15 +0000]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (48 commits)
  [NETFILTER]: Fix non-ANSI func. decl.
  [TG3]: Identify Serdes devices more clearly.
  [TG3]: Use msleep.
  [TG3]: Use netif_msg_*.
  [TG3]: Allow partial speed advertisement.
  [TG3]: Add TG3_FLG2_IS_NIC flag.
  [TG3]: Add 5787F device ID.
  [TG3]: Fix Phy loopback.
  [WANROUTER]: Kill kmalloc debugging code.
  [TCP] inet_twdr_hangman: Delete unnecessary memory barrier().
  [NET]: Memory barrier cleanups
  [IPSEC]: Fix inetpeer leak in ipv4 xfrm dst entries.
  audit: disable ipsec auditing when CONFIG_AUDITSYSCALL=n
  audit: Add auditing to ipsec
  [IRDA] irlan: Fix compile warning when CONFIG_PROC_FS=n
  [IrDA]: Incorrect TTP header reservation
  [IrDA]: PXA FIR code device model conversion
  [GENETLINK]: Fix misplaced command flags.
  [NETLIK]: Add a pointer to the Generic Netlink wiki page.
  [IPV6] RAW: Don't release unlocked sock.
  ...

13 years agoMerge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
Linus Torvalds [Thu, 7 Dec 2006 16:59:11 +0000]
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (156 commits)
  [PATCH] x86-64: Export smp_call_function_single
  [PATCH] i386: Clean up smp_tune_scheduling()
  [PATCH] unwinder: move .eh_frame to RODATA
  [PATCH] unwinder: fully support linker generated .eh_frame_hdr section
  [PATCH] x86-64: don't use set_irq_regs()
  [PATCH] x86-64: check vector in setup_ioapic_dest to verify if need setup_IO_APIC_irq
  [PATCH] x86-64: Make ix86 default to HIGHMEM4G instead of NOHIGHMEM
  [PATCH] i386: replace kmalloc+memset with kzalloc
  [PATCH] x86-64: remove remaining pc98 code
  [PATCH] x86-64: remove unused variable
  [PATCH] x86-64: Fix constraints in atomic_add_return()
  [PATCH] x86-64: fix asm constraints in i386 atomic_add_return
  [PATCH] x86-64: Correct documentation for bzImage protocol v2.05
  [PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code
  [PATCH] x86-64: Fix numaq build error
  [PATCH] x86-64: include/asm-x86_64/cpufeature.h isn't a userspace header
  [PATCH] unwinder: Add debugging output to the Dwarf2 unwinder
  [PATCH] x86-64: Clarify error message in GART code
  [PATCH] x86-64: Fix interrupt race in idle callback (3rd try)
  [PATCH] x86-64: Remove unwind stack pointer alignment forcing again
  ...

Fixed conflict in include/linux/uaccess.h manually

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] elf.h: forward declare struct file
Andrew Morton [Thu, 7 Dec 2006 04:41:39 +0000]
[PATCH] elf.h: forward declare struct file

  In file included from include/asm/patch.h:14,
 from arch/ia64/kernel/patch.c:10:
  include/linux/elf.h:375: warning: "struct file" declared inside parameter list
  include/linux/elf.h:375: warning: its scope is only this definition or declaration, which is probably not what you want

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] cpuset: allow a larger buffer for writes to cpuset files
Paul Menage [Thu, 7 Dec 2006 04:41:37 +0000]
[PATCH] cpuset: allow a larger buffer for writes to cpuset files

When using fake NUMA setup, the number of memory nodes can greatly exceed
the number of CPUs.  So the current limit in cpuset_common_file_write() is
insufficient.

Signed-off-by: Paul Menage <menage@google.com>
Acked-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] ext4: Eliminate inline functions
Avantika Mathur [Thu, 7 Dec 2006 04:41:36 +0000]
[PATCH] ext4: Eliminate inline functions

Removes all inline keywords, since the compiler will make static functions
inline when it is appropriate.

Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] ext4: kmalloc to kzalloc
Avantika Mathur [Thu, 7 Dec 2006 04:41:35 +0000]
[PATCH] ext4: kmalloc to kzalloc

Performs kmalloc to kzalloc conversion

Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

13 years ago[PATCH] ext4: if expression format
Avantika Mathur [Thu, 7 Dec 2006 04:41:33 +0000]
[PATCH] ext4: if expression format

changes instances of
if ((lhs = expression)) {

to the preferred coding style

lhs=expression;
if (lhs) {

Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>