commit 20d9207849d5abe60461841b3c3724f6e7c9d33e Merge: c19f836... 4ea3c51... Author: Linus Torvalds Date: Thu Apr 16 16:43:20 2009 -0700 Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: UV BAU distribution and payload MMRs x86: UV: BAU partition-relative distribution map x86, uv: add Kconfig dependency on NUMA for UV systems x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems x86, UV: Fix for nodes with memory and no cpus x86, UV: system table in bios accessed after unmap x86: UV BAU messaging timeouts x86: UV BAU and nodes with no memory commit c19f83669a02d4fa047d0d40f518e90f6f19c4c6 Merge: 05fa199... e3cf95d... Author: Linus Torvalds Date: Thu Apr 16 14:42:04 2009 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata: Report 16/32bit PIO as best we can libata: use ATA_ID_CFA_* pata_legacy: fix no device fail path pata_hpt37x: fix HPT370 DMA timeouts libata: handle SEMB signature better commit 05fa199d45c54a9bda7aa3ae6537253d6f097aa9 Author: Hugh Dickins Date: Thu Apr 16 21:58:12 2009 +0100 mm: pass correct mm when growing stack Tetsuo Handa reports seeing the WARN_ON(current->mm == NULL) in security_vm_enough_memory(), when do_execve() is touching the target mm's stack, to set up its args and environment. Yes, a UMH_NO_WAIT or UMH_WAIT_PROC call_usermodehelper() spawns an mm-less kernel thread to do the exec. And in any case, that vm_enough_memory check when growing stack ought to be done on the target mm, not on the execer's mm (though apart from the warning, it only makes a slight tweak to OVERCOMMIT_NEVER behaviour). Reported-by: Tetsuo Handa Signed-off-by: Hugh Dickins Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 05f54c13cd0c33694eec39a265475c5d6cf223cf Author: Hugh Dickins Date: Thu Apr 16 21:55:29 2009 +0100 Revert "kobject: don't block for each kobject_uevent". This reverts commit f520360d93cdc37de5d972dac4bf3bdef6a7f6a7. Tetsuo Handa, running a kernel with CONFIG_DEBUG_PAGEALLOC=y and CONFIG_UEVENT_HELPER_PATH=/sbin/hotplug, has been hitting RCU detected CPU stalls: it's been spinning in the loop where do_execve() counts up the args (but why wasn't fixup_exception working? dunno). The recent change, switching kobject_uevent_env() from UMH_WAIT_EXEC to UMH_NO_WAIT, is broken: the exec uses args on the local stack here, and an env which is kfreed as soon as call_usermodehelper() returns. It very much needs to wait for the exec to be done. An alternative would be to keep the UMH_NO_WAIT, and complicate the code to allocate and free these resources correctly? but no, as GregKH pointed out when making the commit, CONFIG_UEVENT_HELPER_PATH="" is a much better optimization - though some distros are still saying /sbin/hotplug in their .config, yet with no such binary in their initrd or their root. Reported-by: Tetsuo Handa Signed-off-by: Hugh Dickins Acked-by: Greg Kroah-Hartman Acked-by: Arjan van de Ven Acked-by: Will Newton Signed-off-by: Linus Torvalds commit e3cf95dd6d352954b663d2934110d6e30af2406d Author: Alan Cox Date: Thu Apr 9 17:31:17 2009 +0100 ata: Report 16/32bit PIO as best we can The legacy old IDE ioctl API for this is a bit primitive so we try and map stuff sensibly onto it. - Set PIO over DMA devices to report 32bit - Add ability to change the PIO32 settings if the controller permits it - Add that functionality into the sff drivers - Add that functionality into the VLB legacy driver - Turn on the 32bit PIO on the ninja32 and add support there Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 62afe5d744047df8ff15a369f4c1ebad71c937d4 Author: Sergei Shtylyov Date: Mon Apr 13 20:50:00 2009 +0400 libata: use ATA_ID_CFA_* Use ATA_ID_CFA_* constants for CFA specific identify data words 162 and 163. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 20cbf5f8c0fe3df2ddbde1f334993b4dda18a651 Author: Tejun Heo Date: Tue Apr 14 12:59:03 2009 +0900 pata_legacy: fix no device fail path When pata_legacy can't detect any device, it unregisters the platform_device and fails detection. However, it forgets to detach ata host triggering weird failures as the host later gets freed by devres while still attached. Fix it. Signed-off-by: Tejun Heo Reported-by: Peter Zijlstra Signed-off-by: Jeff Garzik commit 265b7215aed36941620b65ecfff516200fb190c1 Author: Sergei Shtylyov Date: Tue Apr 14 18:39:14 2009 +0400 pata_hpt37x: fix HPT370 DMA timeouts The libata driver has copied the code from the IDE driver which caused a post 2.4.18 regression on many HPT370[A] chips -- DMA stopped to work completely, only causing timeouts. Now remove hpt370_bmdma_start() for good... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 79b42babbac2a5a522b8e269fb2811b6e1063030 Author: Tejun Heo Date: Wed Apr 15 06:21:10 2009 +0900 libata: handle SEMB signature better WDC WD1600JS-62MHB5 successfully hits the window between ATA/ATAPI-7 and Serial ATA II standards and reports 3c/c3 signature which now is assigned to SEMB. Make ata_dev_classify() report ATA_DEV_SEMB on the sig and let ata_dev_read_id() work around it by trying IDENTIFY once. This fixes bko#11579. Signed-off-by: Tejun Heo Reported-by: David Haun Reported-by: Lars Wirzenius Reported-by: Juan Manuel Signed-off-by: Jeff Garzik commit 4ea3c51d5bd3bb4eea7d7d3a1f80d1a48c2a6f92 Author: Cliff Wickman Date: Thu Apr 16 07:53:09 2009 -0500 x86: UV BAU distribution and payload MMRs This patch correctly sets BAU memory mapped registers to point to the sending activation descriptor table and target payload table. The "Broadcast Assist Unit" is used for TLB shootdown in UV. The memory mapped registers that point to sending and receiving memory structures contain node numbers. In one case the __pa() function did not provide the node id of memory on blade zero in configurations where that id is nonzero. In another case, it was assumed that memory was allocated on the local node. That assumption is not true in a configuration in which the node has no memory. Tested on the UV hardware simulator. [ Impact: fix possible runtime crash due to incorrect TLB logic ] Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar commit 35c80d5f400f68f2eccf3069d1c068e154bde9c9 Author: Chris Mason Date: Wed Apr 15 13:22:38 2009 -0400 Add block_write_full_page_endio for passing endio handler block_write_full_page doesn't allow the caller to control what happens when the IO is over. This adds a new call named block_write_full_page_endio so the buffer head end_io handler can be provided by the caller. This will be used by the ext3 data=guarded mode to do i_size updates in a workqueue based end_io handler. end_buffer_async_write is also exported so it can be called to do the dirty work of managing page writeback for the higher level end_io handler. Signed-off-by: Chris Mason Acked-by: Theodore Tso Acked-by: Jan Kara Signed-off-by: Linus Torvalds commit f69955855eac55a048d26a1618f50dfaa160a006 Author: Chris Mason Date: Wed Apr 15 13:22:37 2009 -0400 Export filemap_write_and_wait_range This wasn't exported before and is useful (used by the experimental ext3 data=guarded code) Signed-off-by: Chris Mason Acked-by: Theodore Tso Acked-by: Jan Kara Signed-off-by: Linus Torvalds commit cd97824994042b809493807ea644ba26c0c23290 Merge: 3307f19... 3664090... Author: Linus Torvalds Date: Thu Apr 16 07:41:56 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (64 commits) phylib: Fix delay argument of schedule_delayed_work NET/ixgbe: Fix powering off during shutdown NET/e1000e: Fix powering off during shutdown NET/e1000: Fix powering off during shutdown packet: avoid warnings when high-order page allocation fails gianfar: stop send queue before resetting gianfar myr10ge: again fix lro_gen_skb() alignment declance: convert to net_device_ops bfin_mac: convert to net_device_ops au1000: convert to net_device_ops atarilance: convert to net_device_ops a2065: convert to net_device_ops ixgbe: update real_num_tx_queues on changing num_rx_queues ixgbe: fix tx queue index Revert "rose: zero length frame filtering in af_rose.c" sfc: Use correct macro to set event bitfield sfc: Match calls to netif_napi_add() and netif_napi_del() bonding: Remove debug printk e1000/e1000: fix compile warning ehea: Fix incomplete conversion to net_device_ops ... commit 3307f19f634dfb134b370c59a778fdb2d574c17b Merge: 5b1d07e... ed247e1... Author: Linus Torvalds Date: Thu Apr 16 07:40:48 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: remove some pointless conditionals before kfree() sbus: changed ioctls to unlocked sparc: asm/atomic.h on 32bit should include asm/system.h for xchg sparc64: Fix smp_callin() locking. commit 3664090e199f10cb0282097faae8f8ca58c1e4ae Author: Atsushi Nemoto Date: Thu Apr 16 02:43:37 2009 -0700 phylib: Fix delay argument of schedule_delayed_work The commit a390d1f3 ("phylib: convert state_queue work to delayed_work") missed converting 'expires' value to 'delay' value. Signed-off-by: Atsushi Nemoto Acked-by: Marcin Slusarz Signed-off-by: David S. Miller commit 9d8d05ae66f40642987486f4b107565fc561a77c Author: Rafael J. Wysocki Date: Wed Apr 15 17:44:01 2009 +0000 NET/ixgbe: Fix powering off during shutdown Prevent ixgbe from putting the adapter into D3 during shutdown except when we're going to power off the system, since doing that may generally cause problems with kexec to happen (such problems were observed for igb and forcedeth). For this purpose seperate ixgbe_shutdown() from ixgbe_suspend() and use the appropriate PCI PM callbacks in both of them. Signed-off-by: "Rafael J. Wysocki" Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4f9de721ab73a5271a79b126f7b5140b01a05c99 Author: Rafael J. Wysocki Date: Wed Apr 15 17:43:43 2009 +0000 NET/e1000e: Fix powering off during shutdown Prevent e1000e from putting the adapter into D3 during shutdown except when we're going to power off the system, since doing that may generally cause problems with kexec to happen (such problems were observed for igb and forcedeth). For this purpose seperate e1000e_shutdown() from e1000e_suspend() and use the appropriate PCI PM callbacks in both of them. Signed-off-by: "Rafael J. Wysocki" Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b43fcd7dc7bf0471b3bdda8fee3418e93ac25863 Author: Rafael J. Wysocki Date: Wed Apr 15 17:43:24 2009 +0000 NET/e1000: Fix powering off during shutdown Prevent e1000 from putting the adapter into D3 during shutdown except when we're going to power off the system, since doing that may generally cause problems with kexec to happen (such problems were observed for igb and forcedeth). For this purpose seperate e1000_shutdown() from e1000_suspend() and use the appropriate PCI PM callbacks in both of them. Signed-off-by: "Rafael J. Wysocki" Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5b1d07ed0e5b2707f786957c7a40eb2f399c84a8 Author: David Howells Date: Wed Apr 15 19:35:01 2009 +0100 RCU: Don't try and predeclare inline funcs as it upsets some versions of gcc Don't try and predeclare inline funcs like this: static inline void wait_migrated_callbacks(void) ... static void _rcu_barrier(enum rcu_barrier type) { ... wait_migrated_callbacks(); } ... static inline void wait_migrated_callbacks(void) { wait_event(rcu_migrate_wq, !atomic_read(&rcu_migrate_type_count)); } as it upsets some versions of gcc under some circumstances: kernel/rcupdate.c: In function `_rcu_barrier': kernel/rcupdate.c:125: sorry, unimplemented: inlining failed in call to 'wait_migrated_callbacks': function body not available kernel/rcupdate.c:152: sorry, unimplemented: called from here This can be dealt with by simply putting the static variables (rcu_migrate_*) at the top, and moving the implementation of the function up so that it replaces its forward declaration. Signed-off-by: David Howells Cc: Dipankar Sarma Cc: Paul E. McKenney Signed-off-by: Linus Torvalds commit da60682c116855cf342926b4f3427079400ee7e6 Author: David Howells Date: Wed Apr 15 19:34:56 2009 +0100 The default CONFIG_BUG=n version of BUG() should have an empty do...while The default CONFIG_BUG=n version of BUG() should incorporate an empty a do...while statement to avoid compilation weirdness. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 616df135110ccae617ef9f10e0814fa48462cc37 Author: David Howells Date: Wed Apr 15 19:34:51 2009 +0100 MN10300: Stop gcc from generating uninitialised variable warnings after BUG() Stop gcc from generating uninitialised variable warnings after BUG(). The problem is that MN10300's implementation of BUG() invokes system call 15 which doesn't return - but there's no way to tell the compiler that and also emit the bug table element with the correct file and line data. So instead, we make the do...while wrapper in _debug_bug_trap() an endless loop from which there's no escape. Also, while we're at it, (1) get rid of _debug_bug_trap() and just implement directly as BUG(), and (2) make the implementation of BUG() contingent on CONFIG_BUG=y. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 76d320a5072f93abb913e9b9d84304f819c34b96 Author: David Howells Date: Wed Apr 15 19:34:46 2009 +0100 MN10300: Wire up missing system calls Wire up missing system calls preadv() and pwritev(). Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 3bb4e153a7819c53911aa8a767c22bac9871a202 Author: David Howells Date: Wed Apr 15 19:34:41 2009 +0100 MN10300: Discard duplicate PFN_xxx() macros Discard duplicate PFN_xxx() macros from arch code as they're now in the general headers. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 31712eec954dea9260006ac415abc9bc747ddc84 Merge: 3ee8da8... ab96e79... Author: Linus Torvalds Date: Wed Apr 15 13:28:27 2009 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] boot cputime accounting [S390] add read_persistent_clock [S390] cpu hotplug and accounting values [S390] fix idle time accounting [S390] smp: fix cpu_possible_map initialization [S390] dasd: fix idaw boundary checking for track based ccw [S390] dasd: Use the new async framework for autoonlining. [S390] qdio: remove dead timeout handler [S390] appldata: Use new mod_virt_timer_periodic() function. [S390] extend virtual timer interface by mod_virt_timer_periodic [S390] stp synchronization retry timer [S390] call nmi_enter/nmi_exit on machine checks [S390] wire up preadv/pwritev system calls [S390] s390: move machine flags to lowcore commit 3ee8da87ba6151ec91b2b8bbd27633bb248ea0d5 Merge: a2c252e... 9dd175f... Author: Linus Torvalds Date: Wed Apr 15 09:11:11 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix the cmd cache keys for amp verbs ALSA: add missing definitions(letters) to HD-Audio.txt ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 [ALSA] intel8x0: add one retry to the ac97_clock measurement routine [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes ALSA: snd-usb-caiaq: clean up header includes ALSA: sound/pci: use memdup_user() ALSA: sound/usb: use memdup_user() ALSA: sound/isa: use memdup_user() ALSA: sound/core: use memdup_user() [ALSA] intel8x0: do not use zero value from PICB register [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies [ALSA] hda_intel: fix unexpected ring buffer positions ASoC: Disable S3C64xx support in Kconfig ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h commit a2c252ebdeaab28c9b400570594d576dae295958 Merge: 23da64b... 1328df7... Author: Linus Torvalds Date: Wed Apr 15 09:04:12 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Use DEFINE_SPINLOCK GFS2: cleanup file_operations mess GFS2: Move umount flush rwsem GFS2: Fix symlink creation race GFS2: Make quotad's waiting interruptible commit 23da64b4714812b66ecf010e7dfb3ed1bf2eda69 Merge: a23c218... a36e71f... Author: Linus Torvalds Date: Wed Apr 15 09:03:47 2009 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: (28 commits) cfq-iosched: add close cooperator code cfq-iosched: log responsible 'cfqq' in idle timer arm cfq-iosched: tweak kick logic a bit more cfq-iosched: no need to save interrupts in cfq_kick_queue() brd: fix cacheflushing brd: support barriers swap: Remove code handling bio_alloc failure with __GFP_WAIT gfs2: Remove code handling bio_alloc failure with __GFP_WAIT ext4: Remove code handling bio_alloc failure with __GFP_WAIT dio: Remove code handling bio_alloc failure with __GFP_WAIT block: Remove code handling bio_alloc failure with __GFP_WAIT bio: add documentation to bio_alloc() splice: add helpers for locking pipe inode splice: remove generic_file_splice_write_nolock() ocfs2: fix i_mutex locking in ocfs2_splice_to_file() splice: fix i_mutex locking in generic_splice_write() splice: remove i_mutex locking in splice_from_pipe() splice: split up __splice_from_pipe() block: fix SG_IO to return a proper error value cfq-iosched: don't delay queue kick for a merged request ... commit 9dd175f7d2db1826c891855d3d150da3a5792e94 Merge: f4723b2... fcad94a... Author: Takashi Iwai Date: Wed Apr 15 17:52:32 2009 +0200 Merge branch 'topic/hda' into for-linus * topic/hda: ALSA: hda - Fix the cmd cache keys for amp verbs ALSA: add missing definitions(letters) to HD-Audio.txt commit fcad94a4c71c36a05f4d5c6dcb174534b4e0b136 Author: Takashi Iwai Date: Wed Apr 15 17:48:35 2009 +0200 ALSA: hda - Fix the cmd cache keys for amp verbs Fix the key value generation for get/set amp verbs. The upper bits of the parameter have to be combined with the verb value to be unique for each direction/index of amp access. This fixes the resume problem on some hardwares like Macbook after the channel mode is changed. Tested-by: Johannes Berg Cc: Signed-off-by: Takashi Iwai commit a23c218bd36e11120daf18e00a91d5dc20e288e6 Merge: ea34f43... b71a0c2... Author: Linus Torvalds Date: Wed Apr 15 08:42:40 2009 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: pseries/dtl.c should include asm/firmware.h powerpc: Fix data-corrupting bug in __futex_atomic_op powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset() powerpc: Allow 256kB pages with SHMEM powerpc: Document new FSL I2C bindings and cleanup powerpc/mm: Fix compile warning powerpc/85xx: TQM8548: update defconfig powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3 powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes powerpc: Add support for early tlbilx opcode powerpc: Fix tlbilx opcode commit ea34f43a074af85823e49b9bf62f47d8d3f0e81a Author: Linus Torvalds Date: Wed Apr 15 08:05:13 2009 -0700 acpi-cpufreq: fix 'smp_call_function_many()' confusion It turns out that 'smp_call_function_many()' doesn't work at all like 'smp_call_function_single()', and my change to Andrew's patch to use it rather than a loop over all CPU's acpi-cpufreq doesn't work. My bad. 'smp_call_function_many()' has two "features" (aka "documented bugs"): (a) it needs to be called with preemption disabled, because it uses smp_processor_id() without guarding the CPU lookup with 'get_cpu()' and 'put_cpu()' like the 'single' variant does. (b) even if the current CPU is part of the CPU mask, it won't do the call on that CPU. Still, we're better off trying to use 'smp_call_function_many()' than looping over CPU's, since it at least in theory allows us to use a broadcast IPI and do it all in parallel. So let's just work around the silly semantic bugs in that function. Reported-and-tested-by: Ali Gholami Rudi Cc: Ingo Molnar Cc: Andrew Morton , Cc: Rusty Russell Cc: Dave Jones Signed-off-by: Linus Torvalds commit 719bfeaae8104fca4ca5d47c02592b08682f14fa Author: Eric Dumazet Date: Wed Apr 15 03:39:52 2009 -0700 packet: avoid warnings when high-order page allocation fails Latest tcpdump/libpcap triggers annoying messages because of high order page allocation failures (when lowmem exhausted or fragmented) These allocation errors are correctly handled so could be silent. [22660.208901] tcpdump: page allocation failure. order:5, mode:0xc0d0 [22660.208921] Pid: 13866, comm: tcpdump Not tainted 2.6.30-rc2 #170 [22660.208936] Call Trace: [22660.208950] [] ? printk+0x18/0x1a [22660.208965] [] __alloc_pages_internal+0x357/0x460 [22660.208980] [] __get_free_pages+0x21/0x40 [22660.208995] [] packet_set_ring+0x105/0x3d0 [22660.209009] [] packet_setsockopt+0x21d/0x4d0 [22660.209025] [] ? filemap_fault+0x0/0x450 [22660.209040] [] sys_setsockopt+0x54/0xa0 [22660.209053] [] sys_socketcall+0xef/0x270 [22660.209067] [] sysenter_do_call+0x12/0x26 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a36e71f996e25d6213f57951f7ae1874086ec57e Author: Jens Axboe Date: Wed Apr 15 12:15:11 2009 +0200 cfq-iosched: add close cooperator code If we have processes that are working in close proximity to each other on disk, we don't want to idle wait. Instead allow the close process to issue a request, getting better aggregate bandwidth. The anticipatory scheduler has similar checks, noop and deadline do not need it since they don't care about process <-> io mappings. The code for CFQ is a little more involved though, since we split request queues into per-process contexts. This fixes a performance problem with eg dump(8), since it uses several processes in some silly attempt to speed IO up. Even if dump(8) isn't really a valid case (it should be fixed by using CLONE_IO), there are other cases where we see close processes and where idling ends up hurting performance. Credit goes to Jeff Moyer for writing the initial implementation. Signed-off-by: Jens Axboe commit 9481ffdc61738a91baf0f8b7fb20922768ae1b8e Author: Jens Axboe Date: Wed Apr 15 12:14:13 2009 +0200 cfq-iosched: log responsible 'cfqq' in idle timer arm Makes it easier to read the traces. Signed-off-by: Jens Axboe commit 2d870722965211de072bb36b446a4df99dae07e1 Author: Jens Axboe Date: Wed Apr 15 12:12:46 2009 +0200 cfq-iosched: tweak kick logic a bit more We only kick the dispatch for an idling queue, if we think it's a (somewhat) fully merged request. Also allow a kick if we have other busy queues in the system, since we don't want to risk waiting for a potential merge in that case. It's better to get some work done and proceed. Signed-off-by: Jens Axboe commit 40bb54d197a10fe86d73073ee8202ba2812a05fa Author: Jens Axboe Date: Wed Apr 15 12:11:10 2009 +0200 cfq-iosched: no need to save interrupts in cfq_kick_queue() It's called from the workqueue handlers from process context, so we always have irqs enabled when entered. Signed-off-by: Jens Axboe commit c2572f2b4ffc27ba79211aceee3bef53a59bb5cd Author: Nick Piggin Date: Wed Apr 15 10:32:07 2009 +0200 brd: fix cacheflushing brd is missing a flush_dcache_page. On 2nd thoughts, perhaps it is the pagecache's responsibility to flush user virtual aliases (the driver of course should flush kernel virtual mappings)... but anyway, there already exists cache flushing for one direction of transfer, so we should add the other. Signed-off-by: Nick Piggin Signed-off-by: Jens Axboe commit dfbc4752eab33e66f113f9daa2effbe241cd661d Author: Nick Piggin Date: Wed Apr 15 10:27:07 2009 +0200 brd: support barriers brd is always ordered (not that it matters, as it is defined not to survive when the system goes down). So tell the block layer it is ordered, which might be of help with testing filesystems. Signed-off-by: Nick Piggin Signed-off-by: Jens Axboe commit 297dbf50d7ab0539cf9cf7f2a66918665a18e45e Author: Nikanth Karthikesan Date: Wed Apr 15 10:37:04 2009 +0530 swap: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit b1fffc9ca6ca4c3feef3a7e8405252d528d312dc Author: Nikanth Karthikesan Date: Wed Apr 15 10:36:35 2009 +0530 gfs2: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. GFP_NOFS implies __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Acked-by: Steven Whitehouse Signed-off-by: Jens Axboe commit 226e7dabf5534722944adefbad01970bd38bb7ae Author: Nikanth Karthikesan Date: Wed Apr 15 10:36:16 2009 +0530 ext4: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. GFP_NOIO implies __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit 4d1f9fdb6177a9bdecf26976337dd39abcc8edbc Author: Nikanth Karthikesan Date: Wed Apr 15 10:35:52 2009 +0530 dio: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. GFP_KERNEL implies __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit 15afd1cc7b624e1c94fdf824ec5af611050b150c Author: Nikanth Karthikesan Date: Wed Apr 15 10:35:31 2009 +0530 block: Remove code handling bio_alloc failure with __GFP_WAIT Remove code handling bio_alloc failure with __GFP_WAIT. GFP_KERNEL implies __GFP_WAIT. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit 86c824b9434e764d01489688e4e38aee43b93fcf Author: Jens Axboe Date: Wed Apr 15 09:00:07 2009 +0200 bio: add documentation to bio_alloc() Explain that with __GFP_WAIT set it will not fail, and that the caller must never allocate more than 1 bio at the time. Signed-off-by: Jens Axboe commit 61e0d47c33cc371f725bcda4a47ae0efe652dba8 Author: Miklos Szeredi Date: Tue Apr 14 19:48:41 2009 +0200 splice: add helpers for locking pipe inode There are lots of sequences like this, especially in splice code: if (pipe->inode) mutex_lock(&pipe->inode->i_mutex); /* do something */ if (pipe->inode) mutex_unlock(&pipe->inode->i_mutex); so introduce helpers which do the conditional locking and unlocking. Also replace the inode_double_lock() call with a pipe_double_lock() helper to avoid spreading the use of this functionality beyond the pipe code. This patch is just a cleanup, and should cause no behavioral changes. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit f8cc774ce4844811a55e2352f1443055e3994e28 Author: Miklos Szeredi Date: Tue Apr 14 19:48:40 2009 +0200 splice: remove generic_file_splice_write_nolock() Remove the now unused generic_file_splice_write_nolock() function. It's conceptually broken anyway, because splice may need to wait for pipe events so holding locks across the whole operation is wrong. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit 328eaaba4e41a04c1dc4679d65bea3fee4349d86 Author: Miklos Szeredi Date: Tue Apr 14 19:48:39 2009 +0200 ocfs2: fix i_mutex locking in ocfs2_splice_to_file() Rearrange locking of i_mutex on destination and call to ocfs2_rw_lock() so locks are only held while buffers are copied with the pipe_to_file() actor, and not while waiting for more data on the pipe. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit eb443e5a25d43996deb62b9bcee1a4ce5dea2ead Author: Miklos Szeredi Date: Tue Apr 14 19:48:38 2009 +0200 splice: fix i_mutex locking in generic_splice_write() Rearrange locking of i_mutex on destination so it's only held while buffers are copied with the pipe_to_file() actor, and not while waiting for more data on the pipe. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit 2933970b960223076d6affcf7a77e2bc546b8102 Author: Miklos Szeredi Date: Tue Apr 14 19:48:37 2009 +0200 splice: remove i_mutex locking in splice_from_pipe() splice_from_pipe() is only called from two places: - generic_splice_sendpage() - splice_write_null() Neither of these require i_mutex to be taken on the destination inode. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit b3c2d2ddd63944ef2a1e4a43077b602288107e01 Author: Miklos Szeredi Date: Tue Apr 14 19:48:36 2009 +0200 splice: split up __splice_from_pipe() Split up __splice_from_pipe() into four helper functions: splice_from_pipe_begin() splice_from_pipe_next() splice_from_pipe_feed() splice_from_pipe_end() splice_from_pipe_next() will wait (if necessary) for more buffers to be added to the pipe. splice_from_pipe_feed() will feed the buffers to the supplied actor and return when there's no more data available (or if all of the requested data has been copied). This is necessary so that implementations can do locking around the non-waiting splice_from_pipe_feed(). This patch should not cause any change in behavior. Signed-off-by: Miklos Szeredi Signed-off-by: Jens Axboe commit 91e463c8f5f7a5b09d3d034c01a88567af60c504 Author: FUJITA Tomonori Date: Mon Apr 13 20:03:10 2009 +0200 block: fix SG_IO to return a proper error value blk_rq_unmap_user() returns -EFAULT if a program passes an invalid address to kernel. SG_IO path needs to pass the returned value to user space instead of ignoring it. Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit ed247e12fe5da4417602c3c0ce22932fb0f9cac1 Author: Wei Yongjun Date: Wed Apr 15 03:04:56 2009 -0700 sparc: remove some pointless conditionals before kfree() Remove some pointless conditionals before kfree(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 83b2086ce2a1458168dc8b9d624060b2d7a82d4c Author: Justin Mattock Date: Tue Apr 14 14:31:21 2009 -0700 ALSA: add missing definitions(letters) to HD-Audio.txt impact: Add missing definitions(letters). Signed-off-by: Justin P. Mattock Signed-off-by: Takashi Iwai commit cbea270714faae389c48c2901ee7988ecd62f664 Author: Markus Brunner Date: Wed Apr 15 02:35:40 2009 -0700 gianfar: stop send queue before resetting gianfar After a transmit timed out, the reset task will be called, which will free the allocated resources(stop_gfar). If gfar_poll will be called before the resources get allocated again gfar_clean_tx_ring will call dev_kfree_skb_any(NULL). Example crash: ops: Kernel access of bad area, sig: 11 [#1] PREEMPT RSBBA100 Modules linked in: NIP: c01a10c4 LR: c013b254 CTR: c013c038 REGS: c02e7d20 TRAP: 0300 Not tainted (2.6.27.20) MSR: 00001032 CR: 24000082 XER: 20000000 DAR: 000000a0, DSISR: 20000000 TASK = c02ce578[0] 'swapper' THREAD: c02e6000 GPR00: 000000a0 c02e7dd0 c02ce578 00000000 00000040 00000001 c02ec1c0 00001032 GPR08: c080d1e0 df9ea800 00000000 00000000 24000082 ffffffff 0404f000 00000000 GPR16: ffffffbf ffffffff ffffffff ffdff7ff ffffffff c02d0fd4 00100100 00200200 GPR24: c031220c 00000001 00000001 00000000 00000000 df849800 ff109000 df849b80 NIP [c01a10c4] dev_kfree_skb_irq+0x18/0x70 LR [c013b254] gfar_clean_tx_ring+0x70/0x11c Call Trace: [c02e7dd0] [c003e978] update_wall_time+0x730/0x744 (unreliable) [c02e7df0] [c013b254] gfar_clean_tx_ring+0x70/0x11c [c02e7e10] [c013c07c] gfar_poll+0x44/0x150 [c02e7e30] [c01a064c] net_rx_action+0xa8/0x19c [c02e7e70] [c00251d4] __do_softirq+0x64/0xc0 [c02e7e90] [c0006384] do_softirq+0x40/0x58 [c02e7ea0] [c00250a8] irq_exit+0x40/0x9c [c02e7eb0] [c000642c] do_IRQ+0x90/0xac [c02e7ec0] [c0010ab4] ret_from_except+0x0/0x14 --- Exception: 501 at cpu_idle+0x9c/0xf8 LR = cpu_idle+0x9c/0xf8 [c02e7f80] [c0009820] cpu_idle+0x58/0xf8 (unreliable) [c02e7fa0] [c01fb8c8] __got2_end+0x7c/0x90 [c02e7fc0] [c026c794] start_kernel+0x2c0/0x2d4 [c02e7ff0] [00003438] 0x3438 Instruction dump: 7fa00124 80010024 bba10014 38210020 7c0803a6 4e800020 9421ffe0 7c0802a6 7c6b1b78 90010024 380300a0 bfa10014 <7d200028> 3129ffff 7d20012d 40a2fff4 Kernel panic - not syncing: Fatal exception in interrupt This Patch calls netif_stop_queue before calling stop_gfar. Signed-off-by: Markus Brunner Signed-off-by: David S. Miller commit 636d2f68a0814d84de26c021b2c15e3b4ffa29de Author: Stanislaw Gruszka Date: Wed Apr 15 02:26:49 2009 -0700 myr10ge: again fix lro_gen_skb() alignment Add LRO alignment initially committed in 621544eb8c3beaa859c75850f816dd9b056a00a3 ("[LRO]: fix lro_gen_skb() alignment") and removed in 0dcffac1a329be69bab0ac604bf7283737108e68 ("myri10ge: add multislices support") during conversion to multi-slice. Signed-off-by: Stanislaw Gruszka Signed-off-by: David S. Miller commit f4723b224d21ff546ac1fea4483094548d529479 Merge: 00610a8... 336500f... Author: Takashi Iwai Date: Wed Apr 15 11:24:27 2009 +0200 Merge branch 'topic/memdup_user' into for-linus * topic/memdup_user: ALSA: sound/pci: use memdup_user() ALSA: sound/usb: use memdup_user() ALSA: sound/isa: use memdup_user() ALSA: sound/core: use memdup_user() commit 00610a81df32ea50dba0105078e7369988caef3b Merge: 035f5af... 936e7d0... Author: Takashi Iwai Date: Wed Apr 15 11:24:22 2009 +0200 Merge branch 'topic/usb-caiaq' into for-linus * topic/usb-caiaq: ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes ALSA: snd-usb-caiaq: clean up header includes commit 035f5afb022451b6b4f7ca1ff65a43d7ea8154a1 Merge: 2e8e59f... 34e51ce... Author: Takashi Iwai Date: Wed Apr 15 11:24:14 2009 +0200 Merge branch 'topic/asoc' into for-linus * topic/asoc: ASoC: Disable S3C64xx support in Kconfig ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h commit 2e8e59f437ce303fde2077cc5f84ce03c6ff1020 Merge: 45c27fc... ff0c68d... Author: Takashi Iwai Date: Wed Apr 15 11:24:09 2009 +0200 Merge branch 'topic/hda' into for-linus * topic/hda: ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack commit ff0c68d03b77ecb3a682137c42e947a4dc33e9b3 Merge: bfb5303... 95c0909... Author: Takashi Iwai Date: Wed Apr 15 11:23:44 2009 +0200 Merge branch 'topic/jack-free-fix' into topic/hda * topic/jack-free-fix: ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack commit 45c27fc8c89d39956930abeff8433c33d07a8d5f Merge: 0882e8d... 2ec775e... Author: Takashi Iwai Date: Wed Apr 15 11:21:13 2009 +0200 Merge branch 'master' of git://git.alsa-project.org/alsa-kernel into for-linus * 'master' of git://git.alsa-project.org/alsa-kernel: [ALSA] intel8x0: add one retry to the ac97_clock measurement routine [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine [ALSA] intel8x0: do not use zero value from PICB register [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies [ALSA] hda_intel: fix unexpected ring buffer positions commit 1328df725239804ae30fc7257c1a3185e679b517 Author: Xu Gang Date: Tue Apr 14 14:54:14 2009 +0800 GFS2: Use DEFINE_SPINLOCK SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead. (as suggested in Documentation/spinlocks.txt) Signed-off-by: Xu Gang Signed-off-by: Steven Whitehouse commit 10d2198805d7faa2b193485446ff6b1de42c9b78 Author: Christoph Hellwig Date: Tue Apr 7 19:42:17 2009 +0200 GFS2: cleanup file_operations mess Remove the weird pointer to file_operations mess and replace it with straight-forward defining of the lockinginstance names to the _nolock variants. Signed-off-by: Christoph Hellwig Signed-off-by: Steven Whitehouse commit a228df6339e0d385b8149c860d81b6007f5e9c81 Author: Steven Whitehouse Date: Tue Apr 7 14:01:34 2009 +0100 GFS2: Move umount flush rwsem The rwsem, used only on umount, is in the wrong place in glock.c. This patch moves it up a bit so that it does not get called under a spinlock. Signed-off-by: Steven Whitehouse commit 5cf32524de745c56e1411d63eccf23fef1709d73 Author: Steven Whitehouse Date: Tue Mar 31 16:06:27 2009 +0100 GFS2: Fix symlink creation race In certain cases symlinks can appear to have zero size if a lookup on the inode occurs within a certain (very short) time after the symlink has been created. The symlink is correctly created on disk but appears to have zero size when stat()ed. This patch closes the race and prevents incorrect sizes appearing. Signed-off-by: Steven Whitehouse commit 7fa5d20d1a5e60ef7e453993b67b26c87dc09f07 Author: Steven Whitehouse Date: Tue Mar 31 15:49:08 2009 +0100 GFS2: Make quotad's waiting interruptible So we don't count its D state in the loadavg. Reported-by: Nathan Straz Signed-off-by: Steven Whitehouse commit bfb53037c61ddf7c16a40297ad16f2bcbde534dc Author: Takashi Iwai Date: Tue Apr 14 14:51:04 2009 +0200 ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 Added the models for quirk bitmask 1734:110x and 1734:113x of Fujitsu laptops. This will fix the model detection for Amilo Xa3540. Signed-off-by: Takashi Iwai commit 2ec775e7053c82bc90858ede011b35aeb416995b Author: Jaroslav Kysela Date: Wed Apr 15 10:16:24 2009 +0200 [ALSA] intel8x0: add one retry to the ac97_clock measurement routine It seems that on some hardware platforms, the first measurement is wrong. This patch adds second measurement to this case. Signed-off-by: Jaroslav Kysela commit d6ceb25e8d8bccf826848c2621a50d02c0a7f4ae Author: Jens Axboe Date: Tue Apr 14 14:18:16 2009 +0200 cfq-iosched: don't delay queue kick for a merged request "Zhang, Yanmin" reports that commit b029195dda0129b427c6e579a3bb3ae752da3a93 introduced a regression of about 50% with sequential threaded read workloads. The test case is: tiotest -k0 -k1 -k3 -f 80 -t 32 which starts 32 threads each reading a 80MB file. Twiddle the kick queue logic so that we do start IO immediately, if it appears to be a fully merged request. We can't really detect that, so just check if the request is bigger than a page or not. The assumption is that since single bio issues will first queue a single request with just one page attached and then later do merges on that, if we already have more than a page worth of data in the request, then the request is most likely good to go. Verified that this doesn't cause a regression with the test case that commit b029195dda0129b427c6e579a3bb3ae752da3a93 was fixing. It does not, we still see maximum sized requests for the queue-then-merge cases. Signed-off-by: Jens Axboe commit 053c525fcf976810f023d96472f414c0d5e6339b Author: Jens Axboe Date: Wed Apr 8 13:44:08 2009 +0200 buffer: switch do_emergency_thaw() away from pdflush_operation() This is (again) a preparatory patch similar to commit a2a9537ac0b37a5da6fbe7e1e9cb06c524d2a9c4. It open codes a simple async way of executing do_thaw_all() out of context, so we can get rid of pdflush. Signed-off-by: Jens Axboe commit 329007ce25d56fc7113df7b4828d607806d8bc21 Author: Jens Axboe Date: Wed Apr 8 11:38:50 2009 +0200 block: update biodoc.txt on plugging We do per-device plugging, get rid of any references to tq_disk as that has been dead since 2.6.5 or so. Signed-off-by: Jens Axboe commit 1d6bfbdf38f37bcc259e7c56c8c73664772651fb Author: Jens Axboe Date: Wed Apr 8 11:02:08 2009 +0200 as-iosched: get rid of private REQ_SYNC/REQ_ASYNC defines We can just use the block layer BLK_RW_SYNC/ASYNC defines now. Signed-off-by: Jens Axboe commit ff6657c6c8ac99444e5dd4c4f7c1dc9271173382 Author: Jens Axboe Date: Wed Apr 8 10:58:57 2009 +0200 cfq-iosched: get rid of private SYNC/ASYNC defines We can just use the block layer BLK_RW_SYNC/ASYNC defines now. Signed-off-by: Jens Axboe commit b0b78f81a5a3bfe9442fcc3a9c13e298a742556a Author: Jens Axboe Date: Wed Apr 8 10:56:08 2009 +0200 cfq-iosched: use rw_is_sync() to see if rw flags are sync or not Signed-off-by: Jens Axboe commit 48e70bc18ac81881dedd3aa327c55b924fc41ecf Author: Jens Axboe Date: Tue Apr 14 08:19:27 2009 +0200 Document and move the various READ/WRITE types It's a somewhat twisty maze of hints and behavioural modifiers, try and clear it up a bit with some documentation. Signed-off-by: Jens Axboe commit f600abe2de81628c40effbb3f8eaf5af0d291e57 Author: Jens Axboe Date: Wed Apr 8 14:22:01 2009 +0200 block: fix bad spelling of quiesce Credit goes to Andrew Morton for spotting this one. Signed-off-by: Jens Axboe commit 8f3d8ba20e67991b531e9c0227dcd1f99271a32c Author: Christoph Hellwig Date: Tue Apr 7 19:55:13 2009 +0200 block: move bio list helpers into bio.h It's used by DM and MD and generally useful, so move the bio list helpers into bio.h. Signed-off-by: Christoph Hellwig Acked-by: Alasdair G Kergon Signed-off-by: Jens Axboe commit b71a0c296cee4debaf446760fbd29ead1587a7ac Author: Sachin Sant Date: Tue Apr 14 14:35:55 2009 +0000 powerpc: pseries/dtl.c should include asm/firmware.h A randconfig build on powerpc failed with: dtl.c: In function 'dtl_init': dtl.c:238: error: implicit declaration of function 'firmware_has_feature' dtl.c:238: error: 'FW_FEATURE_SPLPAR' undeclared (first use in this function) - We need firmware.h for these definitions. Signed-off-by: Sachin Sant Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 306a82881b14d950d59e0b59a55093a07d82aa9a Author: Paul Mackerras Date: Mon Apr 13 14:09:09 2009 +0000 powerpc: Fix data-corrupting bug in __futex_atomic_op Richard Henderson pointed out that the powerpc __futex_atomic_op has a bug: it will write the wrong value if the stwcx. fails and it has to retry the lwarx/stwcx. loop, since 'oparg' will have been overwritten by the result from the first time around the loop. This happens because it uses the same register for 'oparg' (an input) as it uses for the result. This fixes it by using separate registers for 'oparg' and 'ret'. Cc: stable@kernel.org Signed-off-by: Paul Mackerras commit c58dc575f3c8bdc69fb868ec51e1c80ee7cae5e7 Author: Mike Mason Date: Fri Apr 10 08:57:03 2009 +0000 powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset() While adding native EEH support to Emulex and Qlogic drivers, it was discovered that dev->error_state was set to pci_io_channel_normal too late in the recovery process. These drivers rely on error_state to determine if they can access the device in their slot_reset callback, thus error_state needs to be set to pci_io_channel_normal in eeh_report_reset(). Below is a detailed explanation (courtesy of Richard Lary) as to why this is necessary. Background: PCI MMIO or DMA accesses to a frozen slot generate additional EEH errors. If the number of additional EEH errors exceeds EEH_MAX_FAILS the adapter will be shutdown. To avoid triggering excessive EEH errors and an undesirable adapter shutdown, some drivers use the pci_channel_offline(dev) wrapper function to return a Boolean value based on the value of pci_dev->error_state to determine if PCI MMIO or DMA accesses are safe. If the wrapper returns TRUE, drivers must not make PCI MMIO or DMA access to their hardware. The pci_dev structure member error_state reflects one of three values, 1) pci_channel_io_normal, 2) pci_channel_io_frozen, 3) pci_channel_io_perm_failure. Function pci_channel_offline(dev) returns TRUE if error_state is pci_channel_io_frozen or pci_channel_io_perm_failure. The EEH driver sets pci_dev->error_state to pci_channel_io_frozen at the point where the PCI slot is frozen. Currently, the EEH driver restores dev->error_state to pci_channel_io_normal in eeh_report_resume() before calling the driver's resume callback. However, when the EEH driver calls the driver's slot_reset callback() from eeh_report_reset(), it incorrectly indicates the error state is still pci_channel_io_frozen. Waiting until eeh_report_resume() to restore dev->error_state to pci_channel_io_normal is too late for Emulex and QLogic FC drivers and any other drivers which are designed to use common code paths in these two cases: i) those called after the driver's slot_reset callback() and ii) those called after the PCI slot is frozen but before the driver's slot_reset callback is called. Case i) all driver paths executed to reinitialize the hardware after a reset and case ii) all code paths executed by driver kernel threads that run asynchronous to the main driver thread, such as interrupt handlers and worker threads to process driver work queues. Emulex and QLogic FC drivers are designed with common code paths which require that pci_channel_offline(dev) reflect the true state of the hardware. The state transitions that the hardware takes from Normal Operations to Slot Frozen to Reset to Normal Operations are documented in the Power Architecture™ Platform Requirements+ (PAPR+) in Table 75. PE State Control. PAPR defines the following 3 states: 0 -- Not reset, Not EEH stopped, MMIO load/store allowed, DMA allowed (Normal Operations) 1 -- Reset, Not EEH stopped, MMIO load/store disabled, DMA disabled 2 -- Not reset, EEH stopped, MMIO load/store disabled, DMA disabled (Slot Frozen) An EEH error places the slot in state 2 (Frozen) and the adapter driver is notified that an EEH error was detected. If the adapter driver returns PCI_ERS_RESULT_NEED_RESET, the EEH driver calls eeh_reset_device() to place the slot into state 1 (Reset) and eeh_reset_device completes by placing the slot into State 0 (Normal Operations). Upon return from eeh_reset_device(), the EEH driver calls eeh_report_reset, which then calls the adapter's slot_reset callback. At the time the adapter's slot_reset callback is called, the true state of the hardware is Normal Operations and should be accurately reflected by setting dev->error_state to pci_channel_io_normal. The current implementation of EEH driver does not do so and requires this change to correct this deficiency. Signed-off-by: Mike Mason Acked-by: Linas Vepstas Signed-off-by: Paul Mackerras commit adf213c43898f2324cfc35c315556bc21cb65b31 Author: Hugh Dickins Date: Mon Apr 6 11:01:15 2009 +0000 powerpc: Allow 256kB pages with SHMEM Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed, let powerpc 256kB pages coexist with CONFIG_SHMEM again. Signed-off-by: Hugh Dickins Signed-off-by: Paul Mackerras commit ad5a24e0944e8a0869d1f685ce4ae739adf84a87 Author: Alexander Beregalov Date: Tue Apr 14 18:30:25 2009 +0000 declance: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 149da651bf340b796576a078574fbb49ed09b7ae Author: Alexander Beregalov Date: Tue Apr 14 18:30:24 2009 +0000 bfin_mac: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit d9a92cee09d2748ec5d4126cf36083a3a8a5449d Author: Alexander Beregalov Date: Tue Apr 14 18:30:23 2009 +0000 au1000: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 8e7678fe0992a6107041b839b08ac4af55d41592 Author: Alexander Beregalov Date: Tue Apr 14 18:30:22 2009 +0000 atarilance: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 444f1a92702adb9865dd8f509fd55bca9c46a78e Author: Alexander Beregalov Date: Tue Apr 14 18:30:21 2009 +0000 a2065: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit af22ab1bd20e9dedf3a37cc1d401ef8bbd587ef0 Author: Wu Fengguang Date: Tue Apr 14 21:54:07 2009 -0700 ixgbe: update real_num_tx_queues on changing num_rx_queues Move the update of real_num_tx_queues from ixgbe_acquire_msix_vectors() to ixgbe_set_num_queues(), to ensure it be always in sync with num_tx_queues. Signed-off-by: Wu Fengguang Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 95615d90a321349709c80091f2a9cb284757ff0d Author: Wu Fengguang Date: Tue Apr 14 21:53:48 2009 -0700 ixgbe: fix tx queue index Don't do the num_tx_queues based masking on calculating tx queue index. 1) num_tx_queues is not always power-of-2, because it also depends on the online cpu numbers. So the masking could be a performance bug on a 6 cpu system. 2) queue_mapping will be limited by real_num_tx_queues=num_tx_queues in the generic netdev function set_cur_queue_map(). So the bound limiting here is not necessary. Signed-off-by: Wu Fengguang Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 6fd4777a1fec1f7757b5a302ad3fdcc1eae2abba Author: David S. Miller Date: Tue Apr 14 20:28:00 2009 -0700 Revert "rose: zero length frame filtering in af_rose.c" This reverts commit 244f46ae6e9e18f6fc0be7d1f49febde4762c34b. Alan Cox did the research, and just like the other radio protocols zero-length frames have meaning because at the top level ROSE is X.25 PLP. So this zero-length filtering is invalid. Signed-off-by: David S. Miller commit 239795adf7f1a40cf0be0e05544d37706c9b4cf9 Author: Ben Hutchings Date: Tue Apr 14 19:48:34 2009 -0700 sfc: Use correct macro to set event bitfield falcon_sim_phy_event() used EFX_OWORD_FIELD, which operates on bitfields in 128-bit values, on an event, which is a 64-bit value. This should be harmless - these macros always use little-endian ordering, so it would read and write back the following 8 bytes unchanged - but it is obviously wrong. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 718cff1eec595ce6ab0635b8160a51ee37d9268d Author: Ben Hutchings Date: Tue Apr 14 19:47:46 2009 -0700 sfc: Match calls to netif_napi_add() and netif_napi_del() sfc could call netif_napi_add() multiple times for the same napi_struct, corrupting the list of napi_structs for the associated device and leading to a busy-loop on device removal. Move the call to netif_napi_add() and add a call to netif_napi_del() in the obvious places. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 6c0f8bc77233d000a34a01989c42e650c8c32180 Author: Stoyan Gaydarov Date: Tue Apr 14 19:46:19 2009 -0700 sbus: changed ioctls to unlocked Signed-off-by: Stoyan Gaydarov Signed-off-by: David S. Miller commit c7cb1521b3289e2d107d3139ad7a902b386d7e43 Author: Stephen Rothwell Date: Tue Apr 14 02:00:48 2009 -0700 sparc: asm/atomic.h on 32bit should include asm/system.h for xchg Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit 8e255baa449df3049a8827a7f1f4f12b6921d0d1 Author: David S. Miller Date: Wed Apr 8 21:06:35 2009 -0700 sparc64: Fix smp_callin() locking. Interrupts must be disabled when taking the IPI lock. Caught by lockdep. Reported-by: Meelis Roos Signed-off-by: David S. Miller commit 2690f8d62e98779c71625dba9a0fd525d8b2263d Author: Jay Vosburgh Date: Tue Apr 14 16:53:14 2009 -0700 bonding: Remove debug printk Remove debug printk I accidently left in as part of commit: commit 6146b1a4da98377e4abddc91ba5856bef8f23f1e Author: Jay Vosburgh Date: Tue Nov 4 17:51:15 2008 -0800 bonding: Fix ALB mode to balance traffic on VLANs Reported by Duncan Gibb Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit df26fd2c594a0876b4e6b802dee7753024e484d9 Author: Jesse Brandeburg Date: Tue Apr 14 16:38:49 2009 -0700 e1000/e1000: fix compile warning e1000/e1000e compile report a possible unused variable, fix that for now. Shortly after this a small refactor and bug fix will follow in the same code. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b Author: Alexander Beregalov Date: Tue Apr 14 15:18:00 2009 -0700 ehea: Fix incomplete conversion to net_device_ops Reported-by: Subrata Modak Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit d119b3927994e3d620d6adb0dd1ea6bf24427875 Author: Michal Schmidt Date: Tue Apr 14 15:16:55 2009 -0700 skge: fix occasional BUG during MTU change The BUG_ON(skge->tx_ring.to_use != skge->tx_ring.to_clean) in skge_up() was sometimes observed when setting MTU. skge_down() disables the TX queue, but then reenables it by mistake via skge_tx_clean(). Fix it by moving the waking of the queue from skge_tx_clean() to the other caller. And to make sure start_xmit is not in progress on another CPU, skge_down() should call netif_tx_disable(). The bug was reported to me by Jiri Jilek whose Debian system sometimes failed to boot. He tested the patch and the bug did not happen anymore. Signed-off-by: Michal Schmidt Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit fc59f9a3bf8096a1f68a8b78ada7a0e0ab9236b2 Author: Herbert Xu Date: Tue Apr 14 15:11:06 2009 -0700 gro: Restore correct value to gso_size Since everybody has been focusing on baremetal GRO performance no one noticed when I added a bug that zapped gso_size for all GRO packets. This only gets picked up when you forward the skb out of an interface. Thanks to Mark Wagner for noticing this bug when testing kvm. Reported-by: Mark Wagner Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 29dab4fd3176e25dfab6cd763beb02d87973c288 Author: Jaroslav Kysela Date: Tue Apr 14 22:40:04 2009 +0200 [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine Also add a little code cleanup. Signed-off-by: Jaroslav Kysela commit 94ca8e4852807fc42d2f64fcaf248aafc4f2e6a7 Author: Cliff Wickman Date: Tue Apr 14 10:56:48 2009 -0500 x86: UV: BAU partition-relative distribution map This patch enables each partition's BAU distribution bit map to be partition-relative. The distribution bitmap had been constructed assuming 0 as the base node number. That construct would not have allowed a total system of greater than 256 nodes. It also corrects an error that occurred when the first blade's nasid was not zero. That nasid was stored as the base node. The base node number gets added by hardware to the node numbers implied in the distribution bitmap, resulting in invalid target nasids. Tested on the UV hardware simulator. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar commit 95c0909961bc5ff18c78b2ab0d093cddc0a8b0b5 Author: Takashi Iwai Date: Tue Apr 14 16:15:29 2009 +0200 ALSA: hda - Avoid call of snd_jack_report at release Don't call snd_jack_report at release of sigmatel and conexnat codecs which results in Oops at unloading the module. The Oops is triggered by the power-up sequence during the free due to the pincfg restoration. Since the power-up sequence is involved with the unsol handling, the jack reporting may be issued during that. The Oops occurs with this jack reporting because the jack instances have been already released but the codec doesn't do the proper book-keeping. This patch adds the book-keeping of jack instances to avoid the access to bogus pointers. Signed-off-by: Takashi Iwai commit 9d59065cd6fae841ca56c281189d5b8d0817d35f Author: Takashi Iwai Date: Tue Apr 14 16:13:58 2009 +0200 ALSA: add private_data to struct snd_jack Added private_data and private_free fields to struct snd_jack so that the caller can assign the data. It'll be helpful for avoiding the double-free of the jack instance. Signed-off-by: Takashi Iwai commit ab96e798cbd562a53edd802272e49a5100b29efb Author: Martin Schwidefsky Date: Tue Apr 14 15:36:29 2009 +0200 [S390] boot cputime accounting Start the cpu time accounting very early to catch the cpu time spent for the initial kernel setup. To make the output of /proc/uptime match the sum of all cpu accounting values of the boot cpu reset xtime and wall_to_monotonic to sane values based on the TOD clock. The values set by timekeeping_init are off by up to a second. Signed-off-by: Martin Schwidefsky commit b6112ccbff5ec580d46b584ecc3c3a773b830da2 Author: Martin Schwidefsky Date: Tue Apr 14 15:36:28 2009 +0200 [S390] add read_persistent_clock Add a read_persistent_clock function that does not just return 0. Since timekeeping_init calls the function before time_init has been called move reset_tod_clock to early.c to make sure that the TOD clock is running when read_persistent_clock is invoked. Signed-off-by: Martin Schwidefsky commit 5b409ed17bb32c8316b1f456466c70529454573a Author: Martin Schwidefsky Date: Tue Apr 14 15:36:27 2009 +0200 [S390] cpu hotplug and accounting values Reset the cpu timer to the maximum value and correctly initialize the cpu accounting values in the lowcore when the cpu is started. Signed-off-by: Martin Schwidefsky commit b86ccca49cd8f22086c1d135ab3051cf48fb1688 Author: Martin Schwidefsky Date: Tue Apr 14 15:36:26 2009 +0200 [S390] fix idle time accounting The steal time is calculated by subtracting the time the virtual cpu has been running on a physical cpu from the wall clock time. To make that work all wall time needs to be added to the steal time field first before the virtual cpu time is subtracted. The time between the last clock update and the load of the enabled wait psw needs to be added to the steal_time field as well to make the sum over all cpu accounting numbers match the wall clock. Signed-off-by: Martin Schwidefsky commit 88e012856d05a5d00ae80c691fb7aa5adda268d7 Author: Heiko Carstens Date: Tue Apr 14 15:36:25 2009 +0200 [S390] smp: fix cpu_possible_map initialization The cpu_possible_map by default is initialized with all ones in s390. If the kernel paramert possible_cpus= is passed the cpu_possible_map is supposed to have x bits set. However the current code just sets the x bits without clearing the NR_CPUS bits that were already set. So we end up with an unchanged map that has all bits set. To fix this just clear the map before setting any new bits. This broke with def6cfb70bab83c0094bc0cedd27c4eda563043e "[S390] cpumask: Use accessors code." Cc: Rusty Russell Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 52db45c3c55a0fca53077dfd7b123e30cd210aad Author: Stefan Weinhuber Date: Tue Apr 14 15:36:24 2009 +0200 [S390] dasd: fix idaw boundary checking for track based ccw A ccw command that reads or writes several records at once will usually transfer more data then fits into one page and needs to address memory areas using a list of indirect data address words (idaw). All but the first of these areas must start on a 4KB or 2KB block boundary (depending on the idaw format). A check for this restriction was missing and has been added with this patch. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit f3445a1a656bc26b07946cc6d20de1ef07c8d116 Author: Cornelia Huck Date: Tue Apr 14 15:36:23 2009 +0200 [S390] dasd: Use the new async framework for autoonlining. The dasd driver can automatically online detected dasds, which especially important for finding the root device. Currently, it will wait for each online operation to finish individually, which may take long if many dasds need to be onlined. When using the new async framework, these onlining operations can run in parallel and presence of the root device is ensured by the fact that prepare_namespace() waits for all async threads to finish. Signed-off-by: Cornelia Huck Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 75cb71f3184f3dd5b78d991d5e0e047774865f5d Author: Jan Glauber Date: Tue Apr 14 15:36:22 2009 +0200 [S390] qdio: remove dead timeout handler The QDIO ccw devices are started by ccw_device_start so no timeout can occur for the interrupt handler. Remove the dead code. In case of an I/O error set the device state to error and wake up a possibly running qdio_shutdown waiter. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 43ae8a1b32735c662ba7ebf3509c4f670f75e3d5 Author: Gerald Schaefer Date: Tue Apr 14 15:36:21 2009 +0200 [S390] appldata: Use new mod_virt_timer_periodic() function. mod_virt_timer() was used to modify/add cpu timers for cpus that were set online. This resulted in a one-shot timer for every cpu that was newly added or previously set offline, instead of an interval timer, which broke the appldata vtime interval setup. To fix this, the new mod_virt_timer_periodic() function is used, which adds interval timers instead of one-shot timers. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit b6ecfa9273e27b5c7ba04655eb44f78bf4db5b64 Author: Jan Glauber Date: Tue Apr 14 15:36:20 2009 +0200 [S390] extend virtual timer interface by mod_virt_timer_periodic In case mod_virt_timer is used to add a non pending timer the timer is always added as a one-shot timer. If mod_virt_timer is used for periodic timers they may therfore be degraded to one-shot timers. Add mod_virt_timer_periodic to the interface to allow safe re-programming of the interval value. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 0436230148c55e3afbe5c57775a1fb44ba4834ac Author: Martin Schwidefsky Date: Tue Apr 14 15:36:19 2009 +0200 [S390] stp synchronization retry timer Add a timer that retries the clock synchronization via the server time protocol if there is a usable clock but the synchronization failed. Signed-off-by: Martin Schwidefsky commit 81f64b87731aa33eef6b88af9d92c3398d48cf41 Author: Heiko Carstens Date: Tue Apr 14 15:36:18 2009 +0200 [S390] call nmi_enter/nmi_exit on machine checks nmi_enter/nmi_exit includes the lockdep calls and various other calls which were missing so far. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a93e11f9b9604134373ae790bce738d62109de60 Author: Heiko Carstens Date: Tue Apr 14 15:36:17 2009 +0200 [S390] wire up preadv/pwritev system calls Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 25097bf153391f7be4c591d47061b3dc4990dac2 Author: Christian Ehrhardt Date: Tue Apr 14 15:36:16 2009 +0200 [S390] s390: move machine flags to lowcore Currently the storage of the machine flags is a globally exported unsigned long long variable. By moving the storage location into the lowcore struct we allow assembler code to check machine_flags directly even without needing a register. Addtionally the lowcore and therefore the machine flags too will be in cache most of the time. Signed-off-by: Christian Ehrhardt Signed-off-by: Martin Schwidefsky commit 936e7d03394bc6238091db10d060326622c87ed7 Author: Daniel Mack Date: Wed Apr 1 19:05:39 2009 +0200 ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes Cleanup only, no functional change. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit e431cf45687d1ccb7c7d818defc2af34bd783db2 Author: Daniel Mack Date: Sat Mar 28 21:19:49 2009 +0100 ALSA: snd-usb-caiaq: clean up header includes Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 336500f0305dc1552e8d01a60b409a7db781ca28 Author: Li Zefan Date: Fri Apr 10 09:44:31 2009 +0800 ALSA: sound/pci: use memdup_user() Remove open-coded memdup_user(). Signed-off-by: Li Zefan Signed-off-by: Takashi Iwai commit 85385c1551d509e9e377b7be07ea0e755fb2c3ce Author: Li Zefan Date: Fri Apr 10 09:43:59 2009 +0800 ALSA: sound/usb: use memdup_user() Remove open-coded memdup_user(). Signed-off-by: Li Zefan Signed-off-by: Takashi Iwai commit 68425adcc419bfe90776f59e66b8c4cdb6e1b1f3 Author: Li Zefan Date: Fri Apr 10 09:43:36 2009 +0800 ALSA: sound/isa: use memdup_user() Remove open-coded memdup_user(). Signed-off-by: Li Zefan Signed-off-by: Takashi Iwai commit ef44a1ec6eeef189998f84e7230e1d3535b01074 Author: Li Zefan Date: Fri Apr 10 09:43:08 2009 +0800 ALSA: sound/core: use memdup_user() Remove open-coded memdup_user(). Signed-off-by: Li Zefan Signed-off-by: Takashi Iwai commit 34e51ce60a210094bd66cf0a75dd8512247618ca Merge: 577c9c4... 6e498d5... Author: Takashi Iwai Date: Tue Apr 14 11:48:25 2009 +0200 Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc commit ce8632ba6b3ed0bf2efa98672e2808de34250389 Author: Yang Hongyang Date: Mon Apr 13 15:51:00 2009 +0000 ipv6:remove useless check After switch (rthdr->type) {...},the check below is completely useless.Because: if the type is 2,then hdrlen must be 2 and segments_left must be 1,clearly the check is redundant;if the type is not 2,then goto sticky_done,the check is useless too. Signed-off-by: Yang Hongyang Reviewed-by: Shan Wei Signed-off-by: David S. Miller commit 0eca93bcf73e5939053a94f7c48f8d6fe6199e00 Author: Herbert Xu Date: Tue Apr 14 02:09:43 2009 -0700 tun: Fix crash with non-GSO users When I made the tun driver use non-linear packets as the preferred option, it broke non-GSO users because they would end up allocating a completely non-linear packet, which triggers a crash when we call eth_type_trans. This patch reverts non-GSO users to using linear packets and adds a check to ensure that GSO users can't cause crashes in the same way. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 86bcebafc5e7f5163ccf828792fe694b112ed6fa Author: Ilpo Järvinen Date: Tue Apr 14 02:08:53 2009 -0700 tcp: fix >2 iw selection A long-standing feature in tcp_init_metrics() is such that any of its goto reset prevents call to tcp_init_cwnd(). Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 1a31f2042e938f1b467aa3d807cc5666352bf8a3 Author: Stephen Hemminger Date: Mon Apr 13 18:12:57 2009 -0700 netsched: Allow meta match on vlan tag on receive When vlan acceleration is used on receive, the vlan tag is maintained outside of the skb data. The existing vlan tag match only works on TX path because it uses vlan_get_tag which tests for VLAN_HW_TX_ACCEL. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1db9e29bb0ff3c9366e8a50fb09ca8dbc364bfd6 Author: Herbert Xu Date: Mon Apr 13 04:41:01 2009 +0000 gro: Normalise skb before bypassing GRO on netpoll VLAN path Hi: gro: Normalise skb before bypassing GRO on netpoll VLAN path When we detect netpoll RX on the GRO VLAN path we bail out and call the normal VLAN receive handler. However, the packet needs to be normalised by calling eth_type_trans since that's what the normal path expects (normally the GRO path does the fixup). This patch adds the necessary call to vlan_gro_frags. Signed-off-by: Herbert Xu Thanks, Signed-off-by: David S. Miller commit 03a980d162eb48a79ce21d47f45b9ec7d9db20e9 Author: Ajit Khaparde Date: Mon Apr 13 15:41:50 2009 -0700 be2net: fix for default setting of pause auto-negotiation This patch fixes the default value of pause auto-negotiation supported by PCS. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit a95c2a3b9d6615ef6fad69fbb787a208ad6506b3 Author: Alexander Beregalov Date: Sat Apr 11 07:45:55 2009 +0000 eth_v10: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 2b1425421212e38c7dade357abaf8804fe236ade Author: Alexander Beregalov Date: Sat Apr 11 07:44:55 2009 +0000 ioc3-eth: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 9b6bfecd6556b9844a70147fe94dd86bb00aee97 Author: Alexander Beregalov Date: Sat Apr 11 07:44:06 2009 +0000 isa-skeleton: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit d0174aea3ee8d51a82b5793c3a177efff89121fa Author: Alexander Beregalov Date: Sat Apr 11 07:43:11 2009 +0000 mac89x0: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 5f1fa992382cf8bb82002aaf19fa03bf67330254 Author: Alexander Beregalov Date: Sat Apr 11 07:42:26 2009 +0000 macb: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit c6e6d8525c415736d961a15c449d8c98cb7562d4 Author: Alexander Beregalov Date: Sat Apr 11 07:41:28 2009 +0000 macsonic: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit ebf84eaa927be41a440fd4c8f81e1844922bc0b2 Author: Alexander Beregalov Date: Sat Apr 11 07:40:49 2009 +0000 sh_eth: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 7e4fdcb99cd578c800fb7d6c298950a2938f9ca6 Author: Alexander Beregalov Date: Sat Apr 11 07:39:58 2009 +0000 sun3_82586: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 5a1c28b3e4aa0ac755d73363fd1c84c0063c06be Author: Alexander Beregalov Date: Sat Apr 11 07:38:54 2009 +0000 tc35815: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 80ef1fc82e3feb541f9645322eab7afa778cce98 Author: Alexander Beregalov Date: Sat Apr 11 07:37:59 2009 +0000 tsi108_eth: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit ccd97bb01c7404ee000bb0627d1864b84fc9d904 Author: Alexander Beregalov Date: Sat Apr 11 07:30:19 2009 +0000 xtsonic: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit dcd07be3ffab7d20f4d498369e7526f6f4945257 Author: Anatolij Gustschin Date: Tue Apr 7 02:01:43 2009 +0000 phylib: Add interrupt source check function to M88E1121R driver Add did_interrupt() function to check if a PHY port really caused an interrupt. This is needed in the case of shared PHY interrupt pin configuration to stop interrupt event processing for PHY ports which didn't cause an interrupt. Signed-off-by: Anatolij Gustschin Signed-off-by: David S. Miller commit a8729eb302a5b5da8b0b4d29582c42648a2e0f12 Author: Anatolij Gustschin Date: Tue Apr 7 02:01:42 2009 +0000 phylib: Allow early-out in phy_change Marvell 88E1121R Dual PHY device can be hardware-configured to use shared interrupt pin for both PHY ports. For such PHY configurations using shared PHY interrupt phy_interrupt() handler will also schedule a work for PHY port which didn't cause an interrupt. This patch adds a possibility for PHY drivers to provide did_interrupt() function which reports if the PHY (or a PHY port in a multi-PHY device) generated an interrupt. This function is called in phy_change() as phy_change() shouldn't proceed if it is invoked for a PHY which didn't cause an interrupt. So check for interrupt originator in phy_change() to allow early-out. Signed-off-by: Anatolij Gustschin Signed-off-by: David S. Miller commit 140bc92903287cff4545e358c1651e4b7312cbd3 Author: Sergei Poselenov Date: Tue Apr 7 02:01:41 2009 +0000 phylib: Basic support for the M88E1121R Marvell chip Add support for the Marvell M88E1121R Dual GigE PHY Signed-off-by: Yuri Tikhonov Signed-off-by: Sergei Poselenov Signed-off-by: Anatolij Gustschin Signed-off-by: David S. Miller commit 83400207a07584539366f6859362db6872809a12 Merge: 0d489ff... 80a04d3... Author: David S. Miller Date: Mon Apr 13 14:41:05 2009 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: MAINTAINERS commit 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 Author: James Bottomley Date: Mon Apr 13 14:31:51 2009 -0700 tg3: fix big endian MAC address collection failure We noticed on parisc that our broadcoms all swapped MAC addresses going from 2.6.29 to 2.6.30-rc1: Apr 11 07:48:24 ion kernel: eth0: Tigon3 [partno(BCM95700A6) rev 0105] (PCI:66MHz:64-bit) MAC address 00:30:6e:4b:15:59 Apr 13 07:34:34 ion kernel: eth0: Tigon3 [partno(BCM95700A6) rev 0105] (PCI:66MHz:64-bit) MAC address 00:00:59:15:4b:6e The problem patch is: commit 6d348f2c1e0bb1cf7a494b51fc921095ead3f6ae Author: Matt Carlson Date: Wed Feb 25 14:25:52 2009 +0000 tg3: Eliminate tg3_nvram_read_swab() With the root cause being the use of memcpy to set the mac address: memcpy(&dev->dev_addr[0], ((char *)&hi) + 2, 2); memcpy(&dev->dev_addr[2], (char *)&lo, sizeof(lo)); This might work on little endian machines, but it can't on big endian ones. You have to use the original setting mechanism to be correct on all architectures. The attached patch fixes parisc. Signed-off-by: James Bottomley Signed-off-by: David S. Miller commit da2436a23c038055b1da6fe30b6ea2886b1e07b0 Author: Jaroslav Kysela Date: Mon Apr 13 21:31:25 2009 +0200 [ALSA] intel8x0: do not use zero value from PICB register It seems that the zero value from the PICB (position in current buffer) register is not reliable. Use jiffies to correct returned value from the ring buffer pointer callback. Signed-off-by: Jaroslav Kysela commit 920e4ae31cb113328e617f4a0663fb17d7b09124 Author: Jaroslav Kysela Date: Mon Apr 13 20:45:42 2009 +0200 [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable - use monotonic posix clock to measure time - try to avoid reading zero from PICB (position in current buffer) register - show also measured samples - when clock is near 41000 or 44100, use exactly these values (they appears to be reference clocks for hardware manufacturers) Signed-off-by: Jaroslav Kysela commit 5a31bec014449dc9ca994e4c1dbf2802b7ca458a Author: Brian Haley Date: Mon Apr 13 00:11:30 2009 -0700 Bonding: fix zero address hole bug in arp_ip_target list Fix a zero address hole bug in the bonding arp_ip_target list that was causing the bond to ignore ARP replies (bugz 13006). Instead of just setting the array entry to zero, we now copy any additional entries down one slot, putting the zero entry at the end. With this change we can now have all the loops that walk the array stop when they hit a zero since there will be no addresses after it. Changes are based in part on code fragment provided in kernel: bugzilla 13006: http://bugzilla.kernel.org/show_bug.cgi?id=13006 by Steve Howard Signed-off-by: Brian Haley Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 9ca046d57412361ac4d220b96fed7fb932616d85 Author: Alexander Duyck Date: Thu Apr 9 22:49:39 2009 +0000 igb: do not check for vf_data if we didn't enable vfs The driver is currently dumping a message in the log about failing to allocate vf data when max_vfs is equal to 0. This change makes it so the error message is only displayed if we set max_vfs to a non zero value. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2d165771062cae75de26fe7bc7cb2d937ff6f1b4 Author: Alexander Duyck Date: Thu Apr 9 22:49:20 2009 +0000 igbvf: fix unused external references The igbvbf driver exposed several unused extrnal references due to the fact that code was copied from igb and then some functionality was removed. This changes that so that unused functions are either removed or made static. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ff6f63dde73e0673c09cca22c5005380dfcc79a4 Author: Alexander Duyck Date: Thu Apr 9 22:49:02 2009 +0000 igb: fix unused external references introduced with sr-iov changes There were several unused external references added with the sr-iov enablement changes. This patch changes all those references to static local references. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fe146be67bd73aa35db032fe3481ca20efe17fcc Author: Alexander Beregalov Date: Thu Apr 9 17:29:38 2009 +0000 ether3: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 0b179e315ad61e8969b984a4ab4acc65e5ecb506 Author: Alexander Beregalov Date: Thu Apr 9 17:28:55 2009 +0000 ether1: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 9aa7b30ce36f3bfa03b878296d55e0551682de15 Author: Alexander Beregalov Date: Thu Apr 9 17:28:06 2009 +0000 ep93xx_eth: convert to net_device_ops Also make ep93xx_dev_alloc static. Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 531c6804a4299663c7fa798ebfa9dbf843e91e0e Author: Alexander Beregalov Date: Thu Apr 9 17:27:00 2009 +0000 at91_ether: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit fefbfb1e09cbcd5ad6fd595c52aa8f01dc4e1126 Author: Alexander Beregalov Date: Thu Apr 9 17:25:25 2009 +0000 am79c961a: convert to net_device_ops Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit f97b1f2a416045c7a9c7e62d575a809bc32c0f1e Author: Alexander Beregalov Date: Fri Apr 10 07:59:24 2009 +0000 ariadne: convert to net_device_ops On Fri, Apr 10, 2009 at 06:13:54PM +0200, Jan Ceuleers wrote: > Alexander Beregalov wrote: > > > > Signed-off-by: Alexander Beregalov > ... > > @@ -197,13 +209,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z, > > dev->mem_start = ZTWO_VADDR(mem_start); > > dev->mem_end = dev->mem_start+ARIADNE_RAM_SIZE; > > > > - dev->open = &ariadne_open; > > - dev->stop = &ariadne_close; > > - dev->hard_start_xmit = &ariadne_start_xmit; > > - dev->tx_timeout = &ariadne_tx_timeout; > > + dev->netdev_ops = &ariadne_netdev_ops;; > > We don't really need two semicolons there but I suppose that they won't > hurt. Thanks! David, please apply this patch Signed-off-by: David S. Miller commit 15efc02b2625f1bb2b1970b1f4bc777590b9ed73 Author: Alexander Beregalov Date: Thu Apr 9 15:56:14 2009 +0000 ibm_newemac: convert to netdev_ops Reported-by: Subrata Modak Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 8c02acd79867077508ffa5ed4eb6c8c79df73a96 Author: Alexander Beregalov Date: Thu Apr 9 04:46:53 2009 +0000 fs_enet: convert to netdev_ops Reported-by: Subrata Modak Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit 499923c7a3254971873e55a1690d07d3700eea47 Author: Vlad Yasevich Date: Thu Apr 9 17:37:33 2009 +0000 ipv6: Fix NULL pointer dereference with time-wait sockets Commit b2f5e7cd3dee2ed721bf0675e1a1ddebb849aee6 (ipv6: Fix conflict resolutions during ipv6 binding) introduced a regression where time-wait sockets were not treated correctly. This resulted in the following: BUG: unable to handle kernel NULL pointer dereference at 0000000000000062 IP: [] ipv4_rcv_saddr_equal+0x61/0x70 ... Call Trace: [] ipv6_rcv_saddr_equal+0x1bb/0x250 [ipv6] [] inet6_csk_bind_conflict+0x88/0xd0 [ipv6] [] inet_csk_get_port+0x1ee/0x400 [] inet6_bind+0x1cf/0x3a0 [ipv6] [] ? sockfd_lookup_light+0x3c/0xd0 [] sys_bind+0x89/0x100 [] ? trace_hardirqs_on_thunk+0x3a/0x3c [] system_call_fastpath+0x16/0x1b Tested-by: Brian Haley Tested-by: Ed Tomlinson Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 48f6e8990858fc9a0ca7d3c9347e6774eb941dba Author: Ben Hutchings Date: Thu Apr 9 05:47:41 2009 +0000 net: Update maintainers Essentially all networking changes go through David Miller. Jeff Garzik no longer handles device drivers separately. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 3ca17dfbdcaf3def764e72751619b1cc2c9760b9 Author: Séguier Régis Date: Thu Apr 9 01:33:57 2009 +0000 via-velocity : fix compilation warning. Fix this warning: drivers/net/via-velocity.c:1924: warning: passing argument 2 of 'request_irq' from incompatible pointer type Signed-off-by: Seguier Regis Signed-off-by: David S. Miller commit 57401d5e36d2966247e9c06b94f5133609c8da21 Author: Dan Carpenter Date: Sat Apr 11 01:52:29 2009 -0700 phy: error handling for platform_device_register_simple() platform_device_register_simple() returns ERR_PTR() and not NULL. Found by smatch (http://repo.or.cz/w/smatch.git). Compile tested. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 3384901f1b1af676ccb9d75aa23a568c294c527b Author: Wei Yongjun Date: Wed Apr 8 21:27:28 2009 +0000 tr: fix leakage of device in net/802/tr.c Add dev_put() after dev_get_by_index() to avoid leakage of device. Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit d6c519e12984d26d96b91e4482280acbba0e0a22 Author: Alexander Duyck Date: Wed Apr 8 13:20:50 2009 +0000 ixgbe: only allow WOL for 82599 KX4 NIC All NICs were reporting WOL support when only the KX4 NIC is capable of supporting WOL. This patch adds a function to check for and exclude all non-WOL capable nics from enabling WOL in ethtool. Signed-off-by: Alexander Duyck Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 87c1201708381c2791caa78a2caf217778633277 Author: PJ Waskiewicz Date: Wed Apr 8 13:20:31 2009 +0000 ixgbe: Move the LED blink code to common, since 82599 also uses it The LED blink code is common for 82599 as well. It should be moved to ixgbe_common.c so both devices can use it, and not have it duplicated. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit d543103a0c75edc0a7a08dfd796de67466a15dfb Author: Alexander Duyck Date: Wed Apr 8 13:15:22 2009 +0000 net: netif_device_attach/detach should start/stop all queues Currently netif_device_attach/detach are only stopping one queue. They should be starting and stopping all the queues on a given device. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit bbf6ad1399e9516b0a95de3ad58ffbaed670e4cc Author: Jaroslav Kysela Date: Fri Apr 10 12:28:58 2009 +0200 [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies Some drivers like Intel8x0 or Intel HDA are broken for some hardware variants. This patch adds more strict buffer position checks based on jiffies when internal hw_ptr is updated. Enable xrun_debug to see mangling of wrong positions. As a side effect, the hw_ptr interrupt update routine might do slightly better job when many interrupts are lost. Signed-off-by: Jaroslav Kysela commit fa00e046b41663cbda9b1affc0594669e5f14219 Author: Jaroslav Kysela Date: Fri Apr 10 12:20:45 2009 +0200 [ALSA] hda_intel: fix unexpected ring buffer positions I found two issues with ICH7-M (it should be related to other HDA chipsets as well): - the ring buffer position is not reset when stream restarts (after xrun) - solved by moving azx_stream_reset() call from open() to prepare() callback and reset posbuf to zero (it might be filled with hw later than position() callback is called) - irq_ignore flag should be set also when ring buffer memory area is not changed in prepare() callback - this patch replaces irq_ignore with more universal check based on jiffies clock Signed-off-by: Jaroslav Kysela commit 6e498d5eb6afb50659b4b7fc302d480ca0ceaa93 Author: Mark Brown Date: Thu Apr 9 16:40:41 2009 +0100 ASoC: Disable S3C64xx support in Kconfig Due to the process and communications issues with the 2.6.30 S3C platform merges none of the underlying arch/arm code for S3C64xx audio support made it into mainline, rendering the drivers useless. Disable them in Kconfig to avoid user confusion - users patching in the required support can always reenable this too. Signed-off-by: Mark Brown commit fd2bd98818fc1c9672241b845344cbfbb159a4f9 Author: Eric Miao Date: Thu Apr 9 14:13:07 2009 +0800 ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h Signed-off-by: Eric Miao Cc: Philipp Zabel Signed-off-by: Mark Brown commit 6c2da9c2182fe64b1443a75efc09e493923e86b0 Author: David S. Miller Date: Thu Apr 9 01:09:33 2009 -0700 forcedeth: Use napi_complete() not __napi_complete(). It's not enough that forcedeth's interrupts are disabled, local cpu interrupts have to unconditionally be off when we remove the device from the poll list. Based upon a crash report from Alexander Beregalov : WARNING: at lib/list_debug.c:30 __list_add+0x89/0x90() Hardware name: list_add corruption. prev->next should be next (c06ea834), but was f70244c8. (prev=c06ea834). Modules linked in: w83627hf hwmon_vid i2c_nforce2 Pid: 1436, comm: portageq Not tainted 2.6.30-rc1 #1 Call Trace: [] warn_slowpath+0x73/0xd0 [] ? __kfree_skb+0x38/0x90 [] ? tcp_data_snd_check+0x26/0xe0 [] ? tcp_rcv_established+0x2bf/0x5e0 [] ? tcp_v4_rcv+0x47a/0x610 [] ? print_lock_contention_bug+0x1d/0x110 [] ? _spin_unlock+0x27/0x50 [] ? tcp_v4_rcv+0x54b/0x610 [] __list_add+0x89/0x90 [] __napi_schedule+0x29/0x60 [] e1000_intr+0xbd/0x1a0 [] handle_IRQ_event+0x3e/0x120 [] handle_fasteoi_irq+0x60/0xd0 [] handle_irq+0x34/0x60 [] ? rcu_irq_enter+0x8/0x40 [] do_IRQ+0x39/0xa0 [] ? skb_release_head_state+0x2c/0x60 [] common_interrupt+0x2e/0x34 [] ? list_del+0x21/0x90 [] ? trace_hardirqs_on+0xb/0x10 [] __napi_complete+0x1a/0x30 [] nv_napi_poll+0xd1/0x5c0 [] ? trace_hardirqs_on+0xb/0x10 [] net_rx_action+0x106/0x1b0 [] __do_softirq+0x6f/0x100 [] ? _spin_unlock+0x27/0x50 [] ? handle_fasteoi_irq+0x88/0xd0 [] do_softirq+0x5d/0x70 [] irq_exit+0x7d/0xa0 [] do_IRQ+0x42/0xa0 [] ? do_softirq+0x47/0x70 [] common_interrupt+0x2e/0x34 Signed-off-by: David S. Miller commit 54c28d294c658abb6d6430a49fda230fdfd601c8 Author: Jack Steiner Date: Fri Apr 3 15:39:42 2009 -0500 x86, uv: add Kconfig dependency on NUMA for UV systems Impact: build fix Add Kconfig dependency on NUMA for enabling UV. Although it might be possible to configure non-NUMA UV systems, they are unsupported and not interesting. Much of the infrastructure for UV requires NUMA support. Signed-off-by: Jack Steiner LKML-Reference: <20090403203942.GA20137@sgi.com> Signed-off-by: Ingo Molnar commit 06aa05b307e8efbc278f201198e7cdf3877bc5c2 Author: Russ Anderson Date: Fri Apr 3 17:24:23 2009 -0500 x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems /sys/firmware/sgi_uv should only be created on uv systems. Signed-off-by: Russ Anderson LKML-Reference: <20090403222423.GA28546@sgi.com> Signed-off-by: Ingo Molnar commit 8d82ffd15e59febf2c597067a777526958b7f769 Author: Wolfgang Grandegger Date: Tue Apr 7 10:20:56 2009 +0200 powerpc: Document new FSL I2C bindings and cleanup This patch documents the new bindings for the MPC I2C bus driver. Furthermore, it removes obsolete FSL device related definitions for I2C. Signed-off-by: Wolfgang Grandegger Signed-off-by: Kumar Gala commit 52ce67f157f8c5623524dc6c5b2ddd6a0d2aa774 Author: Kumar Gala Date: Tue Apr 7 21:58:07 2009 -0500 powerpc/mm: Fix compile warning arch/powerpc/mm/tlb_nohash.c: In function 'flush_tlb_mm': arch/powerpc/mm/tlb_nohash.c:128: warning: unused variable 'cpu_mask' Signed-off-by: Kumar Gala commit 54ca40dcb5b956c30495e8c7b73c9ad636fb58bd Author: Wolfgang Grandegger Date: Mon Mar 16 09:57:59 2009 +0100 powerpc/85xx: TQM8548: update defconfig Enable highmem support for the TQM8548-AG modules and NAND support for the TQM8548-BE modules. Furthermore disable USB, Wireless and IDE support because it's not available on the STK85xx starter kit. Signed-off-by: Wolfgang Grandegger Signed-off-by: Kumar Gala commit 655544c69c8d8bdc0c377ad1d30d147a5a28a1fb Author: Wolfgang Grandegger Date: Mon Mar 16 09:57:17 2009 +0100 powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3 For enet2 and enet3 the wrong phy-handles have been used in DTS files of the TQM8548 modules. Signed-off-by: Wolfgang Grandegger Signed-off-by: Kumar Gala commit 6467cae318ba8adaab37a82e8dd8af60ca9ed6e4 Author: Wolfgang Grandegger Date: Mon Mar 16 09:56:26 2009 +0100 powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes Commit 0f73a449a649acfca91404a98a35353a618b9555 added I2C device nodes for the LM75 thermal sensor on the TQM85xx modules, unfortunately with the wrong I2C address. The LM75s are located at address 0x48. Signed-off-by: Wolfgang Grandegger Signed-off-by: Kumar Gala commit e9965577406a2148ade97b5e0ce7c448b4ba4ef6 Author: Kumar Gala Date: Mon Apr 6 23:36:50 2009 -0500 powerpc: Add support for early tlbilx opcode During the ISA 2.06 development the opcode for tlbilx changed and some early implementations used to old opcode. Add support for a MMU_FTR fixup to deal with this. Signed-off-by: Kumar Gala commit 7281f5dc2c9582f3efaed9b367837ca6117d7b7f Author: Kumar Gala Date: Mon Apr 6 15:25:52 2009 -0500 powerpc: Fix tlbilx opcode The tlbilx opcode was not matching the Power ISA 2.06 arch spec. The old opcode was an early suggested opcode that changed during the 2.06 architecture process. Signed-off-by: Kumar Gala commit 6a891a24e4d0056c365a90ff2d71c38fd366b0d0 Author: Jack Steiner Date: Mon Mar 30 09:01:11 2009 -0500 x86, UV: Fix for nodes with memory and no cpus Fix initialization of UV blade information for systems that have nodes with memory but no cpus. Signed-off-by: Jack Steiner LKML-Reference: <20090330140111.GA18461@sgi.com> Signed-off-by: Ingo Molnar commit 1a544e659cbfce178395e9a090a47d1907d0cfa8 Author: Russ Anderson Date: Mon Mar 30 17:52:40 2009 -0500 x86, UV: system table in bios accessed after unmap Use the copy of UV system table in kernel memory, not the one in bios after unmapping. Signed-off-by: Russ Anderson LKML-Reference: <20090330225240.GA22776@sgi.com> Signed-off-by: Ingo Molnar commit c4c4688f72e638708e5f6b5c259699de82a36fec Author: Cliff Wickman Date: Fri Apr 3 08:34:32 2009 -0500 x86: UV BAU messaging timeouts This patch replaces a 'nop' uv_enable_timeouts() in the UV TLB shootdown code. (somehow, long ago that function got eviscerated) If any cpu in the destination node does not get interrupted by the message and post completion in a reasonable time the hardware should respond to the sender with an error. This function enables such timeouts. Tested on the UV hardware simulator. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar commit 9674f35b1ec17577163897f052f405c1e9e5893d Author: Cliff Wickman Date: Fri Apr 3 08:34:05 2009 -0500 x86: UV BAU and nodes with no memory This patch fixes BAU initialization for systems containing nodes with no memory and for systems with non-consecutive node numbers. Fixes and clarifies situations where pnode should be used instead of node id. Tested on the UV hardware simulator. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar