commit 338b9bb3adac0d2c5a1e180491d9b001d624c402 Merge: 7f9dce3... af0575b... Author: Linus Torvalds Date: Wed Jul 23 20:39:21 2008 -0700 Merge branch 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland * 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland: i386 syscall audit fast-path x86_64 ia32 syscall audit fast-path x86_64 syscall audit fast-path x86_64: remove bogus optimization in sysret_signal commit 7f9dce38378f0a4a298e885553d6bb7121376376 Merge: 26dcce0... ba42059... Author: Linus Torvalds Date: Wed Jul 23 19:36:53 2008 -0700 Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: hrtick_enabled() should use cpu_active() sched, x86: clean up hrtick implementation sched: fix build error, provide partition_sched_domains() unconditionally sched: fix warning in inc_rt_tasks() to not declare variable 'rq' if it's not needed cpu hotplug: Make cpu_active_map synchronization dependency clear cpu hotplug, sched: Introduce cpu_active_map and redo sched domain managment (take 2) sched: rework of "prioritize non-migratable tasks over migratable ones" sched: reduce stack size in isolated_cpu_setup() Revert parts of "ftrace: do not trace scheduler functions" Fixed up conflicts in include/asm-x86/thread_info.h (due to the TIF_SINGLESTEP unification vs TIF_HRTICK_RESCHED removal) and kernel/sched_fair.c (due to cpu_active_map vs for_each_cpu_mask_nr() introduction). commit 26dcce0fabbef75ae426461edf21b5030bad60f3 Merge: d7b6de1... eb6a12c... Author: Linus Torvalds Date: Wed Jul 23 18:37:44 2008 -0700 Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits) NR_CPUS: Replace NR_CPUS in speedstep-centrino.c cpumask: Provide a generic set of CPUMASK_ALLOC macros, FIXUP NR_CPUS: Replace NR_CPUS in cpufreq userspace routines NR_CPUS: Replace per_cpu(..., smp_processor_id()) with __get_cpu_var NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genapic_flat_64.c NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genx2apic_uv_x.c NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/proc.c NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/mcheck/mce_64.c cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c, fix cpumask: Use optimized CPUMASK_ALLOC macros in the centrino_target cpumask: Provide a generic set of CPUMASK_ALLOC macros cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c cpumask: Optimize cpumask_of_cpu in kernel/time/tick-common.c cpumask: Optimize cpumask_of_cpu in drivers/misc/sgi-xp/xpc_main.c cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/ldt.c cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/io_apic_64.c cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr Revert "cpumask: introduce new APIs" cpumask: make for_each_cpu_mask a bit smaller net: Pass reference to cpumask variable in net/sunrpc/svc.c ... Fix up trivial conflicts in drivers/cpufreq/cpufreq.c manually commit d7b6de14a0ef8a376f9d57b867545b47302b7bfb Merge: 30d3854... 4dca10a... Author: Linus Torvalds Date: Wed Jul 23 18:34:13 2008 -0700 Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softlockup: fix invalid proc_handler for softlockup_panic softlockup: fix watchdog task wakeup frequency softlockup: fix watchdog task wakeup frequency softlockup: show irqtrace softlockup: print a module list on being stuck softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression softlockup: fix false positives on nohz if CPU is 100% idle for more than 60 seconds softlockup: fix softlockup_thresh fix softlockup: fix softlockup_thresh unaligned access and disable detection at runtime softlockup: allow panic on lockup commit 30d38542ec777468bb6a31829076a2dbc5690e35 Merge: 20b7997... 044e5f4... Author: Linus Torvalds Date: Wed Jul 23 18:24:08 2008 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (85 commits) [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR) [ARM] pxa: add base support for PXA930 Evaluation Board (aka TavorEVB) [ARM] pxa: add base support for PXA930 (aka Tavor-P) [ARM] Update mach-types [ARM] pxa: make littleton to use the new smc91x platform data [ARM] pxa: make zylonite to use the new smc91x platform data [ARM] pxa: make mainstone to use the new smc91x platform data [ARM] pxa: make lubbock to use new smc91x platform data [NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data [NET] smc91x: prepare for SMC_IO_SHIFT to be a platform configurable variable [NET] smc91x: add SMC91X_NOWAIT flag to platform data [NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_* [NET] smc91x: remove "irq_flags" from "struct smc91x_platdata" [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper Support for LCD on e740 e750 e400 and e800 e-series PDAs E-series UDC support PXA UDC - allow use of inverted GPIO for pullup Add e350 support Fix broken e-series build E-series GPIO / IRQ definitions. ... commit af0575bba0f46dd9054d46e0a88c57afad3bf4d2 Author: Roland McGrath Date: Tue Jun 24 04:16:52 2008 -0700 i386 syscall audit fast-path This adds fast paths for 32-bit syscall entry and exit when TIF_SYSCALL_AUDIT is set, but no other kind of syscall tracing. These paths does not need to save and restore all registers as the general case of tracing does. Avoiding the iret return path when syscall audit is enabled helps performance a lot. Signed-off-by: Roland McGrath commit 5cbf1565f29eb57a86a305b08836613508e294d7 Author: Roland McGrath Date: Tue Jun 24 01:13:31 2008 -0700 x86_64 ia32 syscall audit fast-path This adds fast paths for 32-bit syscall entry and exit when TIF_SYSCALL_AUDIT is set, but no other kind of syscall tracing. These paths does not need to save and restore all registers as the general case of tracing does. Avoiding the iret return path when syscall audit is enabled helps performance a lot. Signed-off-by: Roland McGrath commit 86a1c34a929f30fde8ad01ea8245df61ddcf58b7 Author: Roland McGrath Date: Mon Jun 23 15:37:04 2008 -0700 x86_64 syscall audit fast-path This adds a fast path for 64-bit syscall entry and exit when TIF_SYSCALL_AUDIT is set, but no other kind of syscall tracing. This path does not need to save and restore all registers as the general case of tracing does. Avoiding the iret return path when syscall audit is enabled helps performance a lot. Signed-off-by: Roland McGrath commit 15e8f348db372dec21229fda5d52ae6ee7e64666 Author: Roland McGrath Date: Mon Jun 23 20:41:12 2008 -0700 x86_64: remove bogus optimization in sysret_signal This short-circuit path in sysret_signal looks wrong to me. AFAICT, in practice the branch is never taken--and if it were, it would go wrong. To wit, try loading a module whose init function does set_thread_flag(TIF_IRET), and see insmod crash (presumably with a wrong user stack pointer). This is because the FIXUP_TOP_OF_STACK work hasn't been done yet when we jump around the call to ptregscall_common and get to int_with_check--where it expects the user RSP,SS,CS and EFLAGS to have been stored by FIXUP_TOP_OF_STACK. I don't think it's normally possible to get to sysret_signal with no _TIF_DO_NOTIFY_MASK bits set anyway, so these two instructions are already superfluous. If it ever did happen, it is harmless to call do_notify_resume with nothing for it to do. Signed-off-by: Roland McGrath commit 20b7997e8abdf338dcc27fb4f1333c4973a7f113 Merge: 5554b35... 7659150... Author: Linus Torvalds Date: Wed Jul 23 12:04:34 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: sdhci: highmem capable PIO routines sg: reimplement sg mapping iterator mmc_test: print message when attaching to card mmc: Remove Russell as primecell mci maintainer mmc_block: bounce buffer highmem support sdhci: fix bad warning from commit c8b3e02 sdhci: add warnings for bad buffers in ADMA path mmc_test: test oversized sg lists mmc_test: highmem tests s3cmci: ensure host stopped on machine shutdown au1xmmc: suspend/resume implementation s3cmci: fixes for section mismatch warnings pxamci: trivial fix of DMA alignment register bit clearing commit 5554b35933245e95710d709175e14c02cbc956a4 Merge: 0f6e38a... 7f1b358... Author: Linus Torvalds Date: Wed Jul 23 12:03:18 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (24 commits) I/OAT: I/OAT version 3.0 support I/OAT: tcp_dma_copybreak default value dependent on I/OAT version I/OAT: Add watchdog/reset functionality to ioatdma iop_adma: cleanup iop_chan_xor_slot_count iop_adma: document how to calculate the minimum descriptor pool size iop_adma: directly reclaim descriptors on allocation failure async_tx: make async_tx_test_ack a boolean routine async_tx: remove depend_tx from async_tx_sync_epilog async_tx: export async_tx_quiesce async_tx: fix handling of the "out of descriptor" condition in async_xor async_tx: ensure the xor destination buffer remains dma-mapped async_tx: list_for_each_entry_rcu() cleanup dmaengine: Driver for the Synopsys DesignWare DMA controller dmaengine: Add slave DMA interface dmaengine: add DMA_COMPL_SKIP_{SRC,DEST}_UNMAP flags to control dma unmap dmaengine: Add dma_client parameter to device_alloc_chan_resources dmatest: Simple DMA memcpy test client dmaengine: DMA engine driver for Marvell XOR engine iop-adma: fix platform driver hotplug/coldplug dmaengine: track the number of clients using a channel ... Fixed up conflict in drivers/dca/dca-sysfs.c manually commit 0f6e38a6381446eff5175b77d1094834a633a90f Merge: e669e81... 3b216c9... Author: Linus Torvalds Date: Wed Jul 23 11:59:37 2008 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: kgdb: kgdboc console poll hooks for mpsc uart kgdb: kgdboc console poll hooks for cpm uart kgdb, powerpc: arch specific powerpc kgdb support kgdb: support for ARCH=arm kgdb: remove unused HAVE_ARCH_KGDB_SHADOW_INFO config variable commit e669e8179d364bb11ed51504e1a1c60830bff4c5 Merge: 876a425... fc41069... Author: Linus Torvalds Date: Wed Jul 23 11:59:09 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (60 commits) ide: small whitespace fixes ide: ide-cd_ioctl.c fix sparse integer as NULL pointer warnings ide: ide-cd.c fix sparse endianness warnings ide-cd: convert to using the new atapi_flags ide: remove unused PC_FLAG_DRQ_INTERRUPT ide-scsi: convert to using the new atapi_flags ide-tape: convert to using the new atapi_flags ide-floppy: convert to using the new atapi_flags (take 2) ide: add per-device flags ide: use rq->cmd instead of pc->c in atapi common code ide-scsi: pass packet command in rq->cmd ide-tape: pass packet command in rq->cmd ide-tape: make room for packet command ids in rq->cmd ide-floppy: pass packet command in rq->cmd ide: remove pc->callback member from ide_atapi_pc ide-scsi: use drive->pc_callback instead of pc->callback ide-tape: use drive->pc_callback instead of pc->callback ide-floppy: use drive->pc_callback instead of pc->callback ide: push pc callback pointer into the ide_drive_t structure drivers/ide/ide-tape.c: remove double kfree ... commit fc410698ebf7abfb64f0e2337b871298557f0575 Author: Pavel Machek Date: Wed Jul 23 19:56:02 2008 +0200 ide: small whitespace fixes Small whitespace fixes for drivers/ide. Signed-off-by: Pavel Machek Signed-off-by: Bartlomiej Zolnierkiewicz commit 1a677aba5e0e45cc5b2a04c059edfcf06c1ea9bb Author: Harvey Harrison Date: Wed Jul 23 19:56:02 2008 +0200 ide: ide-cd_ioctl.c fix sparse integer as NULL pointer warnings The function ide_cd_queue_pc should be checked as the bufflen arg is dereferenced and lots of callers are passing in NULL. drivers/ide/ide-cd_ioctl.c:124:46: warning: Using plain integer as NULL pointer drivers/ide/ide-cd_ioctl.c:149:47: warning: Using plain integer as NULL pointer drivers/ide/ide-cd_ioctl.c:231:46: warning: Using plain integer as NULL pointer drivers/ide/ide-cd_ioctl.c:374:46: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Cc: Andrew Morton Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 141d3b27fc4b4f97ca6d9b5c1cc8aeeab967dcfc Author: Harvey Harrison Date: Wed Jul 23 19:56:02 2008 +0200 ide: ide-cd.c fix sparse endianness warnings drivers/ide/ide-cd.c:1276:46: warning: Using plain integer as NULL pointer drivers/ide/ide-cd.c:1298:19: warning: cast to restricted __be32 drivers/ide/ide-cd.c:1300:4: warning: cast to restricted __be32 drivers/ide/ide-cd.c:1522:14: warning: cast to restricted __le16 drivers/ide/ide-cd.c:1523:14: warning: cast to restricted __le16 drivers/ide/ide-cd.c:1525:14: warning: cast to restricted __be16 drivers/ide/ide-cd.c:1526:14: warning: cast to restricted __be16 drivers/ide/ide-cd.c:1667:37: warning: cast to restricted __be16 Signed-off-by: Harvey Harrison Cc: Andrew Morton Acked-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 570f89ea5f3ee93756dc2293b83bdfedb8d35348 Author: Borislav Petkov Date: Wed Jul 23 19:56:02 2008 +0200 ide-cd: convert to using the new atapi_flags There should be no functionality change resulting from this patch. [bart: IDE_FLAG_* -> IDE_AFLAG_*, dev_flags -> atapi_flags] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit ac77ef8b03677c8ae8afe77bccc5f6a969193a79 Author: Borislav Petkov Date: Wed Jul 23 19:56:01 2008 +0200 ide: remove unused PC_FLAG_DRQ_INTERRUPT There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit be4c916e96bcde629463d7577d4c402c7f6e6f3e Author: Borislav Petkov Date: Wed Jul 23 19:56:01 2008 +0200 ide-scsi: convert to using the new atapi_flags Remove unused IDESCSI_PC_RQ while at it. There should be no functionality change resulting from this patch. [bart: IDE_FLAG_* -> IDE_AFLAG_*, dev_flags -> atapi_flags] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit f2e3ab52afb3b05879b9d82a05740cd924993325 Author: Borislav Petkov Date: Wed Jul 23 19:56:01 2008 +0200 ide-tape: convert to using the new atapi_flags There should be no functionality change resulting from this patch. [bart: IDE_FLAG_* -> IDE_AFLAG_*, dev_flags -> atapi_flags] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit ea68d270ff55bcdfa5d07697eb68103b5b02c7bb Author: Borislav Petkov Date: Wed Jul 23 19:56:01 2008 +0200 ide-floppy: convert to using the new atapi_flags (take 2) while at it, remove PC_FLAG_ZIP_DRIVE from the packed command flags altogether and query the drive type through drive->atapi_flags. v2: ide-floppy fix. There should be no functionality change resulting from this patch. [bart: IDE_FLAG_* -> IDE_AFLAG_*, dev_flags -> atapi_flags] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3b8ac5398ca8137b41aa5da4d9fad89153450aaa Author: Borislav Petkov Date: Wed Jul 23 19:56:01 2008 +0200 ide: add per-device flags Push device flags up into ide_drive_t. There should be no functionality change resulting from this patch. [bart: IDE_FLAG_* -> IDE_AFLAG_*, dev_flags -> atapi_flags] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 8fccf8995c6d462db50265a5f7fa9a288a5a4590 Author: Borislav Petkov Date: Wed Jul 23 19:56:01 2008 +0200 ide: use rq->cmd instead of pc->c in atapi common code There should be no functionality change resulting from this patch. [bart: s/HWGROUP(drive)/hwif->hwgroup/] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 08feacf3bcc20c33e6a2a91d85d8190dd219d967 Author: Borislav Petkov Date: Wed Jul 23 19:56:00 2008 +0200 ide-scsi: pass packet command in rq->cmd Make a redundant copy of the packet command bits into rq->cmd. Later, after all drivers have been converted, it'll be switched to use that in the common code instead of pc->c. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 0014c75be31d9fa7435105afa9960374a82cc55c Author: Borislav Petkov Date: Wed Jul 23 19:56:00 2008 +0200 ide-tape: pass packet command in rq->cmd Make a redundant copy of the packet command bits into rq->cmd. Later, after all drivers have been converted, it'll be switched to use that in the common code instead of pc->c. While at it, simplify ide_tape_create_rw_cmd. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 83dd573513471c67f9cc93a88795c25a91ebf4b3 Author: Borislav Petkov Date: Wed Jul 23 19:56:00 2008 +0200 ide-tape: make room for packet command ids in rq->cmd ide-tape uses rq->cmd for special commands from the chrdev interface so move those to byte 13 (BLK_MAX_CDB = 16) since a packet cmd is max 12 bytes. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 20cd93be67f967c57e5abf62bf5652a00c66b9f0 Author: Borislav Petkov Date: Wed Jul 23 19:56:00 2008 +0200 ide-floppy: pass packet command in rq->cmd Make a redundant copy of the packet command bits into rq->cmd. Later, after all drivers have been converted, it'll be switched to use that in the common code instead of pc->c. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 8bcda3bc492c56abed33a8cbf824c410d7ce69f0 Author: Borislav Petkov Date: Wed Jul 23 19:56:00 2008 +0200 ide: remove pc->callback member from ide_atapi_pc There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit db9d286988b9e905045c536f681e85fa5e3a728b Author: Borislav Petkov Date: Wed Jul 23 19:55:59 2008 +0200 ide-scsi: use drive->pc_callback instead of pc->callback There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 776bb0270ea72c40f95347dcac868c9f602dcb3e Author: Borislav Petkov Date: Wed Jul 23 19:55:59 2008 +0200 ide-tape: use drive->pc_callback instead of pc->callback The if-else block in the IRQ handler is only temporary so that bisect searches don't break and it'll be removed after converting the remainder of the drivers. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2207fa5af1507ea018fc95e777276edb1ca5601a Author: Borislav Petkov Date: Wed Jul 23 19:55:59 2008 +0200 ide-floppy: use drive->pc_callback instead of pc->callback It is important that drive->pc_callback is set prior to enabling IRQs on the device since this is called from the IRQ handler. Otherwise it hurts as I learnt the hard way from the several "Kernel panic - not synching: Fatal exception in interrupt" during the weekend :). The if-else block in the IRQ handler is only temporary so that bisect searches don't break and it'll be removed after converting the remainder of the drivers. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit d7c26ebb5bca284ece9db7311a9e180aabae1922 Author: Borislav Petkov Date: Wed Jul 23 19:55:59 2008 +0200 ide: push pc callback pointer into the ide_drive_t structure Refrain from carrying the callback ptr with every packet command since the callback function is only one anyways. ide_drive_t is probably not the most suitable place for it right now but is the more sane solution. Besides, these structs are going to be reorganized anyways during the generic ide rewrite. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4b5075050072ed7c4730ee547ae80117c4fa8513 Author: Darren Jenkins Date: Wed Jul 23 19:55:59 2008 +0200 drivers/ide/ide-tape.c: remove double kfree Coverity CID: 2336 USE_AFTER_FREE drivers/ide/ide-tape.c ide_tape_kfree_buffer() double free's a pointer (hint freed by an alias in first outer loop). This patch simply removes the superfluous kfree(). Signed-off-by: Darren Jenkins Acked-by: Borislav Petkov Cc: gadio@netvision.net.il Signed-off-by: Bartlomiej Zolnierkiewicz commit 8a69580e1ea9516caada5eed202afd39546e9809 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:59 2008 +0200 ide: add ide_host_free() helper (take 2) * Add ide_host_free() helper and convert ide_host_remove() to use it. * Fix handling of ide_host_register() failure in ide_host_add(), icside.c, ide-generic.c, falconide.c and sgiioc4.c. While at it: * Fix handling of ide_host_alloc_all() failure in ide-generic.c. * Fix handling of ide_host_alloc() failure in falconide.c (also return the correct error value if no device is found). v2: * falconide build fix. (From Stephen Rothwell) Signed-off-by: Bartlomiej Zolnierkiewicz commit 18de10170df31d34b342612f1c896a16a52f0a5c Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:58 2008 +0200 ide: allocate ide_hwif_t instances dynamically * Allocate ide_hwif_t instances dynamically and remove ide_hwifs[]. This cuts almost ~14kB from ide-probe.o (x86-32, MAX_HWIFS == 10): text data bss dec hex filename 9140 40 14084 23264 5ae0 drivers/ide/ide-probe.o.before 9169 40 44 9253 2425 drivers/ide/ide-probe.o.after * Remove no longer needed ide_init_port_data() call from ide_unregister(). Signed-off-by: Bartlomiej Zolnierkiewicz commit af1cbba37343c827e116638b097b94f5e6c38963 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:58 2008 +0200 ide: add ide_ports[] * Add ide_ports[] table keeping pointers to all initialized ports. * Set ide_ports[] entry for a given port in init_irq() and clear it ide_remove_port_from_hwgroup(). * Convert init_irq() to use ide_ports[] instead of ide_hwifs[] for grouping ports into hwgroup. Signed-off-by: Bartlomiej Zolnierkiewicz commit 6059143ae34f30bb49ec8733468315284f78e2da Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:58 2008 +0200 ide: move ide_remove_port_from_hwgroup() to ide-probe.c Signed-off-by: Bartlomiej Zolnierkiewicz commit 8cdf310025bff8c5ef78564f525a8f347952237b Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:57 2008 +0200 ide: fix IDE port slots reservation and freeing (take 2) * Make ide_find_port_slot() return port slot index. * Add ide_free_port_slot() helper. * Move ide_init_port_data() call and error printk() from ide_find_port_slot() to ide_host_alloc_all(). * Make ide_{find,free}_port_slot() take ide_cfg_mtx mutex and convert them use ide_indexes bitmap to keep track of reserved port slots. * Don't set hwif->chipset in ide_host_alloc_all() as it is no longer necessary. v2: * Pass the correct slot index to ide_init_port_data(). Signed-off-by: Bartlomiej Zolnierkiewicz commit e0d0020788543febd10ab933bde0fa181b627f4f Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:57 2008 +0200 ide: fix ide_host_register() return value Fix ide_host_register() to fail only if all ports cannot be registered. While at it: * Use host->ports[] instead of ide_hwifs[] and remove idx[]. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 6f904d015262dfa43eb1cecc00b0998b4c3543f2 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:57 2008 +0200 ide: add ide_host_add() helper Add ide_host_add() helper which does ide_host_alloc()+ide_host_register(), then convert ide_setup_pci_device[s](), ide_legacy_device_add() and some host drivers to use it. While at it: * Fix ide_setup_pci_device[s](), ide_arm.c, gayle.c, ide-4drives.c, macide.c, q40ide.c, cmd640.c and cs5520.c to return correct error value. * -ENOENT -> -ENOMEM in rapide.c, ide-h8300.c, ide-generic.c, au1xxx-ide.c and pmac.c * -ENODEV -> -ENOMEM in palm_bk3710.c, ide_platform.c and delkin_cb.c * -1 -> -ENOMEM in ide-pnp.c Signed-off-by: Bartlomiej Zolnierkiewicz commit 48c3c1072651922ed153bcf0a33ea82cf20df390 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:57 2008 +0200 ide: add struct ide_host (take 3) * Add struct ide_host which keeps pointers to host's ports. * Add ide_host_alloc[_all]() and ide_host_remove() helpers. * Pass 'struct ide_host *host' instead of 'u8 *idx' to ide_device_add[_all]() and rename it to ide_host_register[_all](). * Convert host drivers and core code to use struct ide_host. * Remove no longer needed ide_find_port(). * Make ide_find_port_slot() static. * Unexport ide_unregister(). v2: * Add missing 'struct ide_host *host' to macide.c. v3: * Fix build problem in pmac.c (s/ide_alloc_host/ide_host_alloc/) (Noticed by Stephen Rothwell). Signed-off-by: Bartlomiej Zolnierkiewicz commit 374e042c3e767ac2e5a40b78529220e0b3de793c Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:56 2008 +0200 ide: add struct ide_tp_ops (take 2) * Add struct ide_tp_ops for transport methods. * Add 'const struct ide_tp_ops *tp_ops' to struct ide_port_info and ide_hwif_t. * Set the default hwif->tp_ops in ide_init_port_data(). * Set host driver specific hwif->tp_ops in ide_init_port(). * Export ide_exec_command(), ide_read_status(), ide_read_altstatus(), ide_read_sff_dma_status(), ide_set_irq(), ide_tf_{load,read}() and ata_{in,out}put_data(). * Convert host drivers and core code to use struct ide_tp_ops. * Remove no longer needed default_hwif_transport(). * Cleanup ide_hwif_t from methods that are now in struct ide_tp_ops. While at it: * Use struct ide_port_info in falconide.c and q40ide.c. * Rename ata_{in,out}put_data() to ide_{in,out}put_data(). v2: * Fix missing convertion in ns87415.c. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit d6276b5f5cc7508124de291f3ed59c6945c17ae7 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:56 2008 +0200 ide: add 'config' field to hw_regs_t Add 'config' field to hw_regs_t and use it to set hwif->config_data in ide_init_port_hw(), then convert ide_legacy_init_one() to use hw->config. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit edc74b247bedb3a1f80eb6371d4171f2d49c1c77 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:56 2008 +0200 ide-generic: probing fix * Don't skip probing IDE port if the corresponding ide_hwifs[] slot is already occupied. * Remove duplicate idx[i] assignment. Signed-off-by: Bartlomiej Zolnierkiewicz commit 73dc532bc1eebe3bff6b918c5685a219eae27f97 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:56 2008 +0200 gayle: reserve memory resources at once * Reserve memory resources for all IDE ports at once by moving request_mem_region() out of 'for ()' loop and always defining GAYLE_IDEREG_SIZE to 0x2000. * Keep memory resources even if no free IDE slots can be found (this driver is unloadable currently). Cc: Geert Uytterhoeven Signed-off-by: Bartlomiej Zolnierkiewicz commit 3b2a5c7149ee4af4aff8fee953f66fc846d92cea Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:56 2008 +0200 ide: filter out "default" transfer mode values in set_xfer_rate() * Filter out "default" transfer mode values (0x00 - default PIO mode, 0x01 - default PIO mode w/ IORDY disabled) in write handler for obsoleted /proc/ide/hd?/settings:current_speed setting. Allowing "default" transfer mode values is a dangerous thing to do as we don't support programming controller to the "default" transfer mode and devices often use different values for the default and maximum PIO mode (i.e. PIO2 default and PIO4 maximum) so the controller will stay programmed for higher PIO mode while device will use the lower PIO mode. There is no functionality loss as by using special IOCTLs device can still be programmed to "default" transfer modes (it is only useful for debugging/testing purposes anyway). * Remove no longer needed IDE_HFLAG_ABUSE_SET_DMA_MODE host flag, it was previously used by few host drivers to program the controller to PIO0 timings for "default" transfer mode == 0x01 (although some host drivers would program invalid PIO timings instead). * Cleanup ide_set_xfer_rate() and add BUG_ON(). Suggested-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit c30daac190de23779090c645e680c7977377032c Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:55 2008 +0200 ide: filter out invalid transfer mode values in set_xfer_rate() Filter out invalid transfer mode values (0x02-0x07) in write handler for obsoleted /proc/ide/hd?/settings:current_speed setting. While at it: * Use XFER_UDMA_6 define. Suggested-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit ba4b2e607e4e9eaa929935325dafd5c86d3b5262 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:55 2008 +0200 ide: remove dead Virtual DMA support Lets remove dead Virtual DMA support for now so it doesn't clutter core IDE code (it can be bring back when there is a need for it): * Remove IDE_HFLAG_VDMA host flag. * Remove ide_drive_t.vdma flag. * cs5520.c: remove stale FIXMEs, cs5520_dma_host_set() and cs5520_dma_ops (also there is no longer a need to set IDE_HFLAG_NO_ATAPI_DMA). There should be no functional changes caused by this patch. Cc: TAKADA Yoshihito Signed-off-by: Bartlomiej Zolnierkiewicz commit 472b4bc1af50431e08130c786ef0612f5b641839 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:55 2008 +0200 ide: mark hpt34x host driver as BROKEN Alan Cox has noticed some time ago that hpt34x is broken (http://lkml.org/lkml/2007/7/3/257): "No the old driver doesn't even do that. It starts up. It spuriously adjusts some non writable PCI BAR registers, prints a message about resources being in use already then exits." Reported-by: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit cbf3d262e0b70652d602b9c072daf1c1f29dccf0 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:54 2008 +0200 ide: limit cy82c693 host driver to ALPHA Cc: Ivan Kokshaysky Signed-off-by: Bartlomiej Zolnierkiewicz commit 761052e676372465fdeb97c148d5a4b0790fa8a0 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:54 2008 +0200 ide: remove ->INB, ->OUTB and ->OUTBSYNC methods * Remove no longer needed ->INB, ->OUTB and ->OUTBSYNC methods. Then: * Remove no longer used default_hwif_[mm]iops() and ide_[mm_]outbsync(). * Cleanup SuperIO handling in ns87415.c. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1823649b5abb77ffe638178bc5253249d3ecd17d Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:54 2008 +0200 ide: add ide_read_bcount_and_ireason() helper Add ide_read_bcount_and_ireason() helper and use it instead of ->INB in {cdrom_newpc,ide_pc}_intr(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 88a72109b2256bf2974f324a8f890b4a06faf7e9 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:54 2008 +0200 ide: add ide_read_ireason() helper Add ide_read_ireason() helper and use instead of ->INB for reading ATAPI Interrupt Reason register. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1f2efb82af3cfbac995f590a8f8d3beb6fa5678b Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:54 2008 +0200 ide: add ide_read_device() helper Add ide_read_device() helper and convert do_probe() to use it instead of ->INB. Signed-off-by: Bartlomiej Zolnierkiewicz commit 92eb43800a3c1300bd5cb8a2a27e6f2a84f7042e Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:53 2008 +0200 ide: use ->tf_read in ide_read_error() * Add IDE_TFLAG_IN_FEATURE taskfile flag for reading Feature register and handle it in ->tf_read. * Convert ide_read_error() to use ->tf_read instead of ->INB, then uninline and export it. Signed-off-by: Bartlomiej Zolnierkiewicz commit 40f095f0138ea5b5971e5128b27e1bb907161149 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:53 2008 +0200 ide: use ->tf_load in SELECT_DRIVE() Convert SELECT_DRIVE() to use ->tf_load instead of ->OUTB. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 4e65837b293f3ee6399006e94120d61430f72f26 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:53 2008 +0200 ide: use ->tf_load in actual_try_to_identify() Convert actual_try_to_identify() to use ->tf_load instead of ->OUTB. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 59be2c80f0c1080634006135aa9130f1736fbfba Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:52 2008 +0200 ide: use ->tf_load in ide_config_drive_speed() Convert ide_config_drive_speed() to use ->tf_load instead of ->OUTB. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 3c09384e95fa4048a06f179849901f3e57266d58 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:52 2008 +0200 ide: change order of register access in ide_config_drive_speed() Write ATA Feature register before ATA Sector Count register as a preparation to use ->tf_load in ide_config_drive_speed(). This change shouldn't affect anything (just an usual paranoia). Signed-off-by: Bartlomiej Zolnierkiewicz commit 6e6afb3b7401f0181da74a1add57f126946b43e6 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:52 2008 +0200 ide: add ->set_irq method Add ->set_irq method for setting nIEN bit of ATA Device Control register and use it instead of ide_set_irq(). While at it: * Use ->set_irq in init_irq() and do_reset1(). * Don't use HWIF() macro in ide_check_pm_state(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1f6d8a0fd8f6cc5ee2219a8cf9b2da16dfd67397 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:52 2008 +0200 ide: add ->read_altstatus method * Remove ide_read_altstatus() inline helper. * Add ->read_altstatus method for reading ATA Alternate Status register and use it instead of ->INB. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit b73c7ee25da6133f97f47ffd3557288417da7c76 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:52 2008 +0200 ide: add ->read_status method * Remove ide_read_status() inline helper. * Add ->read_status method for reading ATA Status register and use it instead of ->INB. While at it: * Don't use HWGROUP() macro. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit c6dfa867bb45f4bff2e48f3bc89ab1d6a7ab4c21 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:51 2008 +0200 ide: add ->exec_command method Add ->exec_command method for writing ATA Command register and use it instead of ->OUTBSYNC. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit ebb00fb55d0566bb3e81518122a57b4b3bedf1e4 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:51 2008 +0200 ide: factor out simplex handling from ide_pci_dma_base() * Factor out simplex handling from ide_pci_dma_base() to ide_pci_check_simplex(). * Set hwif->dma_base early in ->init_dma method / ide_hwif_setup_dma() and reset it in ide_init_port() if DMA initialization fails. * Use ->read_sff_dma_status instead of ->INB in ide_pci_dma_base(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 81e8d5a34f7d2a2acbe309cfa5810a9699a63239 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:51 2008 +0200 ide: remove ide_setup_dma() Export sff_dma_ops and then remove ide_setup_dma(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit cab7f8eda40d3e3e16b137c67cdddc2cf893c5d7 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:51 2008 +0200 ide: remove ->dma_{status,command} fields from ide_hwif_t * Use ->dma_base + offset instead of ->dma_{status,command} and remove no longer needed ->dma_{status,command}. While at it: * Use ATA_DMA_* defines. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit ab86f91e8739e0b1587a16e4792ab5e4bb11f1b5 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:50 2008 +0200 ide: use I/O ops directly in ide-dma.c Use I/O ops directly in ide_dma_host_set(), ide_dma_setup(), ide_dma_start() and __ide_dma_end(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit b2f951aabc9cc7d5fb987aeec9aef96ccce618a5 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:50 2008 +0200 ide: add ->read_sff_dma_status method Add ->read_sff_dma_status method for reading DMA Status register and use it instead of ->INB. While at it: * Use inb() directly in ns87415.c::ns87415_dma_end(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit c97c6aca75fd5f718056fde7cff798b8cbdb07c0 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:50 2008 +0200 ide: pass hw_regs_t-s to ide_device_add[_all]() (take 3) * Add 'hw_regs_t **hws' argument to ide_device_add[_all]() and convert host drivers + ide_legacy_init_one() + ide_setup_pci_device[s]() to use it instead of calling ide_init_port_hw() directly. [ However if host has > 1 port we must still set hwif->chipset to hint consecutive ide_find_port() call that the previous slot is occupied. ] * Unexport ide_init_port_hw(). v2: * Use defines instead of hard-coded values in buddha.c, gayle.c and q40ide.c. (Suggested by Geert Uytterhoeven) * Better patch description. v3: * Fix build problem in ide-cs.c. (Noticed by Stephen Rothwell) There should be no functional changes caused by this patch. Cc: Geert Uytterhoeven Signed-off-by: Bartlomiej Zolnierkiewicz commit 51d87ed0aab98999bebaf891b99730e15502a592 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:49 2008 +0200 ide: move ide_pci_setup_ports() call out from do_ide_setup_pci_device() * Move ide_pci_setup_ports() call out from do_ide_setup_pci_device() to ide_setup_pci_device[s](). * Drop no longer needed idx argument from do_ide_setup_pci_device(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit b36ba53218e164e49623e36fa3a2fec9f08cf70a Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:49 2008 +0200 ide-pmac: move ide_find_port() call to pmac_ide_setup_device() (take 2) Move ide_find_port() call to pmac_ide_setup_device(). While at it: - fix return value (s/-ENODEV/-ENOENT/) - add DRV_NAME define and use it to set name field of pmac_port_info - use ide_find_port_slot() instead of ide_find_port() - remove superfluous error message (ide_find_port_slot() takes care of it) - drop IDE interface number from driver banner message (but include bus type) v2: * Build fix (thanks to Stephen Rothwell for noticing the issue). Cc: Benjamin Herrenschmidt Cc: Stephen Rothwell Signed-off-by: Bartlomiej Zolnierkiewicz commit 07eb106f3a69400b628b7b6ca3464a1a8f847fa3 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:49 2008 +0200 ide-pmac: add ->init_dev method (take 4) v2/3: * Build fixes from Stephen Rothwell. v4: * Fix ->noprobe setting. (From Benjamin Herrenschmidt) Cc: Benjamin Herrenschmidt Cc: Stephen Rothwell Signed-off-by: Bartlomiej Zolnierkiewicz commit 7b8797acd499d59ed03c7a5b98d82cdf054fd04d Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 23 19:55:48 2008 +0200 ide-pmac: store pmif instead of hwif in ->driver_data (take 2) * Pass pmif instead of hwif to pmac_ide_do_{suspend,resume}(). * Store pmif instead of hwif in ->driver_data. * Use dev_get_drvdata() instead of ->hwif_data to obtain pmif. v2: * Build fixes from Stephen Rothwell. There should be no functional changes caused by this patch. Cc: Benjamin Herrenschmidt Cc: Stephen Rothwell Signed-off-by: Bartlomiej Zolnierkiewicz commit 876a4256d25b7fd7917f53e767da1ebdf3168457 Merge: 7c1fed0... b22d837... Author: Linus Torvalds Date: Wed Jul 23 09:44:31 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: apple_fn_keys F5 and F6 HID: remove quirk lookup from usbkbd/usbmouse HID: Add mapping of new KEY_MEDIA_REPEAT keycode HID: gyration remote support HID: gyration sleep button quirk HID: add quirk for Logitech DiNovo desktop HID: fix quirk handling in usbmouse/kbd HID: fix memory leak in hidraw_release HID: add n-trig digitizer usage HID: Invert HWHEEL mappings for some Logitech mice HID:usbkbd:mark usb_kbd_keycode array as const HID: add fn key support on Macbook Pro 4,1 and Macbook Air HID: remove unused variable from hiddev compat ioctl HID: fix compile issue in hiddev ioctl HID: Push down BKL into ioctl handler in hidraw HID: Switch hiddev to unlocked_ioctl HID: use get/put_unaligned_* helpers HID: fix report descriptor handling for MS Wireless model 1028 commit 7c1fed03b9fa32d4323d5caa6a9c7dcdd7eba767 Author: Jeff Dike Date: Wed Jul 23 11:46:50 2008 -0400 UML - Fix boot crash My copying of linux/init.h didn't go far enough. The definition of __used singled out gcc minor version 3, but didn't care what the major version was. This broke when unit-at-a-time was added and gcc started throwing out initcalls. This results in an early boot crash when ptrace tries to initialize a process with an empty, uninitialized register set. Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds commit 4d8f54d9e4323baae8c8ca753db91563f4b34ddb Author: Huang Weiyi Date: Wed Jul 23 22:45:20 2008 +0800 drivers/char/nvram.c: Removed duplicated include Removed duplicated include file in drivers/char/nvram.c. Signed-off-by: Huang Weiyi Signed-off-by: Linus Torvalds commit 2db873211ba47ef704c301f9ecf4a33413a0b649 Author: Uwe Kleine-König Date: Wed Jul 23 14:42:25 2008 +0200 set_irq_wake: fix return code and wake status tracking Since 15a647eba94c3da27ccc666bea72e7cca06b2d19 set_irq_wake returned -ENXIO if another device had it already enabled. Zero is the right value to return in this case. Moreover the change to desc->status was not reverted if desc->chip->set_wake returned an error. Signed-off-by: Uwe Kleine-König Acked-by: David Brownell Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Russell King Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 3b216c9ed347924efb5e7a66b3257c40a5596d30 Author: Jason Wessel Date: Wed Jul 23 11:30:16 2008 -0500 kgdb: kgdboc console poll hooks for mpsc uart Add in console polling hooks for the mpsc uart for use with kgdb and kgdboc. Signed-off-by: Jason Wessel commit 8e21d04c077c50284bdad10fda8f8cea674458e1 Author: Jason Wessel Date: Wed Jul 23 11:30:16 2008 -0500 kgdb: kgdboc console poll hooks for cpm uart Add in console polling hooks for the cpm uart for use with kgdb and kgdboc. Signed-off-by: Jason Wessel CC: galak@kernel.crashing.org commit 17ce452f7ea3df760b7f9f42453b6f6acd765217 Author: Jason Wessel Date: Wed Jul 23 11:30:15 2008 -0500 kgdb, powerpc: arch specific powerpc kgdb support This patch removes the old kgdb reminants from ARCH=powerpc and implements the new style arch specific stub for the common kgdb core interface. It is possible to have xmon and kgdb in the same kernel, but you cannot use both at the same time because there is only one set of debug hooks. The arch specific kgdb implementation saves the previous state of the debug hooks and restores them if you unconfigure the kgdb I/O driver. Kgdb should have no impact on a kernel that has no kgdb I/O driver configured. Signed-off-by: Jason Wessel commit 5cbad0ebf45c5417104b383dc0e34f64fa7f2473 Author: Jason Wessel Date: Wed Feb 20 13:33:40 2008 -0600 kgdb: support for ARCH=arm This patch adds the ARCH=arm specific a kgdb backend, originally written by Deepak Saxena and George Davis . Geoff Levand , Nicolas Pitre, Manish Lachwani, and Jason Wessel have contributed various fixups here as well. The KGDB patch makes one change to the core ARM architecture such that the traps are initialized early for use with the debugger or other subsystems. [ mingo@elte.hu: small cleanups. ] [ ben-linux@fluff.org: fixed early_trap_init ] Signed-off-by: Jason Wessel Acked-by: Deepak Saxena commit 68afab1cb31436fc9b256a5f44771fa58ed019e2 Author: Jason Wessel Date: Wed Jul 23 11:30:15 2008 -0500 kgdb: remove unused HAVE_ARCH_KGDB_SHADOW_INFO config variable Remove HAVE_ARCH_KGDB_SHADOW_INFO because it does not exist anywhere in the kernel mainline sources Signed-off-by: Jason Wessel commit b22d8370061898f3029cdc2601fbdec493443f03 Merge: 00b3327... 6a25077... Author: Jiri Kosina Date: Wed Jul 23 15:26:10 2008 +0200 Merge branches 'upstream' and 'upstream-fixes' into for-linus commit 6a250778c79d6d14db9ed8e1f86f7b934e2bf3dc Author: Henrik Rydberg Date: Tue Jul 22 15:54:05 2008 +0200 HID: apple_fn_keys F5 and F6 In drivers/hid/hid-input.c, the apple_fn_keys translation table contains no entries for the F5 and F6 keys. This patch maps the F5 and F6 keys to KBDILLUMDOWN and KBDILLUMUP, respektively, which make them work as keyboard backlight control keys. Signed-off-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit acc0b7c40983c316bc69d97b1acf05a228b0d61e Author: Jiri Kosina Date: Mon Jul 21 18:30:05 2008 +0200 HID: remove quirk lookup from usbkbd/usbmouse This patch completely removes the dependency of usbkbd and usbmouse drivers on usbhid code. usbkbd/usbmouse drivers are not needed in the vast majority of cases anyway, and they shouldn't be loaded in standard configurations at all. They are supposed to be as trivial as possible, and searching for HID_QUIRK_IGNORE can even be bad in some cases. Signed-off-by: Jiri Kosina commit 094403ce3ec30e9819b1526134a948a1c92d1421 Author: Dmitry Torokhov Date: Fri Jul 4 12:48:20 2008 -0400 HID: Add mapping of new KEY_MEDIA_REPEAT keycode Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit a7f32697ed571d8a222ff9e77b9f4476e877ed1a Author: Daniel Walker Date: Fri Jul 4 15:23:10 2008 +0200 HID: gyration remote support This adds in a quirk for the additional un-mapped buttons on the gyration MCE remote. Defines are now alphabetical. Signed-off-by: Daniel Walker Signed-off-by: Jiri Kosina commit 32146dc90860b3847b945fdb220a7d86c1ead92a Author: Jiri Kosina Date: Fri Jul 4 15:22:53 2008 +0200 HID: gyration sleep button quirk This patch is based on one provided by Jiri Kosina to handle the sleep button. I just added some cleanup and integrated it into my series. Signed-off-by: Daniel Walker Signed-off-by: Jiri Kosina commit 2c3e3bfbb667f486579d6742b481058e4316dafd Author: Jiri Kosina Date: Tue Jul 1 12:35:16 2008 +0200 HID: add quirk for Logitech DiNovo desktop Logitech DiNovo desktop needs the same quirk as other DiNovo devices. Reported-by: Farid Benamrouche Signed-off-by: Jiri Kosina commit dc25b78f21384f534a8a5da9600972aa9a51a680 Author: Jiri Slaby Date: Fri Jun 27 22:09:25 2008 +0200 HID: fix quirk handling in usbmouse/kbd When usbmouse/kbd is set to build, USB_HID is never defined due to the USB_HID!=y Kconfig rule. Test CONFIG_USB_HID_MODULE in both drivers instead. Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 4db1c62c9991e62b441672db7f227e722776adc4 Author: Jiri Kosina Date: Tue Jun 24 14:45:27 2008 +0200 HID: fix memory leak in hidraw_release hidraw_release() forgot to free the linked list structure, causing memory leak. Reported-by: Juan Marcos Diez Esteban Signed-off-by: Jiri Kosina commit f472f80034ae5d0be7d7196c7e65d0ca8890afb4 Author: Rafi Rubin Date: Thu Jun 19 11:51:04 2008 +0200 HID: add n-trig digitizer usage This adds a hid usage that is reported by the N-Trig digitizer in the Dell Latitude XT screen. Signed-off-by: Rafi Rubin Signed-off-by: Vojtech Pavlik Signed-off-by: Jiri Kosina commit 740f370dc61dc478d891d7d47660bb3ae39ddb4f Author: Dan Nicholson Date: Sat Jun 14 10:26:24 2008 -0700 HID: Invert HWHEEL mappings for some Logitech mice Some Logitech mice have a tilt wheel which register as HWHEEL buttons. The events are positive for a click to the right and negative for a click to the left. Applications expect the opposite, though. I suspect this affects a lot more Logitech mice, but these are the only two I have. I tested this using evtest and a GTK application. A similar Microsoft Intellimouse I have works correctly. Signed-off-by: Dan Nicholson Signed-off-by: Jiri Kosina commit a44ebccea873cf7d58b63605f1cdd6da9dfec70f Author: Ming Lei Date: Sun Jun 8 16:15:16 2008 +0800 HID:usbkbd:mark usb_kbd_keycode array as const mark it as const because it is read only Signed-off-by: Ming Lei Signed-off-by: Jiri Kosina commit 37cdffdadf7ad1b28fa4bd14bb904f4f612e5ae3 Author: Alexandre Karpenko Date: Wed Jun 4 10:31:24 2008 +0200 HID: add fn key support on Macbook Pro 4,1 and Macbook Air Added device ids to hid-quriks for detection of keyboards on 4th generation Macbook Pro and Macbook Air The naming scheme is consistent with past Apple keyboards in hid-quirks; as defined by Apple (including device ids) in: /System/Library/Extensions/AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyboard.kext/Co ntents/Info.plist Patch was originally posted and tested at: https://bugs.launchpad.net/mactel-support/+bug/207127 Signed-off-by: Alexandre Karpenko Signed-off-by: Andrew Morton Signed-off-by: Jiri Kosina commit 00b33277fa544676250d898fccea0a0255608e7f Author: Jiri Kosina Date: Wed Jun 4 15:29:42 2008 +0200 HID: remove unused variable from hiddev compat ioctl Remove unused inode variable from hiddev compat ioctl handler. Signed-off-by: Jiri Kosina commit 88af45bafdda8f892c9d45ce38d55fdf7e734513 Author: Jiri Kosina Date: Tue May 27 11:36:40 2008 +0200 HID: fix compile issue in hiddev ioctl Fix build failure introduced by Alan's ioctl -> unlocked_ioctl (pushing BKL down to the driver) conversion patch for hiddev. Signed-off-by: Jiri Kosina commit 979c407e3b89b606e810fa494ef316896eadbfad Author: Alan Cox Date: Mon May 26 11:25:26 2008 +0200 HID: Push down BKL into ioctl handler in hidraw In this case I simply wrapped it as code review suggests the locking already terminally broken and I didn't want to make it first. See added comment Signed-off-by: Alan Cox Signed-off-by: Jiri Kosina commit 7961df16819085b8a357720d89d0239036e6af2a Author: Alan Cox Date: Mon May 26 11:25:20 2008 +0200 HID: Switch hiddev to unlocked_ioctl Push down the BKL. In some cases compat_ioctl already doesn't take the BKL so we don't either. Some of the locking here seems already dubious and object lifetimes want documenting Signed-off-by: Alan Cox Signed-off-by: Jiri Kosina commit 6f0168d2dacd7972d887e1ca27943ef8af7512a5 Author: Harvey Harrison Date: Fri May 16 11:00:23 2008 +0200 HID: use get/put_unaligned_* helpers Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Jiri Kosina commit 9063974cdbc5463528cb6aa60c91bc0267af7bbb Merge: d6d6a86... c010b2f... Author: Jiri Kosina Date: Wed Jul 23 15:19:00 2008 +0200 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 7659150c60839a2bd31f74e866374abb9be17e43 Author: Pierre Ossman Date: Mon Jul 21 00:32:11 2008 +0200 sdhci: highmem capable PIO routines Improve the PIO handling so that it can service highmem pages. Signed-off-by: Pierre Ossman commit 137d3edb48425f82a6a4226b664f90ed5e42eea5 Author: Tejun Heo Date: Sat Jul 19 23:03:35 2008 +0900 sg: reimplement sg mapping iterator This is alternative implementation of sg content iterator introduced by commit 83e7d317... from Pierre Ossman in next-20080716. As there's already an sg iterator which iterates over sg entries themselves, name this sg_mapping_iterator. Slightly edited description from the original implementation follows. Iteration over a sg list is not that trivial when you take into account that memory pages might have to be mapped before being used. Unfortunately, that means that some parts of the kernel restrict themselves to directly accesible memory just to not have to deal with the mess. This patch adds a simple iterator system that allows any code to easily traverse an sg list and not have to deal with all the details. The user can decide to consume part of the iteration. Also, iteration can be stopped and resumed later if releasing the kmap between iteration steps is necessary. These features are useful to implement piecemeal sg copying for interrupt drive PIO for example. Signed-off-by: Tejun Heo Signed-off-by: Pierre Ossman commit 60c9c7b1d91396f511e55a2a5be13d148dcf66ff Author: Pierre Ossman Date: Tue Jul 22 14:38:35 2008 +0200 mmc_test: print message when attaching to card Make it a bit more obvious that the card has been claimed by the mmc_test driver so that people don't have to wonder why their block device never shows up. Signed-off-by: Pierre Ossman commit 6d79947a2d34470311012c3ee45ad33650a7f192 Author: Pierre Ossman Date: Tue Jul 22 14:36:57 2008 +0200 mmc: Remove Russell as primecell mci maintainer Russell no longer has the resources to fully test the controller, so he is stepping down as maintainer. Signed-off-by: Pierre Ossman commit 2ff1fa679115e3c8c78ad74ad8fd2d7fd87ae4e7 Author: Pierre Ossman Date: Tue Jul 22 14:35:42 2008 +0200 mmc_block: bounce buffer highmem support Support highmem pages in the bounce buffer code by using the sg_copy_from/to_buffer() functions. Signed-off-by: Pierre Ossman commit 719a61b452ff74cf81a96e4212748d9d63bcc924 Author: Pierre Ossman Date: Tue Jul 22 13:23:23 2008 +0200 sdhci: fix bad warning from commit c8b3e02 Commit c8b3e02 renamed a variable, but missed one reference to it inside a WARN_ON, causing it to incorrectly trigger. Signed-off-by: Pierre Ossman commit 6cefd05f35177ad5d22d44519c680cf43f2ac86d Author: Pierre Ossman Date: Mon Jul 21 00:45:15 2008 +0200 sdhci: add warnings for bad buffers in ADMA path The ADMA code path assumes that the 3 byte alignment fix doesn't cross a page boundary. I'm not convinced this is worth supporting, but at least print a warning in the off chance we'll actually see such a request. Signed-off-by: Pierre Ossman commit 48b5352ea1891455eb8e824cf7d92f66931a090f Author: Pierre Ossman Date: Mon Jul 21 00:14:52 2008 +0200 mmc_test: test oversized sg lists Add tests that make sure the driver properly checks the blocks and blksz fields and doesn't assume the sg list has a size that perfectly matches the current request. Signed-off-by: Pierre Ossman commit 2661081f5ab9cb25359d27f88707a018cf4e68e9 Author: Pierre Ossman Date: Fri Jul 4 18:17:13 2008 +0200 mmc_test: highmem tests Add a couple of tests to make sure the host driver handles highmem memory pages properly. Unfortunately there is no way to guarantee an allocation below 4 GB in i386, so it might give you addresses that are out of reach for the hardware (OTOH, so will any other highmem allocation in the kernel). Signed-off-by: Pierre Ossman commit 907b2cd6dbbdfd6a4be7908f57b1498dfabc880e Author: Ben Dooks Date: Thu Jul 17 15:32:54 2008 +0100 s3cmci: ensure host stopped on machine shutdown Ensure that the s3cmci host controller is turned off when the machine is shutdown, otherwise we end up leaving the card powered and processing insertion and removal events after the system prints "System halted." Signed-off-by: Ben Dooks Signed-off-by: Pierre Ossman commit dd8572af68229a65b6716b286395ad7f5e2ecc48 Author: Manuel Lauss Date: Thu Jul 17 13:07:28 2008 +0200 au1xmmc: suspend/resume implementation Basic suspend/resume support: disable peripheral on suspend and reinit on resume. Tested on Au1200. Signed-off-by: Manuel Lauss Signed-off-by: Pierre Ossman commit d2f2761bb75ee365077b52c7e73a6e5164d3efa0 Author: Ben Dooks Date: Thu Jul 17 11:54:01 2008 +0100 s3cmci: fixes for section mismatch warnings Fix the naming of various functions in the s3cmc driver to stop triggering section mismatch warnings. Signed-off-by: Ben Dooks Signed-off-by: Pierre Ossman commit 4fe16897c59882420d66f2d503106653d026ed6c Author: Karl Beldan Date: Wed Jul 16 18:29:11 2008 +0200 pxamci: trivial fix of DMA alignment register bit clearing Signed-off-by: Karl Beldan Acked-by: Eric Miao Signed-off-by: Pierre Ossman commit 1bad879a078111748ebc27fb0d29e8c916556835 Author: Alan Cox Date: Tue Jul 22 23:38:04 2008 +0100 tty: Fix up escaped character Louis Rilling noticed this. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit c010b2f76c3032e48097a6eef291d8593d5d79a6 Merge: 6069fb2... 521c4d9... Author: Linus Torvalds Date: Tue Jul 22 19:09:51 2008 -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: (82 commits) ipw2200: Call netif_*_queue() interfaces properly. netxen: Needs to include linux/vmalloc.h [netdrvr] atl1d: fix !CONFIG_PM build r6040: rework init_one error handling r6040: bump release number to 0.18 r6040: handle RX fifo full and no descriptor interrupts r6040: change the default waiting time r6040: use definitions for magic values in descriptor status r6040: completely rework the RX path r6040: call napi_disable when puting down the interface and set lp->dev accordingly. mv643xx_eth: fix NETPOLL build r6040: rework the RX buffers allocation routine r6040: fix scheduling while atomic in r6040_tx_timeout r6040: fix null pointer access and tx timeouts r6040: prefix all functions with r6040 rndis_host: support WM6 devices as modems at91_ether: use netstats in net_device structure sfc: Create one RX queue and interrupt per CPU package by default sfc: Use a separate workqueue for resets sfc: I2C adapter initialisation fixes ... commit 6069fb2ef5d4f47432359c97f350e0cfcc4d208e Author: Linus Torvalds Date: Tue Jul 22 19:06:00 2008 -0700 Re-delete zombie 'drivers/usb/serial/airprime.c' file Stephen Rothwell points out that this file got deleted (on purpose) by commit 640c1bce86d1e11ee6a1263fdf6170d3210b1684 ("USB: delete airprime driver"), but then almost immediately incorrectly resurrected by commit 95da310e66ee8090119596c70ca8432e57f9a97f ("usb_serial: API all change"). Delete it again. If it comes back, we'll need to drive a stake through its heart. Reported-by: Stephen Rothwell Acked-by: Greg KH Cc: Alan Cox Cc: Andrew Morton Signed-off-by: Linus Torvalds commit e9dd54da0ba494bd86c45bdf574a6fd6ff8f2210 Merge: 0988c37... 4a0a088... Author: Linus Torvalds Date: Tue Jul 22 19:04:22 2008 -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: sparc32: pass -m32 when building vmlinux.lds sparc: Fixes the DRM layer build on sparc. ide: merge with ide: : use __raw_{read,write}w() ide: : use __raw_{read,write}w() ide: : use %r0 for outw_be() sparc64: Do not define BIO_VMERGE_BOUNDARY. commit 521c4d96e0840ecce25b956e00f416ed499ef2ba Author: David S. Miller Date: Tue Jul 22 18:32:47 2008 -0700 ipw2200: Call netif_*_queue() interfaces properly. netif_carrier_{on,off}() handles starting and stopping packet flow into the driver. So there is no reason to invoke netif_stop_queue() and netif_wake_queue() in response to link status events. Signed-off-by: David S. Miller commit 4255589293b78c4dab324323e12857876b154863 Author: David S. Miller Date: Tue Jul 22 18:29:10 2008 -0700 netxen: Needs to include linux/vmalloc.h Signed-off-by: David S. Miller commit 380bab10de09c22c813ae83f8e148f5a46c1de40 Merge: 7cf7526... d6f8aa8... Author: David S. Miller Date: Tue Jul 22 18:19:22 2008 -0700 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit d6f8aa8586dabe605454f3c98a5c1a577c3e0cfb Author: Jeff Garzik Date: Tue Jul 22 21:17:38 2008 -0400 [netdrvr] atl1d: fix !CONFIG_PM build Signed-off-by: Jeff Garzik commit 7cf75262a4aafe1483349e897bf905e121314dff Merge: c8f1568... b0e4539... Author: David S. Miller Date: Tue Jul 22 17:54:47 2008 -0700 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 7f1b358a236ee9c19657a619ac6f2dcabcaa0924 Author: Maciej Sosnowski Date: Tue Jul 22 17:30:57 2008 -0700 I/OAT: I/OAT version 3.0 support This patch adds to ioatdma and dca modules support for Intel I/OAT DMA engine ver.3 (aka CB3 device). The main features of I/OAT ver.3 are: * 8 single channel DMA devices (8 channels total) * 8 DCA providers, each can accept 2 requesters * 8-bit TAG values and 32-bit extended APIC IDs Signed-off-by: Maciej Sosnowski Signed-off-by: Dan Williams commit 16a37acaaf4aaa631ba3f83710ed6cdb1a597520 Author: Maciej Sosnowski Date: Tue Jul 22 17:30:57 2008 -0700 I/OAT: tcp_dma_copybreak default value dependent on I/OAT version I/OAT DMA performance tuning showed different optimal values of tcp_dma_copybreak for different I/OAT versions (4096 for 1.2 and 2048 for 2.0). This patch lets ioatdma driver set tcp_dma_copybreak value according to these results. [dan.j.williams@intel.com: remove some ifdefs] Signed-off-by: Maciej Sosnowski Signed-off-by: Dan Williams commit b0e453902ad53580a77c2b1baddcc0b2d8ce8acc Author: Florian Fainelli Date: Mon Jul 21 12:32:29 2008 +0200 r6040: rework init_one error handling This patch reworks the error handling in r6040_init_one in order not to leak resources and correcly unmap and release PCI regions of the MAC. Also prefix printk's with the driver name for clarity. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 1de95294f16cab0e924e1b4cd9b554a6eca65e6e Author: Florian Fainelli Date: Sun Jul 13 14:36:04 2008 +0200 r6040: bump release number to 0.18 This patch bumps the release of the r6040 driver. There has been quite some versions of it out there, but this one is the one people should report bugs against. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit e24ddf3aa8a2c4c14df1136e762c315c436488e7 Author: Florian Fainelli Date: Sun Jul 13 14:35:32 2008 +0200 r6040: handle RX fifo full and no descriptor interrupts This patch allows the MAC to handle the RX FIFO full and no descriptor available interrupts. While we are at it replace the TX interrupt with its corresponding definition. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 31718dedf62fd62e807001138ab5ac76e9b11064 Author: Florian Fainelli Date: Sun Jul 13 14:35:00 2008 +0200 r6040: change the default waiting time This patch changes the default waiting time of a packet, which along with our previous r6040_rx path, was causing huge delays with another host (160 to 230 ms). Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 32f565df9ba451a24117db67003ed2ae21bab88c Author: Florian Fainelli Date: Sun Jul 13 14:34:15 2008 +0200 r6040: use definitions for magic values in descriptor status Define all the descriptor status the MAC can set. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 9ca28dc4c75f018201e21b10e34b8161bcb0ffb2 Author: Florian Fainelli Date: Sun Jul 13 14:33:36 2008 +0200 r6040: completely rework the RX path This patch completely reworks the RX path in order to be more accurate about what is going on with the MAC. We no longer read the error from the MLSR register instead read the descriptor status register which reflects, the error per descriptor. We now allocate skbs on the fly in r6040_rx, and we handle allocation failure instead of simply dropping the packet. Remove the rx_free_desc counter of r6040_private structure since we allocate skbs in the RX path. r6040_rx_buf_alloc is now removed and becomes unuseless. Signed-Off-By: Joerg Albert Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 129cf9a7028fc50b226b8021bc0b76fb38efa81d Author: Florian Fainelli Date: Sun Jul 13 14:32:45 2008 +0200 r6040: call napi_disable when puting down the interface and set lp->dev accordingly. We did not call napi_disabled when putting down the interface which should be done. Finally initialize lp->dev when everything is set. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit f2ca60f2067958e45f949e74abd580715c6c4b33 Author: Lennert Buytenhek Date: Mon Jul 7 00:03:00 2008 +0200 mv643xx_eth: fix NETPOLL build Joseph Fannin and Takashi Iwai noticed that commit 073a345c04b01da0cc5b79ac7be0c7c8b1691ef5 ("mv643xx_eth: clarify irq masking and unmasking") broke the mv643xx_eth build when NETPOLL is enabled, due to it not renaming one instance of INT_CAUSE_EXT in mv643xx_eth_netpoll(). This patch takes care of that instance as well. Signed-off-by: Lennert Buytenhek Cc: Dale Farnsworth Cc: Joseph Fannin Cc: Takashi Iwai Signed-off-by: Jeff Garzik commit 3d4634193aa95a6d04a786fc12b190d0e4295685 Author: Florian Fainelli Date: Sun Jul 13 14:32:18 2008 +0200 r6040: rework the RX buffers allocation routine Rework the RX buffers allocation function so that we do not leak memory in the case we could not allocate skbs for the RX path. Propagate the errors to the r6040_up function where we call the RX buffers allocation function. Also rename the r6040_alloc_txbufs function to r6040_init_txbufs, to reflect what it really does. Signed-Off-By: Joerg Albert Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit fec3a23be0daceeb0695f8296aea07ea1ad073d8 Author: Florian Fainelli Date: Sun Jul 13 14:29:20 2008 +0200 r6040: fix scheduling while atomic in r6040_tx_timeout Add a helper function which only modifies R6040 MAC registers use it when we timeout, and on adapter initialization. Fix the scheduling while atomic but in the timeout routine due to the reallocation of rx/tx buffers. Signed-Off-By: Joerg Albert Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 3d25434816356e8d1e3167c5f7a56d3d81aeb239 Author: Florian Fainelli Date: Sun Jul 13 14:28:27 2008 +0200 r6040: fix null pointer access and tx timeouts This patch fixes a null pointer access in r6040_rx due to lp->dev not being initialized. Fix the TX timeouts, TX irq was not re-enabled on RX irq Signed-Off-By: Joerg Albert Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit c6e69bb92ed6e22a0931e29daff6539f2bac29b9 Author: Florian Fainelli Date: Sun Jul 13 13:39:32 2008 +0200 r6040: prefix all functions with r6040 Prefix all functions inside the r6040 driver with r6040 to avoid namespace clashing. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 7e99eeddb35cdaafb820676a57517b5e58685e4c Author: Thomas Backlund Date: Tue Jul 22 13:55:58 2008 -0700 rndis_host: support WM6 devices as modems This patch allows Windows Mobile 6 devices to be used for tethering -- that is, used as modems. It was requested by AdamW in kernel bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=11119 and Mandriva kernel-discuss list. It is tested and confirmed to work by Peterl: http://forum.eeeuser.com/viewtopic.php?pid=323543#p323543 This patch is based on the patch in the above kernel bugzilla, which is from the usb-rndis-lite tree. [ dbrownell@users.sourceforge.net: misc fixes ] Signed-off-by: Thomas Backlund Signed-off-by: David Brownell Signed-off-by: Jeff Garzik commit 7a2f53ee0b56ff7e1c0c24404575cb62935d37d9 Author: Paulius Zaleckas Date: Thu Jul 17 11:01:26 2008 +0300 at91_ether: use netstats in net_device structure Use net_device_stats from net_device structure instead of local. Signed-off-by: Paulius Zaleckas Tested-by: Marc Pignat Acked-by: Andrew Victor Signed-off-by: Jeff Garzik commit aa6ef27ea906e74bd23d14f43f095c012469d9c7 Author: Ben Hutchings Date: Fri Jul 18 19:03:10 2008 +0100 sfc: Create one RX queue and interrupt per CPU package by default Using multiple cores in the same package to handle received traffic does not appear to provide a performance benefit. Therefore use CPU topology information to count CPU packages and use that as the default number of RX queues and interrupts. We rely on interrupt balancing to spread the interrupts across packages. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 8d9853d911b9d3fb767c3886066530c0e39b78ba Author: Ben Hutchings Date: Fri Jul 18 19:01:20 2008 +0100 sfc: Use a separate workqueue for resets This avoids deadlock in case a reset is triggered during self-test. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 9dadae686fce02a02982fc9c0563f6b917217a66 Author: Ben Hutchings Date: Fri Jul 18 18:59:12 2008 +0100 sfc: I2C adapter initialisation fixes As recommended by Jean Delvare: - Increase timeout to 50 ms - Leave adapter class clear so that unwanted drivers do not probe our bus - Use strlcpy() for name initialisation Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 81250297d85b26eb4e9de5decf752dce430277f9 Author: Taku Izumi Date: Fri Jul 11 15:17:44 2008 -0700 e1000: make ioport free This patch makes e1000 driver ioport-free. This corrects behavior in probe function so as not to request ioport resources as long as they are not really needed. This is based on the ioport-free patch of e1000 driver from Auke Kok and Tomohiro Kusumi. Signed-off-by: Tomohiro Kusumi Signed-off-by: Auke Kok Signed-off-by: Taku Izumi Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c3570acb53c885f8accb8c85eda195781d30632f Author: Francois Romieu Date: Fri Jul 11 15:17:38 2008 -0700 e1000: delete non NAPI code from the driver Compile-tested only. Signed-off-by: Francois Romieu Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 63cd31f60716c4a9f1b5b6ffd804326dc766d2d2 Author: Jeff Kirsher Date: Fri Jul 11 15:17:33 2008 -0700 e1000: remove email reference The email linux-nics@intel.com is no longer available, remove all references. Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c7be73bc9bfc8a650fe646f484dea5bad3cf92d5 Author: Joe Perches Date: Fri Jul 11 15:17:28 2008 -0700 e1000: Move assignments in tests before test Signed-off-by: Joe Perches Signed-off-by: Auke Kok Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit b11840204f36f9a1e3027033227e17d167e04377 Author: Joe Perches Date: Fri Jul 11 15:17:23 2008 -0700 e1000: checkpatch clean Redefine DPRINTK macro using do while(0) __FUNCTION__ to __func__ structs {} on separate lines Surround negative constants with () Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit e982f17c87488a98df6bc4f5454a176646b4d00b Author: Joe Perches Date: Fri Jul 11 15:17:18 2008 -0700 e1000: Remove spaces after casts and function names Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c03e83b0351f8a9464d32f31302ec75ba88518dc Author: Joe Perches Date: Fri Jul 11 15:17:13 2008 -0700 e1000: Move extern function definitions to e1000.h Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 1dc329180fe22ff8651e0ef550ba17ca1cc7bf22 Author: Joe Perches Date: Fri Jul 11 15:17:08 2008 -0700 e1000: Use hw, er32, and ew32 Use struct e1000_hw *hw = adapter->hw; where necessary Change macros E1000_READ_REG and E1000_WRITE_REG to er32 and ew32 Signed-off-by: Auke Kok Signed-off-by: Joe Perches Signed-off-by: Jeff Garzik commit 6479884509e6cd30c6708fbf05fafc0d1fc85f7a Author: Joe Perches Date: Fri Jul 11 15:17:02 2008 -0700 e1000: neaten function declarations Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit cdc18a670923d01a762d66be582bfe763772d441 Author: Christoph Lameter Date: Fri Jul 11 16:12:34 2008 -0500 Fix typo in meth driver An | in an if statement to check a bit? I think this needs to be a &. As a result of this typo meth will always operate in promiscuous mode. Signed-off-by: Christoph Lameter Signed-off-by: Jeff Garzik commit a6a5325239c20202e18e21e94291bccc659fbf9e Author: Jie Yang Date: Fri Jul 18 11:37:13 2008 +0800 atl1e: Atheros L1E Gigabit Ethernet driver Full patch for the Atheros L1E Gigabit Ethernet driver. Supportring AR8121, AR8113 and AR8114 Signed-off-by: Jie Yang Signed-off-by: Jeff Garzik commit bb5d10ac8cc315d53306963001fe650d88a1cbb2 Author: Jesse Brandeburg Date: Fri Jul 11 17:34:58 2008 -0700 ixgbe: remove device ID for unsupported device The ixgbe driver was untested with device ID 8086:10c8 but still advertises support. Currently if this device is present in the system when the driver is loaded, the system will panic. Remove this device ID until full support can be tested with available hardware. This patch is necessary for 2.6.24, 2.6.25 and 2.6.26 Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 4a0a088970a553e9f89d23eec688932f689d57f9 Author: Stephen Rothwell Date: Tue Jul 22 15:47:17 2008 -0700 sparc32: pass -m32 when building vmlinux.lds Otherwise it breaks since we merged asm/page.h Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit c8f15686a4b3345e3e81e09cfe191df58bbedd45 Author: Anton Vorontsov Date: Tue Jul 22 15:41:24 2008 -0700 netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328 The drivers were touching net queue before it has been started, so without this patch, the drivers will potentially WARN at net/core/dev.c:1328. I don't have the hardware for the drivers below, so this patch is untested, and thus should be carefully peer reviewed. tc35815.c au1000_eth.c bfin_mac.c macb.c ^ The four drivers are using phylib, they're calling netif_start_queue() in open() callback. So trivially remove netif_tx_schedule_all(). Phylib will handle netif_carrier_*(). cpmac.c fec_mpc52xx.c fs_enet/fs_enet-main.c sh_eth.c ^ The same as above, but these were also needlessly calling netif_carrier_*() functions. So removed queue calls and also remove carrier calls, since phylib will handle it. fs_enet-main.c also didn't call netif_start_queue() at open(), this is fixed now. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 1a4dc68b31fd04573ab3c554702372941a4fd46f Author: Dave Jones Date: Tue Jul 15 19:54:52 2008 -0400 8139too: Fall back to PIO when MMIO fails. Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit 152151daece9d5dfd86e652b95846072c0d2b566 Author: Dave Jones Date: Tue Jul 15 19:54:53 2008 -0400 8139too: Force usage of PIO on OQO2 The OQO model 2 has an RTL8139 from Atheros that doesn't like MMIO. It fails on modprobe, with a 'PCI Bus error' message. Force it to always use polled IO. Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit eb5813481a97582c80c8d402ecb371149c77b4e0 Author: Dave Jones Date: Tue Jul 15 19:54:53 2008 -0400 8139too: Make PIO/MMIO a runtime decision through a module parameter. This is needed to support devices that only work with PIO without penalising devices that work fine with MMIO in distro kernels. It also allows us to eventually use PIO as a fallback when setting up MMIO fails. Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit 7239016d52c6d568d069f083bdcd17f35ab79fd8 Author: Wang Jian Date: Wed Jul 16 21:46:20 2008 +0800 net/phy: Fix 88e1111 copper/fiber selection in RGMII mode MII_M1111_HWCFG_FIBER_COPPER_RES is a bit of MII_M1111_PHY_EXT_SR, not MII_M1111_PHY_EXT_CR. Signed-off-by: Wang Jian Signed-off-by: Jeff Garzik commit 9cf8fa4334e60f27b4a392f432c292f3af268215 Author: Wang Jian Date: Wed Jul 16 21:46:17 2008 +0800 net/phy: Fix copper/fiber auto-selection for 88e1111 The 27.15 bit (MII_M1111_HWCFG_FIBER_COPPER_AUTO) is disable bit. When set to 1, copper/fiber auto selection is disabled. The current code to enable but actually disable auto selection. Signed-off-by: Wang Jian Signed-off-by: Jeff Garzik commit c0e5a8c21bb9bb222917c36eba503ae88af52c34 Author: Harvey Harrison Date: Wed Jul 16 12:45:34 2008 -0700 net: tun.c fix cast Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 25ac3c24839002298e9329a5fda305e5383b1dc7 Author: Harvey Harrison Date: Wed Jul 16 12:45:27 2008 -0700 net: igb_main.c fix sparse integer as NULL pointer warning drivers/net/igb/igb_main.c:388:20: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit f8e5e776a3ac29705b1a357b23cad0920ef1a1d2 Author: Ben Dooks Date: Thu Jul 17 20:29:13 2008 +0100 DM9000: Remove magic numbers Remove magic numbers for items that we already have defined in the register header file. Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit 23fcc8d991c7f7bf3eaa64c296217103ab59f5dc Author: Ursula Braun Date: Fri Jul 18 15:24:58 2008 +0200 MAINTAINERS: Update email address of Ursula Braun Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit aa3f2cb63086e474a2ac3836d01fc6d9db393846 Author: Peter Tiedemann Date: Fri Jul 18 15:24:57 2008 +0200 s390/net/ctcm: message cleanup Cc: Martin Schwidefsky Signed-off-by: Peter Tiedemann Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit b805da74dee3a8de8a29654078c5198f2fb0e15b Author: Andy Richter Date: Fri Jul 18 15:24:56 2008 +0200 s390/net: Cleanup claw printk messages. Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andy Richter Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit 58735567b6de3034c9d0d7e1dcf31614b66de986 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:10 2008 -0700 netxen: update driver version Change driver version to 4.0.0. Netxen firmwares as old as v3.4.216 are supported. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit cd1f8160e015cd1538701b7de216cbeaefc6b0a8 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:09 2008 -0700 netxen: enable tso6, intr coalescing. Enable tso6 and ipv6 checksum, interrupt coalescing for NX3031. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit d9e651bc06690c5a5326e8d019fa7668409bc819 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:08 2008 -0700 netxen: cut-through rx changes NX3031 supports cut-through operation where ingress packets are directly dma'ed into host buffers to reduce latency. This requires larger dma buffers (2kb) and different alignemnt. The buffer posting logic is changed a bit. The free rx buffers are maintained in linked list, since the received reference handles can be out of order. However rx descriptors are still posted sequentially, indexed by producer. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit c9fc891f86c062449116fde8826a0ead650e17ac Author: Dhananjay Phadke Date: Mon Jul 21 19:44:07 2008 -0700 netxen: mtu, mac, link status changes MAC addr, multicast filters, mtu are set through firmware commands in firmware v4.0.0+ because of virtualization of physical ports. Link status is also read from registers allocated by firmware for each virtual port. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 48bfd1e0fc66b27254ec742b014e689ef218e76c Author: Dhananjay Phadke Date: Mon Jul 21 19:44:06 2008 -0700 netxen: add netxen_nic_ctx.c Contains rx and tx ring context management and certain firmware commands for netxen firmware v4.0.0+. This patch gathers all HW context management code into netxen_nic_ctx.c. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit a97342f9790f14ac20bd5f8b16ed661411fa2e3e Author: Dhananjay Phadke Date: Mon Jul 21 19:44:05 2008 -0700 netxen: remove netxen_nic_isr.c It had only couple of functions which are moved to main.c Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 2956640d4aaaecd42bd8ba800cc8c33bfe206b7e Author: Dhananjay Phadke Date: Mon Jul 21 19:44:04 2008 -0700 netxen: pci probe and firmware init changes Add initialization code in pci probe for new chip and retain compatibility with old revisions. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 3ce06a320f8d5a3f16960e63021cc372283efffb Author: Dhananjay Phadke Date: Mon Jul 21 19:44:03 2008 -0700 netxen: add 2MB PCI memory support New revision of netxen chip has 2MB PCI memory. Older chips had 128MB addressable PCI memory. To retain compatibility, this patch adds function pointers based on pci bar0 size. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit e4c93c817ce650401db42db6c869cf7688217ff4 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:02 2008 -0700 netxen: add defs for new chip/boards Add macros for new chip revision and board configurations. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 623621b07ebc5b72e0bdfa4a50bbb28f4587de0c Author: Dhananjay Phadke Date: Mon Jul 21 19:44:01 2008 -0700 netxen: hw multicast filtering Enable multicast address filtering capabilities in the hardware. Upto 16 multicast addresses can be programmed for each physical port. Support "allmulti" mode, if enabled. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 7830b22cbc5f5e804469b74a3fe0d3a8ed88ca31 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:00 2008 -0700 netxen: cleanup unused variables/functions o Reduce access to global arrays in data path. o Remove duplicate/unused variables, unecessary alignment constraints. o Use correct pci_dev instead of fallback device for consistent allocations. o Disable ethtool set_eeprom functionality for now, it was only used for flashing firmware. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit f0084a36d4d799c024a5211555334d56c91d236d Author: Ingo Molnar Date: Tue Jul 22 09:23:34 2008 +0200 net 8390p: fix interface usage various drivers were using the wrong APIs: drivers/built-in.o: In function `hp_probe1': hp.c:(.init.text+0xa280): undefined reference to `NS8390_init' fixed via: cd drivers/net/; sed -i 's/NS8390_/NS8390p_/g' \ $(grep -l NS8390_ $(grep 8390p.o Makefile | cut -d' ' -f3 | \ sed 's/.o$/.c/g')) Signed-off-by: Ingo Molnar Signed-off-by: Jeff Garzik commit 3d0f24a74e7957593a5622eb5c04ed6860dd8391 Author: Stephen Hemminger Date: Tue Jul 22 14:35:50 2008 -0700 ipv6: icmp6_dst_gc return change Change icmp6_dst_gc to return the one value the caller cares about rather than using call by reference. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 75307c0fe7fcb3b52a92fe32384fc33f50622654 Author: Stephen Hemminger Date: Tue Jul 22 14:35:07 2008 -0700 ipv6: use kcalloc Th fib_table_hash is an array, so use kcalloc. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a76d7345a3f92bb8352f200e7b2e380dddcd7e36 Author: Stephen Hemminger Date: Tue Jul 22 14:34:35 2008 -0700 ipv6: use spin_trylock_bh Now there is spin_trylock_bh, use it rather than open coding. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c8a4522245e9931a53a98d5160bb4c00d3f73921 Author: Stephen Hemminger Date: Tue Jul 22 14:34:09 2008 -0700 ipv6: use round_jiffies This timer normally happens once a minute, there is no need to cause an early wakeup for it, so align it to next second boundary to safe power. It can't be deferred because then it could take too long on cleanup or DoS. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 417f28bb340725544c36b35465444d2fd57232b8 Author: Stephen Hemminger Date: Tue Jul 22 14:33:45 2008 -0700 netns: dont alloc ipv6 fib timer list FIB timer list is a trivial size structure, avoid indirection and just put it in existing ns. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 428695b89831d781ba203d97ee07da68150ea40d Author: David S. Miller Date: Tue Jul 22 14:30:55 2008 -0700 sparc: Fixes the DRM layer build on sparc. By providing an ioremap_wc(). Signed-off-by: David S. Miller commit 888c848ed34bd5f8cb56567624c0d951ab35174e Author: Adrian Bunk Date: Tue Jul 22 14:21:58 2008 -0700 ipv6: make struct ipv6_devconf static struct ipv6_devconf can now become static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 4d6971e909e904be60218739fc961188471fc4f4 Author: Adrian Bunk Date: Tue Jul 22 14:21:30 2008 -0700 sctp: remove sctp_assoc_proc_exit() Commit 20c2c1fd6c842caf70dcb1d94b9d58861949fd3d (sctp: add sctp/remaddr table to complete RFC remote address table OID) added an unused sctp_assoc_proc_exit() function that seems to have been unintentionally created when copying the assocs code. Signed-off-by: Adrian Bunk Acked-by: Neil Horman Signed-off-by: David S. Miller commit abd0b198ea699578c3c3476d646c91842e19dbd2 Author: Adrian Bunk Date: Tue Jul 22 14:20:45 2008 -0700 sctp: make sctp_outq_flush() static sctp_outq_flush() can now become static. Signed-off-by: Adrian Bunk Acked-by: Neil Horman Signed-off-by: David S. Miller commit a94f779f9d82eb2d758a8715eaae5df98e8dcb21 Author: Adrian Bunk Date: Tue Jul 22 14:20:11 2008 -0700 pkt_sched: make qdisc_class_hash_alloc() static This patch makes the needlessly global qdisc_class_hash_alloc() static. Signed-off-by: Adrian Bunk Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 8086cd451f08f4c0f9693fc66d87754bbd18cfba Author: Adrian Bunk Date: Tue Jul 22 14:19:19 2008 -0700 netns: make get_proc_net() static get_proc_net() can now become static. Signed-off-by: Adrian Bunk Acked-by: Pavel Emelyanov Signed-off-by: David S. Miller commit cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea Author: David S. Miller Date: Tue Jul 22 14:16:42 2008 -0700 netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep. The new address list lock needs to handle the same device layering issues that the _xmit_lock one does. This integrates work done by Patrick McHardy. Signed-off-by: David S. Miller commit d29f749e252bcdbfe7a75a58f0ee92da16f127c0 Author: Dave Jones Date: Tue Jul 22 14:09:06 2008 -0700 net: Fix build failure with 'make mandocs'. The function header comments have to go with the functions they are documenting, or things go horribly wrong when we try to process them with the docbook tools. Warning(include/linux/netdevice.h:1006): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1033): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1067): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1093): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1474): No description found for parameter 'txq' Error(net/core/dev.c:1674): cannot understand prototype: 'u32 simple_tx_hashrnd; ' Signed-off-by: Dave Jones Acked-by: Randy Dunlap Signed-off-by: David S. Miller commit 0988c37c248e824953d95a11412696c348dbca91 Merge: 6eaaaac... d536b1f... Author: Linus Torvalds Date: Tue Jul 22 13:40:24 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix crash due to missing debugctlmsr on AMD K6-3 x86: add PTE_FLAGS_MASK x86: rename PTE_MASK to PTE_PFN_MASK x86: fix pte_flags() to only return flags, fix lguest (updated) x86: use setup_clear_cpu_cap with disable_apic, fix x86: move the last Dprintk instance to pr_debug() commit 6eaaaac97433575894570a990aa27310040a8177 Merge: 06b8147... a1ef5ad... Author: Linus Torvalds Date: Tue Jul 22 13:17:15 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: remove CONFIG_KMOD from core kernel code remove CONFIG_KMOD from lib remove CONFIG_KMOD from sparc64 rework try_then_request_module to do less in non-modular kernels remove mention of CONFIG_KMOD from documentation make CONFIG_KMOD invisible modules: Take a shortcut for checking if an address is in a module module: turn longs into ints for module sizes Shrink struct module: CONFIG_UNUSED_SYMBOLS ifdefs module: reorder struct module to save space on 64 bit builds module: generic each_symbol iterator function module: don't use stop_machine for waiting rmmod commit 06b8147c5dbd385b5b97ca74e19f6f3951ebc1cb Merge: 53baaaa... 8725f25... Author: Linus Torvalds Date: Tue Jul 22 13:16:01 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (49 commits) powerpc: Fix build bug with binutils < 2.18 and GCC < 4.2 powerpc/eeh: Don't panic when EEH_MAX_FAILS is exceeded fbdev: Teaches offb about palette on radeon r5xx/r6xx powerpc/cell/edac: Log a syndrome code in case of correctable error powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code powerpc: Indicate which oprofile counters to use while in compat mode powerpc/boot: Change spaces to tabs powerpc: Remove duplicate 6xx option in Kconfig powerpc: Use PPC_LONG and PPC_LONG_ALIGN in lib/string.S powerpc: Use PPC_LONG_ALIGN in uaccess.h powerpc: Add a #define for aligning to a long-sized boundary powerpc: Fix OF parsing of 64 bits PCI addresses powerpc: Use WARN_ON(1) instead of __WARN() powerpc: Fix support for latencytop powerpc/ps3: Update ps3_defconfig powerpc/ps3: Add a sub-match id to ps3_system_bus powerpc: Add a 6xx defconfig powerpc/dma: Use the struct dma_attrs in iommu code powerpc/cell: Add support for power button of future IBM cell blades powerpc/cell: Cleanup sysreset_hack for IBM cell blades ... commit 53baaaa9682c230410a057263d1ce2922f43ddc4 Merge: f10140f... 3f97870... Author: Linus Torvalds Date: Tue Jul 22 13:13:47 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (79 commits) arm: bus_id -> dev_name() and dev_set_name() conversions sparc64: fix up bus_id changes in sparc core code 3c59x: handle pci_name() being const MTD: handle pci_name() being const HP iLO driver sysdev: Convert the x86 mce tolerant sysdev attribute to generic attribute sysdev: Add utility functions for simple int/ulong variable sysdev attributes sysdev: Pass the attribute to the low level sysdev show/store function driver core: Suppress sysfs warnings for device_rename(). kobject: Transmit return value of call_usermodehelper() to caller sysfs-rules.txt: reword API stability statement debugfs: Implement debugfs_remove_recursive() HOWTO: change email addresses of James in HOWTO always enable FW_LOADER unless EMBEDDED=y uio-howto.tmpl: use unique output names uio-howto.tmpl: use standard copyright/legal markings sysfs: don't call notify_change sysdev: fix debugging statements in registration code. kobject: should use kobject_put() in kset-example kobject: reorder kobject to save space on 64 bit builds ... commit c7f80993a38f0354a8ad821bcd9335b47a464357 Author: Brice Goglin Date: Mon Jul 21 10:26:25 2008 +0200 myri10ge: use ioremap_wc Switch to ioremap_wc(). We keep the MTRR code since ioremap_wc() will use UC_MINUS when falling back to uncachable, and thus let the MTRR WC take precedence. Also rename the error path better. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit e454e7e2e3afbcdc002ed55a087a14e8b057519d Author: Brice Goglin Date: Mon Jul 21 10:25:50 2008 +0200 myri10ge: remove wcfifo Remove the wcfifo since it never gave any performance improvement. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit b57f9cae8724e4822fedfcc12530f868dcf6ea94 Author: Wang Chen Date: Tue Jul 22 13:13:18 2008 +0800 de4x5: Remove developer debug feature about set/clear promisc IFF_PROMISC flag shouldn't be set or cleared by drivers, because whether device be promisc mode is decided by how many upper layer callers being referenced to it. And the promisc changing feature of de4x5 ioctl is developer debug feature, we can remove it now. Signed-off-by: Wang Chen Acked-by: Grant Grundler Signed-off-by: Jeff Garzik commit 2b4ff112a0b3fe90de561a77f2e66000c028ca54 Author: frank.blaschka@de.ibm.com Date: Tue Jul 22 09:39:25 2008 +0200 qeth: fix build error caused by VLAN changes Adrian Bunk reports this build error: CC drivers/s390/net/qeth_l3_main.o /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_hard_start_xmit': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c: 2654: error: implicit declaration of function 'VLAN_TX_SKB_CB' /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c: 2654: error: invalid type argument of '->' (have 'int') make[3]: *** [drivers/s390/net/qeth_l3_main.o] Error 1 The intention of the driver appears to be to invalidate the VLAN tag. Change it to set skb->vlan_tci to zero, which has the same effect. Signed-off-by: Patrick McHardy Signed-off-by: Frank Blaschka Signed-off-by: Jeff Garzik commit 217d5a51953143046cf2972eebdefe2b2db05718 Author: Laurent Pinchart Date: Tue Jul 22 17:43:42 2008 +0200 fs_enet: Remove unused fields in the fs_mii_bb_platform_info structure. The mdio_port, mdio_bit, mdc_port and mdc_bit fields in the fs_mii_bb_platform_info structure are left-overs from the move to the Phy Abstraction Layer subsystem. They are not used anymore and can be safely removed. Signed-off-by: Laurent Pinchart Signed-off-by: Jeff Garzik commit d999597349dcfd3b11205705c31a2f8e00688dd3 Merge: b32d131... 7733289... Author: Jeff Garzik Date: Tue Jul 22 16:07:11 2008 -0400 Merge branch 'r8169-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes commit f10140fbe5f97ecfeda986a12d0f1bad75642779 Author: Alan Cox Date: Tue Jul 22 15:25:07 2008 +0100 port_fixups: Fix ups for tty port changes I missed the cpm_uart one. Thanks to Kumar Gala for reporting it. A double check found samsung also needed fixing up. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit ed569bfb8e5d0725db11018130e44eb567d829c1 Author: Alan Cox Date: Tue Jul 22 13:44:14 2008 +0100 istallion: Use helpers The ldisc needs to be referenced properly when used. The tty layer has a helper for this which should have been used but this driver got missed originally. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit c68a99cda87a8356ea0e56cc5111043ac8402ffd Author: Paul Fulghum Date: Tue Jul 22 11:23:24 2008 +0100 synclink_gt fix locking in error path of rx enable Fix locking in error path of rx_enable() introduced by synclink_gt-add-rx-dma-buffer-fill-level-control patch. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 814dae031d08d40d34c0403a54d6e659baf0ae71 Author: Paul Fulghum Date: Tue Jul 22 11:22:14 2008 +0100 synclink_gt: add rx DMA buffer fill level control Add run time control for receive DMA buffer fill level to allow application to control receive latency when using stream oriented serial protocols that pass receive data to application only after a DMA buffer fills. This was previously a compile time option, but run time control is needed when application changes data rate (and latency requirements) or uses different data rates on different ports. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 993456cdc853a52e1042ebf93fc6e1a12d1216f7 Author: Paul Fulghum Date: Tue Jul 22 11:22:04 2008 +0100 synclink_gt: leave transmitter in reset state after configuration Leave the transmitter in reset state after configuration so that transmit signal is held at mark until transmitter is explicitly enabled by application, otherwise transmitter sends idle pattern. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 403214d0ad9b2b9e46c89a5b4b513c910c89068d Author: Paul Fulghum Date: Tue Jul 22 11:21:55 2008 +0100 synclink_gt: improve TIOCOUTQ accuracy Improve the accuracy of TIOCOUTQ value as implemented in chars_in_buffer() method by walking and counting tx DMA buffers, reading controller tx FIFO level and accounting for controller tx shift register. The greatly improves application control of transmit latency at lower data rates. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e5590717afd5fb6f494323206a1a35ea25610c2d Author: Paul Fulghum Date: Tue Jul 22 11:21:39 2008 +0100 synclink_gt: add serial bit order control Add control of hardware serial bit order between LSB first (default/standard) and MSB first. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8a38c2851d6950502252982af712ac65ef6784ed Author: Paul Fulghum Date: Tue Jul 22 11:21:28 2008 +0100 synclink_gt: improve and simplify write method Improve write method by allowing multiple HDLC frames to be loaded into tx DMA buffer ring for continuous frame transmission. This simplifies the transmit code by using the common procedures for all serial protocols. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit c72f527c104cae8e767e714574238b5550879e0c Author: Paul Fulghum Date: Tue Jul 22 11:21:19 2008 +0100 n_hdlc: honor O_NONBLOCK on write Make n_hdlc line discipline honor the O_NONBLOCK file flag on write. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 768aec0b5bccbd460bcf6e9131f19b5a26f3862d Author: Anton Vorontsov Date: Tue Jul 22 11:21:07 2008 +0100 serial: 8250: fix shared interrupts issues with SMP and RT kernels With SMP kernels _irqsave spinlock disables only local interrupts, while the shared serial interrupt could be assigned to the CPU that is not currently starting up the serial port. This might cause issues because serial8250_startup() routine issues IRQ-triggering operations before registering the port in the IRQ chain (though, this is fine to do and done explicitly because we don't want to process any interrupts on the port startup). With RT kernels and preemptable hardirqs, _irqsave spinlock does not disable local hardirqs, and the bug could be reproduced much easily: $ cat /dev/ttyS0 & $ cat /dev/ttyS1 irq 42: nobody cared (try booting with the "irqpoll" option) Call Trace: [C0475EB0] [C0008A98] show_stack+0x4c/0x1ac (unreliable) [C0475EF0] [C004BBD4] __report_bad_irq+0x34/0xb8 [C0475F10] [C004BD38] note_interrupt+0xe0/0x308 [C0475F50] [C004B09C] thread_simple_irq+0xdc/0x104 [C0475F70] [C004B3FC] do_irqd+0x338/0x3c8 [C0475FC0] [C00398E0] kthread+0xf8/0x100 [C0475FF0] [C0011FE0] original_kernel_thread+0x44/0x60 handlers: [] (serial8250_interrupt+0x0/0x138) Disabling IRQ #42 After this, all serial ports on the given IRQ are non-functional. To fix the issue we should explicitly disable shared IRQ before issuing any IRQ-triggering operations. I also changed spin_lock_irqsave to the ordinary spin_lock, since it seems to be safe: chain does not contain new port (yet), thus nobody will interfere us from the ISRs. Signed-off-by: Anton Vorontsov Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 88e882497d154dfb7c341902c079c9daeca1626f Author: David Howells Date: Tue Jul 22 11:20:45 2008 +0100 Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline Fix the epca driver to call epca_setup() if digiepca=xxx is included on the command line and the epca driver is built in. epca_setup() used to be called from init/main.c in 2.2 kernels, but somewhere along the way that call was removed but not replaced. Signed-off-by: David Howells Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e129deff3d979df1ad3d0a6756c90932c0a0a102 Author: Jiri Slaby Date: Tue Jul 22 11:20:34 2008 +0100 Char: mxser, add CP-102UF support Add support for CP-102UF moxa card (update to 1.12 original driver) and increment this driver version. (Somewhat reworked by alan@redhat.com to merge in with other patches) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit faa7612c09ae4519ad4659c8417aaaba81183833 Author: Alan Cox Date: Tue Jul 22 11:19:05 2008 +0100 specialix: restore driver using new break functionality Use the hardware break support on the specialix driver Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 4a56122297ac7a4a3bf09fb66c0a365a13abe707 Author: David Howells Date: Tue Jul 22 11:18:43 2008 +0100 Fix the (i)Stallion driver's putchar() and break_ctl() ops Fix the Stallion driver's putchar() and break_ctl() ops and iStallion's putchar() to return values. Is it actually possible for putchar() or break_ctl() to be called with tty == NULL or can the check be discarded? Should stl_write() be returning 0 if tty->driver_data is NULL or tx.buf is NULL? Is this even possible? I've made Stallion's functions return -EINVAL as stli_breakctl() if the checks fail. Signed-off-by: David Howells Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 781cff5cb2bc8d714270accf88db23a855de9816 Author: Alan Cox Date: Tue Jul 22 11:18:30 2008 +0100 riscom8: Restore driver using new break functionality Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 6d889724332e875ac07b6c88e08d9564c180824d Author: Alan Cox Date: Tue Jul 22 11:18:21 2008 +0100 isicom: restore using hardware break support Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit dcbf1280796be7c0b74c4231f0ac9dd8aa1e2591 Author: Alan Cox Date: Tue Jul 22 11:18:12 2008 +0100 epca: Restore driver Convert the driver to use the added hardware break support Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9e98966c7bb94355689478bc84cc3e0c190f977e Author: Alan Cox Date: Tue Jul 22 11:18:03 2008 +0100 tty: rework break handling Some hardware needs to do break handling itself and may have partial support only. Make break_ctl return an error code. Add a tty driver flag so you can indicate driver hardware side break support. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit abbe629ae4011d2020047f41bea9f9e4b0ec4361 Author: Alan Cox Date: Tue Jul 22 11:17:53 2008 +0100 tty: Mark unconverted drivers as BROKEN Nobody seems to use these drivers anyway so if they want them they can fix them up. I don't have the needed info to add break_ctl support to them. Send patches if you don't like it. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8ca8b9005a742edf8d82749d4ad4e616405fbdc4 Author: Alan Cox Date: Tue Jul 22 11:17:43 2008 +0100 mxser: remove dead code Old style ioctl break code can go Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 30252ec958897d61925a4baf79cd9411a6be0486 Author: Alan Cox Date: Tue Jul 22 11:17:32 2008 +0100 epca: Fix comments and move break The ioctls it talks about are midlayer provided. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d2fbd0f2f9f5a34831a0b8fe6b16c6e1afba1200 Author: Alan Cox Date: Tue Jul 22 11:17:16 2008 +0100 specialix: Code cleanups Go through the inlines and other oddments that are iffy. Remove various bits of dead code and bogus debug. Turn the crtsdts compile time option into a runtime switch. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a72492bd8a8d4326fd78b2142bf7cae779d5d4c2 Author: Alan Cox Date: Tue Jul 22 11:17:05 2008 +0100 specialix: Tidy up coding style Preparation for doing some real work on the driver. Do this first so we can easily identify if the cleanups accidentally broke something Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 01e1abb2c27e43339b8829a2e3b1c6f53806b77a Author: Alan Cox Date: Tue Jul 22 11:16:55 2008 +0100 tty: Split ldisc code into its own file Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d76f2f4462bbb2cf7bc83a35c5278177aa627e89 Author: Alan Cox Date: Tue Jul 22 11:16:42 2008 +0100 io_edgeport: Fix various bogus returns to the tty layer The edgeport reports negative error codes to functions that do not expect them. This can cause ports to jam forever Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 03f0dbf74c7a117c270e63d62d5e4927af6f295b Author: Alan Cox Date: Tue Jul 22 11:16:34 2008 +0100 tty-usb-io_edgeport: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit