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 4da1a17dbc5211ac90264cfc4f0e076c8bdc1732 Author: Alan Cox Date: Tue Jul 22 11:16:21 2008 +0100 tty-usb-mos7720: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 880af9db2c35c5fedaef0de89473f202329934db Author: Alan Cox Date: Tue Jul 22 11:16:12 2008 +0100 mos7840: remove loads of bogus assignments to status Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4944d40054d73b2f8d7d546f55c206eb3baf2710 Author: Alan Cox Date: Tue Jul 22 11:16:03 2008 +0100 omninet: Use string flip functions Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f89d0dff2507b6bd486b7db59a5f6a733fbfaa12 Author: Alan Cox Date: Tue Jul 22 11:15:54 2008 +0100 tty-usb-omninet: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 19e58fae0c8f197d80fcea338b94fb5740369bc1 Author: Alan Cox Date: Tue Jul 22 11:15:45 2008 +0100 tty-usb-option: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2a77c8144992e21367cc15956b0ff295f1112c85 Author: Alan Cox Date: Tue Jul 22 11:15:36 2008 +0100 tty-usb-oti6858: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 43c8f435b2ca39f12ad89d91d9ee2be04a196f93 Author: Alan Cox Date: Tue Jul 22 11:15:26 2008 +0100 tty-usb-safe-serial: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a30fa793f35b9a72fdb9ea90a539c8c9cf7bee94 Author: Alan Cox Date: Tue Jul 22 11:15:17 2008 +0100 tty-usb-ti-usb: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0487b583f268ea43ededd7897dbf519bdcb395ee Author: Alan Cox Date: Tue Jul 22 11:15:08 2008 +0100 tty-usb-spcp8x5: Minor coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9660ea36bdcd4c33174e912a3e649c048d22a3d6 Author: Alan Cox Date: Tue Jul 22 11:14:59 2008 +0100 tty-usb-sierra: Coding style - minor Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3a0f43e9deffd9619ac34e3b6b9ba7089aa1e511 Author: Alan Cox Date: Tue Jul 22 11:14:49 2008 +0100 tty-usb-pl2303: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit acc80758abc91e5d91f3f4ceb8dd94da2aa7064d Author: Alan Cox Date: Tue Jul 22 11:14:40 2008 +0100 mct_u232: Use flip buffer functions Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit e19b2560be568301ec4cc486671361ef0471d839 Author: Alan Cox Date: Tue Jul 22 11:14:30 2008 +0100 tty-usb-mct-u232: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b31f658b0bb42b315c22ae2ef814e5fba36ac737 Author: Alan Cox Date: Tue Jul 22 11:14:22 2008 +0100 kobil_sct: Fix ioctls Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dee0a7ccaa0bcdeebb590879d68739cce4ff1b07 Author: Alan Cox Date: Tue Jul 22 11:14:10 2008 +0100 tty-usb-kobil-sct: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0c265f4e8598e251108759685dbb3789868086b2 Author: Alan Cox Date: Tue Jul 22 11:14:00 2008 +0100 tty-usb-kl5kusb105: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8dd03a5b2b775b0932c1705dc19298ccda19167d Author: Alan Cox Date: Tue Jul 22 11:13:51 2008 +0100 keyspan_pda: Use string flip functions Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9e70f319d14ac4dd077de7fc835a391ece804500 Author: Alan Cox Date: Tue Jul 22 11:13:42 2008 +0100 tty-usb-keyspan-pda: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f035a8ad158f0bdc94125004488b0ea8438edaa9 Author: Alan Cox Date: Tue Jul 22 11:13:32 2008 +0100 keyspan: Use string flip functions when possible Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit deb91685784fc0bc845c582f8b2bc229cb7bc9da Author: Alan Cox Date: Tue Jul 22 11:13:08 2008 +0100 tty-usb-keyspan: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9e8e2d2ab58ee942b700a9453541d7539b704994 Author: Alan Cox Date: Tue Jul 22 11:12:59 2008 +0100 tty-usb-iuu-phoenix: Clean up to coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 6d1d1698966ab6a5ac7ddcb16602ffebcf97f887 Author: Alan Cox Date: Tue Jul 22 11:12:51 2008 +0100 tty-usb-ipw: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit eb6215ccd403153c6376f7eaa7b31eef19e488f5 Author: Alan Cox Date: Tue Jul 22 11:12:41 2008 +0100 ipaq: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2e0ddd626d14f3b69d6c1bdd526721a65d52f93b Author: Alan Cox Date: Tue Jul 22 11:12:33 2008 +0100 io_ti: Minor coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a8d6f0a9c4c9af0e478383d870e828693e983dfb Author: Alan Cox Date: Tue Jul 22 11:12:24 2008 +0100 usb-serial: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d60d43965e46674b9097b422336a55c6ca08559a Author: Alan Cox Date: Tue Jul 22 11:12:15 2008 +0100 tty-usb-visor: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3a262b2ea7c0905026c0be3618dba1f825e5387a Author: Alan Cox Date: Tue Jul 22 11:12:05 2008 +0100 tty-usb-hp4x: Fix overlong line Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ae64387a54fd519d68aa7d1aacba095140f1a647 Author: Alan Cox Date: Tue Jul 22 11:11:55 2008 +0100 tty-usb-generic: Code cleanup Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit af6d780b578778d442278ac4894ff10847bebae2 Author: Alan Cox Date: Tue Jul 22 11:11:44 2008 +0100 garmin_gps: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 64701e8122fff3605c674c056749864c97485de4 Author: Alan Cox Date: Tue Jul 22 11:11:34 2008 +0100 funsoft: Switch to linux/uaccess Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 464cbb24698ddb7bf24b2b73204e3dc121886211 Author: Alan Cox Date: Tue Jul 22 11:11:23 2008 +0100 ftdi_sio: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 93c467952ff6b5c3d92fddf4b1a609e68f6d08d1 Author: Alan Cox Date: Tue Jul 22 11:11:11 2008 +0100 empeg: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 41ad427da1f9303e2e34811398b31c999c3d39d1 Author: Alan Cox Date: Tue Jul 22 11:11:02 2008 +0100 digi_acceleport: coding style Code tidy Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 77336828c01933d37102c4bef6e2a2cf7e3243b3 Author: Alan Cox Date: Tue Jul 22 11:10:53 2008 +0100 usb-cypress: There is no 0 case to go with CS5/6/7/8 so remove the test Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 813a224fa5bff3e34309a6494e231d5ebfa0fb4e Author: Alan Cox Date: Tue Jul 22 11:10:36 2008 +0100 cypress_m8: coding style Coding style clean ups Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b9c52f155f86eca9c4625b254b5f41dc151431be Author: Alan Cox Date: Tue Jul 22 11:10:27 2008 +0100 cyberjack: Coding style Coding style fixups Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ff7eb602605cc0100f089d57966fcd347e137137 Author: Alan Cox Date: Tue Jul 22 11:10:17 2008 +0100 cp2101: coding style Bring up to coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c17ee886976b64d29ea89ee5d87751438e26025b Author: Alan Cox Date: Tue Jul 22 11:10:08 2008 +0100 tty-usb-console: Fix termios Setting CFLAG bits is all well and good but you must sort out ispeed and ospeed properly. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4dbd5a0961ff55cb8a7bce309dd5ef9b04090570 Author: Alan Cox Date: Tue Jul 22 11:09:57 2008 +0100 tty-usb-console: tidy the USB console code Code tidy Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c97611c16d9b3c37fcf3c18cc442dfde3a8b5d43 Author: Alan Cox Date: Tue Jul 22 11:09:48 2008 +0100 usb-serial-bus: tidy coding style Tidy up Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b69c14992ecbff99d1b2b66d8ccbcffe131c6e38 Author: Alan Cox Date: Tue Jul 22 11:09:39 2008 +0100 belkin_sa: clean up code Coding style tidy up for belkin_sa Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 72e2741256e65f2adcc03754523d6a2fdb260e4a Author: Alan Cox Date: Tue Jul 22 11:09:29 2008 +0100 whiteheat: fix bugs found in the tidy and audit Termios tidy up, plus fix break and DTR. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 80359a9c5c03d585686e2596c9ee46703eb03047 Author: Alan Cox Date: Tue Jul 22 11:09:16 2008 +0100 whiteheat: coding style Bring ezusb and whiteheat into line with the coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 95da310e66ee8090119596c70ca8432e57f9a97f Author: Alan Cox Date: Tue Jul 22 11:09:07 2008 +0100 usb_serial: API all change USB serial likes to use port->tty back pointers for the real work it does and to do so without any actual locking. Unfortunately when you consider hangup events, hangup/parallel reopen or even worse hangup followed by parallel close events the tty->port and port->tty pointers are not guaranteed to be the same as port->tty is the active tty while tty->port is the port the tty may or may not still be attached to. So rework the entire API to pass the tty struct. For console cases we need to pass both for now. This shows up multiple drivers that immediately crash with USB console some of which have been fixed in the process. Longer term we need a proper tty as console abstraction Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 1aa3692da57c773e5c76de55c5c4a953962d360e Author: Alan Cox Date: Tue Jul 22 11:08:53 2008 +0100 ttydev: Fix up compile failures in the PPC build Fix up a couple of reported merge problems Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 09177e85d6a0bffac8b55afd28ed8b82bd873f0b Author: Maciej Sosnowski Date: Tue Jul 22 10:07:33 2008 -0700 I/OAT: Add watchdog/reset functionality to ioatdma Due to occasional DMA channel hangs observed for I/OAT versions 1.2 and 2.0 a watchdog has been introduced to check every 2 seconds if all channels progress normally. If stuck channel is detected, driver resets it. The reset is done in two parts. The second part is scheduled by the first one to reinitialize the channel after the restart. Signed-off-by: Maciej Sosnowski Signed-off-by: Dan Williams commit d35cb360c29956510b2fe1a953bd4968536f7216 Author: Mathieu Desnoyers Date: Mon Jul 21 14:21:38 2008 -0700 markers: fix duplicate modpost entry When a kernel was rebuilt, the previous Module.markers was not cleared. It caused markers with different format strings to appear as duplicates when a markers was changed. This problem is present since scripts/mod/modpost.c started to generate Module.markers, commit b2e3e658b344c6bcfb8fb694100ab2f2b5b2edb0 It therefore applies to 2.6.25, 2.6.26 and linux-next. I merely merged the patches from Roland, Wenji and Takashi here. Credits to Roland McGrath Wenji Huang and Takashi Nishiie for providing the individual fixes. - Changelog : - Integrated Takashi's Makefile modification to clear Module.markers upon make clean. Signed-off-by: Mathieu Desnoyers Cc: Roland McGrath Cc: Wenji Huang Cc: Takashi Nishiie Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f17156fc55abac476d180e480bedb0f07f01b14 Author: Atsushi Nemoto Date: Mon Jul 21 14:21:37 2008 -0700 Fix build on COMPAT platforms when CONFIG_EPOLL is disabled Add missing cond_syscall() entry for compat_sys_epoll_pwait. Signed-off-by: Atsushi Nemoto Cc: Davide Libenzi Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 141c024036dc8ee7b2b374c6645659f1a2fc4334 Author: Rajiv Andrade Date: Mon Jul 21 14:21:37 2008 -0700 tpm: MAINTAINERS whitespace fix and email addresses addition Signed-off-by: Rajiv Andrade Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee1e6ab6056a8b9c19377257002da98b83819531 Author: Alexey Dobriyan Date: Mon Jul 21 14:21:36 2008 -0700 proc: fix /proc/*/pagemap some more struct pagemap_walk was placed on stack, some hooks are initialized, the rest (->pgd_entry, ->pud_entry, ->pte_entry) are valid but junk. Reported-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Cc: "Vegard Nossum" Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91cd4d6ef0abb1f65e81f8fe37e7d3c10344e38c Author: Miao Xie Date: Mon Jul 21 14:21:35 2008 -0700 cpusets: fix wrong domain attr updates Fix wrong domain attr updates, or we will always update the first sched domain attr. Signed-off-by: Miao Xie Cc: Hidetoshi Seto Cc: Paul Jackson Cc: Nick Piggin Cc: Ingo Molnar Cc: [2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1673ad52bd9a3c747e596a76e65c55981ea651e3 Author: David Brownell Date: Mon Jul 21 14:21:34 2008 -0700 gpio: pcf857x: add lock and handle more chips Two small updates to the pcf857x driver: (a) the max732[89] chips are also second sources for the pcf8574/a, and (b) add a mutex to prevent trashing the cached state. Adding the lock is effectively a bugfix, although it seems unlikely that anyone would have run into the issue it protects against. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c36ec31473593aa937ff04f3b3b630e81512734 Author: Juergen Beisert Date: Mon Jul 21 14:21:34 2008 -0700 gpio: gpio driver for max7301 SPI GPIO expander Maxim's MAX7301 is an SPI GPIO expander with 28 GPIOs. Note: MAX7301's interrupt feature is not supported yet. [akpm@linux-foundation.org: coding-style fixes] [g.liakhovetski@pengutronix.de: Fix inaccuracies in comments, check spi_setup() return code, mask off high byte in max7301_read()] Signed-off-by: Juergen Beisert Signed-off-by: Guennadi Liakhovetski Cc: Russell King Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 651910874633a75f4a726d44e449be0a56b4b2e0 Author: John Reiser Date: Mon Jul 21 14:21:32 2008 -0700 execve filename: document and export via auxiliary vector The Linux kernel puts the filename argument of execve() into the new address space. Many developers are surprised to learn this. Those who know and could use it, object "But it's not documented." Those who want to use it dislike the expression (char *)(1+ strlen(env[-1+ n_env]) + env[-1+ n_env]) because it requires locating the last original environment variable, and assumes that the filename follows the characters. This patch documents the insertion of the filename, and makes it easier to find by adding a new tag AT_EXECFN in the ElfXX_auxv_t; see . In many cases readlink("/proc/self/exe",) gives the same answer. But if all the original pages get unmapped, then the kernel erases the symlink for /proc/self/exe. This can happen when a program decompressor does a good job of cleaning up after uncompressing directly to memory, so that the address space of the target program looks the same as if compression had never happened. One example is http://upx.sourceforge.net . One notable use of the underlying concept (what path containED the executable) is glibc expanding $ORIGIN in DT_RUNPATH. In practice for the near term, it may be a good idea for user-mode code to use both /proc/self/exe and AT_EXECFN as fall-back methods for each other. /proc/self/exe can fail due to unmapping, AT_EXECFN can fail because it won't be present on non-new systems. The auxvec or {AT_EXECFN}.d_val also can get overwritten, although in nearly all cases this would be the result of a bug. The runtime cost is one NEW_AUX_ENT using two words of stack space. The underlying value is maintained already as bprm->exec; setup_arg_pages() in fs/exec.c slides it for stack_shift, etc. Signed-off-by: John Reiser Cc: Roland McGrath Cc: Jakub Jelinek Cc: Ulrich Drepper Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d536b1f86591fb081c7a56eab04e711eb4dab951 Author: Jan Kratochvil Date: Tue Jul 22 14:00:47 2008 +0200 x86: fix crash due to missing debugctlmsr on AMD K6-3 currently if you use PTRACE_SINGLEBLOCK on AMD K6-3 (i586) it will crash. Kernel now wrongly assumes existing DEBUGCTLMSR MSR register there. Removed the assumption also for some other non-K6 CPUs but I am not sure there (but it can only bring small inefficiency there if my assumption is wrong). Based on info from Roland McGrath, Chuck Ebbert and Mikulas Patocka. More info at: https://bugzilla.redhat.com/show_bug.cgi?id=456175 Signed-off-by: Jan Kratochvil Cc: Signed-off-by: Ingo Molnar commit a1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b Author: Johannes Berg Date: Tue Jul 8 19:00:17 2008 +0200 remove CONFIG_KMOD from core kernel code Always compile request_module when the kernel allows modules. Signed-off-by: Johannes Berg Signed-off-by: Rusty Russell commit a00caa1fa954c734f4214a074727a329a9ba6568 Author: Johannes Berg Date: Tue Jul 8 19:00:24 2008 +0200 remove CONFIG_KMOD from lib textsearch algorithms can be loaded, make the code depend on CONFIG_MODULES instead of CONFIG_KMOD. Signed-off-by: Johannes Berg Signed-off-by: Rusty Russell commit 184b6c7682e484032e3f845eef5db26e72681d6f Author: Johannes Berg Date: Tue Jul 8 19:00:20 2008 +0200 remove CONFIG_KMOD from sparc64 One place is just a comment, the other a conditional, unused inclusion of linux/kmod.h. Signed-off-by: Johannes Berg Cc: David S. Miller Signed-off-by: Rusty Russell commit df648c9fbebb4de50e7a6e76cc253c7cb0421f9b Author: Johannes Berg Date: Tue Jul 8 19:00:18 2008 +0200 rework try_then_request_module to do less in non-modular kernels This reworks try_then_request_module to only invoke the "lookup" function "x" once when the kernel is not modular. Signed-off-by: Johannes Berg Signed-off-by: Rusty Russell commit a81792f668c20540c336af4242ba1400763eb14f Author: Johannes Berg Date: Tue Jul 8 19:00:25 2008 +0200 remove mention of CONFIG_KMOD from documentation Also includes a few Kconfig files (xtensa, blackfin) Signed-off-by: Johannes Berg Cc: Michael Kerrisk Cc: linux-doc@vger.kernel.org Signed-off-by: Rusty Russell Acked-by: Randy Dunlap commit baabaae98125fbd1a8dc258aa95333c01cd9e206 Author: Johannes Berg Date: Tue Jul 8 19:00:16 2008 +0200 make CONFIG_KMOD invisible ... as preparation for removing it completely, make it an invisible bool defaulting to yes. Signed-off-by: Johannes Berg Signed-off-by: Rusty Russell commit 3a642e99babe0617febb6f402e1e063479f489db Author: Rusty Russell Date: Tue Jul 22 19:24:28 2008 -0500 modules: Take a shortcut for checking if an address is in a module This patch keeps track of the boundaries of module allocation, in order to speed up module_text_address(). Inspired by Arjan's version, which required arch-specific defines: Various pieces of the kernel (lockdep, latencytop, etc) tend to store backtraces, sometimes at a relatively high frequency. In itself this isn't a big performance deal (after all you're using diagnostics features), but there have been some complaints from people who have over 100 modules loaded that this is a tad too slow. This is due to the new backtracer code which looks at every slot on the stack to see if it's a kernel/module text address, so that's 1024 slots. 1024 times 100 modules... that's a lot of list walking. Signed-off-by: Rusty Russell commit 2f0f2a334bc38b61a9afca951185cd3844ee709d Author: Denys Vlasenko Date: Tue Jul 22 19:24:27 2008 -0500 module: turn longs into ints for module sizes This shrinks module.o and each *.ko file. And finally, structure members which hold length of module code (four such members there) and count of symbols are converted from longs to ints. We cannot possibly have a module where 32 bits won't be enough to hold such counts. For one, module loading checks module size for sanity before loading, so such insanely big module will fail that test first. Signed-off-by: Denys Vlasenko Signed-off-by: Rusty Russell commit f7f5b67557eac1131ba6532522e3c50eced34238 Author: Denys Vlasenko Date: Tue Jul 22 19:24:26 2008 -0500 Shrink struct module: CONFIG_UNUSED_SYMBOLS ifdefs module.c and module.h conatains code for finding exported symbols which are declared with EXPORT_UNUSED_SYMBOL, and this code is compiled in even if CONFIG_UNUSED_SYMBOLS is not set and thus there can be no EXPORT_UNUSED_SYMBOLs in modules anyway (because EXPORT_UNUSED_SYMBOL(x) are compiled out to nothing then). This patch adds required #ifdefs. Signed-off-by: Denys Vlasenko Signed-off-by: Rusty Russell commit af5406895a05720a879dc33e2f4878fa503e81b3 Author: Richard Kennedy Date: Tue Jul 22 19:24:26 2008 -0500 module: reorder struct module to save space on 64 bit builds reorder struct module to save space on 64 bit builds. saves 1 cacheline_size (128 on default x86_64 & 64 on AMD Opteron/athlon) when CONFIG_MODULE_UNLOAD=y. Signed-off-by: Richard Kennedy Signed-off-by: Rusty Russell commit dafd0940c96fec67974a88ed8e6b8ba3160394cd Author: Rusty Russell Date: Tue Jul 22 19:24:25 2008 -0500 module: generic each_symbol iterator function Introduce an each_symbol() iterator to avoid duplicating the knowledge about the 5 different sections containing symbols. Currently only used by find_symbol(), but will be used by symbol_put_addr() too. (Includes NULL ptr deref fix by Jiri Kosina ) Signed-off-by: Rusty Russell Cc: Jiri Kosina commit da39ba5e1d65e997a98f6eb93ba6e6eb505f6e3c Author: Rusty Russell Date: Tue Jul 22 19:24:25 2008 -0500 module: don't use stop_machine for waiting rmmod rmmod has a little-used "-w" option, meaning that instead of failing if the module is in use, it should block until the module becomes unused. In this case, we don't need to use stop_machine: Max Krasnyansky indicated that would be useful for SystemTap which loads/unloads new modules frequently. Cc: Max Krasnyansky Signed-off-by: Rusty Russell commit 77be1fabd024b37423d12f832b1fbdb95dbdf494 Author: Jeremy Fitzhardinge Date: Mon Jul 21 22:59:56 2008 -0700 x86: add PTE_FLAGS_MASK PTE_PFN_MASK was getting lonely, so I made it a friend. Signed-off-by: Jeremy Fitzhardinge Cc: Rusty Russell Signed-off-by: Ingo Molnar commit 59438c9fc4f7a92c808c9049bc6b396f98bf954c Author: Jeremy Fitzhardinge Date: Mon Jul 21 22:59:42 2008 -0700 x86: rename PTE_MASK to PTE_PFN_MASK Rusty, in his peevish way, complained that macros defining constants should have a name which somewhat accurately reflects the actual purpose of the constant. Aside from the fact that PTE_MASK gives no clue as to what's actually being masked, and is misleadingly similar to the functionally entirely different PMD_MASK, PUD_MASK and PGD_MASK, I don't really see what the problem is. But if this patch silences the incessent noise, then it will have achieved its goal (TODO: write test-case). Signed-off-by: Jeremy Fitzhardinge Cc: Rusty Russell Signed-off-by: Ingo Molnar commit c2e3277f875b83e5adc34e96989d6d87ec5f80f7 Author: Rusty Russell Date: Tue Jul 22 15:40:46 2008 +1000 x86: fix pte_flags() to only return flags, fix lguest (updated) (Jeremy said: rusty: use PTE_MASK rusty: use PTE_MASK rusty: use PTE_MASK When I asked: jsgf: does that include the NX flag? He responded eloquently: rusty: use PTE_MASK rusty: use PTE_MASK yes, it's the official constant of masking flags out of ptes ) Change a15af1c9ea2750a9ff01e51615c45950bad8221b 'x86/paravirt: add pte_flags to just get pte flags' removed lguest's private pte_flags() in favor of a generic one. Unfortunately, the generic one doesn't filter out the non-flags bits: this results in lguest creating corrupt shadow page tables and blowing up host memory. Since noone is supposed to use the pfn part of pte_flags(), it seems safest to always do the filtering. Signed-off-by: Rusty Russell Acked-by: Jeremy Fitzhardinge Signed-off-and-morning-tea-spilled-by: Ingo Molnar commit 8725f25acc656c1522d48a6746055099efdaca4c Merge: c69cccc... 93ded9b... Author: Benjamin Herrenschmidt Date: Tue Jul 22 17:12:37 2008 +1000 Merge commit 'origin/master' Manually fixed up: drivers/net/fs_enet/fs_enet-main.c commit 988781dc3e1d9209192b04458d279815923f5e76 Author: Yinghai Lu Date: Mon Jul 21 11:21:43 2008 -0700 x86: use setup_clear_cpu_cap with disable_apic, fix beauty fix: /proc/cpuinfo will still show apic feature even if we booted up with it disabled. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 3f9787046ea37a26170dc4439efa21f8d23a9978 Author: Kay Sievers Date: Fri May 30 17:42:11 2008 +0200 arm: bus_id -> dev_name() and dev_set_name() conversions Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 2222c313e9371b6476787594bc5804c72cee2597 Author: Greg Kroah-Hartman Date: Fri May 2 06:02:41 2008 +0200 sparc64: fix up bus_id changes in sparc core code This converts all instances of bus_id in the sparc core kernel to use either dev_set_name(), or dev_name() depending on the need. This is done in anticipation of removing the bus_id field from struct driver. Cc: Kay Sievers Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 361d5ee3c04c43c8fa0e277545ac5258dc310a5e Author: Greg Kroah-Hartman Date: Wed Jul 2 12:46:22 2008 -0700 3c59x: handle pci_name() being const This changes vortex_prob1() to handle pci_name() now returning a constant string. Cc: Steffen Klassert Signed-off-by: Greg Kroah-Hartman commit eadcf0d704a46979c29984fa05f1fc413c775bcb Author: Greg Kroah-Hartman Date: Wed Jul 2 12:46:22 2008 -0700 MTD: handle pci_name() being const This changes the MTD core to handle pci_name() now returning a constant string. Cc: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 89bcb05d9bbf8bd559988bca4f2579defd28d008 Author: David Altobelli Date: Wed Jul 2 09:38:53 2008 -0600 HP iLO driver A driver for the HP iLO/iLO2 management processor, which allows userspace programs to query the management processor. Programs can open a channel to the device (/dev/hpilo/dXccbN), and use this to send/receive queries. The O_EXCL open flag is used to indicate that a particular channel cannot be shared between processes. This driver will replace various packages HP has shipped, including hprsm and hp-ilo. Signed-off-by: David Altobelli Signed-off-by: Greg Kroah-Hartman commit d95d62c018209355c0dc998682ff792432aa870c Author: Andi Kleen Date: Tue Jul 1 18:48:43 2008 +0200 sysdev: Convert the x86 mce tolerant sysdev attribute to generic attribute Use the new generic int attribute accessors for the x86 mce tolerant attribute. Simple example to illustrate the new macros. There are much more places all over the tree that could be converted like this. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 9800794ac11d4646384b3a310dfd1fe2eed577bf Author: Andi Kleen Date: Tue Jul 1 18:48:42 2008 +0200 sysdev: Add utility functions for simple int/ulong variable sysdev attributes This adds a new sysdev_ext_attribute that stores a pointer to the variable it manages and some utility functions/macro to easily use them. Previously all users wrote custom macros to generate show/store functions for each variable, with this it is possible to avoid that in many cases. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 4a0b2b4dbe1335b8b9886ba3dc85a145d5d938ed Author: Andi Kleen Date: Tue Jul 1 18:48:41 2008 +0200 sysdev: Pass the attribute to the low level sysdev show/store function This allow to dynamically generate attributes and share show/store functions between attributes. Right now most attributes are generated by special macros and lots of duplicated code. With the attribute passed it's instead possible to attach some data to the attribute and then use that in shared low level functions to do different things. I need this for the dynamically generated bank attributes in the x86 machine check code, but it'll allow some further cleanups. I converted all users in tree to the new show/store prototype. It's a single huge patch to avoid unbisectable sections. Runtime tested: x86-32, x86-64 Compiled only: ia64, powerpc Not compile tested/only grep converted: sh, arm, avr32 Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 36ce6dad6e3cb3f050ed41e0beac0070d2062b25 Author: Cornelia Huck Date: Tue Jun 10 11:09:08 2008 +0200 driver core: Suppress sysfs warnings for device_rename(). driver core: Suppress sysfs warnings for device_rename(). Renaming network devices to an already existing name is not something we want sysfs to print a scary warning for, since the callers can deal with this correctly. So let's introduce sysfs_create_link_nowarn() which gets rid of the common warning. Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 0ad1d6f37cc3bb234c6e7ae30e40d1d40b9aa258 Author: Wang Chen Date: Tue Jun 24 16:59:02 2008 +0800 kobject: Transmit return value of call_usermodehelper() to caller kobject_uevent_env() drops the return value of call_usermodehelper(). It will make upper caller, such as dm_send_uevents(), to lose error information. BTW, Previously kobject_uevent_env() transmitted return of call_usermodehelper() to callers, but commit 5f123fbd80f4f788554636f02bf73e40f914e0d6 "[PATCH] merge kobject_uevent and kobject_hotplug" removed it. Signed-off-by: Wang Chen Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 83c79b55f0d929a0dcf2b0d347cd1875afc06f21 Author: Nathan Lynch Date: Wed Jul 2 10:21:30 2008 -0700 sysfs-rules.txt: reword API stability statement The first paragraph of this document implies that user space developers shouldn't use sysfs at all, but then it goes on to describe rules that developers should follow when accessing sysfs. Not only is this somewhat self-contradictory, it has been shown to discourage developers from using established sysfs interfaces. A note of caution is more appropriate than a blanket "sysfs will never be stable" assertion. Signed-off-by: Nathan Lynch Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9505e6375640fc61d92d36c8e9f25a6a218f3f57 Author: Haavard Skinnemoen Date: Tue Jul 1 15:14:51 2008 +0200 debugfs: Implement debugfs_remove_recursive() debugfs_remove_recursive() will remove a dentry and all its children. Drivers can use this to zap their whole debugfs tree so that they don't need to keep track of every single debugfs dentry they created. It may fail to remove the whole tree in certain cases: sh-3.2# rmmod atmel-mci < /sys/kernel/debug/mmc0/ios/clock mmc0: card b368 removed atmel_mci atmel_mci.0: Lost dma0chan1, falling back to PIO sh-3.2# ls /sys/kernel/debug/mmc0/ ios But I'm not sure if that case can be handled in any sane manner. Signed-off-by: Haavard Skinnemoen Cc: Pierre Ossman Signed-off-by: Greg Kroah-Hartman commit 43166141f73f969794bd7c850c89913631df99e4 Author: Tsugikazu Shibata Date: Fri Jun 20 10:59:52 2008 +0900 HOWTO: change email addresses of James in HOWTO Signed-off-by: Tsugikazu Shibata Signed-off-by: Greg Kroah-Hartman commit d9b19199e4894089456aaad295023263b5225c1a Author: Adrian Bunk Date: Tue Jun 10 19:04:08 2008 +0300 always enable FW_LOADER unless EMBEDDED=y James Bottomley recently discovered that we have {request,release}_firmware() dummies for the case of the actual functions not being available and has a fix for the bug that was actually causing build errors for built-in users with CONFIG_FW_LOADER=m. But now missing selects on FW_LOADER are no longer visible at compile-time at all and can become runtime problems. FW_LOADER is infrastructure with relatively small codesize we can safely enable for everyone, and only for people who really need small kernels (and can be expected to know what they are doing) it matters being able to disable it. This patch therefore always sets FW_LOADER=y and allows users only to disable it with EMBEDDED=y. As a bonus, we can then get rid of all "select FW_LOADER" plus the due to it required "depends on HOTPLUG" which removes some complexity from our Kconfig files. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 4f7e53096c93f0bdf2205134dfc541d0c3cc6e41 Author: Mike Frysinger Date: Tue Jun 24 14:25:00 2008 -0700 uio-howto.tmpl: use unique output names The Userspace I/O HOWTO template sets two different sections with the same html output name (about.html). This clearly won't work, so change the first one to a unique "aboutthis.html" to prevent clobbering. Signed-off-by: Mike Frysinger Acked-by: Hans J. Koch Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 17149d9fff18c4811349140934dc541f70c617df Author: Mike Frysinger Date: Tue Jun 24 14:24:57 2008 -0700 uio-howto.tmpl: use standard copyright/legal markings The Userspace I/O HOWTO document uses straight tags and plain text to describe copyright/legal information. It should instead use the and tags like all other documents in the kernel. Signed-off-by: Mike Frysinger Acked-by: Hans J. Koch Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 93265d13ea5c3ec5f61a8009407fbe046ce6b7c0 Author: Miklos Szeredi Date: Mon Jun 16 13:46:47 2008 +0200 sysfs: don't call notify_change sysfs_chmod_file() calls notify_change() to change the permission bits on a sysfs file. Replace with explicit call to sysfs_setattr() and fsnotify_change(). This is equivalent, except that security_inode_setattr() is not called. This function is called by drivers, so the security checks do not make any sense. Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman commit 838ea8e8dbfc8d907c7a55bbad507a44c1b81d57 Author: Ben Dooks Date: Thu Jun 12 19:00:34 2008 +0100 sysdev: fix debugging statements in registration code. The systdev_class_register() and sysdev_register() functions have pr_debug() statements which are enabled when the user selects the driver core debug. Both of these routines do not produce the correct output, as they make assumptions about data which has not been initialised. In sysdev_class_register() the code uses the kobject_name(&cls->kset.kobj) at the start of the function, but this is not setup until later in the same call. Change this to use cls->name which is passed in from the caller. The sysdev_register() function tries to get the name of the sysdev by kobject_name(&sysdev->kobj), but that isn't setup until later in the same function so change this message to use the name of the sysdev's class and add another message once the name is initialised. Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 185000fc556372b7fb7f26516c325f212030dbd3 Author: Li Zefan Date: Fri Jun 13 11:09:16 2008 +0800 kobject: should use kobject_put() in kset-example We should call kobject_put() instead of kfree() if kobject_init_and_add() returns an error, shouldn't we? Don't set up a bad example ;) Signed-off-by: Li Zefan Signed-off-by: Greg Kroah-Hartman commit a231934bdf086a4fefc0df06e669499125a9db6f Author: Richard Kennedy Date: Mon Jun 2 11:07:25 2008 +0100 kobject: reorder kobject to save space on 64 bit builds reorder kobject to save space on 64 bit builds. shrinks from 72 to 64 bytes & moves allocated kobject to a smaller slab. Signed-off-by: Richard Kennedy Signed-off-by: Greg Kroah-Hartman commit 6d8333c24d41637f0f847f6e17032189dae08c02 Author: Uwe Kleine-König Date: Tue Jun 10 09:14:48 2008 +0200 UIO: minor style and comment fixes Signed-off-by: Uwe Kleine-König Signed-off-by: Hans J. Koch commit 4d80d59437247075029534adec8d69fce2cfb87a Author: Uwe Kleine-König Date: Sat May 31 11:37:27 2008 +0200 UIO: add generic UIO platform driver This patch adds a generic UIO platform driver. It eliminates the need for a dedicated kernel module for simple platform devices. Users only need to implement their irq handler in platform code and fill a struct uio_info there. This helps avoiding code duplication as UIO platform drivers often share a lot of common code. Signed-off-by: Uwe Kleine-König Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 328a14e70e7f46997cb50d4258dd93d5377f98c6 Author: Hans J. Koch Date: Fri May 23 13:50:14 2008 +0200 UIO: Add write function to allow irq masking Sometimes it is necessary to enable/disable the interrupt of a UIO device from the userspace part of the driver. With this patch, the UIO kernel driver can implement an "irqcontrol()" function that does this. Userspace can write an s32 value to /dev/uioX (usually 0 or 1 to turn the irq off or on). The UIO core will then call the driver's irqcontrol function. Signed-off-by: Hans J. Koch Acked-by: Uwe Kleine-König Acked-by: Magnus Damm Signed-off-by: Greg Kroah-Hartman commit 934da4766e5f72797118f7c014efaef567a812fc Author: Uwe Kleine-König Date: Sat May 31 11:37:27 2008 +0200 UIO: fix UIO Kconfig dependencies ae210f188614bb3d1ee3f19c64e28e3cdd44877c introduced a big "if UIO"/"endif" where all uio drivers are defined. So know there is no need for them to depend explicitly on UIO. Signed-off-by: Uwe Kleine-König Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 22454cb99fc39f2629ad06a7eccb3df312f8830e Author: Kay Sievers Date: Wed May 28 23:06:47 2008 +0200 pnp: add acpi:* modalias entries Along with the non-modalias conformant "pnp:*" aliases, we add "acpi:*" entries to PNP drivers, to allow module autoloading by ACPI PNP device entries, which export proper modalias information, without any specific userspace modprobe mangling. Cc: Adam Belay Cc: Thomas Renninger Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit fc3a8828b139c24aade3f9d608775e36c248f8f5 Author: Greg Kroah-Hartman Date: Fri May 2 06:02:41 2008 +0200 driver core: fix a lot of printk usages of bus_id We have the dev_printk() variants for this kind of thing, use them instead of directly trying to access the bus_id field of struct device. This is done in order to remove bus_id entirely. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit b98cb4b7fe0e83238501b48489e46b3e0dce9aaf Author: Greg Kroah-Hartman Date: Fri May 2 06:02:41 2008 +0200 driver core: remove DEVICE_ID_SIZE define There is no such thing as a "device id size" in the driver core, so remove the define and fix up any users of this odd define in the rest of the kernel. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit ca52a49846f1451163c0dc14c40cd06ff808df3e Author: Kay Sievers Date: Fri May 2 06:02:41 2008 +0200 driver core: remove DEVICE_NAME_SIZE define There is no such thing as a "device name size" in the driver core, so remove the define and fix up any users of this odd define in the rest of the kernel. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit aab0de245150c09e61c30962feb16aacde508dc3 Author: Kay Sievers Date: Fri May 2 06:02:41 2008 +0200 driver core: remove KOBJ_NAME_LEN define Kobjects do not have a limit in name size since a while, so stop pretending that they do. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit f75b1c60fc1e53c4004a79ea0be071aa3318cdcc Author: Dave Young Date: Wed May 28 09:28:39 2008 -0700 class: change internal semaphore to a mutex Now that the lockdep infrastructure in the class core is in place, we should be able to properly change the internal class semaphore to be a mutex. David wrote the original patch, and Greg fixed it up to apply properly due to all of the recent changes in this area. From: Dave Young Cc: Matthew Wilcox Cc: Kay Sievers Cc: Andrew Morton Cc: James Bottomley Signed-off-by: Greg Kroah-Hartman commit d2a3b9146e4f40c2e872d7567c996ef95083d802 Author: Matthew Wilcox Date: Wed May 28 09:28:39 2008 -0700 class: add lockdep infrastructure This adds the infrastructure to properly handle lockdep issues when the internal class semaphore is changed to a mutex. Matthew wrote the original patch, and Greg fixed it up to work properly with the class_create() function. From: Matthew Wilcox Cc: Kay Sievers Cc: Dave Young Cc: Andrew Morton Cc: James Bottomley Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 1e41250863cd4de5ffa0678c405d001ca5b62796 Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: fix docbook comments for class_private structure Removes a field that has been deleted, and adds a description fo the class_dirs field which was previously undocumented. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit d9a0157328507c5f563e16a583cd0a063854aebb Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: rename "sem" to "class_sem" in internal class structure This renames the struct class "sem" field to be "class_sem" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 1fbfee6c6dc0f4a4c587b6b163ee79643fc9aaa7 Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: rename "subsys" to "class_subsys" in internal class structure This renames the struct class "subsys" field to be "class_subsys" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 184f1f779d5a2e62de4a0b34842ddf8546beca8f Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: rename "interfaces" to "class_interfaces" in internal class structure This renames the struct class "interfaces" field to be "class_interfaces" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 97ae69fdbaa71a8f7dbc20bf10fb349d1759152f Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: rename "devices" to "class_devices" in internal class structure This renames the struct class "devices" field to be "class_devices" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 7c71448b8aa80123fc521563d5f7c63a099d97ab Author: Greg Kroah-Hartman Date: Tue Jan 22 18:17:41 2008 -0500 class: move driver core specific parts to a private structure This moves the portions of struct class that are dynamic (kobject and lock and lists) out of the main structure and into a dynamic, private, structure. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 16be63fd1670000b96b76cb55b6f1bead21b4c4b Author: Greg Kroah-Hartman Date: Tue May 27 11:50:16 2008 -0700 bluetooth: remove improper bluetooth class symlinks. Don't create symlinks in a class to a device that is not owned by the class. If the bluetooth subsystem really wants to point to all of the devices it controls, it needs to create real devices, not fake symlinks. Cc: Maxim Krasnyansky Cc: Kay Sievers Acked-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman commit 110cf374a809817d5c080c0ac82d65d029820a66 Author: Greg Kroah-Hartman Date: Tue May 27 10:17:53 2008 +0300 infiniband: make cm_device use a struct device and not a kobject. This object really should be a struct device, or at least contain a pointer to a struct device, as it is trying to create a separate device tree outside of the main device tree. This patch fixes this problem. It is needed for the class core rework that is being done in the driver core. Cc: Kay Sievers Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Greg Kroah-Hartman commit d4c4196f24ade5f336882587480652efde2c739c Author: Greg Kroah-Hartman Date: Tue May 27 10:17:53 2008 +0300 infiniband: rename "device" to "ib_device" in cm_device This pointer really is a struct ib_device, not a struct device, so name it properly to help prevent confusion. This makes the followon patch in this series much smaller and easier to understand as well. Cc: Kay Sievers Cc: Roland Dreier Cc: Hal Rosenstock Acked-by: Sean Hefty Signed-off-by: Greg Kroah-Hartman commit 27f302519148f311307637d4c9a6d0fd87d07e4c Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: make /proc/partitions and /proc/diskstats use class_find_device() Use the proper class iterator function instead of mucking around in the internals of the class structures. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 66c64afec16a7b46212ecb2fa99998923bbeea3f Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: move header for /proc/partitions to seq_start The seq_start call is the better place for the header for the file, that way we don't have to be mucking in the class structure to try to figure out if this is the first partition or not. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 68c4d4a7875c59f2e4b72901ab11ba978e75bde0 Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: make proc files seq_start use the class_find_device() Use the proper class iterator function instead of mucking around in the internals of the class structures. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit a6e2ba88774bc5870ab3d9664cb86d70415f7402 Author: Randy Dunlap Date: Fri May 23 09:44:11 2008 -0700 block: make /proc/diskstats only build if CONFIG_PROC_FS is enabled These functions are only needed if CONFIG_PROC_FS is enabled, so save the space when it is not. This also makes it easier for a patch later in this series to work properly if CONFIG_PROC_FS is not enabled. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit a142be856f060ae8106512c0e81a8d6f8746ab0b Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: make blk_lookup_devt use the class iterator function Use the proper class iterator function instead of mucking around in the internals of the class structures. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 5c6f35c5ece8f130cd8ec9ba0d71dc146b46a0f1 Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: make printk_partition use the class iterator function Use the proper class iterator function instead of mucking around in the internals of the class structures. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 6ffeea77ff014f1456fcd0564eac84b34e9535ca Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: fix compiler warning in genhd.c Warn if something really bad happens if we can't create this link. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 695794ae0c5bdd9bd06e35b118801e2e9be04f9e Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 Driver Core: add ability for class_find_device to start in middle of list This mirrors the functionality that driver_find_device has as well. We add a start variable, and all callers of the function are fixed up at the same time. The block layer will be using this new functionality in a follow-on patch. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 93562b537659fc0f63920fd4d9d24f54e434f4c4 Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 Driver Core: add ability for class_for_each_device to start in middle of list This mirrors the functionality that driver_for_each_device has as well. We add a start variable, and all callers of the function are fixed up at the same time. The block layer will be using this new functionality in a follow-on patch. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 4e10673944a5c386378ff9d692ae37e19993f9d5 Author: Greg Kroah-Hartman Date: Mon Jul 21 20:03:34 2008 -0700 device create: convert device_create_drvdata to device_create Now that device_create() has been audited, rename things back to the original call to be sane. Keep the device_create_drvdata macro around to make merges easier. Signed-off-by: Greg Kroah-Hartman commit ccea44fadca396b0f89aed5bdeb60e4abb212566 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 driver core: remove device_create() There are no more users of this, and it is racy. Use device_create_drvdata() or device_create_vargs() instead. Signed-off-by: Greg Kroah-Hartman commit 3bfd49c8ab1859ae0f5fa1df2b3781c99115f442 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: x86: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit bc00bc924295f02295fe5eeeba3618ba0d0db1ef Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: usb: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Greg Kroah-Hartman commit 3d81252ddb10f63ae4db713d9b32faabe641b850 Author: David Brownell Date: Fri Jun 6 15:48:07 2008 -0500 device create: spi: convert device_create to device_create_drvdata Switch over to use the shiny new device_create_drvdata() call instead of the original device_create() calls, so this continues to work after device_create() is removed. Note that this driver never had the race which motivated removing the original call; it locked correctly. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 89409211ff97bf82295d1fb98ab18302a03e9199 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: sound: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 9def0b9761ee096c3c539b427dfb1e52b373cdad Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: scsi: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: James E.J. Bottomley Signed-off-by: Greg Kroah-Hartman commit 05675de250c4efcefbd488e6a556639b63898af8 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: s390: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Greg Kroah-Hartman commit e17da9c4c5fc19e16ddcb0ae020ee4425ca0c96f Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: net: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit daea34bc6f67cf3872d1b52ba5ccf249f3ceb176 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: mtd: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 7da5a05dd7b95315af49f724f623bbfdab0f5e4d Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: misc: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Greg Kroah-Hartman commit 43f98747d48195d92c4102c17d7175bf24df1801 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: mips: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Ralf Baechle Signed-off-by: Greg Kroah-Hartman commit 97cd790e3a9cf2855676a461ac5c448f5843017d Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: macintosh: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit 24d0b416f988fcdfa2615a25c7c33c21cc2a65a9 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: isdn: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Karsten Keil Signed-off-by: Greg Kroah-Hartman commit c76d3d28c31a68f45d6b5acaa4813138dd7883b3 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: infiniband: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Greg Kroah-Hartman commit f71674a09f374bb0b5371b3e7b943029867477c5 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: ieee1394: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Ben Collins Acked-by: Stefan Richter Signed-off-by: Greg Kroah-Hartman commit 6ecaaf94b831827405613ee9110d8fb8eff92482 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: ide: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman commit 1cc4376c259d1950817aaa6221aad7c2058df4a8 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: i2c: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2871f55237e2aaa00fd724ce45b47e567974045f Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: hwmon: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Mark M. Hoffman Signed-off-by: Greg Kroah-Hartman commit 0fd15a18d876a9571cc5b88a5d1716dfccb8e493 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: hid: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman commit 1e2744011ff3cd195aba9f7a15dd71b332812a5c Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: framebuffer: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Antonino Daplas Signed-off-by: Greg Kroah-Hartman commit e282959ef3ebae0d72ac0b24242c376fa34da585 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: dvb: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Greg Kroah-Hartman commit 275e64decc01acf4d2f6b6ad1b83f1c4bd9033e5 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: dca: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Greg Kroah-Hartman commit 6143b599700f7d6d7961e2de88f1486b2b19b1f2 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: coda: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Jan Harkes Signed-off-by: Greg Kroah-Hartman commit 47aa5793f78c274d51711f6a621fa6b02d4e6402 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: char: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Greg Kroah-Hartman commit f79f060561d04a38d41e773ade9baafce3c96179 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: block: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Greg Kroah-Hartman commit 09857e35cdccf2457bb03c6d7595adc210a517cc Author: Greg Kroah-Hartman Date: Wed May 21 18:21:38 2008 -0400 Firmware: fix typo in example code It's not like this stuff even builds right now, but this will make Randy's scripts happy :) Cc: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit ff543332ec5d23833994fca9e7789f067fb51221 Author: Robert P. J. Day Date: Tue May 20 00:06:00 2008 +0200 debugfs: Add a reference to the debugfs API documentation. Signed-off-by: Robert P. J. Day Cc: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 9f255651fb41c111ee35a2ae632df8ce9bd61def Author: Kay Sievers Date: Tue May 6 22:24:04 2008 +0200 kobject: replace '/' with '!' in name Some (block) devices have a '/' in the name, and need special handling. Let's have that rule to the core, so we can remove it from the block class. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit e105b8bfc769b0545b6f0f395179d1e43cbee822 Author: Dan Williams Date: Mon Apr 21 10:51:07 2008 -0700 sysfs: add /sys/dev/{char,block} to lookup sysfs path by major:minor Why?: There are occasions where userspace would like to access sysfs attributes for a device but it may not know how sysfs has named the device or the path. For example what is the sysfs path for /dev/disk/by-id/ata-ST3160827AS_5MT004CK? With this change a call to stat(2) returns the major:minor then userspace can see that /sys/dev/block/8:32 links to /sys/block/sdc. What are the alternatives?: 1/ Add an ioctl to return the path: Doable, but sysfs is meant to reduce the need to proliferate ioctl interfaces into the kernel, so this seems counter productive. 2/ Use udev to create these symlinks: Also doable, but it adds a udev dependency to utilities that might be running in a limited environment like an initramfs. 3/ Do a full-tree search of sysfs. [kay.sievers@vrfy.org: fix duplicate registrations] [kay.sievers@vrfy.org: cleanup suggestions] Cc: Neil Brown Cc: Tejun Heo Acked-by: Kay Sievers Reviewed-by: SL Baur Acked-by: Kay Sievers Acked-by: Mark Lord Acked-by: H. Peter Anvin Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman commit b32d13102d39ed411d152a7ffcc5f66d5b3b1b49 Author: David S. Miller Date: Mon Jul 21 18:45:34 2008 -0700 tcp: Fix bitmask test in tcp_syn_options() As reported by Alexey Dobriyan: CHECK net/ipv4/tcp_output.c net/ipv4/tcp_output.c:475:7: warning: dubious: !x & y And sparse is damn right! if (unlikely(!OPTION_TS & opts->options)) ^^^ size += TCPOLEN_SACKPERM_ALIGNED; OPTION_TS is (1 << 1), so condition will never trigger. Signed-off-by: David S. Miller commit c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 Author: Segher Boessenkool Date: Tue Jul 22 09:03:45 2008 +1000 powerpc: Fix build bug with binutils < 2.18 and GCC < 4.2 binutils < 2.18 has a bug that makes it misbehave when taking an ELF file with all segments at load address 0 as input. This happens when running "strip" on vmlinux, because of the AT() magic in this linker script. People using GCC >= 4.2 won't run into this problem, because the "build-id" support will put some data into the "notes" segment (at a non-zero load address). To work around this, we force some data into both the "dummy" segment and the kernel segment, so the dummy segment will get a non-zero load address. It's not enough to always create the "notes" segment, since if nothing gets assigned to it, its load address will be zero. Signed-off-by: Segher Boessenkool Tested-By: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit f36c5227cd88b6340c40d62b05859e8213740a97 Author: Mike Mason Date: Tue Jul 22 02:40:17 2008 +1000 powerpc/eeh: Don't panic when EEH_MAX_FAILS is exceeded This patch changes the EEH_MAX_FAILS action from panic to printing an error message. Panicking under under this condition is too harsh. Although performance will be affected and the device may not recover, the system is still running, which at the very least should allow for a more graceful shutdown. The patch also removes the msleep() within a spinlock, which can lead to a deadlock and is not recommended. Signed-off-by: Mike Mason Acked-by: Linas Vepstas Signed-off-by: Benjamin Herrenschmidt commit 57a20d8fb0d2a05abe40abd6bb29e3f923721f1b Author: Benjamin Herrenschmidt Date: Thu Jul 17 15:05:22 2008 +1000 fbdev: Teaches offb about palette on radeon r5xx/r6xx The offb driver already has a collection of hacks to be able to set the palette on various chips. This adds support for r5xx/r6xx radeons. This is needed as offb is the only console solution on these currently and the firmware in some cases sets a really bad color palette. This fixes using some Radeon X16xx on the Powerstation for example. Signed-off-by: Benjamin Herrenschmidt commit c134fd868fb5137984ce1b7a58f3f6dd4171615e Author: Maxim Shchetynin Date: Wed Jul 16 05:51:40 2008 +1000 powerpc/cell/edac: Log a syndrome code in case of correctable error If correctable error occurs the syndrome code was logged as 0. This patch lets EDAC to log a correct syndrome code to make problem investigation easier. Signed-off-by: Maxim Shchetynin Signed-off-by: Arnd Bergmann Acked-by: Doug Thompson Signed-off-by: Benjamin Herrenschmidt commit 1ed6af73440c5ec920884bb800685a8cab4ce847 Author: Mark Nelson Date: Fri Jul 18 23:03:34 2008 +1000 powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code Introduce a new dma attriblue DMA_ATTR_WEAK_ORDERING to use weak ordering on DMA mappings in the Cell processor. Add the code to the Cell's IOMMU implementation to use this code. Dynamic mappings can be weakly or strongly ordered on an individual basis but the fixed mapping has to be either completely strong or completely weak. This is currently decided by a kernel boot option (pass iommu_fixed=weak for a weakly ordered fixed linear mapping, strongly ordered is the default). Signed-off-by: Mark Nelson Signed-off-by: Arnd Bergmann Signed-off-by: Benjamin Herrenschmidt commit 79e25bac124a7d1d7bf966f06dd9398a1b5f3d20 Author: Torez Smith Date: Fri Jul 18 06:42:07 2008 +1000 powerpc: Indicate which oprofile counters to use while in compat mode While running on a system with new hardware and a kernel where the cpu_specs[] table does not recognize the new hardware, the identify_cpu() routine will select the default case as it searches through cpu_specs[] in an attempt to match the real PVR. Once the default case is selected, non of the oprofile counters and/or fields have been set up or defined. When identify_cpu() is called once more with the logical PVR, some of the cpu specific fields are replaced with the exception of the oprofile related ones. However, in the case where we have actually taken the default case while searching for the real PVR, we need to tell oprofile that we are now running in compatibility mode so it can pick up the correct counters. We do this by setting the oprofile_cpu_type field to be that taken from the cpu_specs[] for the cpu we are now emulating. This change will detect that we are now altering the real PVR and determine if we also need to update the oprofile_cpu_type field. Signed-off-by: Torez Smith Signed-off-by: Benjamin Herrenschmidt commit 542a3a3bc9d9c176f7cb332948df1cb8ff91fa64 Author: Adrian Bunk Date: Fri Jul 18 04:18:54 2008 +1000 powerpc/boot: Change spaces to tabs For C code spaces versus tabs is just a religious issue, but for Makefiles it actually matters. This patch fixes he following errors: /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/powerpc/boot/Makefile:166: *** missing separator. Stop. /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/powerpc/boot/Makefile:171: *** missing separator. Stop. Since this was inside an ifdef DTC_GENPARSER it was not a problem unless someone wanted to regenerate the shipped generated files. Signed-off-by: Adrian Bunk Acked-by: David Gibson Signed-off-by: Benjamin Herrenschmidt commit bf312ccc04ab09d674cd1b0f228e76201d94483b Author: Adrian Bunk Date: Fri Jul 18 04:18:28 2008 +1000 powerpc: Remove duplicate 6xx option in Kconfig The real option is above in the same Kconfig file. Signed-off-by: Adrian Bunk Signed-off-by: Benjamin Herrenschmidt commit 76bfdcf71c421154b69470e1ce346c8cf4ee1230 Author: Michael Ellerman Date: Thu Jul 17 17:17:52 2008 +1000 powerpc: Use PPC_LONG and PPC_LONG_ALIGN in lib/string.S Replace ifdef clutter with the PPC_LONG and PPC_LONG_ALIGN macros for readability. No change to the generated code. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 551c3c04b478b987ccd335f1a42362d571b1592d Author: Michael Ellerman Date: Thu Jul 17 17:17:52 2008 +1000 powerpc: Use PPC_LONG_ALIGN in uaccess.h Use the new PPC_LONG_ALIGN macro instead of passing an argument to the asm for consistency. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 6a2a24bb755405d5311efaaed865042477b26f30 Author: Michael Ellerman Date: Thu Jul 17 17:17:51 2008 +1000 powerpc: Add a #define for aligning to a long-sized boundary Add a #define for aligning to a long-sized boundary. It would be nice to use sizeof(long) for this, but that requires generating the value with asm-offsets.c, and asm-offsets.c includes asm-compat.h and we descend into some sort of recursive include hell. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 67260ac9a397eb7c9e2980be2865912d3840b042 Author: Benjamin Herrenschmidt Date: Thu Jul 17 15:53:31 2008 +1000 powerpc: Fix OF parsing of 64 bits PCI addresses The OF parsing code for PCI addresses isn't always treating properly the address space indication 0b11 (ie. 0x3) as meaning 64 bits memory space. This means that it fails to parse addresses for PCI BARs that have this encoding set by the firmware, which happens on some SLOF versions and breaks offb palette handling on Powerstation. Signed-off-by: Benjamin Herrenschmidt Acked-by: Segher Boessenkool commit 1856c020402f602b2bd26bcc9b77250304565b7e Author: Michael Ellerman Date: Thu Jul 17 14:46:00 2008 +1000 powerpc: Use WARN_ON(1) instead of __WARN() __WARN() is not defined for all configs, use WARN_ON(1) instead. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 6fdc9f5076e0f6018e1d9250c6673f812b556d90 Author: Arnd Bergmann Date: Thu Jul 17 08:12:25 2008 +1000 powerpc: Fix support for latencytop We need to pass the kernel stack pointer instead of the user space stack pointer in save_stack_trace_tsk(). Signed-off-by: Arnd Bergmann Signed-off-by: Benjamin Herrenschmidt commit 72e82dcd1f8fc6f99e0ee2ef1ed1ff37c1e63858 Author: Geoff Levand Date: Thu Jul 17 07:22:26 2008 +1000 powerpc/ps3: Update ps3_defconfig Update ps3_defconfig. Signed-off-by: Geoff Levand Signed-off-by: Benjamin Herrenschmidt commit 059e4938f8b060b10c4352e6c45739473bc73267 Author: Masakazu Mokuno Date: Thu Jul 17 07:22:19 2008 +1000 powerpc/ps3: Add a sub-match id to ps3_system_bus Add sub match id for ps3 system bus so that two different system bus devices can be connected to a shared device. Signed-off-by: Masakazu Mokuno Signed-off-by: Geoff Levand Signed-off-by: Benjamin Herrenschmidt commit 6e5f1537833a9fc8251157dff403231f5c89a894 Author: Kumar Gala Date: Wed Jul 16 23:43:06 2008 +1000 powerpc: Add a 6xx defconfig This is a defconfig from Dave Jones and should be similar (if not identical) to the fedora ppc32 defconfig. The intent is to cover all cache coherent 6xx based chips and platforms as reasonable. Signed-off-by: Kumar Gala Signed-off-by: Benjamin Herrenschmidt commit 4f3dd8a06239c0a19d772a27c2f618dc2faadf4a Author: Mark Nelson Date: Wed Jul 16 05:51:47 2008 +1000 powerpc/dma: Use the struct dma_attrs in iommu code Update iommu_alloc() to take the struct dma_attrs and pass them on to tce_build(). This change propagates down to the tce_build functions of all the platforms. Signed-off-by: Mark Nelson Signed-off-by: Arnd Bergmann Signed-off-by: Benjamin Herrenschmidt commit 4795b7801b07e1b7286edb0d9321433fc0eac6cc Author: Christian Krafft Date: Wed Jul 16 05:51:45 2008 +1000 powerpc/cell: Add support for power button of future IBM cell blades This patch adds support for the power button on future IBM cell blades. It actually doesn't shut down the machine. Instead it exposes an input device /dev/input/event0 to userspace which sends KEY_POWER if power button has been pressed. haldaemon actually recognizes the button, so a plattform independent acpid replacement should handle it correctly. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann Signed-off-by: Benjamin Herrenschmidt commit 70694a8bab22bd0cc98ff4ee5cc75fe9be30fcd0 Author: Christian Krafft Date: Wed Jul 16 05:51:44 2008 +1000 powerpc/cell: Cleanup sysreset_hack for IBM cell blades This patch adds a config option for the sysreset_hack used for IBM Cell blades. The code is moves from pervasive.c into ras.c and gets it's own init method. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann Signed-off-by: Benjamin Herrenschmidt commit 880e710580c09bf86cddac687fc492a8318934fe Author: Christian Krafft Date: Wed Jul 16 05:51:43 2008 +1000 powerpc/cell/cpufreq: Add spu aware cpufreq governor This patch adds a cpufreq governor that takes the number of running spus into account. It's very similar to the ondemand governor, but not as complex. Instead of hacking spu load into the ondemand governor it might be easier to have cpufreq accepting multiple governors per cpu in future. Don't know if this is the right way, but it would keep the governors simple. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann Acked-by: Dave Jones Signed-off-by: Benjamin Herrenschmidt commit 8204cba7fa0ca0752fdaec021dae2634788178aa Author: Maxim Shchetynin Date: Wed Jul 16 05:51:42 2008 +1000 powerpc/axonram: Enable partitioning of the Axons DDR2 DIMMs DDR2 memory DIMMs on the Axon could be accessed only as one partition when using file system drivers which are using the direct_access() method. This patch enables for such file system drivers to access Axon's DDR2 memory even if it is splitted in several partitions. Signed-off-by: Maxim Shchetynin Signed-off-by: Arnd Bergmann Signed-off-by: Benjamin Herrenschmidt commit 9a23409b69440e76d34dc23846cae44f46f60d98 Author: Maxim Shchetynin Date: Wed Jul 16 05:51:41 2008 +1000 powerpc/axonram: Use only one block device major number Axonram module registers one block device for each DDR2 DIMM found on a system. This means that each DDR2 DIMM becomes its own block device major number. This patch lets axonram module to register the only one block device for all DDR2 DIMMs which also spares kernel resources. Signed-off-by: Maxim Shchetynin Signed-off-by: Arnd Bergmann Signed-off-by: Benjamin Herrenschmidt commit 18ad7a61e1b700dfe177fabf1c350b4f5d4da8ac Author: Wolfgang Grandegger Date: Fri May 30 22:51:33 2008 +1000 of_gpio: Should use new header Since commit 7560fa60fcdcdb0da662f6a9fad9064b554ef46c (gpio: and "no GPIO support here" stubs) drivers can use GPIOs if they're available, but don't require them. This patch actually enables this feature. Signed-off-by: Wolfgang Grandegger Signed-off-by: Anton Vorontsov Signed-off-by: Benjamin Herrenschmidt commit 6662327e190a20bd42867f11abca095badee56e1 Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 21 16:55:11 2008 -0700 ide: merge with Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit edc83d4f3e971b322c557604d064b68374a7b77b Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 21 16:51:43 2008 -0700 ide: : use __raw_{read,write}w() Use __raw_{read,write}w() in __ide_{in,out}sw() and remove no longer needed {in,out}w_be(). Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 8fbf3f30fe0700eff01d6ff8d058cd6f47d4da1b Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 21 16:50:56 2008 -0700 ide: : use __raw_{read,write}w() Use __raw_{read,write}w() in __ide_{in,out}sw(). Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 28c10af712d875f85c3b8f70aa7a47b77be0f27d Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 21 16:49:34 2008 -0700 ide: : use %r0 for outw_be() Use %r0 for outw_be() to make it match __raw_writew(). Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit 93ded9b8fd42abe2c3607097963d8de6ad9117eb Merge: 6d52dcb... f756cbd... Author: Linus Torvalds Date: Mon Jul 21 15:42:20 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (100 commits) usb-storage: revert DMA-alignment change for Wireless USB USB: use reset_resume when normal resume fails usb_gadget: composite cdc gadget fault handling usb gadget: minor USBCV fix for composite framework USB: Fix bug with byte order in isp116x-hcd.c fio write/read USB: fix double kfree in ipaq in error case USB: fix build error in cdc-acm for CONFIG_PM=n USB: remove board-specific UP2OCR configuration from pxa27x-udc USB: EHCI: Reconciling USB register differences on MPC85xx vs MPC83xx USB: Fix pointer/int cast in USB devio code usb gadget: g_cdc dependso on NET USB: Au1xxx-usb: suspend/resume support. USB: Au1xxx-usb: clean up ohci/ehci bus glue sources. usbfs: don't store bad pointers in registration usbfs: fix race between open and unregister usbfs: simplify the lookup-by-minor routines usbfs: send disconnect signals when device is unregistered USB: Force unbinding of drivers lacking reset_resume or other methods USB: ohci-pnx4008: I2C cleanups and fixes USB: debug port converter does not accept more than 8 byte packets ... commit f756cbd458ab71c996a069cb3928fb1e2d7cd9cc Author: Alan Stern Date: Mon Jun 30 13:39:59 2008 -0400 usb-storage: revert DMA-alignment change for Wireless USB This patch (as1110) reverts an earlier patch meant to help with Wireless USB host controllers. These controllers can have bulk maxpacket values larger than 512, which puts unusual constraints on the sizes of scatter-gather list elements. However it turns out that the block layer does not provide the support we need to enforce these constraints; merely changing the DMA alignment mask doesn't help. Hence there's no reason to keep the original patch. The Wireless USB problem will have to be solved a different way. In addition, there is a reason to get rid of the earlier patch. By dereferencing a pointer stored in the ep_in array of struct usb_device, the current code risks an invalid memory access when it runs concurrently with device removal. The members of that array are cleared before the driver's disconnect method is called, so it should not try to use them. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 86c57edf60f5c98adb496880f56cd0e5a3423153 Author: Alan Stern Date: Mon Jun 30 11:14:43 2008 -0400 USB: use reset_resume when normal resume fails This patch (as1109b) makes USB-Persist more resilient to errors. With the current code, if a normal resume fails, it's an unrecoverable error. With the patch, if a normal resume fails (and if the device is enabled for USB-Persist) then a reset-resume is tried. This fixes the problem reported in Bugzilla #10977. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ac90e36592ea5171c4e70f58b39a782d871a7d9f Author: David Brownell Date: Tue Jul 1 13:18:20 2008 -0700 usb_gadget: composite cdc gadget fault handling These two fixes ensure the new "CDC Composite Device" gadget fails cleanly when it's loaded on hardware that can't support this particular gadget driver. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit c24f42276b4c4467e82cdd5a941fb7f9400aeea0 Author: David Lopo Date: Tue Jul 1 13:14:17 2008 -0700 usb gadget: minor USBCV fix for composite framework Fill in a reserved/unused device qualifier field to ensure that the USBCV tests will always pass. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 28874b7ec47e1e5cfe2b67420c4d07c6297a43a9 Author: Julien May Date: Fri Jun 27 15:01:18 2008 +0200 USB: Fix bug with byte order in isp116x-hcd.c fio write/read URB payload data are transfered in wrong byte order on a big endinan architecture (AVR32). Signed-off-by: Julien May Signed-off-by: Greg Kroah-Hartman commit df3e1ab7334279bc744344bcf05272dc8b985d3d Author: Oliver Neukum Date: Mon Jun 30 14:33:57 2008 +0200 USB: fix double kfree in ipaq in error case in the error case the ipaq driver leaves a dangling pointer to already freed memory that will be freed again. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 357585892e56f7c7bec4a9c8dfaf90257c8756c6 Author: Oliver Neukum Date: Tue Jul 1 19:10:08 2008 +0200 USB: fix build error in cdc-acm for CONFIG_PM=n Here's the fix. cdc-wdm has the same problem. The fix is the same. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 95f371f24c48b50e365f4c08d8f61eb8b15b3bba Author: Daniel Ribeiro Date: Tue Jul 1 23:09:27 2008 -0300 USB: remove board-specific UP2OCR configuration from pxa27x-udc Remove the board-specific UP2OCR configuration from the pxa27x-udc driver. Signed-off-by: Daniel Ribeiro Signed-off-by: Greg Kroah-Hartman commit 4f5342583c67fde6825d39b19c6b252db80beaf2 Author: Srikanth Srinivasan Date: Wed Jul 2 02:14:33 2008 -0500 USB: EHCI: Reconciling USB register differences on MPC85xx vs MPC83xx A couple of USB register initializations had to be changed on MPC85xx platforms. This is due to the internal SoC buses being different on MPC83xx SoCs vs MPC85xx SoCs. We currently handle this via an ifdef since 83xx and 85xx are mutually exclusive kernel builds. Signed-off-by: Srikanth Srinivasan Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman commit a80d5ff0d7d3a99e962a02c36acf97ba5a70b86e Author: David Howells Date: Wed Jul 2 12:28:55 2008 +0100 USB: Fix pointer/int cast in USB devio code Fix pointer/int cast in USB devio code, and thus avoid a compiler warning. A void* data argument passed to bus_find_device() and thence to match_devt() is used to carry a 32-bit datum. However, casting directly between a u32 and a pointer is not permitted - there must be an intermediate cast via (unsigned) long. This was introduced by the following patch: commit 94b1c9fa060ece2c8f080583beb6cc6008e41413 Author: Alan Stern Date: Tue Jun 24 14:47:12 2008 -0400 usbfs: simplify the lookup-by-minor routines This patch (as1105) simplifies the lookup-by-minor-number code in usbfs. Instead of passing the minor number to the callback, which must then reconstruct the entire dev_t value, the patch passes the dev_t value directly. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: David Howells Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4ddd9ec17af6a7c539f4a12758905340c00847d6 Author: Randy Dunlap Date: Thu Jul 3 14:44:59 2008 -0700 usb gadget: g_cdc dependso on NET g_cdc needs to depend on NET, otherwise net-related build errors happen: ERROR: "netif_carrier_on" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "netif_carrier_off" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "netif_rx" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "alloc_etherdev_mq" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "free_netdev" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "register_netdev" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "print_mac" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "dev_kfree_skb_any" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "__alloc_skb" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "eth_type_trans" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "unregister_netdev" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "__netif_schedule" [drivers/usb/gadget/g_cdc.ko] undefined! ERROR: "skb_put" [drivers/usb/gadget/g_cdc.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 42bfc7b44f724fb5ce838fc2f552a3eb8cd768ec Author: Manuel Lauss Date: Mon Jun 23 09:09:37 2008 +0200 USB: Au1xxx-usb: suspend/resume support. Copy the OHCI/EHCI PM callbacks of the PCI implementation since they work equally well on Au1xxx hardware. Tested on Au1200. Signed-off-by: Manuel Lauss Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 53c81a348fa1d21dd042d9c9a9f91795f83fed66 Author: Manuel Lauss Date: Mon Jun 23 09:08:29 2008 +0200 USB: Au1xxx-usb: clean up ohci/ehci bus glue sources. - Fold multiple probe/remove callbacks into one function; - minor style fixes, no functional changes. Tested on Au1200. Signed-off-by: Manuel Lauss Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit e04199b2167e88f0e2d0410fafaa2c35ff7ba8c1 Author: Alan Stern Date: Tue Jun 24 14:47:29 2008 -0400 usbfs: don't store bad pointers in registration This patch (as1107) fixes a small bug in the usbfs registration and unregistration code. It avoids leaving an error value stored in the device's usb_classdev field and it avoids trying to unregister a NULL pointer. (It also fixes a rather extreme overuse of whitespace.) Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d64aac36394b3c26db53538bfedd8444a3a2206e Author: Alan Stern Date: Tue Jun 24 14:47:19 2008 -0400 usbfs: fix race between open and unregister This patch (as1106) fixes a race between opening and unregistering device files in usbfs. The current code drops its reference to the device and then reacquires it, ignoring the possibility that the device structure might have been removed in the meantime. It also doesn't check whether the device is already in the NOTATTACHED state when the file is opened. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 61ad04a89f0e3e6adaed0d9adfc0c9b431ccbb92 Author: Alan Stern Date: Tue Jun 24 14:47:12 2008 -0400 usbfs: simplify the lookup-by-minor routines This patch (as1105) simplifies the lookup-by-minor-number code in usbfs. Instead of passing the minor number to the callback, which must then reconstruct the entire dev_t value, the patch passes the dev_t value directly. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit cd9f03759d3eb588e185b04e1854c778b050833e Author: Alan Stern Date: Tue Jun 24 14:47:04 2008 -0400 usbfs: send disconnect signals when device is unregistered USB device files are accessible in two ways: as files in usbfs and as character device nodes. The two paths are supposed to behave identically, but they don't. When the underlying USB device is unplugged, disconnect signals are sent to processes with open usbfs files (if they requested these signals) but not to processes with open device node files. This patch (as1104) fixes the bug by moving the disconnect-signalling code into a common subroutine which is called from both paths. Putting this subroutine in devio.c removes the only out-of-file reference to struct dev_state, and so the structure's declaration can be moved from usb.h into devio.c. Finally, the new subroutine performs one extra action: It kills all the outstanding async URBs. (I'd kill the outstanding synchronous URBs too, if there was any way to do it.) In the past this hasn't mattered much, because devices were unregistered from usbfs only when they were disconnected. But now the unregistration can also occur whenever devices are unbound from the usb_generic driver. At any rate, killing URBs when a device is unregistered from usbfs seems like a good thing to do. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 78d9a487ee961c356e1a934d9a92eca38ffb3a70 Author: Alan Stern Date: Mon Jun 23 16:00:40 2008 -0400 USB: Force unbinding of drivers lacking reset_resume or other methods This patch (as1024) takes care of a FIXME issue: Drivers that don't have the necessary suspend, resume, reset_resume, pre_reset, or post_reset methods will be unbound and their interface reprobed when one of the unsupported events occurs. This is made slightly more difficult by the fact that bind operations won't work during a system sleep transition. So instead the code has to defer the operation until the transition ends. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 64b3d6d11948cc71ff12124dcb693392a32f1bf4 Author: Jean Delvare Date: Wed Jun 18 14:46:27 2008 +0200 USB: ohci-pnx4008: I2C cleanups and fixes Various cleanups and fixes to the i2c code in ohci-pnx4008: * Delete empty isp1301_command. The i2c driver command implementation is optional, so there's no point in providing an empty implementation. * Give a name to isp1301_driver. I'm surprised that i2c-core accepted to register this driver at all. I've chosen "isp1301_pnx" as the name, because it's not a generic ISP1301 driver (much like the isp1301_omap driver.) We might want to make the name even more specific (but "isp1301_ohci_pnx4008" doesn't fit.) * The ISP1301 is definitely not a hardware monitoring device. * Fix a memory leak on failure in isp1301_attach. If i2c_attach_client fails, the client is not registered so isp1301_detach is never called and the i2c_client memory is lost. * Use strlcpy instead of strcpy. Signed-off-by: Jean Delvare Cc: Vitaly Wool Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 71be4f81e97fe1f42c48a6dfc411dc6d3c18687f Author: Aleksey Gorelov Date: Thu Jun 19 15:22:17 2008 -0700 USB: debug port converter does not accept more than 8 byte packets USB debug port only supports 8 byte rx/tx packets. Although spec implies that "if a packet larger than eight bytes is received from the remote computer, the device must break the larger packet into eight-byte packets before sending the data to the Debug Port", the real PLX NET20DC device does not handle it right - data is corrupted on debug port end if serial interface sends >8 byte urbs. Patch below fixes the issue by limiting tx urb to 8 byte. Signed off by: Aleks Gorelov Signed-off-by: Greg Kroah-Hartman commit 830f4021a8d5ce97c6bed267132e5e90fb166192 Author: Oliver Neukum Date: Wed Jun 25 14:17:16 2008 +0200 USB: fix disconnect bug in cdc-acm cdc-acm must give up secondary interfaces if the primary is disconnected and vice versa. This wasn't done correctly. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 62ad296b6ca78bd123864c138814c0a597873693 Author: Oliver Neukum Date: Wed Jun 25 13:32:49 2008 +0200 USB: fix usb serial pm counter decrement for disconnected interfaces usb serial decrements the pm counter even if an interface has been disconnected. If it was a logical disconnect the interface may belong already to another driver. This patch introduces a check for disconnected interfaces. Signed-off-by: Oliver Neukum Cc: Stable Signed-off-by: Greg Kroah-Hartman commit 17d80d562fd78a035e994afde88f354973e76236 Author: Oliver Neukum Date: Tue Jun 24 15:56:10 2008 +0200 USB: autosuspend for cdc-wdm this patch implements - suspend/resume - aggressive autosuspend for the cdc-wdm driver - pre/post_reset Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 11ea859d64b69a747d6b060b9ed1520eab1161fe Author: Oliver Neukum Date: Fri Jun 20 11:25:57 2008 +0200 USB: additional power savings for cdc-acm devices that support remote wakeup this patch saves power for cdc-acm devices that support remote wakeup while the device is connected. - request needs_remote_wakeup when needed - delayed write while a device is autoresumed - the device is marked busy when appropriate Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 188d63602756bfd4aa1fb61d531dbd59bddac962 Author: Ben Collins Date: Thu Jun 26 20:08:16 2008 -0400 USB: keyspan: Remove duplicate device entries The 28xb, as documented in comments, has the same ID's as the 28x. Remove the duplicated ID's from the device tables, and expand the comment to document this. Signed-off-by: Ben Collins Signed-off-by: Greg Kroah-Hartman commit 3b36a8fd67774867536f138035823ea9fb1b9566 Author: Benny Halevy Date: Fri Jun 27 12:22:32 2008 +0300 usb: fix uninitialized variable warning in keyspan_pda This fixes the compiler warning. Signed-off-by: Greg Kroah-Hartman commit 397f519a0d771a6bddbcd71a31da6880e81c2e6b Author: Yoshihiro Shimoda Date: Fri Jun 27 19:09:58 2008 +0900 usb: r8a66597-hcd: fix iinterval for Full/Low speed device fix interrupt transfer interval for Full/Low speed device. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit 0bf32b807ff28bb71012f60660e97e79408252ce Author: Yoshihiro Shimoda Date: Fri Jun 27 19:09:55 2008 +0900 usb: r8a66597-hcd: fix interrupt trigger fix the problem that did not set IRQF_TRIGGER_ flag. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit 742120c63138651c898614001cb58cd607401eac Author: Ming Lei Date: Wed Jun 18 22:00:29 2008 +0800 USB: fix usb_reset_device and usb_reset_composite_device(take 3) This patch renames the existing usb_reset_device in hub.c to usb_reset_and_verify_device and renames the existing usb_reset_composite_device to usb_reset_device. Also the new usb_reset_and_verify_device does't need to be EXPORTED . The idea of the patch is that external interface driver should warn the other interfaces' driver of the same device before and after reseting the usb device. One interface driver shoud call _old_ usb_reset_composite_device instead of _old_ usb_reset_device since it can't assume the device contains only one interface. The _old_ usb_reset_composite_device is safe for single interface device also. we rename the two functions to make the change easily. This patch is under guideline from Alan Stern. Signed-off-by: Ming Lei commit dd9ca5d9be7eba99d685d733e23d5be7110e9556 Author: Andre Haupt Date: Wed Jun 18 15:56:00 2008 +0200 USB: usb-serial: fix a sparse warning about different signedness fix the following sparse warning: drivers/usb/serial/usb-serial.c:927:43: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/usb-serial.c:927:43: expected unsigned int *minor drivers/usb/serial/usb-serial.c:927:43: got int * CHECK drivers/usb/serial/generic.c Signed-off-by: Andre Haupt Signed-off-by: Greg Kroah-Hartman commit 3faefc88c1a32b0b4a00b9089fab5d917996b16c Author: Nate Case Date: Tue Jun 17 11:11:38 2008 -0500 USB: isp1760: Support board-specific hardware configurations This adds support for hardware configurations that don't match the chip default register settings (e.g., 16-bit data bus, DACK and DREQ pulled up instead of down, analog overcurrent mode). These settings are passed in via the OF device tree. The PCI interface still assumes the same default values. Signed-off-by: Nate Case Acked-by: Olof Johansson Signed-off-by: Greg Kroah-Hartman commit 6d243e5c76b632a94d54cac2fe7fe8c0b41cd482 Author: Ming Lei Date: Tue Jun 17 23:24:08 2008 +0800 USB: fix comment of usb_set_configuration It is the usb interface driver probe() methods that can't call usb_set_configuration, not usb device driver. Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman commit 7c3e28bc56bd2e4310dc0af99f2b95eeda9a2ff7 Author: Alan Stern Date: Mon Jun 16 12:11:39 2008 -0400 USB: use standard SG iterator in the scatter-gather library This patch (as1103) changes the iteration in the USB scatter-gather to use a standard SG iterator. Otherwise the iteration will fail if it encounters a chained SG list. Signed-off-by: Alan Stern Acked-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit 625f694936cbbdee98e6cc65f72724a7660e7946 Author: Ming Lei Date: Sun Jun 15 09:42:02 2008 +0800 USB: remove interface parameter of usb_reset_composite_device From the current implementation of usb_reset_composite_device function, the iface parameter is no longer useful. This function doesn't do something special for the iface usb_interface,compared with other interfaces in the usb_device. So remove the parameter and fix the related caller. Signed-off-by: Ming Lei Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 33578bd706e40eb877bd87bfc47e5da30034afde Author: Christophe Jaillet Date: Mon Jun 9 16:39:53 2008 -0700 USB: AccessRunner: avoid unnecessary memset Remove an explicit memset(.., 0, ...) to a variable allocated with kzalloc (i.e. 'card_info' array of the structure 'instance'). Signed-off-by: Christophe Jaillet Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d249afddffda695a20afe5270cbbfa242969d6e1 Author: Andrew Morton Date: Mon Jun 9 16:39:52 2008 -0700 USB: drivers/usb/host/isp1760-hcd.c: processor flags have type `unsigned long' Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 87d65e54b6d5ff6ee905c4ade1e28f486ccfce8a Author: Oliver Neukum Date: Thu Jun 19 14:20:18 2008 +0200 USB: cdc-wdm cleanup - fixes an error with filling out control requests - increases grepability and error logging - fixes the short read code path Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 640c1bce86d1e11ee6a1263fdf6170d3210b1684 Author: Greg Kroah-Hartman Date: Thu Jun 19 11:21:16 2008 -0700 USB: delete airprime driver This driver is only for one device id, and the option driver should be used instead for it. Signed-off-by: Greg Kroah-Hartman commit 518386c7d4cc3eb8e6b815e0b11ed2cec6245907 Author: Akinobu Mita Date: Mon Jun 9 16:39:57 2008 -0700 USB: usbmon: use simple_read_from_buffer() Signed-off-by: Akinobu Mita Acked-by: Pete Zaitcev Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bef4665a2e5145737fa925a5a1a7a8afd1b91acc Author: Ming Lei Date: Sun Jun 8 16:44:40 2008 +0800 USB: uhci: mark root_hub_hub_des[] as const mark this array as const because it is read-only Signed-off-by: Ming Lei Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit fe9b9034aa6f69dd7bf3bdca4288763ac2cd534a Author: Ming Lei Date: Sun Jun 8 16:13:03 2008 +0800 USB: host: mark const variable tables as "const" Mark the tables as const so that they end up in .rodata section and don't cacheline share with things that get written to. Signed-off-by: Ming Lei Cc: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit f579c2b46f74038e8f5a762c7f10c2385b33e3dc Author: Alan Stern Date: Mon Jun 2 16:26:48 2008 -0400 USB Gadget: documentation update This patch (as1102) clarifies two points in the USB Gadget kerneldoc: Request completion callbacks are always made with interrupts disabled; Device controllers may not support STALLing the status stage of a control transfer after the data stage is over. Signed-off-by: Alan Stern Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e0d795e4f36c2d8949c1355b497fc5425dbb9437 Author: Felipe Balbi Date: Tue Jun 3 14:47:52 2008 +0300 usb: irda: cleanup on ir-usb module General cleanup on ir-usb module. Introduced a common header that could be used also on usb gadget framework. Lot's of cleanups and now using macros from the header file. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit b963801164618e25fbdc0cd452ce49c3628b46c8 Author: David Brownell Date: Tue Jun 3 22:21:55 2008 -0700 USB: ehci-hcd unlink speedups This patch fixes some performance bugs observed with some workloads when unlinking EHCI queue header (QH) descriptors from the async ring (control/bulk schedule). The mechanism intended to defer unlinking an empty QH (so there is no penalty in common cases where it's quickly reused) was not working as intended. Sometimes the unlink was scheduled: - too quickly ... which can be a *strong* negative effect, since that QH becomes unavailable for immediate re-use; - too slowly ... wasting DMA cycles, usually a minor issue except for increased bus contention and power usage; Plus there was an extreme case of "too slowly": a logical error in the IAA watchdog-timer conversion meant that sometimes the unlink never got scheduled. The fix replaces a simple counter with a timestamp derived from the controller's 8 KHz microframe counter, and adjusts the timer usage for some issues associated with HZ being less than 8K. (Based on a patch originally by Alan Stern, and good troubleshooting from Leonid.) Signed-off-by: David Brownell Cc: Alan Stern Cc: Leonid Signed-off-by: Greg Kroah-Hartman commit 38f3ad5e7463d4dd490a8081a5f3f9f2dec7ecd6 Author: Felipe Balbi Date: Thu Jun 12 10:49:47 2008 +0300 usb: hub: add check for unsupported bus topology We can't allow hubs on the 7th tier as they would allow devices on the 8th tier. Signed-off-by: Felipe Balbi Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6deb270b5c60680ca9117bd545302ea6a58bad42 Author: Pete Zaitcev Date: Sun Jun 1 21:23:07 2008 -0700 USB: ohci_hcd hang: submit vs. rmmod race If we do rmmod ohci_hcd while an application is doing something, the following may happen: - a control URB completes (in finish_urb) and the ohci's endpoint is set into ED_UNLINK in ed_deschedule - same URB is (re)submitted because of the open/close loop or other such application behaviour - rmmod sets the state to HC_STATE_QUESCING - finish_unlinks happens at next SOF; normally it would set ed into ED_IDLE and immediately call ed_schedule (since URB had extra TDs queued), which sets it into ED_OPER. But the check in ed_schedule makes it fail with -EAGAIN (which is ignored) - from now on we have a dead URB stuck; it cannot even be unlinked because the ed status is not ED_OPER, and thus start_ed_unlink is not invoked. This patch removes the check. In 2.6.25, all callers check for __ACTIVE bit before invoking ed_schedule, which is more appropriate. Alan Stern and David Brownell approved of this (cautiously). Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 6381fad77e5d44f8e0e2afffe686cb4e6fc36e71 Author: Eric Miao Date: Mon Jun 2 10:05:30 2008 +0800 USB: make SA1111 OHCI driver SA11x0 specific As RMK pointed out, considering the fact that the _only_ platform with a PXA and SA1111 is the Lubbock, and that SA1111 DMA doesn't work there, (i.e. the SA1111 OHCI doesn't work there) the SA1111 OHCI driver should really be made SA11x0 specific. Signed-off-by: Eric Miao Acked-by: Russell King Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 421b4bf5f292cc97c07a7f838595ccf128cc2c92 Author: Pete Zaitcev Date: Sun Jun 1 14:38:43 2008 -0700 USB: missing usb_put_hcd to ohci-at91 Looks like usb_put_hcd was missing. Also, make an always-zero function return void. Signed-off-by: Pete Zaitcev Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit abe28c00b906b79dc9aff81087a81a5608f64170 Author: Harvey Harrison Date: Fri May 30 10:39:04 2008 -0700 USB: speedtch.c fix sparse shadowed variable warning i is used only as a for-loop index no need to declare another. drivers/usb/atm/speedtch.c:832:7: warning: symbol 'i' shadows an earlier one drivers/usb/atm/speedtch.c:766:6: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Greg Kroah-Hartman commit b2bdd1f5041db6f2d172417b5ceea20abc7a6eb6 Author: Harvey Harrison Date: Fri May 30 10:29:55 2008 -0700 USB: cp2101.c fix sparse signedness mismatch warnings The get/set 2101_config helpers take an unsigned int rather than an int. It is safe to change these in each case and may even produce better code as it will be an unsigned divide rather than a signed divide in places. All other manipulation was setting/masking bits which will not be affected by the sign change. Fixes the following sparse warnings: drivers/usb/serial/cp2101.c:378:44: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:378:44: expected unsigned int *data drivers/usb/serial/cp2101.c:378:44: got int * drivers/usb/serial/cp2101.c:388:40: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:388:40: expected unsigned int *data drivers/usb/serial/cp2101.c:388:40: got int * drivers/usb/serial/cp2101.c:413:42: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:413:42: expected unsigned int *data drivers/usb/serial/cp2101.c:413:42: got int * drivers/usb/serial/cp2101.c:421:42: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:421:42: expected unsigned int *data drivers/usb/serial/cp2101.c:421:42: got int * drivers/usb/serial/cp2101.c:444:42: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:444:42: expected unsigned int *data drivers/usb/serial/cp2101.c:444:42: got int * drivers/usb/serial/cp2101.c:451:42: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:451:42: expected unsigned int *data drivers/usb/serial/cp2101.c:451:42: got int * drivers/usb/serial/cp2101.c:458:42: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:458:42: expected unsigned int *data drivers/usb/serial/cp2101.c:458:42: got int * drivers/usb/serial/cp2101.c:471:42: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:471:42: expected unsigned int *data drivers/usb/serial/cp2101.c:471:42: got int * drivers/usb/serial/cp2101.c:481:42: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:481:42: expected unsigned int *data drivers/usb/serial/cp2101.c:481:42: got int * drivers/usb/serial/cp2101.c:561:41: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:561:41: expected unsigned int *data drivers/usb/serial/cp2101.c:561:41: got int * drivers/usb/serial/cp2101.c:591:45: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:591:45: expected unsigned int *data drivers/usb/serial/cp2101.c:591:45: got int * drivers/usb/serial/cp2101.c:597:41: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:597:41: expected unsigned int *data drivers/usb/serial/cp2101.c:597:41: got int * drivers/usb/serial/cp2101.c:608:45: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:608:45: expected unsigned int *data drivers/usb/serial/cp2101.c:608:45: got int * drivers/usb/serial/cp2101.c:614:41: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:614:41: expected unsigned int *data drivers/usb/serial/cp2101.c:614:41: got int * drivers/usb/serial/cp2101.c:623:45: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:623:45: expected unsigned int *data drivers/usb/serial/cp2101.c:623:45: got int * drivers/usb/serial/cp2101.c:680:50: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:680:50: expected unsigned int *data drivers/usb/serial/cp2101.c:680:50: got int * drivers/usb/serial/cp2101.c:690:43: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:690:43: expected unsigned int *data drivers/usb/serial/cp2101.c:690:43: got int * drivers/usb/serial/cp2101.c:715:41: warning: incorrect type in argument 3 (different signedness) drivers/usb/serial/cp2101.c:715:41: expected unsigned int *data drivers/usb/serial/cp2101.c:715:41: got int * Signed-off-by: Harvey Harrison Signed-off-by: Greg Kroah-Hartman commit 5a33956a300dcb48a3b125cae437ad6f5c718282 Author: Harvey Harrison Date: Fri May 30 10:18:53 2008 -0700 USB: digi_accelport.c trivial sparse lock annotation Signed-off-by: Harvey Harrison Signed-off-by: Greg Kroah-Hartman commit 554cc171e3b08a0cecd5cf7c0c38f66c43f76b39 Author: Stephen Rothwell Date: Fri May 23 16:37:58 2008 +1000 USB: ohci-ppc-of: use linux/of_platform.h instead of asm Signed-off-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit 49f1525546532139e0260ae19ab8012a2bfbd1f3 Author: Alan Cox Date: Thu May 22 22:48:48 2008 +0100 USB: sisusb: Push down the BKL This is another case where the lock_kernel appears to be unneccessary and could be removed with a bit more investigative work Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 54592157c7120ea4d6d0014cbbfc327d4b867fe3 Author: Alan Cox Date: Thu May 22 22:47:31 2008 +0100 USB: rio100: Push down the BKL The BKL is actually probably not needed as the mutex seems sufficient. If so then a further patch to drop it would be a good followup. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit f1b5a7fe1718393f67fa6222a1cc27f97e12c4b3 Author: Alan Cox Date: Thu May 22 22:46:25 2008 +0100 USB: auerwald: Push down the BKL into the driver Also fix the unknown ioctl return code Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 824f16fda56a88267aba9b2580d7566cf56a0860 Author: Alan Cox Date: Thu May 22 22:06:02 2008 +0100 USB: iowarrior: Push down BKL I'm pretty sure the mutex is sufficient for all locking but will come back to that later if the USB folks don't beat me to it. For now get rid of the old BKL ioctl method and wrap the ioctl handler Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 5cb4aeca8e8c29605703be5576825eb3257d8a92 Author: Alan Cox Date: Thu May 22 22:07:51 2008 +0100 USB: usblcd: Push down BKL into driver I'm pretty sure this can be eliminated however I couldn't prove (or find) what stopped the device vanishing mid IOCTL_GET_HARD_VERSION. Perhaps a USB wizard could double check that and see if the lock_kernel can go entirely. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1160d0765660e14b44dffd931b28a3875d5d9e46 Author: Alan Cox Date: Thu May 22 22:04:48 2008 +0100 USB: ftdi_usb: Eliminate ioctl and BKL ioctl use ftdi has one ioctl, which is buggy and for debugging. Kill it off Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 44c389a00ff7229ab2f2aab22ce03ae0c9037df7 Author: Alan Cox Date: Thu May 22 22:03:27 2008 +0100 USB: gadget: Push BKL down into drivers This keeps the gadget ioctl method wrapped but pushes the BKL down into the gadget code so we can use unlocked_ioctl(). Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 0391c828ce75cc71ae301946699a6f2d515fd99d Author: David Brownell Date: Thu Jun 19 18:20:11 2008 -0700 usb ethernet gadget: use composite gadget framework Building on the previous patches which took code from this driver and pakaged it in more-reusable network "function" components, this patch gets rid of the original code and uses those components instead. As seen with the other gadget driver conversions, the resulting code is much easier to understand and (presumably) work with. In this case that's especially true, since the Ethernet gadget had grown to handle three (!) different Ethernet-over-USB protocols. This modularization should make it much easier to add a fourth option for the newish CDC "Ethernet Emulation Model" (or EEM). Lightly tested, primarily at full speed. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 19e2068015d4a66f62a0a19be2130d2948ba8024 Author: David Brownell Date: Thu Jun 19 18:20:26 2008 -0700 usb gadget: new "CDC Composite" gadget driver This is a simple example of a composite gadget, combining two Communications Class Device (CDC) functions: ECM and ACM. This provides a clear example of how the composite gadget framework is intended to work. It's surprising that MS-Windows (or at least, XP and previous) won't "just work" with something this simple... One /proc/bus/usb/devices listing looks like: T: Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 46 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=02(comm.) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=0525 ProdID=a4aa Rev= 3.01 S: Manufacturer=Linux 2.6.26-rc6-pnut with net2280 S: Product=CDC Composite Gadget C:* #Ifs= 4 Cfg#= 1 Atr=c0 MxPwr= 2mA I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=06 Prot=00 Driver=cdc_ether E: Ad=83(I) Atr=03(Int.) MxPS= 16 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=cdc_acm E: Ad=86(I) Atr=03(Int.) MxPS= 8 Ivl=32ms I:* If#= 3 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_acm E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms Not all USB peripheral controller hardware can support this driver. All the highspeed-capable peripheral controllers with drivers now in the mainline kernel seem to support this, as does omap_udc. But many full speed controllers don't have enough endpoints, or (as with the PXA controllers) don't support altsettings. Lightly tested. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 45fe3b8e5342cd1ce307099459c74011d8e01986 Author: David Brownell Date: Thu Jun 19 18:20:04 2008 -0700 usb ethernet gadget: split RNDIS function This is a RNDIS function driver, extracted from the all-in-one Ethernet gadget driver. Lightly tested ... there seems to be a pre-existing problem when talking to Windows XP SP2, not quite sure what's up with that yet. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit da741b8c56d612b5dd26ffa31341911a5fea23ee Author: David Brownell Date: Thu Jun 19 18:19:46 2008 -0700 usb ethernet gadget: split CDC Ethernet function This is a "CDC Ethernet" (ECM) function driver, extracted from the all-in-one Ethernet gadget driver. This is a good example of how to implement interface altsettings. In fact it's currently the only such example in the gadget stack, pending addition of OBEX support. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 8a40819e97368f2b6e67fea103348f9fc2f68ceb Author: David Brownell Date: Thu Jun 19 18:19:32 2008 -0700 usb ethernet gadget: split CDC Subset function This is a simple "CDC Subset" (and MCCI "SAFE") function driver, extracted from the all-in-one Ethernet gadget driver. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2b3d942c4878084a37991a65e66512c02b8fa2ad Author: David Brownell Date: Thu Jun 19 18:19:28 2008 -0700 usb ethernet gadget: split out network core Abstract the peripheral side Ethernet-over-USB link layer code from the all-in-one Ethernet gadget driver into a component that can be called by various functions, so the various flavors can be split apart and selectively reused. A notable difference from the approach taken with the serial link layer code (beyond talking to NET not TTY) is that because of the initialization requirements, this only supports one network link. (And one set of Ethernet link addresses.) That is, each configuration may have only one instance of a network function. This doesn't change behavior; the current code has that same restriction. If you want multiple logical links, that can easily be done using network layer tools. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 15b2d2b529d11449910ac86f6093124bce8f6103 Author: David Brownell Date: Thu Jun 19 18:19:16 2008 -0700 usb gadget: RNDIS cleanups Some cleanup to the RNDIS code: - Minor bugfix: rndis_unit() is supposed to put the link into the RNDIS_UNINITIALIZED state, which does not mean "unused". There's a separate method to stop using the link. (Bug doesn't affect anything right now because of how the code is used.) - Reduce coupling between RNDIS code and its user(s), in preparation for updates in that code: * Decouple RNDIS_RESPONSE_AVAILABLE notifications from net_device by passing just a void* handle. (Also, remove the unused return value of the notification callback.) * When it needs a copy of net_device stats, just ask for it - Remove unused/untested code backing various never-used OIDs: * RNDIS_PM, RNDIS_WAKEUP ... "should" get implemented, but the relevant docs were unclear, ambguous, and incomplete. Someone with access to the Hidden Gospels (maybe in the EU?) might be able to figure out what this should do. * RNDIS_OPTIONAL_STATS ... as the name suggests, optional. Never implemented in part because not all the semantics were clear. * OID_GEN_RNDIS_CONFIG_PARAMETER, which has been #if 0 forever. - A few small whitespace fixes Plus switch the VERBOSE symbol over to the newer VERBOSE_DEBUG style. There should be no functional changes because of this patch; it's a net source code shrink (because of the dead/unused code removal) and a small object code shrink (a couple hundred bytes on ARMv5). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7bb5ea54be47584869b9a748696e06788c55e28f Author: David Brownell Date: Thu Jun 19 18:19:03 2008 -0700 usb gadget serial: use composite gadget framework This switches the serial gadget over to using the new "function" versions of the serial port interfacing code. The remaining code in the main source file is quite small... Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 61d8baea5d02f0f00fb789ce5551cbd8f8b77087 Author: David Brownell Date: Thu Jun 19 18:18:50 2008 -0700 usb gadget serial: split out generic serial function Split out the generic serial support into a "function driver". This closely mimics the ACM support, but with a MUCH simpler control model. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4d5a73dc39c1e1d8ba5feec5c6234ae920c59161 Author: David Brownell Date: Thu Jun 19 18:18:40 2008 -0700 usb gadget serial: split out CDC ACM function Split out CDC ACM parts of "gadget serial" to a "function driver". Some key structural differences from the previous ACM support, shared with with the generic serial function (next patch): - As a function driver, it can be combined with other functions. One gadget configuration could offer both serial and network links, as an example. - One serial port can be exposed in multiple configurations; the /dev/ttyGS0 node could be exposed regardless of which config the host selected. - One configuration can expose multiple serial ports, such as ttyGS0, ttyGS1, ttyGS2, and ttyGS3. This code should be a lot easier to understand than the previous all-in-one-big-file version of the driver. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 097db1d034b0927056f3d9e844dc80b3ba881765 Author: David Brownell Date: Thu Jun 19 18:18:27 2008 -0700 usb gadget zero: use composite gadget framework Update Gadget Zero to use the more modular versions of the loopback and source/sink configuration drivers which build on the new gadget framework code. The core code is a LOT simpler, and it should be much easier now to understand how the parts fit together. The conversion is an overall source shrink in terms of this gadget, since it uses more midlayer support. However, it's an overall increase in object size because there's less sharing between the two configurations (improves code clarity) and because the midlayer is a bit more functional than this driver actually needs. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e5760fdac8c8aeca060d1afc8a233ea3d7a46720 Author: David Brownell Date: Thu Jun 19 17:55:35 2008 -0700 usb gadget zero: split out loopback config This splits the gadget zero "loopback" configuration into a standalone "configuration driver", building on the composite gadget framework code. It doesn't yet pull the original code out of gadget zero or update how that driver is built. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit a400cadc0774c31f67c419a835d80ba611128c2a Author: David Brownell Date: Thu Jun 19 17:55:23 2008 -0700 usb gadget zero: split out source/sink config This splits the gadget zero "source/sink" configuration into a standalone "configuration driver", building on the composite gadget framework code. It doesn't yet pull the original code out of gadget zero or update how that driver is built. Neither this, nor its sibling "loopback" configuration, is a function driver that can be combined with other functions. (The host "usbtest" driver wouldn't know how to deal with that!) However the code becomes simpler because of this conversion, so it's a net win. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 40982be52d8f64c3e10adce17e66ab755a4fa26b Author: David Brownell Date: Thu Jun 19 17:52:58 2008 -0700 usb gadget: composite gadget core Add interfaces for composite gadget drivers, and basic implementation support behind it: - struct usb_function ... groups one or more interfaces into a function managed as one unit within a configuration, to which it's added by usb_add_function(). - struct usb_configuration ... groups one or more such functions into a configuration managed as one unit by a driver, to which it's added by usb_add_config(). These operate at either high or full/low speeds and at a given bMaxPower. - struct usb_composite_driver ... groups one or more such configurations into a gadget driver, which may be registered or unregistered. - struct usb_composite_dev ... a usb_composite_driver manages this; it wraps the usb_gadget exposed by the controller driver. This also includes some basic kerneldoc. How to use it (the short version): provide a usb_composite_driver with a bind() that calls usb_add_config() for each of the needed configurations. The configurations in turn have bind() calls, which will usb_add_function() for each function required. Each function's bind() allocates resources needed to perform its tasks, like endpoints; sometimes configurations will allocate resources too. Separate patches will convert most gadget drivers to this infrastructure. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit a4c39c41bf3592684e36fa0dbbd4ab1a31f969b9 Author: David Brownell Date: Thu Jun 19 17:52:25 2008 -0700 usb gadget: descriptor copying support Define three new descriptor manipulation utilities, for use when setting up functions that may have multiple instances: usb_copy_descriptors() to copy a vector of descriptors usb_free_descriptors() to free the copy usb_find_endpoint() to find a copied version These will be used as follows. Functions will continue to have static tables of descriptors they update, now used as __initdata templates. When a function creates a new instance, it patches those tables with relevant interface and string IDs, plus endpoint assignments. Then it copies those morphed descriptors, associates the copies with the new function instance, and records the endpoint descriptors to use when activating the endpoints. When initialization is done, only the copies remain in memory. The copies are freed on driver removal. This ensures that each instance has descriptors which hold the right instance-specific data. Two instances in the same configuration will obviously never share the same interface IDs or use the same endpoints. Instances in different configurations won't do so either, which means this is slightly less memory-efficient in some cases. This also includes a bugfix to the epautoconf code that shows up with this usage model. It must replace the previous endpoint number when updating the template descriptors, not just mask in a few more bits. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit a7707adf9ee8de3c5b67e3793b98888f551ad00d Author: David Brownell Date: Thu Jun 19 17:52:07 2008 -0700 usb gadget: use new serial core Teach "gadget serial" to use the new abstracted (and bugfixed) TTY glue, and remove all the orignal tangled-up code. Update the documentation accordingly. This is a net object code shrink and cleanup; it should make it a lot easier to see how the TTY glue should accomodate updates to the TTY layer, be bugfixed, etc. Notable behavior changes include: it can now support getty even when there's no USB connection; it fits properly into the mdev/udev world; and RX handling is better (throttling works, and low latency). Configurations with scripts setting up the /dev/ttygserial device node (with "experimental" major number) may want to change that to be a symlink pointing to the /dev/ttyGS0 file, as a migration aid; else, just switch entirely over to mdev/udev. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit c1dca562be8ada614ef193aa246c6f8705bcd6b9 Author: David Brownell Date: Thu Jun 19 17:51:44 2008 -0700 usb gadget: split out serial core This abstracts the "gadget serial" driver TTY glue into a separate component, cleaning it up and disentangling it from connection state. It also changed some behaviors for the better: - Stops using "experimental" major #127, and switches over to having the TTY layer allocate the dev_t numbers. - Provides /sys/class/tty/ttyGS* nodes, thus mdev/udev support. (Note "mdev" hotplug bug in Busybox v1.7.2: /dev/ttyGS0 will be a *block* device without CONFIG_SYSFS_DEPRECATED_V2.) - The tty nodes no longer reject opens when there's no host. Now they can support normal getty configs in /etc/inttab... - Now implements RX throttling. When the line discipline says it doesn't want any more data, only packets in flight will be delivered (currently, max 1K/8K at full/high speeds) until it unthrottles the data. - Supports low_latency. This is a good policy for all USB serial adapters, since it eliminates scheduler overhead on RX paths. This also includes much cleanup including better comments, fixing memory leaks and other bugs (including some locking fixes), messaging cleanup, and an interface audit and tightening. This added up to a significant object code shrinkage, on the order of 20% (!) depending on CPU and compiler. A separate patch actually kicks in this new code, using the functions declared in this new header, and removes the previous glue. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit bb24280ffce6a8bc6b03d29a43ec16ac14e9ec85 Author: David Brownell Date: Tue May 27 19:24:20 2008 -0700 USB: at91_udc: updated fifo sizes It turns out newer versions of the AT91 UDC hardware have increased sizes of some of the FIFOs. Reporting that is a Good Thing. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e184d5fcaac9676bd83a956a774a04a72bf2b28b Author: Alexey Dobriyan Date: Wed May 14 16:25:13 2008 -0700 USB: rndis: switch to seq_files Signed-off-by: Alexey Dobriyan Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit baad4119a3b5215a040bc221478da57c76389e34 Author: Adrian Bunk Date: Tue May 20 01:00:24 2008 +0300 USB: remove Documentation/usb/uhci.txt The driver was removed before kernel 2.6.0 Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit ea05af61a874ffbc158d9cf06df8a9396f299f38 Author: Adrian Bunk Date: Tue May 20 01:00:46 2008 +0300 USB: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 543f7810fba2a62e412efa9473ad08167b691f09 Author: Alan Stern Date: Thu May 8 11:55:59 2008 -0400 usb-storage: implement "soft" unbinding This patch (as1092) implements "soft" unbinding for usb-storage. When the disconnect routine is called, all commands and reset delays are allowed to complete normally until after scsi_remove_host() returns. This means that the commands needed for an orderly shutdown will be sent through to the device. Unlike before, the driver will now execute every command that it accepts. Hence there's no need for special code to catch unexecuted commands and fail them. The new sequence of events when disconnect runs goes as follows: If the device is truly unplugged, set the DISCONNECTING flag so we won't try to access it any more. If the SCSI-scanning thread hasn't started up yet, prevent it from doing anything by setting the new DONT_SCAN flag. Then wake it up and wait for it to terminate. Remove the SCSI host. This unbinds the upper-level drivers, doing an orderly shutdown. Commands sent to quiesce the device will be transmitted normally, unless the device is unplugged. Set the DISCONNECTING flag so that we won't accept any new commands that might get submitted (there aren't supposed to be any) and we won't try to access the device for resets. Tell the control thread to exit by waking it up with no pending command, and wait for it to terminate. Go on to do all the other normal stuff: releasing resources, freeing memory, and so on. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9da82bd4649334817ef0e752a69eb99051645dad Author: Alan Stern Date: Thu May 8 11:54:37 2008 -0400 USB: implement "soft" unbinding This patch (as1091) changes the way usbcore handles interface unbinding. If the interface's driver supports "soft" unbinding (a new flag in the driver structure) then in-flight URBs are not cancelled and endpoints are not disabled. Instead the driver is allowed to continue communicating with the device (although of course it should stop before its disconnect routine returns). The purpose of this change is to allow drivers to do a clean shutdown when they get unbound from a device that is still plugged in. Killing all the URBs and disabling the endpoints before calling the driver's disconnect method doesn't give the driver any control over what happens, and it can leave devices in indeterminate states. For example, when usb-storage unbinds it doesn't want to stop while in the middle of transmitting a SCSI command. The soft_unbind flag is added because in the past, a number of drivers have experienced problems related to ongoing I/O after their disconnect routine returned. Hence "soft" unbinding is made available only to drivers that claim to support it. The patch also replaces "interface_to_usbdev(intf)" with "udev" in a couple of places, a minor simplification. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 473bca94ba432b3c194e6fa315d81d8ac7670a4f Author: Adrian Bunk Date: Mon May 5 21:25:33 2008 +0300 USB: isp1760-hcd.c: make 2 functions static This patch makes the following needlessly global functions static: - enqueue_an_ATL_packet() - enqueue_an_INT_packet() Signed-off-by: Adrian Bunk Acked-by: Sebastian Siewior Signed-off-by: Greg Kroah-Hartman commit 7119e3c37fbf7c27adb5929f344c826ecb8c7859 Author: Alan Stern Date: Thu May 1 15:36:13 2008 -0400 usb-storage: change remaining semaphore to completion This patch (as1090) converts the one remaining semaphore in usb-storage into a completion. Signed-off-by: Alan Stern Cc: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 7e4d6c387994294ac8198b624ee71e75de60dfd2 Author: Alan Stern Date: Thu May 1 15:35:18 2008 -0400 usb-storage: separate dynamic flags from fixed flags This patch (as1089) separates out the dynamic atomic bitflags and the static bitfields in usb-storage. Until now the two sorts of flags have been sharing the same word; this has always been awkward. To help prevent possible confusion, the two new fields each have a different name from the original. us->fflags contains the fixed bitfields (mostly taken from the USB ID table in unusual_devs.h), and us->dflags contains the dynamic atomic bitflags (used with set_bit, test_bit, and so on). Signed-off-by: Alan Stern Cc: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 2742fd8899328345d97a3443fb787b051b79ebae Author: Alan Cox Date: Tue Apr 29 14:45:15 2008 +0100 USB: io_ti: FIrst cut at a big clean up Sort out the insane naming like "OperationalFirmwareVersion" which seems designed to cause formatting problems and RSI Merge various common code together Clean up the pointlessly complex and spread about MCR handling This is really just the low hanging fruit. Needs lots of testing before it goes upstream so testers and reports appreciated Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4330354f7660828d97834598633054b413f6264d Author: Alan Stern Date: Mon Apr 28 11:07:31 2008 -0400 USB: combine hub_quiesce and hub_stop This patch (as1083) combines hub_quiesce() and hub_stop() into a single routine. There's no point keeping them separate since they are usually called together. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f2835219ed5e29ec959a0e635af4339d6174b2a7 Author: Alan Stern Date: Mon Apr 28 11:07:17 2008 -0400 USB: combine hub_activate and hub_restart This patch (as1071) combines hub_activate() and hub_restart() into a single routine. There's no point keeping them separate, since they are always called together. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 948fea37dcebfef8f0f2faf00930e7ec7e756e07 Author: Alan Stern Date: Mon Apr 28 11:07:07 2008 -0400 USB: optimize port debouncing during hub activation This patch (as1082) makes a small optimization to the way the hub driver carries out port debouncing immediately after a hub is activated (i.e., initialized, reset, or resumed). If any port-change statuses are observed, the code will delay for a minimal debounce period -- thereby making a good start at debouncing all the ports at once. If this wasn't sufficient then khubd will debounce any port that still requires attention. But in most cases it should suffice; it's rare for a device to need more than a minimal debounce delay. (In the cases of hub initialization or reset even that is most likely not needed, since any devices plugged in at such times have probably been attached for a while.) Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 8808f00c7adfc8dc0b797c34ec03490b237fce4e Author: Alan Stern Date: Mon Apr 28 11:06:55 2008 -0400 USB: try to salvage lost power sessions This patch (as1073) adds to khubd a way to recover from power-session interruption caused by transient connect-change or enable-change events. After the debouncing period, khubd attempts to do a USB-Persist-style reset or reset-resume. If it works, the connection will remain unscathed. The upshot is that we will be more immune to noise caused by EMI. The grace period is on the order of 100 ms, so this won't permit recovery from the "accidentally knocked the USB cable out of its socket" type of event, but it's a start. As an added bonus, if a device was suspended when the system goes to sleep then we no longer need to check for power-session interruptions when the system wakes up. Khubd will naturally see the status change while processing the device's parent hub and will do the right thing. The remote_wakeup() routine is changed; now it expects the caller to acquire the device lock rather than acquiring the lock itself. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6ee0b270c733027b2b716b1c80b9aced41e08d20 Author: Alan Stern Date: Mon Apr 28 11:06:42 2008 -0400 USB: simplify hub_restart() logic This patch (as1081) straightens out the logic of the hub_restart() routine. Each port of the hub is scanned and the driver makes sure that ports which are supposed to be disabled really _are_ disabled. Any ports with a significant change in status are flagged in hub->change_bits, so that khubd can focus on them without the need to scan all the ports a second time -- which means the hub->activating flag is no longer needed. Also, it is now recognized explicitly that the only reason for resuming a port which was not suspended is to carry out a reset-resume operation, which happens only in a non-CONFIG_USB_SUSPEND setting. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9e5eace734a7b4e96a4ba4cf1f85622446e95e17 Author: Greg Kroah-Hartman Date: Tue Jun 10 14:59:43 2008 -0400 USB: revert "don't use reset-resume if drivers don't support it" This reverts Linus's previous patch that is in mainline to make it easier for the USB hub.c patches that follow this to apply cleanly. The functionality will be added back in a followon patch in this series. Signed-off-by: Greg Kroah-Hartman commit 24618b0cd42f936cda461bdf6144670a5c925178 Author: Alan Stern Date: Mon Apr 28 11:06:28 2008 -0400 USB: debounce before unregistering This patch (as1080) makes a significant change to the way khubd handles port connect-change and enable-change events. Both types of event are now debounced, and the debouncing is carried out _before_ an existing usb_device is unregistered, instead of afterward. This means that drivers will have to deal with longer runs of errors when a device is unplugged, but they are supposed to be prepared for that in any case. The advantage is that when an enable-change occurs (caused for example by electromagnetic interference), the debouncing period will provide time for the cause of the problem to die away. A simple port reset (added in a forthcoming patch) will then allow us to recover from the fault. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b01b03f3ad82b4293f6ca4da9b2692b6a377c609 Author: Alan Stern Date: Mon Apr 28 11:06:11 2008 -0400 USB: add new routine for checking port-resume type This patch (as1070) creates a new subroutine to check whether a device can be resumed. This code is needed even when CONFIG_USB_SUSPEND isn't set, because devices do suspend themselves when the root hub (and hence the entire bus) is suspended, and power sessions can get lost during a system sleep even without individual port suspends. The patch also fixes a loose end in USB-Persist reset-resume handling. When a low- or full-speed device is attached to an EHCI's companion controller, the port handoff during resume will cause the companion port's connect-status-change feature to be set. If that flag isn't cleared, the port-reset code will think it indicates that the device has been unplugged and the reset-resume will fail. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit bd2c784595e3dd551c2b3aa4167657bcc802f598 Author: Harvey Harrison Date: Thu May 1 20:52:57 2008 -0700 USB: use get_unaligned_* helpers for kl5kusb105 driver Signed-off-by: Harvey Harrison Signed-off-by: Greg Kroah-Hartman commit 0031a06e2f07ab0d1bc98c31dbb6801f95f4bf01 Author: Kay Sievers Date: Fri May 2 06:02:41 2008 +0200 USB: usb dev_set_name() instead of dev->bus_id The bus_id field is going away, use the dev_set_name() function to set it properly. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005 Author: Kay Sievers Date: Fri May 2 06:02:41 2008 +0200 USB: usb dev_name() instead of dev->bus_id The bus_id field is going away, use the dev_name() function instead. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 36aa81172edba8a3a8ecedbd1f56d41774ce2e08 Author: Greg Kroah-Hartman Date: Tue Jul 1 10:45:51 2008 -0400 USB: revert "don't lose disconnections during suspend" This reverts Alan's previous patch so that the recent Hub changes will apply cleanly. The above mentioned patch was needed for 2.6.26 to work properly. Cc: Alan Stern Cc: Lukas Hejtmanek Signed-off-by: Greg Kroah-Hartman commit 1b26da1510c02a2dac33c0ea48904256dcec4617 Author: Greg Kroah-Hartman Date: Wed Jul 2 12:46:22 2008 -0700 USB: handle pci_name() being const This changes usb_create_hcd() to be able to handle the fact that pci_name() has changed to a constant string. Signed-off-by: Greg Kroah-Hartman commit c5e46007e9737b77a79ec79ed95262c0ce996d6a Author: Andrew Lunn Date: Thu Apr 24 19:36:39 2008 +0200 USB: storage: UNUSUAL_DEVS() for PanDigital Picture frame. Signed-off-by: Andrew Lunn Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 6d52dcbe56ca8464bcad56d98a64bcd781596663 Merge: eb4225b... 48adcf1... Author: Linus Torvalds Date: Mon Jul 21 15:10:37 2008 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] cpufreq: remove CVS keywords [CPUFREQ] change cpu freq arrays to per_cpu variables commit eb4225b2da2b9f3c1ee43efe58ed1415cc1d4c47 Merge: 807677f... 4cddb88... Author: Linus Torvalds Date: Mon Jul 21 14:55:23 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (25 commits) mmtimer: Push BKL down into the ioctl handler [IA64] Remove experimental status of kdump [IA64] Update ia64 mmr list for SGI uv [IA64] Avoid overflowing ia64_cpu_to_sapicid in acpi_map_lsapic() [IA64] adding parameter check to module_free() [IA64] improper printk format in acpi-cpufreq [IA64] pv_ops: move some functions in ivt.S to avoid lack of space. [IA64] pvops: documentation on ia64/pv_ops [IA64] pvops: add to hooks, pv_time_ops, for steal time accounting. [IA64] pvops: add hooks, pv_irq_ops, to paravirtualized irq related operations. [IA64] pvops: add hooks, pv_iosapic_ops, to paravirtualize iosapic. [IA64] pvops: define initialization hooks, pv_init_ops, for paravirtualized environment. [IA64] pvops: paravirtualize NR_IRQS [IA64] pvops: paravirtualize entry.S [IA64] pvops: paravirtualize ivt.S [IA64] pvops: paravirtualize minstate.h. [IA64] pvops: define paravirtualized instructions for native. [IA64] pvops: preparation for paravirtulization of hand written assembly code. [IA64] pvops: introduce pv_cpu_ops to paravirtualize privileged instructions. [IA64] pvops: add an early setup hook for pv_ops. ... commit ebb36a978131810c98e7198b1187090c697cf99f Author: David S. Miller Date: Mon Jul 21 13:41:16 2008 -0700 ipv6: __KERNEL__ ifdef struct ipv6_devconf Based upon a report by Olaf Hering. Signed-off-by: David S. Miller commit 47112e25da41d9059626033986dc3353e101f815 Author: Gerrit Renker Date: Mon Jul 21 13:35:08 2008 -0700 udplite: Protection against coverage value wrap-around This patch clamps the cscov setsockopt values to a maximum of 0xFFFF. Setsockopt values greater than 0xffff can cause an unwanted wrap-around. Further, IPv6 jumbograms are not supported (RFC 3838, 3.5), so that values greater than 0xffff are not even useful. Further changes: fixed a typo in the documentation. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 6579e57b31d79d31d9b806e41ba48774e73257dc Author: Arjan van de Ven Date: Mon Jul 21 13:31:48 2008 -0700 net: Print the module name as part of the watchdog message As suggested by Dave: This patch adds a function to get the driver name from a struct net_device, and consequently uses this in the watchdog timeout handler to print as part of the message. Signed-off-by: Arjan van de Ven Signed-off-by: David S. Miller commit 7943986ca1138ac99597b1aa4dc893012dcfdc08 Author: Stephen Hemminger Date: Mon Jul 21 13:28:44 2008 -0700 net: use kcalloc in netdev_queue alloc Minor nit, use size_t for allocation size and kcalloc to allocate an array. Probably makes no actual code difference. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 847499ce71bdcc8fc542062df6ebed3e596608dd Author: Stephen Hemminger Date: Mon Jul 21 13:21:35 2008 -0700 ipv6: use timer pending This fixes the bridge reference count problem and cleanups ipv6 FIB timer management. Don't use expires field, because it is not a proper way to test, instead use timer_pending(). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3a33cc108d11fab2a2544e2601066ba4924736aa Author: Ian Schram Date: Mon Jul 21 13:19:35 2008 -0700 mac80211_hwsim.c: fix: BUG: unable to handle kernel NULL pointer dereference at 0000000000000370 I was looking at this out of interest, but I'm in no way familiar with the code. Looks to me that the error handling code in mac80211_hwsim is awkward. Which leads to it calling ieee80211_unregister_hw even when ieee80211_register_hw failed. The function has a for loop where it generates all simulated radios. when something fails, the error handling will call mac80211_hwsim_free which frees all simulated radios who's pointer isn't zero. However the information stored is insufficient to determine whether or not the call to ieee80211_register_hw succeeded or not for a specific radio. The included patch makes init_mac80211_hwsim clean up the current simulated radio, and then calls into mac80211_hwsim_free to clean up all the radios that did succeed. This however doesn't explain why the rate control registration failed.. build tested this, but had some problems reproducing the original problem. Signed-off-by: Ian Schram Signed-off-by: Ingo Molnar Signed-off-by: David S. Miller commit 74988bd85d1cb97987534fd7ffbc570e81145418 Author: David S. Miller Date: Mon Jul 21 13:17:38 2008 -0700 sparc64: Do not define BIO_VMERGE_BOUNDARY. The IOMMU code and the block layer can split things up using different rules, so this can't work reliably. Signed-off-by: David S. Miller commit 807677f812639bdeeddf86abc66117e124eaedb2 Author: Linus Torvalds Date: Mon Jul 21 13:06:20 2008 -0700 Don't list my old OSDL mailing address in CREDITS file .. it may or may be forwarded, but it's not like I want people to send stuff without knowing or checking first anyway, so delete the address entirely. Signed-off-by: Linus Torvalds commit f2d0f1dea41fd6c7a347e71b505a155096643517 Author: Linus Torvalds Date: Mon Jul 21 13:04:08 2008 -0700 x86: Fix help message for STRICT_DEVMEM config option The message talked about "left on" when it meant to say disabled. Signed-off-by: Linus Torvalds commit 3488007afc139929cfd16ab98670f87749d4f6fd Merge: 47c317a... cfc1b9a... Author: Linus Torvalds Date: Mon Jul 21 13:02:00 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: convert Dprintk to pr_debug commit 5171c3047df9d5b5183b2b179aa797a5aed8369b Author: Thomas Gleixner Date: Mon Jul 21 21:58:34 2008 +0200 x86: move the last Dprintk instance to pr_debug() Signed-off-by: Thomas Gleixner commit 47c317a7aaa2fbac03811a569829fa954e641520 Merge: e89970a... 0ebd652... Author: Linus Torvalds Date: Mon Jul 21 12:40:15 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: dump more data on slab corruption SLUB: simplify re on_each_cpu() commit cfc1b9a6a683c835a20d5b565ade55baf639f72f Author: Thomas Gleixner Date: Mon Jul 21 21:35:38 2008 +0200 x86: convert Dprintk to pr_debug There are a couple of places where (P)Dprintk is used which is an old compile time enabled printk wrapper. Convert it to the generic pr_debug(). Signed-off-by: Thomas Gleixner commit e89970aa93b06d0605a488e74af3b0a2a80e03b5 Merge: 443bd1c... 5547cd0... Author: Linus Torvalds Date: Mon Jul 21 11:29:52 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: netfilter: nf_conntrack_sctp: fix sparse warnings netfilter: nf_nat_sip: c= is optional for session netfilter: xt_TCPMSS: collapse tcpmss_reverse_mtu{4,6} into one function netfilter: nfnetlink_log: send complete hardware header netfilter: xt_time: fix time's time_mt()'s use of do_div() netfilter: accounting rework: ct_extend + 64bit counters (v4) netlink: add NLA_PUT_BE64 macro netfilter: nf_nat_core: eliminate useless find_appropriate_src for IP_NAT_RANGE_PROTO_RANDOM hdlcdrv: Fix CRC calculation. Revert "pkt_sched: Make default qdisc nonshared-multiqueue safe." net: In __netif_schedule() use WARN_ON instead of BUG_ON net: Improve simple_tx_hash(). pkt_sched: Remove unused variable skb in dev_deactivate_queue function. sunhme: Remove stop/wake TX queue calls in set-multicast-list handler. ucc_geth: do not touch net queue in adjust_link phylib callback gianfar: do not touch net queue in adjust_link phylib callback atl1: Do not wake queue before queue has been started. commit 443bd1c4ddab9d2144f4c9b85e0abccf2d93423f Author: Randy Dunlap Date: Mon Jul 21 09:27:18 2008 -0700 pci kernel-doc fatal error Fix kernel-doc comments so that they don't produce errors. Also cut some extraneous copy-paste text. Error(linhead//drivers/pci/pci.c:1133): duplicate section name 'Description' Error(linhead//drivers/pci/pci.c:1189): duplicate section name 'Description' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 72a73693aac5ae82850cedc69fa5d264ca977c13 Merge: b7e6f62... 2e2dcc7... Author: Linus Torvalds Date: Mon Jul 21 10:34:25 2008 -0700 Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (160 commits) x86: remove extra calling to get ext cpuid level x86: use setup_clear_cpu_cap() when disabling the lapic KVM: fix exception entry / build bug, on 64-bit x86: add unknown_nmi_panic kernel parameter x86, VisWS: turn into generic arch, eliminate leftover files x86: add ->pre_time_init to x86_quirks x86: extend and use x86_quirks to clean up NUMAQ code x86: introduce x86_quirks x86: improve debug printout: add target bootmem range in early_res_to_bootmem() Subject: devmem, x86: fix rename of CONFIG_NONPROMISC_DEVMEM x86: remove arch_get_ram_range x86: Add a debugfs interface to dump PAT memtype x86: Add a arch directory for x86 under debugfs x86: i386: reduce boot fixmap space i386/xen: add proper unwind annotations to xen_sysenter_target x86: reduce force_mwait visibility x86: reduce forbid_dac's visibility x86: fix two modpost warnings x86: check function status in EDD boot code x86_64: ia32_signal.c: remove signal number conversion ... commit b7e6f62fe259187f2578d00960ef1b0e6ff6afd5 Merge: 8a39262... d41e26b... Author: Linus Torvalds Date: Mon Jul 21 10:30:10 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm crypt: add merge dm table: remove merge_bvec sector restriction dm: linear add merge dm: introduce merge_bvec_fn dm snapshot: use per device mempools dm snapshot: fix race during exception creation dm snapshot: track snapshot reads dm mpath: fix test for reinstate_path dm mpath: return parameter error dm io: remove struct padding dm log: make dm_dirty_log init and exit static dm mpath: free path selector on invalid args commit 8a392625b665c676a77c62f8608d10ff430bcb83 Merge: 519f014... 4b80991... Author: Linus Torvalds Date: Mon Jul 21 10:29:12 2008 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: (52 commits) md: Protect access to mddev->disks list using RCU md: only count actual openers as access which prevent a 'stop' md: linear: Make array_size sector-based and rename it to array_sectors. md: Make mddev->array_size sector-based. md: Make super_type->rdev_size_change() take sector-based sizes. md: Fix check for overlapping devices. md: Tidy up rdev_size_store a bit: md: Remove some unused macros. md: Turn rdev->sb_offset into a sector-based quantity. md: Make calc_dev_sboffset() return a sector count. md: Replace calc_dev_size() by calc_num_sectors(). md: Make update_size() take the number of sectors. md: Better control of when do_md_stop is allowed to stop the array. md: get_disk_info(): Don't convert between signed and unsigned and back. md: Simplify restart_array(). md: alloc_disk_sb(): Return proper error value. md: Simplify sb_equal(). md: Simplify uuid_equal(). md: sb_equal(): Fix misleading printk. md: Fix a typo in the comment to cmd_match(). ... commit 519f0141f1c42e2b8b59c7dea005cbf6095358e8 Merge: f8b71a3... 908cf4b... Author: Linus Torvalds Date: Mon Jul 21 10:27:31 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (48 commits) Input: add switch for dock events Input: add microphone insert switch definition Input: i8042 - add Arima-Rioworks HDAMB board to noloop list Input: sgi_btns - add support for SGI Indy volume buttons Input: add option to disable HP SDC driver Input: serio - trivial documentation fix Input: add new serio driver for Xilinx XPS PS2 IP Input: add driver for Tabletkiosk Sahara TouchIT-213 touchscreen Input: new driver for SGI O2 volume buttons Input: yealink - reliably kill urbs Input: q40kbd - make q40kbd_lock static Input: gtco - eliminate early return Input: i8042 - add Dritek quirk for Acer Aspire 5720 Input: usbtouchscreen - ignore eGalax screens supporting HID protocol Input: i8042 - add Medion NAM 2070 to noloop blacklist Input: i8042 - add Gericom Bellagio to nomux blacklist Input: i8042 - add Acer Aspire 1360 to nomux blacklist Input: hp_sdc_mlc.c - make a struct static Input: hil_mlc.c - make code static Input: wistron - generate normal key event if bluetooth or wifi not present ... commit 5547cd0ae8b46db9a084505239294eed9b8c8e2d Author: Patrick McHardy Date: Mon Jul 21 10:03:49 2008 -0700 netfilter: nf_conntrack_sctp: fix sparse warnings Introduced by a258860e (netfilter: ctnetlink: add full support for SCTP to ctnetlink): net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: incorrect type in argument 1 (different base types) net/netfilter/nf_conntrack_proto_sctp.c:483:2: expected unsigned int [unsigned] [usertype] x net/netfilter/nf_conntrack_proto_sctp.c:483:2: got restricted unsigned int const net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: incorrect type in argument 1 (different base types) net/netfilter/nf_conntrack_proto_sctp.c:487:2: expected unsigned int [unsigned] [usertype] x net/netfilter/nf_conntrack_proto_sctp.c:487:2: got restricted unsigned int const net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type net/netfilter/nf_conntrack_proto_sctp.c:532:42: warning: incorrect type in assignment (different base types) net/netfilter/nf_conntrack_proto_sctp.c:532:42: expected restricted unsigned int net/netfilter/nf_conntrack_proto_sctp.c:532:42: got unsigned int net/netfilter/nf_conntrack_proto_sctp.c:534:39: warning: incorrect type in assignment (different base types) net/netfilter/nf_conntrack_proto_sctp.c:534:39: expected restricted unsigned int net/netfilter/nf_conntrack_proto_sctp.c:534:39: got unsigned int Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c71529e42ce39c167dc53430cb8f3d5634af77df Author: Herbert Xu Date: Mon Jul 21 10:03:23 2008 -0700 netfilter: nf_nat_sip: c= is optional for session According to RFC2327, the connection information is optional in the session description since it can be specified in the media description instead. My provider does exactly that and does not provide any connection information in the session description. As a result the new kernel drops all invite responses. This patch makes it optional as documented. Signed-off-by: Herbert Xu Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit db1a75bdcc1766dc7e1fae9201ae287dcbcb6c66 Author: Jan Engelhardt Date: Mon Jul 21 10:02:59 2008 -0700 netfilter: xt_TCPMSS: collapse tcpmss_reverse_mtu{4,6} into one function Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 72961ecf84d67d6359a1b30f9b2a8427f13e1e71 Author: Eric Leblond Date: Mon Jul 21 10:02:35 2008 -0700 netfilter: nfnetlink_log: send complete hardware header This patch adds some fields to NFLOG to be able to send the complete hardware header with all necessary informations. It sends to userspace: * the type of hardware link * the lenght of hardware header * the hardware header Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 280763c053fee297d95b474f2c145990670371e6 Author: David Howells Date: Mon Jul 21 10:02:12 2008 -0700 netfilter: xt_time: fix time's time_mt()'s use of do_div() Fix netfilter xt_time's time_mt()'s use of do_div() on an s64 by using div_s64() instead. This was introduced by patch ee4411a1b1e0b679c99686629b5eab5a072ce49f ("[NETFILTER]: x_tables: add xt_time match"). Signed-off-by: David Howells Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 584015727a3b88b46602b20077b46cd04f8b4ab3 Author: Krzysztof Piotr Oledzki Date: Mon Jul 21 10:01:34 2008 -0700 netfilter: accounting rework: ct_extend + 64bit counters (v4) Initially netfilter has had 64bit counters for conntrack-based accounting, but it was changed in 2.6.14 to save memory. Unfortunately in-kernel 64bit counters are still required, for example for "connbytes" extension. However, 64bit counters waste a lot of memory and it was not possible to enable/disable it runtime. This patch: - reimplements accounting with respect to the extension infrastructure, - makes one global version of seq_print_acct() instead of two seq_print_counters(), - makes it possible to enable it at boot time (for CONFIG_SYSCTL/CONFIG_SYSFS=n), - makes it possible to enable/disable it at runtime by sysctl or sysfs, - extends counters from 32bit to 64bit, - renames ip_conntrack_counter -> nf_conn_counter, - enables accounting code unconditionally (no longer depends on CONFIG_NF_CT_ACCT), - set initial accounting enable state based on CONFIG_NF_CT_ACCT - removes buggy IPCT_COUNTER_FILLING event handling. If accounting is enabled newly created connections get additional acct extend. Old connections are not changed as it is not possible to add a ct_extend area to confirmed conntrack. Accounting is performed for all connections with acct extend regardless of a current state of "net.netfilter.nf_conntrack_acct". Signed-off-by: Krzysztof Piotr Oledzki Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 07a7c1070ed382ad4562e3a0d453fd2001d92f7b Author: Krzysztof Piotr Oledzki Date: Mon Jul 21 10:01:14 2008 -0700 netlink: add NLA_PUT_BE64 macro Add NLA_PUT_BE64 macro required for 64bit counters in netfilter Signed-off-by: Krzysztof Piotr Oledzki Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0dbff689c2f299e8f63911247925f2728d087688 Author: Changli Gao Date: Mon Jul 21 10:00:51 2008 -0700 netfilter: nf_nat_core: eliminate useless find_appropriate_src for IP_NAT_RANGE_PROTO_RANDOM Signed-off-by: Changli Gao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ae6134bdf3197206fba95563d755d2fa50d90ddd Author: Micah Dowty Date: Mon Jul 21 09:59:09 2008 -0700 hdlcdrv: Fix CRC calculation. This is a trivial patch against the hdlcdrv module that fixes its CRC calculation. The finished CRC was overwriting the first two bytes of each packet rather than being appended to the end. I've tested this with 2.6.8 and 2.6.10-rc1, but hdlcdrv hasn't changed much recently so it should work with many other kernel versions. Signed-off-by: Micah Dowty Acked-by: Thomas Sailer Signed-off-by: David S. Miller commit d3678b463df73f5060d7420915080e19baeb379b Author: David S. Miller Date: Mon Jul 21 09:56:13 2008 -0700 Revert "pkt_sched: Make default qdisc nonshared-multiqueue safe." This reverts commit a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d. After discussions with Jamal and Herbert on netdev, we should provide at least minimal prioritization at the qdisc level even in multiqueue situations. Signed-off-by: David S. Miller commit 867d79fb9a4d5929ad8335c896fcfe11c3b2ef14 Author: Linus Torvalds Date: Mon Jul 21 09:54:18 2008 -0700 net: In __netif_schedule() use WARN_ON instead of BUG_ON Signed-off-by: David S. Miller commit b6b2fed1f4802b8fcc9d7548a8f785225d38f9a3 Author: David S. Miller Date: Mon Jul 21 09:48:06 2008 -0700 net: Improve simple_tx_hash(). Based upon feedback from Eric Dumazet and Andi Kleen. Cure several deficiencies in simple_tx_hash() by using jhash + reciprocol multiply. 1) Eliminates expensive modulus operation. 2) Makes hash less attackable by using random seed. 3) Eliminates endianness hash distribution issues. Signed-off-by: David S. Miller commit f8b71a3a92d69cb1c9c2162f9235d3dd550e4aa0 Merge: 42a77a1... e4f2506... Author: Linus Torvalds Date: Mon Jul 21 09:40:26 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: (44 commits) sparc: Remove Sparc's asm-offsets for sclow.S sparc64: Update defconfig. sparc64: Add Niagara2 RNG driver. sparc64: Add missing hypervisor service group numbers. sparc64: Remove 4MB and 512K base page size options. sparc64: Convert to generic helpers for IPI function calls. sparc: Use new '%pS' infrastructure to print symbols. sparc32: fix init.c allnoconfig build error sparc64: Config category "Processor type and features" absent sparc: arch/sparc/kernel/apc.c to unlocked_ioctl sparc: join the remaining header files sparc: merge header files with trivial differences sparc: when header files are equal use asm-sparc version sparc: copy sparc64 specific files to asm-sparc sparc: Merge asm-sparc{,64}/asi.h sparc: export openprom.h to userspace sparc: Merge asm-sparc{,64}/types.h sparc: Merge asm-sparc{,64}/termios.h sparc: Merge asm-sparc{,64}/termbits.h sparc: Merge asm-sparc{,64}/setup.h ... commit 42a77a1b8fe4fd78cf8d8fccbaac918bbe888192 Author: Wang Chen Date: Mon Jul 21 17:48:59 2008 +0800 Fix istallion build failure Commits b02f5ad6a3ff5a1ee2a7b8ec6eee338de553b060 ("istallion: use tty_port") and a352def21a642133758b868c71bee12ab34ad5c5 ("tty: Ldisc revamp") broke the istallion driver. Fix the compile error and silence a warning. Signed-off-by: Wang Chen Signed-off-by: Linus Torvalds commit c3ee84163e5bc0dc2e1ccf1d3fc412debca73bab Author: Daniel Lezcano Date: Mon Jul 21 09:18:07 2008 -0700 pkt_sched: Remove unused variable skb in dev_deactivate_queue function. Removed unused variable 'skb' in the dev_deactivate_queue function Signed-off-by: Daniel Lezcano Signed-off-by: David S. Miller commit fd24c4af6e82231391fa09875ae6378fa1399f0f Author: David S. Miller Date: Mon Jul 21 08:34:49 2008 -0700 sunhme: Remove stop/wake TX queue calls in set-multicast-list handler. Based upon a bug report by Alexander Beregalov and commentary from Ben Hutchings. These are totally unnecessary, in particular because this driver's ->hard_start_xmit() handler takes the same driver spinlock that the set-multicast-list handler uses. Signed-off-by: David S. Miller commit ebbdbd7c02f4f8dea84e2956aa942bd18e1ddf93 Author: Anton Vorontsov Date: Mon Jul 21 08:30:36 2008 -0700 ucc_geth: do not touch net queue in adjust_link phylib callback If the net queue has not been started, we'll get this nice oops and non-working ethernet: ------------[ cut here ]------------ Kernel BUG at c01f4648 [verbose debug info unavailable] Oops: Exception in kernel mode, sig: 5 [#1] MPC836x RDK Modules linked in: NIP: c01f4648 LR: c01c0a10 CTR: c01c08e4 REGS: cf839e40 TRAP: 0700 Not tainted (2.6.26-05254-gc7b9969) MSR: 00021032 CR: 22042044 XER: 00000000 TASK = cf828c30[4] 'events/0' THREAD: cf838000 GPR00: c01c0a10 cf839ef0 cf828c30 c035ceb0 cf8469a0 00000064 00000000 00000000 GPR08: c035ceb0 00000001 00000001 cf99c280 22044044 7ca81020 0fffc000 00000000 GPR16: 0fff2544 0fff63c0 00000000 0fff78e0 0ffa5580 00000004 00000000 00000000 GPR24: 02082000 cf9d0000 d1068000 00009032 cf846800 cf846b80 00000001 00000014 NIP [c01f4648] __netif_schedule+0x28/0x8c LR [c01c0a10] adjust_link+0x12c/0x1e4 Call Trace: [cf839ef0] [c0380f50] 0xc0380f50 (unreliable) [cf839f10] [c01c0a10] adjust_link+0x12c/0x1e4 [cf839f40] [c01c2628] phy_state_machine+0x2e0/0x448 [cf839f60] [c00425e8] run_workqueue+0xc8/0x168 [cf839f90] [c0042c6c] worker_thread+0x70/0xd0 [cf839fd0] [c0046954] kthread+0x48/0x84 [cf839ff0] [c0012488] kernel_thread+0x44/0x60 Instruction dump: 7c0803a6 4e800020 3d20c036 9421ffe0 7c0802a6 7c681b78 3929ceb0 7c694a78 7d290034 90010024 bfa10014 5529d97e <0f090000> 39600002 38030024 7d200028 ---[ end trace a57d367843bd2904 ]--- Since the driver is using phylib (which is doing netif_carrier_on/off()), we should simply remove netif_tx_schedule_all() from adjust_link(). Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit afc079465e991ffb7fe197d1ad80eb8140e2c341 Author: Anton Vorontsov Date: Mon Jul 21 08:29:54 2008 -0700 gianfar: do not touch net queue in adjust_link phylib callback If the net queue has not been started, we'll get this nice oops and non-working ethernet: PHY: 0:01 - Link is Up - 1000/Full ------------[ cut here ]------------ kernel BUG at net/core/dev.c:1328! Oops: Exception in kernel mode, sig: 5 [#1] MPC837x RDB Modules linked in: NIP: c02544a0 LR: c01a17d0 CTR: c01a16ac REGS: cf837e40 TRAP: 0700 Not tainted (2.6.26-05253-g14b395e) MSR: 00021032 CR: 22042044 XER: 00000000 TASK = cf819400[5] 'events/0' THREAD: cf836000 GPR00: c01a17d0 cf837ef0 cf819400 c03d8d08 cf8469a0 00000064 00000000 00000000 GPR08: c03d8d08 00000001 00000001 cf899ba0 22044044 00000000 0fffd000 00000000 GPR16: 0fff3028 0fff6cf0 00000000 0fff8390 0ff494a0 00000004 00000000 00000000 GPR24: c0361a00 00001058 cf9f6600 00009032 cf846800 cf846b80 00000001 00000014 NIP [c02544a0] __netif_schedule+0x28/0x8c LR [c01a17d0] adjust_link+0x124/0x1cc Call Trace: [cf837ef0] [c03fb3a0] 0xc03fb3a0 (unreliable) [cf837f10] [c01a17d0] adjust_link+0x124/0x1cc [cf837f40] [c01a8e28] phy_state_machine+0x2e0/0x448 [cf837f60] [c0040254] run_workqueue+0xc8/0x168 [cf837f90] [c00408d8] worker_thread+0x70/0xd0 [cf837fd0] [c0044630] kthread+0x48/0x84 [cf837ff0] [c0012610] kernel_thread+0x44/0x60 Instruction dump: 7c0803a6 4e800020 3d20c03e 9421ffe0 7c0802a6 7c681b78 39298d08 7c694a78 7d290034 90010024 bfa10014 5529d97e <0f090000> 39600002 38030024 7d200028 ---[ end trace 13dfd73ee42d0c30 ]--- Since the driver is using phylib (which is doing netif_carrier_on/off()), we should simply remove netif_tx_schedule_all() from adjust_link(). Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 39d48157ac1a0ff3ec81212e5451bfd1bf5f50db Author: David S. Miller Date: Mon Jul 21 08:28:37 2008 -0700 atl1: Do not wake queue before queue has been started. Based upon a bug report by Alexey Dobriyan, the patch is also tested by him and confirmed to fix the problem. Packet flow during link state events should not be done by waking and stopping the TX queue anyways, that is handled transparently by netif_carrier_{on,off}(). So, remove the netif_{wake,stop}_queue() calls in the link check code, and add the necessary netif_start_queue() call to atl1_up(). Signed-off-by: David S. Miller commit eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 Merge: c4762ab... 14b395e... Author: Ingo Molnar Date: Mon Jul 21 17:19:50 2008 +0200 Merge branch 'linus' into cpus4096-for-linus Conflicts: net/sunrpc/svc.c Signed-off-by: Ingo Molnar commit 2e2dcc7631e331cf2e8396ce452e7f01e35f1182 Merge: acee709... 1c29dd9... Author: Ingo Molnar Date: Mon Jul 21 16:45:56 2008 +0200 Merge branch 'x86/paravirt-spinlocks' into x86/for-linus commit acee709cab689ec7703770e8b8cb5cc3a4abcb31 Merge: 33a37eb... 5ff4789... 35b6805... c4dc59a... 7edf889... 9781f39... 48fe4a7... be54f9d... 77e4424... caadbdc... 5e5a29b... e3a61b0... fec0962... fab3b58... f2ba939... 48ae744... 3cabf37... 7019cc2... 2ddf9b7... e66d90f... Author: Ingo Molnar Date: Mon Jul 21 16:37:17 2008 +0200 Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus commit e66d90fb4abd0a27ee96f57a32fb561221c4d6ae Merge: 55ca089... 14b395e... Author: Ingo Molnar Date: Mon Jul 21 15:06:09 2008 +0200 Merge branch 'linus' into xen-64bit commit 1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526 Merge: 3217256... 14b395e... Author: Ingo Molnar Date: Mon Jul 21 15:05:58 2008 +0200 Merge branch 'linus' into x86/paravirt-spinlocks commit 7edf8891ad7aef5f4e97991fed6fb0e605e96ea0 Author: Yinghai Lu Date: Mon Jul 21 01:39:03 2008 -0700 x86: remove extra calling to get ext cpuid level Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 9175fc06aee79c349790672178d3fd7507d75c86 Author: Yinghai Lu Date: Mon Jul 21 01:38:14 2008 -0700 x86: use setup_clear_cpu_cap() when disabling the lapic ... so don't need to call clear_cpu_cap again in early_identify_cpu, and could use cleared_cpu_caps like other places. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit d41e26b901111f4e540aa2c27ec7a1681c782be9 Author: Milan Broz Date: Mon Jul 21 12:00:40 2008 +0100 dm crypt: add merge This patch implements biovec merge function for crypt target. If the underlying device has merge function defined, call it. If not, keep precomputed value. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 9980c638a666ecd88acaf0a7ab91043d4a3f44d1 Author: Milan Broz Date: Mon Jul 21 12:00:39 2008 +0100 dm table: remove merge_bvec sector restriction Remove max_sector restriction - merge function replaced it. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 7bc3447b692185c5ea78bee93d0ef1dee2fd7ce7 Author: Milan Broz Date: Mon Jul 21 12:00:38 2008 +0100 dm: linear add merge This patch implements biovec merge function for linear target. If the underlying device has merge function defined, call it. If not, keep precomputed value. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit f6fccb1213ba3d661baeb2a5eee0a9701dc03e1b Author: Milan Broz Date: Mon Jul 21 12:00:37 2008 +0100 dm: introduce merge_bvec_fn Introduce a bvec merge function for device mapper devices for dynamic size restrictions. This code ensures the requested biovec lies within a single target and then calls a target-specific function to check against any constraints imposed by underlying devices. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 92e868122edf08b9fc06b112e7e0c80ab94c1f93 Author: Mikulas Patocka Date: Mon Jul 21 12:00:35 2008 +0100 dm snapshot: use per device mempools Change snapshot per-module mempool to per-device mempool. Per-module mempools could cause a deadlock if multiple snapshot devices are stacked above each other. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit a8d41b59f3f5a7ac19452ef442a7fc1b5fa17366 Author: Mikulas Patocka Date: Mon Jul 21 12:00:34 2008 +0100 dm snapshot: fix race during exception creation Fix a race condition that returns incorrect data when a write causes an exception to be allocated whilst a read is still in flight. The race condition happens as follows: * A read to non-reallocated sector in the snapshot is submitted so that the read is routed to the original device. * A write to the original device is submitted. The write causes an exception that reallocates the block. The write proceeds. * The original read is dequeued and reads the wrong data. This race can be triggered with CFQ scheduler and one thread writing and multiple threads reading simultaneously. (This patch relies upon the earlier dm-kcopyd-per-device.patch to avoid a deadlock.) Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit cd45daffd1f7b53aac0835b23e97f814ec3f10dc Author: Mikulas Patocka Date: Mon Jul 21 12:00:32 2008 +0100 dm snapshot: track snapshot reads Whenever a snapshot read gets mapped through to the origin, track it in a per-snapshot hash table indexed by chunk number, using memory allocated from a new per-snapshot mempool. We need to track these reads to avoid race conditions which will be fixed by patches that follow. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit def052d21c4e77975bb75cf212f018ec913f8e2f Author: Alasdair G Kergon Date: Mon Jul 21 12:00:31 2008 +0100 dm mpath: fix test for reinstate_path Fix test for reinstate_path method before attempting to use it. Signed-off-by: Alasdair G Kergon Cc: Julia Lawall commit 148acff615b403168cdf39e55bfcfaa6e4a7d233 Author: Mikulas Patocka Date: Mon Jul 21 12:00:30 2008 +0100 dm mpath: return parameter error Return a specific error message if there are an invalid number of multipath arguments. This invalid command returns an "Unknown error" because the ti->error field is not set dmsetup create --table '0 2 multipath 0 0 1 1 round-robin 0 1 1 /dev/sdh' mpath0 Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 6ae2fa6718c398290be29ef740873640d25058b6 Author: Richard Kennedy Date: Mon Jul 21 12:00:28 2008 +0100 dm io: remove struct padding Rearrange struct dm_io. Shrinks size from 40 -> 32 allowing more objects/slab. Signed-off-by: Richard Kennedy Signed-off-by: Alasdair G Kergon commit c8da2f8dd86d70559ec4e50251f6a755b42bd5b4 Author: Adrian Bunk Date: Mon Jul 21 12:00:27 2008 +0100 dm log: make dm_dirty_log init and exit static dm_dirty_log_{init,exit}() can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Alasdair G Kergon commit 371b2e348b7731a548b0a7432ca2ba32e90dd16f Author: Mikulas Patocka Date: Mon Jul 21 12:00:24 2008 +0100 dm mpath: free path selector on invalid args Free path selector if the arguments are invalid. This command (note that it is invalid) causes reference leak on module "dm_round_robin" and prevents the module from being removed. dmsetup create --table '0 2 multipath 0 0 1 1 round-robin /dev/sdh' mpath0 Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 33a37eb411d193851c334060780ab834ba534292 Author: Ingo Molnar Date: Mon Jul 21 10:57:15 2008 +0200 KVM: fix exception entry / build bug, on 64-bit -tip testing found this build bug: arch/x86/kvm/built-in.o:(.text.fixup+0x1): relocation truncated to fit: R_X86_64_32 against `.text' arch/x86/kvm/built-in.o:(.text.fixup+0xb): relocation truncated to fit: R_X86_64_32 against `.text' arch/x86/kvm/built-in.o:(.text.fixup+0x15): relocation truncated to fit: R_X86_64_32 against `.text' arch/x86/kvm/built-in.o:(.text.fixup+0x1f): relocation truncated to fit: R_X86_64_32 against `.text' arch/x86/kvm/built-in.o:(.text.fixup+0x29): relocation truncated to fit: R_X86_64_32 against `.text' Introduced by commit 4ecac3fd. The problem is that 'push' will default to 32-bit, which is not wide enough as a fixup address. (and which would crash on any real fixup event even if it was wide enough) Introduce KVM_EX_PUSH to get the proper address push width on 64-bit too. Signed-off-by: Ingo Molnar commit e27772b48df91a954a74b1411b57d83b945a58c7 Merge: d092633... 14b395e... Author: Ingo Molnar Date: Mon Jul 21 11:02:45 2008 +0200 Merge branch 'linus' into x86/urgent commit 4b80991c6cb9efa607bc4fd6f3ecdf5511c31bb0 Author: NeilBrown Date: Mon Jul 21 17:05:25 2008 +1000 md: Protect access to mddev->disks list using RCU All modifications and most access to the mddev->disks list are made under the reconfig_mutex lock. However there are three places where the list is walked without any locking. If a reconfig happens at this time, havoc (and oops) can ensue. So use RCU to protect these accesses: - wrap them in rcu_read_{,un}lock() - use list_for_each_entry_rcu - add to the list with list_add_rcu - delete from the list with list_del_rcu - delay the 'free' with call_rcu rather than schedule_work Note that export_rdev did a list_del_init on this list. In almost all cases the entry was not in the list anymore so it was a no-op and so safe. It is no longer safe as after list_del_rcu we may not touch the list_head. An audit shows that export_rdev is called: - after unbind_rdev_from_array, in which case the delete has already been done, - after bind_rdev_to_array fails, in which case the delete isn't needed. - before the device has been put on a list at all (e.g. in add_new_disk where reading the superblock fails). - and in autorun devices after a failure when the device is on a different list. So remove the list_del_init call from export_rdev, and add it back immediately before the called to export_rdev for that last case. Note also that ->same_set is sometimes used for lists other than mddev->list (e.g. candidates). In these cases rcu is not needed. Signed-off-by: NeilBrown commit f2ea68cf42aafdd93393b6b8b20fc3c2b5f4390c Author: NeilBrown Date: Mon Jul 21 17:05:25 2008 +1000 md: only count actual openers as access which prevent a 'stop' Open isn't the only thing that increments ->active. e.g. reading /proc/mdstat will increment it briefly. So to avoid false positives in testing for concurrent access, introduce a new counter that counts just the number of times the md device it open. Signed-off-by: NeilBrown commit d6e2215052810678bc9782fd980b52706fc71f50 Author: Andre Noll Date: Mon Jul 21 17:05:25 2008 +1000 md: linear: Make array_size sector-based and rename it to array_sectors. Signed-off-by: Andre Noll Signed-off-by: NeilBrown commit f233ea5c9e0d8b95e4283bf6a3436b88f6fd3586 Author: Andre Noll Date: Mon Jul 21 17:05:22 2008 +1000 md: Make mddev->array_size sector-based. This patch renames the array_size field of struct mddev_s to array_sectors and converts all instances to use units of 512 byte sectors instead of 1k blocks. Signed-off-by: Andre Noll Signed-off-by: NeilBrown commit 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 Merge: 92c4989... 14b395e... Author: Dmitry Torokhov Date: Mon Jul 21 00:55:14 2008 -0400 Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next commit 15f4a5fdf3aa07b53f6a7969664741db5882e485 Author: Andre Noll Date: Mon Jul 21 14:42:12 2008 +1000 md: Make super_type->rdev_size_change() take sector-based sizes. Also, change the type of the size parameter from unsigned long long to sector_t and rename it to num_sectors. Signed-off-by: Andre Noll Signed-off-by: NeilBrown commit d07bd3bcc456228b56a790897162a634691fed9b Author: Andre Noll Date: Mon Jul 21 14:42:07 2008 +1000 md: Fix check for overlapping devices. The checks in overlaps() expect all parameters either in block-based or sector-based quantities. However, its single caller passes two rdev->data_offset arguments as well as two rdev->size arguments, the former being sector counts while the latter are measured in 1K blocks. This could cause rdev_size_store() to accept an invalid size from user space. Fix it by passing only sector-based quantities to overlaps(). Signed-off-by: Andre Noll Signed-off-by: NeilBrown commit d7027458d68b2f1752a28016dcf2ffd0a7e8f567 Author: Neil Brown Date: Sat Jul 12 10:37:50 2008 +1000 md: Tidy up rdev_size_store a bit: - used strict_strtoull in place of simple_strtoull - use my_mddev in place of rdev->mddev (they have the same value) and more significantly, - don't adjust mddev->size to fit, rather reject changes which make rdev->size smaller than mddev->size Adjusting mddev->size is a hangover from bind_rdev_to_array which does a similar thing. But it really is a better design to insist that mddev->size is set as required, then the rdev->sizes are set to allow for that. The previous way invites confusion. Signed-off-by: NeilBrown commit 14b395e35d1afdd8019d11b92e28041fad591b71 Merge: 734b397... 5108b27... Author: Linus Torvalds Date: Sun Jul 20 21:21:46 2008 -0700 Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux * 'for-2.6.27' of git://linux-nfs.org/~bfields/linux: (51 commits) nfsd: nfs4xdr.c do-while is not a compound statement nfsd: Use C99 initializers in fs/nfsd/nfs4xdr.c lockd: Pass "struct sockaddr *" to new failover-by-IP function lockd: get host reference in nlmsvc_create_block() instead of callers lockd: minor svclock.c style fixes lockd: eliminate duplicate nlmsvc_lookup_host call from nlmsvc_lock lockd: eliminate duplicate nlmsvc_lookup_host call from nlmsvc_testlock lockd: nlm_release_host() checks for NULL, caller needn't file lock: reorder struct file_lock to save space on 64 bit builds nfsd: take file and mnt write in nfs4_upgrade_open nfsd: document open share bit tracking nfsd: tabulate nfs4 xdr encoding functions nfsd: dprint operation names svcrdma: Change WR context get/put to use the kmem cache svcrdma: Create a kmem cache for the WR contexts svcrdma: Add flush_scheduled_work to module exit function svcrdma: Limit ORD based on client's advertised IRD svcrdma: Remove unused wait q from svcrdma_xprt structure svcrdma: Remove unneeded spin locks from __svc_rdma_free svcrdma: Add dma map count and WARN_ON ... commit 734b397cd14f3340394a8dd3266bec97d01f034b Merge: 702beb8... e6b5163... Author: Linus Torvalds Date: Sun Jul 20 21:19:17 2008 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: gpu: re-order GPU subdirectory vs char for AGP vs DRM startup. commit 702beb87d6b4e08cca394b210679e5d7c2ac9383 Author: David Miller Date: Sun Jul 20 18:17:02 2008 -0700 ipv6: Fix warning in addrconf code. Reported by Linus. Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds commit d1671a9c15f55a1475d41269494518e348880c33 Merge: ae0645a... 3a682fb... Author: Linus Torvalds Date: Sun Jul 20 21:17:20 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: pkt_sched: Fix build with NET_SCHED disabled. commit ae0645a451b02ad35c520b01177b70ebd59c91ab Merge: f894d18... 99cdb0c... Author: Linus Torvalds Date: Sun Jul 20 21:16:27 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: let asic3 use mem resource instead of bus_shift mfd: remove DS1WM register definitions from asic3.h mfd: add ASIC3_CONFIG_GPIO templates mfd: fix the asic3 irq demux code mfd: asic3 should depend on gpiolib mfd: fix asic3 config array initialisation mfd: move asic3 probe functions into __init section mfd: Use uppercase only for asic3 macros and defines mfd: use dev_* macros for asic3 debugging mfd: New asic3 gpio configuration code mfd: asic3 children platform data removal mfd: asic3 gpiolib support commit f894d18380e7e7ff05f6622ccb75d2881922c6e9 Merge: d13ff05... d20b274... Author: Linus Torvalds Date: Sun Jul 20 21:14:42 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (277 commits) V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms. V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on" V4L/DVB (8390): videodev: add comment and remove magic number. V4L/DVB (8389): videodev: simplify get_index() V4L/DVB (8387): Some cosmetic changes V4L/DVB (8381): ov7670: fix compile warnings V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name. V4L/DVB (8379): saa7127: Make device detection optional V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver. ... commit d13ff0559fea73f237a01669887d2c10e11d7662 Merge: f076ab8... cb7f39d... Author: Linus Torvalds Date: Sun Jul 20 21:14:00 2008 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (21 commits) [MIPS] Remove unused maltasmp.h. [MIPS] Remove unused saa9730_uart.h. [MIPS] Rename MIPS sys_pipe syscall entry point to something MIPS-specific. [MIPS] 32-bit compat: Delete unused sys_truncate64 and sys_ftruncate64. [MIPS] TXx9: Fix some sparse warnings [MIPS] TXx9: Add 64-bit support [MIPS] TXx9: Cleanups for 64-bit support [MIPS] Cobalt: Fix I/O port resource range [MIPS] don't leak setup_early_printk() in userspace header [MIPS] Remove include/asm-mips/mips-boards/sead{,int}.h [MIPS] Remove asm-mips/mips-boards/atlas{,int}.h [MIPS] mips/sgi-ip22/ip28-berr.c: fix the build [MIPS] TXx9: Miscellaneous build fixes [MIPS] Routerboard 532: Support for base system [MIPS] IP32: Use common SGI button driver [MIPS] IP22: Use common SGI button driver [MIPS] IP22, IP28: Fix merge bug [MIPS] Tinker with constraints in to fix build error. [MIPS] Add missing prototypes to asm/page.h [MIPS] Fix missing prototypes in asm/fpu.h ... commit f076ab8d048f152b968bb1c6313fed88abb037fe Merge: db6d8c7... 597a5f5... Author: Linus Torvalds Date: Sun Jul 20 21:13:26 2008 -0700 Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (70 commits) KVM: Adjust smp_call_function_mask() callers to new requirements KVM: MMU: Fix potential race setting upper shadow ptes on nonpae hosts KVM: x86 emulator: emulate clflush KVM: MMU: improve invalid shadow root page handling KVM: MMU: nuke shadowed pgtable pages and ptes on memslot destruction KVM: Prefix some x86 low level function with kvm_, to avoid namespace issues KVM: check injected pic irq within valid pic irqs KVM: x86 emulator: Fix HLT instruction KVM: Apply the kernel sigmask to vcpus blocked due to being uninitialized KVM: VMX: Add ept_sync_context in flush_tlb KVM: mmu_shrink: kvm_mmu_zap_page requires slots_lock to be held x86: KVM guest: make kvm_smp_prepare_boot_cpu() static KVM: SVM: fix suspend/resume support KVM: s390: rename private structures KVM: s390: Set guest storage limit and offset to sane values KVM: Fix memory leak on guest exit KVM: s390: dont allocate dirty bitmap KVM: move slots_lock acquision down to vapic_exit KVM: VMX: Fake emulate Intel perfctr MSRs KVM: VMX: Fix a wrong usage of vmcs_config ... commit 3a682fbd732d3d27bec722a923952b0938e8a404 Author: David S. Miller Date: Sun Jul 20 18:13:01 2008 -0700 pkt_sched: Fix build with NET_SCHED disabled. The stab bits can't be referenced uniless the full packet scheduler layer is enabled. Reported by Stephen Rothwell. Signed-off-by: David S. Miller commit db6d8c7a4027b48d797b369a53f8470aaeed7063 Merge: 3a53337... fb65a7c... Author: Linus Torvalds Date: Sun Jul 20 17:43:29 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: (1232 commits) iucv: Fix bad merging. net_sched: Add size table for qdiscs net_sched: Add accessor function for packet length for qdiscs net_sched: Add qdisc_enqueue wrapper highmem: Export totalhigh_pages. ipv6 mcast: Omit redundant address family checks in ip6_mc_source(). net: Use standard structures for generic socket address structures. ipv6 netns: Make several "global" sysctl variables namespace aware. netns: Use net_eq() to compare net-namespaces for optimization. ipv6: remove unused macros from net/ipv6.h ipv6: remove unused parameter from ip6_ra_control tcp: fix kernel panic with listening_get_next tcp: Remove redundant checks when setting eff_sacks tcp: options clean up tcp: Fix MD5 signatures for non-linear skbs sctp: Update sctp global memory limit allocations. sctp: remove unnecessary byteshifting, calculate directly in big-endian sctp: Allow only 1 listening socket with SO_REUSEADDR sctp: Do not leak memory on multiple listen() calls sctp: Support ipv6only AF_INET6 sockets. ... commit 3a533374283aea50eab3976d8a6d30532175f009 Merge: fb6624e... d17ffb4... Author: Linus Torvalds Date: Sun Jul 20 17:37:46 2008 -0700 Merge branch 'for-linus' of git://www.jni.nu/cris * 'for-linus' of git://www.jni.nu/cris: [CRISv10] Clean up compressed/misc.c [CRISv10] Correct whitespace damage. [CRIS] Correct definition of subdirs for install_headers. [CRIS] Correct image makefiles to allow using a separate OBJ-directory. [CRIS] Build fixes for compressed and rescue images for v10 and v32: It looks at least odd to apply spin_unlock to a mutex. cris: compile fixes for 2.6.26-rc5 commit fb6624ebd912e3d6907ca6490248e73368223da9 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:36 2008 +0200 initrd: Fix virtual/physical mix-up in overwrite test On recent kernels, I get the following error when using an initrd: | initrd overwritten (0x00b78000 < 0x07668000) - disabling it. My Amiga 4000 has 12 MiB of RAM at physical address 0x07400000 (virtual 0x00000000). The initrd is located at the end of RAM: 0x00b78000 - 0x00c00000 (virtual). The overwrite test compares the (virtual) initrd location to the (physical) first available memory location, which fails. This patch converts initrd_start to a page frame number, so it can safely be compared with min_low_pfn. Before the introduction of discontiguous memory support on m68k (12d810c1b8c2b913d48e629e2b5c01d105029839), min_low_pfn was just left untouched by the m68k-specific code (zero, I guess), and everything worked fine. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 18c993629a5a5938a032f04a698d15122550593d Author: Akinobu Mita Date: Thu Jul 17 21:16:35 2008 +0200 dio: use dio_match_device() in dio_bus_match() dio_bus_match() can use dio_match_device(). Signed-off-by: Akinobu Mita Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 93026e217b46b70f9719caf69e716fa3bbe1d20c Author: Julia Lawall Date: Thu Jul 17 21:16:34 2008 +0200 arch/m68k/mm/sun3mmu.c: Eliminate NULL test and memset after alloc_bootmem As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E - memset(E,0,E1); // Signed-off-by: Julia Lawall Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 7b6b948fc0d60a704c15b1cd72345a98e759dd62 Author: Julia Lawall Date: Thu Jul 17 21:16:33 2008 +0200 arch/m68k/mm/motorola.c: Eliminate NULL test and memset after alloc_bootmem As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E - memset(E,0,E1); // Signed-off-by: Julia Lawall Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 3fadd06ebcbff9b0a7c90f68d81250f39bf31db1 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:32 2008 +0200 m68k/Apollo: remove the unused APOLLO_ELPLUS option Looking at older kernel sources the APOLLO_ELPLUS option was added somewhere during kernel 2.1, but even kernel 2.2.0 does not contain any driver that would be enabled through it... Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 7ccaee5cadd7a771773bbb878e139697511ebdde Author: Adrian Bunk Date: Thu Jul 17 21:16:31 2008 +0200 m68k/Atari: remove the dead ATARI_SCC{,_DMA} options It seems the driver was removed back in kernel 2.3 but the options were forgotten. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 62bc654e794feb5242c31a59dcc36bab64f7d917 Author: Adrian Bunk Date: Thu Jul 17 21:16:30 2008 +0200 m68k/Mac: remove the unused ADB_KEYBOARD option When the driver was removed back in 2002 the option was forgotten. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 635c0a217425f6f37422b85bcc88a7af9efc457c Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:29 2008 +0200 m68k/apollo: Add missing call to apollo_parse_bootinfo() Add the missing call to apollo_parse_bootinfo(), which had been lost from a big Apollo support patch by Peter De Schrijver in 1999. Thanks to Adrian Bunk for noticing! Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a594409a2160070b2185e77b33232cf73a9151a5 Author: Adrian Bunk Date: Thu Jul 17 21:16:28 2008 +0200 m68k: remove stale ARCH_SUN4 #define m68k: remove stale ARCH_SUN4 #define Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 07b8125949de66b6552966de8d4280c3a8620359 Author: Adrian Bunk Date: Thu Jul 17 21:16:27 2008 +0200 m68k/sun3/: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global code static: - config.c: sun3_bootmem_alloc() - config.c: sun3_sched_init() - dvma.c: dvma_page() - idprom.c: struct Sun_Machines[] - mmu_emu.c: struct ctx_alloc[] - sun3dvma.c: iommu_use[] - sun3ints.c: led_pattern[] - remove the unused sbus.c Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 22deb527ce5d13e07652f81a53032aa0214ea8c3 Author: Adrian Bunk Date: Thu Jul 17 21:16:26 2008 +0200 m68k/q40/config.c: make functions static This patch makes the following needlessly global functions static: - q40_reset() - q40_halt() - q40_disable_irqs() - q40_gettimeoffset() - q40_hwclk() - q40_get_ss() - q40_set_clock_mmss() Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8dfbdf4abad6e5a7bbd097bf7e2c0ec41e0c54b4 Author: Adrian Bunk Date: Thu Jul 17 21:16:25 2008 +0200 m68k/mac/: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global code (always) static: - baboon.c: struct baboon - baboon.c: baboon_irq() - config.c: mac_orig_videoaddr - config.c: mac_identify() - config.c: mac_report_hardware() - config.c: mac_debug_console_write() - config.c: mac_sccb_console_write() - config.c: mac_scca_console_write() - config.c: mac_init_scc_port() - oss.c: oss_irq() - oss.c: oss_nubus_irq() - psc.c: psc_debug_dump() - psc.c: psc_dma_die_die_die() - via.c: rbv_clear - remove the unused bootparse.c - #if 0 the following unused functions: - config.c: mac_debugging_short() - config.c: mac_debugging_long() - remove the following unused code: - config.c: mac_bisize - config.c: mac_env - config.c: mac_SCC_init_done - config.c: mac_SCC_reset_done - config.c: mac_init_scca_port() - config.c: mac_init_sccb_port() Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 5575d0a3c9676b2886adad67dd4b2ac126a49f1f Author: Adrian Bunk Date: Thu Jul 17 21:16:24 2008 +0200 m68k/atari/debug.c: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global functions (always) static: - atari_mfp_console_write() - atari_scc_console_write() - atari_midi_console_write() - atari_init_mfp_port() - atari_init_scc_port() - atari_init_midi_port() - #if 0 the following unused functions: - atari_mfp_console_wait_key() - atari_scc_console_wait_key() - atari_midi_console_wait_key() - remove the following unused variables: - atari_MFP_init_done - atari_SCC_init_done Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 0795dbcc4c4c93a929463957993c04cf5fec346c Author: Adrian Bunk Date: Thu Jul 17 21:16:23 2008 +0200 m68k/amiga/: possible cleanups This patch contains the following possible cleanups: - amiints.c: add a proper prototype for amiga_init_IRQ() in include/asm-m68k/amigaints.h - make the following needlessly global code static: - config.c: amiga_model - config.c: amiga_psfreq - config.c: amiga_serial_console_write() - #if 0 the following unused functions: - config.c: amiga_serial_puts() - config.c: amiga_serial_console_wait_key() - config.c: amiga_serial_gets() - remove the following unused variable: - config.c: amiga_masterclock Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 880e5e212ec5ab12411e40c78bd5ac501e9caeed Author: Adrian Bunk Date: Thu Jul 17 21:16:22 2008 +0200 export c2p This patch fixes the following build error: <-- snip --> .. Building modules, stage 2. MODPOST 1203 modules ERROR: "c2p" [drivers/video/amifb.ko] undefined! .. make[2]: *** [__modpost] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8468afc039f03837066132be14cdd9e5fa726f0b Author: Adrian Bunk Date: Thu Jul 17 21:16:21 2008 +0200 export amiga_vblank This patch fixes the following build error: <-- snip --> .. Building modules, stage 2. MODPOST 1203 modules ERROR: "amiga_vblank" [drivers/video/amifb.ko] undefined! .. make[2]: *** [__modpost] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8b54b6135a3e6d6e7c7967de7b408fd89afb0333 Author: Adrian Bunk Date: Thu Jul 17 21:16:20 2008 +0200 drivers/video/c2p.c: add MODULE_LICENSE This patch adds the missing MODULE_LICENSE("GPL"). Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit da8513c9b84317d1a2071644b6ccf734463d4849 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:19 2008 +0200 atafb: Register Atari-specific video modes with sysfs Register the Atari-specific video modes with sysfs, so you can see them in /sys/class/graphics/fb0/modes and change the video mode by writing to /sys/class/graphics/fb0/mode. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit db3e5289f51b5d02767fa2951d5f0375efdba35c Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:18 2008 +0200 amifb: Register Amiga-specific video modes with sysfs Register the Amiga-specific video modes with sysfs, so you can see them in /sys/class/graphics/fb0/modes and change the video mode by writing to /sys/class/graphics/fb0/mode. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit fa7f28939634c2ea36817a0c3dbd8d84972c1488 Author: akinobu.mita@gmail.com Date: Thu Jul 17 21:16:17 2008 +0200 zorro: use memory_read_from_buffer zorro: use memory_read_from_buffer Signed-off-by: Akinobu Mita Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a6a26a3e652671a783563f1e9697c68bd19c40fc Author: Robert P. J. Day Date: Thu Jul 17 21:16:16 2008 +0200 ZORRO: Replace deprecated __initcall with equivalent device_initcall. ZORRO: Replace deprecated __initcall with equivalent device_initcall. Signed-off-by: Robert P. J. Day Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit d33b4432e634246eef00ef4d425939c253f70dd6 Author: Adrian Bunk Date: Thu Jul 17 21:16:15 2008 +0200 m68k: remove AP1000 code Unless I miss something that's code for a sparc machine even the sparc code no longer supports that got copied to m68k when these files were copied. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit b739912efc02f80cc4dc5eaef07e5bc7eafee1b0 Author: Adrian Bunk Date: Thu Jul 17 21:16:14 2008 +0200 m68k: make multi_defconfig the default defconfig It seems to match the intention behind multi_defconfig to make it the default defconfig. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a0c14d28df8fcf939a8efd9332ace164e9f931fb Author: Mathieu Desnoyers Date: Thu Jul 17 21:16:13 2008 +0200 Stringify support commas > This is a no-no for those archs that still use -traditional. > > I dunno if this is a problem for you at the moment and the > > right fix is anyway to nuke -traditional. > > > > Sam Signed-off-by: Mathieu Desnoyers Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit edfd92f67eec1bdd905dd7841416eaf945a5b92f Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:12 2008 +0200 m68k: Allow no CPU/platform type for allnoconfig Allow no CPU/platform type for allnoconfig - Provide a dummy value for FPSTATESIZE if no CPU type was selected - Provide a dummy value for NR_IRQS if no platform type was selected - Warn the user if no CPU or platform type was selected Note: you still cannot build an allnoconfig kernel, as CONFIG_SWAP=n doesn't build and we cannot easily fix that (http://groups.google.com/group/linux.kernel/browse_thread/thread/d430c78b07e1827b) Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 97d26e73d729c8d967bc5eb9086321956c444dd4 Author: Cyrill Gorcunov Date: Thu Jul 17 21:16:11 2008 +0200 m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro This patch includes page.h header into linker script that allow us to use PAGE_SIZE macro instead of numeric constant Signed-off-by: Cyrill Gorcunov Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit e945b568e28b42de893ef24989372f0219501d32 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:10 2008 +0200 m68k: Return -ENODEV if no device is found According to the tests in do_initcalls(), the proper error code in case no device is found is -ENODEV, not -ENXIO or -EIO. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 038eddd9acf34e8202b31af3ee9eb48179114323 Author: Paulius Zaleckas Date: Thu Jul 17 21:16:09 2008 +0200 ariadne: use netstats in net_device structure Use net_device_stats from net_device structure instead of local. Signed-off-by: Paulius Zaleckas Signed-off-by: Geert Uytterhoeven Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit f30828a6745281edda735f642b5f814e1123ecd3 Author: Adrian Bunk Date: Thu Jul 17 21:16:08 2008 +0200 m68k: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit f7df406dce01dfd30d7e0c570a928bcfeff03142 Merge: 5e248ac... a6795e9... Author: Linus Torvalds Date: Sun Jul 20 17:17:52 2008 -0700 Merge branch 'configfs-fixup-ptr-error' of git://oss.oracle.com/git/jlbec/linux-2.6 * 'configfs-fixup-ptr-error' of git://oss.oracle.com/git/jlbec/linux-2.6: configfs: Allow ->make_item() and ->make_group() to return detailed errors. Revert "configfs: Allow ->make_item() and ->make_group() to return detailed errors." commit 5e248ac9a5c465b356b936030d5a2e80887eb266 Author: Thomas Gleixner Date: Fri Jul 18 02:07:02 2008 +0200 APCI: revert another duplicated patch commit d1857056904d5f313f11184fcfa624652ff9620a ("ACPI: don't walk tables if ACPI was disabled") is another superfluous duplicate commit caused by git -> quilt -> git conversion. Revert it. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 392798a17b6afba5928bc577aeb7bc83a1585534 Author: Thomas Gleixner Date: Fri Jul 18 01:11:38 2008 +0200 APCI: revert duplicated patch commit 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 ("dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.") was merged between 2.6.26-rc8 and -rc9) Due to rebasing the ACPI tree via quilt the same patch got applied again via commit cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca ("dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.") Revert it, as it is obviously bogus. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 4e4f64da58bc71a139722bb5013adda0f7ca4e78 Author: Alan Cox Date: Wed Jul 16 21:57:28 2008 +0100 Fix strip driver back up for ldisc/tty changes Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 44b7d1b37f786c61d0e382b6f72f605f73de284b Author: Alan Cox Date: Wed Jul 16 21:57:18 2008 +0100 tty: add more tty_port fields Move more bits into the tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 593573bc55c9e1999b9679da4e477c0220a6fbbd Author: Alan Cox Date: Wed Jul 16 21:57:10 2008 +0100 termios: Termios defines for other platforms Fix up the termios of the people who have not yet got with the program Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 77451e53e0a509a98eda272567869cfe96431ba9 Author: Alan Cox Date: Wed Jul 16 21:57:02 2008 +0100 cyclades: use tty_port Switch cyclades to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit ae67751785dae388beb31fc24d14870d0d4669d9 Author: Alan Cox Date: Wed Jul 16 21:56:54 2008 +0100 tty: Clean up tiocmset Reverse the order of one test and it gets much more readable Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8fb06c771399b8d51d724756411108e9abe2a85a Author: Alan Cox Date: Wed Jul 16 21:56:46 2008 +0100 synclink: use tty_port Switch the synclink ports to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f8ae47641611fcdf175ab8bbe89054731b16971d Author: Alan Cox Date: Wed Jul 16 21:56:37 2008 +0100 stallion: use tty_port Switch the stallion driver to use the tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b1d1619b4a53072f19e41b1def71fd223fc5d780 Author: Haavard Skinnemoen Date: Wed Jul 16 21:56:29 2008 +0100 atmel_serial: Fix tty_port breakage The tty pointer has been moved into a tty_port field, so we need to use ->info->port.tty instead of just ->info->tty. Fixes these build errors: David Brownell wrote: > drivers/serial/atmel_serial.c: In function 'atmel_rx_from_ring': > drivers/serial/atmel_serial.c:665: error: 'struct uart_info' has no member named 'tty' > drivers/serial/atmel_serial.c: In function 'atmel_rx_from_dma': > drivers/serial/atmel_serial.c:672: error: 'struct uart_info' has no member named 'tty' > drivers/serial/atmel_serial.c: In function 'atmel_startup': > drivers/serial/atmel_serial.c:797: error: 'struct uart_info' has no member named 'tty' > make[2]: *** [drivers/serial/atmel_serial.o] Error 1 Signed-off-by: Haavard Skinnemoen Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e60a10844879794c7b592acf123cbf9ea0e2c0e7 Author: Alan Cox Date: Wed Jul 16 21:56:18 2008 +0100 rocket: use tty_port Switch the rocketport to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0ad9e7d1d6bf7829912be50d24d4f3f473006326 Author: Alan Cox Date: Wed Jul 16 21:56:10 2008 +0100 mxser: use tty_port Switch mxser to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9de6a51fee08f9e7020074738150441305e83af2 Author: Alan Cox Date: Wed Jul 16 21:56:02 2008 +0100 moxa: use tty_port Switch MOXA to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b02f5ad6a3ff5a1ee2a7b8ec6eee338de553b060 Author: Alan Cox Date: Wed Jul 16 21:55:53 2008 +0100 istallion: use tty_port Switch istallion to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f1d03228ea85877584d41bccf62841e7ca47043c Author: Alan Cox Date: Wed Jul 16 21:55:45 2008 +0100 isicom: use tty_port Switch isicom to use a tty_port structure for some fields Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d99101fda034922d5ecaa735910e9930f076325f Author: Alan Cox Date: Wed Jul 16 21:55:37 2008 +0100 riscom8: remove bogus checks Chris Malley posted a patch removing a NULL check in the riscom8 driver. Further analysis shows that even more of the tests are irrelevant so we can delete lots of stuff Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 85f8f81052eeb3eac1242731a8777caacfef0aa9 Author: Alan Cox Date: Wed Jul 16 21:55:29 2008 +0100 riscom8: use tty_port Switch riscom8 to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b5391e29f428d11755ca2c91074c6db6f5c69d7c Author: Alan Cox Date: Wed Jul 16 21:55:20 2008 +0100 gs: use tty_port Switch drivers using the old "generic serial" driver to use the tty_port structures Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 4982d6b37a5ccebe6c2af79970c7a15c1939243a Author: Alan Cox Date: Wed Jul 16 21:55:11 2008 +0100 esp: use tty_port Switch esp to use the new tty_port structures Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 52d417388d154f68f8ab753de03b1fba1814de81 Author: Alan Cox Date: Wed Jul 16 21:55:02 2008 +0100 epca: use tty_port Switch the EPCA driver to include and begin using a tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 7a4d29f426f17479395980ded8fa5e3bdd6d94e4 Author: Alan Cox Date: Wed Jul 16 21:54:54 2008 +0100 tty.h: clean up Coding style clean up and white space tidy Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a88487c79bfefb715030c5baa68fbedc1b8732e8 Author: Takashi Iwai Date: Wed Jul 16 21:54:42 2008 +0100 Fix compile errors in SGI console drivers (linux-next tree) The below is the patch to replace blindly all possible places, including Jack's fixes. Signed-off-by: Takashi Iwai (Reviewed and checked rather than blindly added) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b1ca7e7a0b35874b2a9cae60f8f5b78df575faa7 Author: Jack Steiner Date: Wed Jul 16 21:54:31 2008 +0100 - Fix compile errors in SGI console drivers (linux-next tree) Fix compile errors in SGI console drivers caused by changes to the tty_port structures in the linux-next tree. Signed-off-by: Jack Steiner Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 87c25ef0a41ad7a8249cd3009bf65deb700d4ee3 Author: Stephen Rothwell Date: Wed Jul 16 21:54:22 2008 +0100 ttydev: fix pamc_zilog for tty pointer move Today's linux-next build (powerpc allyesconfig) failed like this: drivers/serial/pmac_zilog.c: In function 'pmz_receive_chars': drivers/serial/pmac_zilog.c:245: error: 'struct uart_info' has no member named 'tty' drivers/serial/pmac_zilog.c:250: error: 'struct uart_info' has no member named 'tty' I applied the patch below (which builds but may, or may not, be correct). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ Signed-off-by: Stephen Rothwell Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 2f7a697a13a189a7ef43a9b6bfc3fc6e359d96fb Author: Stephen Rothwell Date: Wed Jul 16 21:54:11 2008 +0100 ttydev: fix pamc_zilog for tty pointer move Today's linux-next build (sparc64 defconfig) failed like this: drivers/serial/sunhv.c: In function `receive_chars': drivers/serial/sunhv.c:188: error: structure has no member named `tty' drivers/serial/sunsu.c: In function `receive_chars': drivers/serial/sunsu.c:314: error: structure has no member named `tty' drivers/serial/sunsab.c: In function `receive_chars': drivers/serial/sunsab.c:121: error: structure has no member named `tty' I applied the following patch (which, again, may not be correct). Signed-off-by: Stephen Rothwell Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 34492b5834ede63d896c93ccba9a4657a8435dc2 Author: David Howells Date: Wed Jul 16 21:54:01 2008 +0100 MN10300: Fix MN10300's serial port driver to get at its tty_struct Fix MN10300's serial port driver to get at its tty_struct as this moved from struct uart_info into struct tty_port in patch: Signed-off-by: David Howells Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit df4f4dd429870f435f8d5d9d561db029a29f063b Author: Alan Cox Date: Wed Jul 16 21:53:50 2008 +0100 serial: use tty_port Switch the serial_core based drivers to use the new tty_port structure. We can't quite use all of it yet because of the dynamically allocated extras in the serial_core layer. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 6f67048cd010afe19d79d821f16055d9c704c6f0 Author: Alan Cox Date: Wed Jul 16 21:53:41 2008 +0100 tty: Introduce a tty_port common structure Every tty driver has its own concept of a port structure and because they all differ we cannot extract commonality. Begin fixing this by creating a structure drivers can elect to use so that over time we can push fields into this and create commonality and then introduce common methods. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d87a6d951c6c09d191d9c10903deb3cc353fcd2c Author: Adrian Bunk Date: Wed Jul 16 21:53:31 2008 +0100 drivers/serial/: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time in comments, printk's and MODULE_DESCRIPTION's (no printk's or MODULE_DESCRIPTION's are completely removed). While doing this I also found and fixed a missing \n in a printk in m32r_sio.c Signed-off-by: Adrian Bunk Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 59247ca2fdca9691a6a7df532a830e3a133d9962 Author: Adrian Bunk Date: Wed Jul 16 21:53:22 2008 +0100 drivers/char/rio/: remove VCS tags This patch removes ancient VCS tags (either protected by #ifdef SCCS_LABELS or commented out). Signed-off-by: Adrian Bunk Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a352def21a642133758b868c71bee12ab34ad5c5 Author: Alan Cox Date: Wed Jul 16 21:53:12 2008 +0100 tty: Ldisc revamp Move the line disciplines towards a conventional ->ops arrangement. For the moment the actual 'tty_ldisc' struct in the tty is kept as part of the tty struct but this can then be changed if it turns out that when it all settles down we want to refcount ldiscs separately to the tty. Pull the ldisc code out of /proc and put it with our ldisc code. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e1e5770bb63fb9d71619a68f52cb0ba4b2ae58a6 Author: Jiri Slaby Date: Wed Jul 16 21:52:56 2008 +0100 tty: isicom, enable/disable pci device Don't forget to enable and disable PCI devices. The device might be unusable without that. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9afd561acabe5059ff16d163a176e2350269aba5 Author: Haavard Skinnemoen Date: Wed Jul 16 21:52:46 2008 +0100 Subject: [PATCH 2/2] atmel_serial: Implement flush_buffer() hook Avoid dumping garbage to the serial port when the tty is flushed. This tends to happen when rebooting from a serial console. Signed-off-by: Haavard Skinnemoen Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 6bb0e3a59a089e23eecc0af3b6f6012b2a9affba Author: Haavard Skinnemoen Date: Wed Jul 16 21:52:36 2008 +0100 Subject: [PATCH 1/2] serial: Add flush_buffer() operation to uart_ops Serial drivers using DMA (like the atmel_serial driver) tend to get very confused when the xmit buffer is flushed and nobody told them. They also tend to spew a lot of garbage since the DMA engine keeps running after the buffer is flushed and possibly refilled with unrelated data. This patch adds a new flush_buffer operation to the uart_ops struct, along with a call to it from uart_flush_buffer() right after the xmit buffer has been cleared. The driver can implement this in order to syncronize its internal DMA state with the xmit buffer when the buffer is flushed. Signed-off-by: Haavard Skinnemoen Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 15648f154a8faea97cbe931e189cf0a57fd066f4 Author: Alan Cox Date: Wed Jul 16 21:52:25 2008 +0100 simserial: Fix up for ldisc changes Noted by Tony Luck although I've done the patches differently and also removed some other bogus oddments. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e6b51632b3579d96ce5aa1b3efdeceedd2921a2c Author: Dave Airlie Date: Mon Jul 21 08:42:36 2008 +1000 gpu: re-order GPU subdirectory vs char for AGP vs DRM startup. Signed-off-by: Dave Airlie commit 99cdb0c8c5e0e43652d25951a85bac82a1231591 Author: Philipp Zabel Date: Thu Jul 10 02:17:02 2008 +0200 mfd: let asic3 use mem resource instead of bus_shift The bus_shift parameter in platform_data is not needed as we can tell the driver with the IOMEM_RESOURCE whether the ASIC is located on a 16bit or 32bit memory bus. The htc-egpio driver uses a more descriptive bus_width parameter, but for drivers where the register map size fixed, we don't even need this. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 279cac484e55317456900fe3567c7cb5bd46fd5f Author: Philipp Zabel Date: Thu Jul 10 02:16:27 2008 +0200 mfd: remove DS1WM register definitions from asic3.h There is a dedicated ds1wm driver, no need to duplicate this information here. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 4a67b528e0be5d855b1a7bb71ec769d954765f6c Author: Philipp Zabel Date: Thu Jul 3 12:27:32 2008 +0200 mfd: add ASIC3_CONFIG_GPIO templates As ASIC3 GPIO alternate function configuration is expected to be similar for several devices, it is convenient to define descriptive macros. This patch is inspired by the PXA MFP configuration, the alternate functions were observed on hx4700 and blueangel. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit de0d23c12c42317c273919b597f6822af2102e55 Author: Philipp Zabel Date: Thu Jul 3 11:08:27 2008 +0200 mfd: fix the asic3 irq demux code Wrong irq numbers were given to desc->handle_irq, which on some devices caused endless loops (asic3_irq_demux calling itself, basically). Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 30250b457f30ca655d37ad1a1587221ff6eefc91 Author: Samuel Ortiz Date: Tue Jun 24 23:37:09 2008 +0200 mfd: asic3 should depend on gpiolib Now that asic3 implements the gpiolib API, it should depend on it at build time. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 786bef3768a6ea1070526983b20e316c4eacd854 Author: Philipp Zabel Date: Tue Jun 24 01:31:24 2008 +0200 mfd: fix asic3 config array initialisation Our memset length was incorrect. Tested-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 065032f61bd9acdb843766da3149de12eaf87c0b Author: Philipp Zabel Date: Sat Jun 21 00:51:38 2008 +0200 mfd: move asic3 probe functions into __init section Potentially free some memory by moving the _probe functions into __init. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 3b8139f8b1457af7b5295d97050b3f9a2545a17a Author: Samuel Ortiz Date: Fri Jun 20 11:12:21 2008 +0200 mfd: Use uppercase only for asic3 macros and defines Let's be consistent and use uppercase only, for both macro and defines. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 24f4f2eef2714bddd6fdb823be53fc2ee69699e0 Author: Samuel Ortiz Date: Fri Jun 20 11:11:19 2008 +0200 mfd: use dev_* macros for asic3 debugging We replace the various printks, and use the dev_* macros instead. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 3b26bf17226f66bfd6cd4e36ac81f83fe994043a Author: Samuel Ortiz Date: Fri Jun 20 11:09:51 2008 +0200 mfd: New asic3 gpio configuration code The ASIC3 GPIO configuration code is a bit obscure and hardly readable. This patch changes it so that it is now more readable and understandable, by being more explicit. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 1effe5bc6cfbac4506d7944d68dadbd29ad62645 Author: Samuel Ortiz Date: Fri Jun 20 11:07:39 2008 +0200 mfd: asic3 children platform data removal Platform devices should be dynamically allocated, and each supported device should have its own platform data. For now we just remove this buggy code. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 6f2384c4bdd4be3dc1e5d22ed5e6f0c3076fda60 Author: Samuel Ortiz Date: Fri Jun 20 11:02:19 2008 +0200 mfd: asic3 gpiolib support ASIC3 is, among other things, a GPIO extender. We should thus have it supporting the current gpiolib API. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 77332894c21165404496c56763d7df6c15c4bb09 Author: Marcus Sundberg Date: Thu Jul 10 21:28:08 2008 +0200 r8169: avoid thrashing PCI conf space above RTL_GIGA_MAC_VER_06 The magic write to register 0x82 will often cause PCI config space on my 8168 (PCI ID 10ec:8168, revision 2. mounted in an LG P300 laptop) to be filled with ones during driver load, and thus breaking NIC operation until reboot. If it does not happen on first driver load it can easily be reproduced by unloading and loading the driver a few times. The magic write was added long ago by this commit: Author: François Romieu Date: Sat Jan 10 06:00:46 2004 -0500 [netdrvr r8169] Merge of changes done by Realtek to rtl8169_init_one(): - phy capability settings allows lower or equal capability as suggested in Realtek's changes; - I/O voodoo; - no need to s/mdio_write/RTL8169_WRITE_GMII_REG/; - s/rtl8169_hw_PHY_config/rtl8169_hw_phy_config/; - rtl8169_hw_phy_config(): ad-hoc struct "phy_magic" to limit duplication of code (yep, the u16 -> int conversions should work as expected); - variable renames and whitepace changes ignored. As the 8168 wasn't supported by that version this patch simply removes the bogus write from mac versions <= RTL_GIGA_MAC_VER_06. [The change above makes sense for the 8101/8102 too -- Ueimor] Signed-off-by: Marcus Sundberg Signed-off-by: Francois Romieu commit f887cce8de019bb32917789379af89ae4c0294ee Author: Francois Romieu Date: Thu Jul 17 22:24:18 2008 +0200 r8169: multicast register update The layout of the 8101 series is identical to that of the 8168 one, thus allowing to pack everything not 8169 related above MAC_VER_06. New 810x and 8168 chipsets should automagically behave correctly. It matches code in Realtek's 1.008.00 8101 and 8.007.00 8168 drivers. Signed-off-by: Francois Romieu commit fb65a7c091529bfffb1262515252c0d0f6241c5c Author: David S. Miller Date: Sun Jul 20 10:18:44 2008 -0700 iucv: Fix bad merging. Noticed by Stephen Rothwell. Signed-off-by: David S. Miller commit cb7f39d2bc5a20615d016dd86fca0fd233c13b5d Author: Yoichi Yuasa Date: Sun Jul 20 22:03:32 2008 +0900 [MIPS] Remove unused maltasmp.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 3d739f2daaed442f5bee9da2164757401ae4a417 Author: Yoichi Yuasa Date: Sun Jul 20 22:01:06 2008 +0900 [MIPS] Remove unused saa9730_uart.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 8213bbf9c1c0009872a3278aa7a83ec8f3508195 Author: Ralf Baechle Date: Sun Jul 20 13:16:46 2008 +0100 [MIPS] Rename MIPS sys_pipe syscall entry point to something MIPS-specific. Signed-off-by: Ralf Baechle commit 4914ad4a9f2d484a68422700ba8493db73c7c411 Author: Ralf Baechle Date: Sun Jul 20 11:34:39 2008 +0100 [MIPS] 32-bit compat: Delete unused sys_truncate64 and sys_ftruncate64. Signed-off-by: Ralf Baechle commit e0eb730757665d7e8ec0e79d9042a9311f3edb7e Author: Atsushi Nemoto Date: Sat Jul 19 01:51:52 2008 +0900 [MIPS] TXx9: Fix some sparse warnings Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 94a4c32939dede9328c6e4face335eb8441fc18d Author: Atsushi Nemoto Date: Sat Jul 19 01:51:47 2008 +0900 [MIPS] TXx9: Add 64-bit support SYS_SUPPORTS_64BIT_KERNEL is enabled for RBTX4927/RBTX4938, but actually it was broken for long time (or from the beginning). Now it should work. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 255033a9bb900a06c9a7798908ce12557d24fb66 Author: Atsushi Nemoto Date: Sat Jul 19 01:51:41 2008 +0900 [MIPS] TXx9: Cleanups for 64-bit support * Unify (and fix) mem_tx4938.c and mem_tx4927.c * Simplify prom_init * Kill volatiles and unused definitions for tx4927.h and tx4938.h Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b5d5accc7a2eb41f43ef346f3b258ba2f6342a1c Author: Yoichi Yuasa Date: Fri Jul 18 23:03:15 2008 +0900 [MIPS] Cobalt: Fix I/O port resource range LCD and buttons don't use I/O port space. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5f15d378763e88c361364c0d0ad256d523f2d72f Author: Adrian Bunk Date: Wed Jul 16 19:26:15 2008 +0300 [MIPS] don't leak setup_early_printk() in userspace header Our userspace headers shouldn't contain prototypes of in-kernel functions. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit f113c5eda22c349a163ea17ba11bc64727a0f799 Author: Adrian Bunk Date: Wed Jul 16 19:25:50 2008 +0300 [MIPS] Remove include/asm-mips/mips-boards/sead{,int}.h include/asm-mips/mips-boards/sead{,int}.h are now obsolete. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit e76812eddcebe06403934c868f3a707fd5bc167d Author: Adrian Bunk Date: Wed Jul 16 19:25:44 2008 +0300 [MIPS] Remove asm-mips/mips-boards/atlas{,int}.h asm-mips/mips-boards/atlas{,int}.h are now obsolete. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit fc22c3571c86cc36f4eb29336ce40c04a666ee98 Author: Adrian Bunk Date: Wed Jul 16 19:25:40 2008 +0300 [MIPS] mips/sgi-ip22/ip28-berr.c: fix the build Commit 3e6ea3b0d7a93550a93a265e732413d3a5aaf0d2 (linux-mips.org) / 52f4f6bbcff5510f662a002ec1219660ea25af62 (kernel.org) ([MIPS] Use kernel-supplied ARRAY_SIZE() macro.) causes the following compile error: <-- snip --> ... CC arch/mips/sgi-ip22/ip28-berr.o /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c: In function 'ip28_be_interrupt': /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: warning: type defaults to 'int' in declaration of 'type name' /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: warning: type defaults to 'int' in declaration of 'type name' make[2]: *** [arch/mips/sgi-ip22/ip28-berr.o] Error 1 <-- snip --> Using ARRAY_SIZE in these places in arch/mips/sgi-ip22/ip28-berr.c was bogus, and therefore gets reverted by this patch. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit 8d795f2a5cf73338a467ac82bdeb73225e987c45 Author: Atsushi Nemoto Date: Fri Jul 18 00:43:48 2008 +0900 [MIPS] TXx9: Miscellaneous build fixes * Fix build if only RBTX4927 or RBTX4938 was selected. * Move gpio helpers to generic part. * Select SOC_TX4938 for RBTX4927/37 board. * Fix parent of rbtx4938_fpga_resource. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 73b4390fb23456964201abda79f1210fe337d01a Author: Ralf Baechle Date: Wed Jul 16 16:12:25 2008 +0100 [MIPS] Routerboard 532: Support for base system Signed-off-by: Phil Sutter Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 36a0a3cd45b49ceff78ac28efef1cbeec413d8c2 Author: Thomas Bogendoerfer Date: Wed Jul 16 15:18:58 2008 +0200 [MIPS] IP32: Use common SGI button driver Use the Indy/O2 button driver. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 5a334fa9240411121f5dda9605fc7fd98429e8c5 Author: Thomas Bogendoerfer Date: Wed Jul 16 15:18:54 2008 +0200 [MIPS] IP22: Use common SGI button driver Use the Indy/O2 button driver. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 36e5c21de51e83bfa17c1e7334050edd2eda3d47 Author: Thomas Bogendoerfer Date: Wed Jul 16 14:06:15 2008 +0200 [MIPS] IP22, IP28: Fix merge bug Instead of one SGI_HAS_HAL2 for IP22 and one for IP28, IP28 got two of them... Let's give IP22 some ALSA sound, too. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle [MIPS] IP22, IP28: Fix merge bug Instead of one SGI_HAS_HAL2 for IP22 and one for IP28, IP28 got two of them... Let's give IP22 some ALSA sound, too. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit d6d8a4635a8451ca3c6fa2aaf9bbf934d8e2097b Author: Ralf Baechle Date: Wed Jul 16 12:07:05 2008 +0100 [MIPS] Tinker with constraints in to fix build error. [...] CC init/main.o include/asm/bitops.h: In function `start_kernel': include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: error: impossible constraint in `asm' include/asm/bitops.h:76: error: impossible constraint in `asm' include/asm/bitops.h:76: error: impossible constraint in `asm' make[1]: *** [init/main.o] Error 1 [...] The build error is caused by the ages old gcc bug where gcc at the time of analyzing the constraints is unable to figure out that an "i" constraint actually can be satisfied and thus will abort unless an "r" is added to the constraint. For the actual code generation gcc will only ever use the "i" constraint. Signed-off-by: Ralf Baechle commit c29d150305f7f655b7002cc31754c605e5c0d1a0 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:32 2008 +0300 [MIPS] Add missing prototypes to asm/page.h This patch fixes the following sparse warnings: >>>>>>>>>>>>>>>>>> arch/mips/mm/page.c:284:16: warning: symbol 'build_clear_page' was not declared. Should it be static? arch/mips/mm/page.c:426:16: warning: symbol 'build_copy_page' was not declared. Should it be static? >>>>>>>>>>>>>>>>>> The fix is to add appropriate prototypes to the header include/asm-mips/page.h. Build-tested against Malta defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit f028b8605613ade67fda554e30d367911d6c7222 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:31 2008 +0300 [MIPS] Fix missing prototypes in asm/fpu.h While building the Malta defconfig, sparse spat the following warnings: >>>>>>>>>>>>>>>>>> arch/mips/math-emu/kernel_linkage.c:31:6: warning: symbol 'fpu_emulator_init_fpu' was not declared. Should it be static? arch/mips/math-emu/kernel_linkage.c:54:5: warning: symbol 'fpu_emulator_save_context' was not declared. Should it be static? arch/mips/math-emu/kernel_linkage.c:68:5: warning: symbol 'fpu_emulator_restore_context' was not declared. Should it be static? >>>>>>>>>>>>>>>>>> This patch fixes these errors by adding the proper prototypes to the include/asm-mips/fpu.h header, and actually using this header in the sparse-spotted source file. Build-tested with Malta defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 3450004a8cec8bab246372a1cabb9c2483b1e6c3 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:30 2008 +0300 [MIPS] PCI: Make the pcibios_max_latency variable static The pcibios_max_latency variable is needlessly defined global, and this patch makes it static. Build-tested using malta_defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 597a5f551ec4cd0aa0966e4fff4684ecc8c31c0d Author: Avi Kivity Date: Sun Jul 20 14:24:22 2008 +0300 KVM: Adjust smp_call_function_mask() callers to new requirements smp_call_function_mask() now complains when called in a preemptible context; adjust its callers accordingly. Signed-off-by: Avi Kivity commit d20b27478d6ccf7c4c8de4f09db2bdbaec82a6c0 Author: Jean-Francois Moine Date: Fri Jul 18 05:52:04 2008 -0300 V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit fac3639d886ae577d74e2da16e6a448620d432c9 Author: Hans Verkuil Date: Fri Jul 18 10:07:10 2008 -0300 V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups Fix a bug in get_index that was introduced earlier. Also fix two error handling lock-ups in videodev and cx18 that where found thanks to that bug. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f19ad390146e7745cbc529f3bef8469cf21f3a6b Author: Hans Verkuil Date: Fri Jul 18 02:02:50 2008 -0300 V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 86751b016ff4eb4741b602933e5e6d74ac6cc377 Author: Hans Verkuil Date: Fri Jul 18 01:35:14 2008 -0300 V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit af8b303e96ed5a6882419c8e632df166bde85d7a Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:36:08 2008 -0300 V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on Signed-off-by: Mauro Carvalho Chehab commit 367394ac5cce83d40e605b5c75ee27dbe3d42d92 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:34:27 2008 -0300 V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C Instead of letting VIDEO_IR_I2C to be selected by VIDEO_IR, if I2C, convert it into a symbol that depends on both VIDEO_IR and I2C. Signed-off-by: Mauro Carvalho Chehab commit 1c22dad8ab86caef7a1f01cf3e9bb446a448aac5 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:31:29 2008 -0300 V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c Currently, saa7134 is dependent of ir-kbd-i2c, since it uses a symbol that is defined there. However, as this symbol is used only on saa7134, there's no sense on keeping it defined there (or on ir-commons). So, let's move it to saa7134 and remove one symbol for being exported. Signed-off-by: Mauro Carvalho Chehab commit 4db16db4f60ce063435bd08b71c82aad1254cd95 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:28:56 2008 -0300 V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places Signed-off-by: Mauro Carvalho Chehab commit 432aa3b64d08f1453e2742d20c5fe6946ca22549 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:27:50 2008 -0300 V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF VIDEOBUF_DVB depends on VIDEOBUF_CORE, not on VIDEOBUF_DMA_SG Signed-off-by: Mauro Carvalho Chehab commit d4216488c0ccf7b659411023903bac7207f0dfb7 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:25:53 2008 -0300 V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on" Signed-off-by: Mauro Carvalho Chehab commit c3fb62bf927cee771c3bcd5053e393e7df518f28 Author: Hans Verkuil Date: Thu Jul 17 17:48:38 2008 -0300 V4L/DVB (8390): videodev: add comment and remove magic number. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8373a3e512c8ea8e93981d42b0d1efb252be17fa Author: Brandon Philips Date: Tue Jun 24 22:58:25 2008 -0300 V4L/DVB (8389): videodev: simplify get_index() Use Hans Verkuil's suggested method of implementing get_index which doesn't depend on class_for_each_device and instead uses the video_device array. This simplifies the code and reduces its memory footprint. Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 2bc93aa304f10bf94c377a487b09df75eaf88ab6 Author: Hans Verkuil Date: Thu Jul 17 16:45:00 2008 -0300 V4L/DVB (8387): Some cosmetic changes Those changes, together with some proper patches, will allow out-of-tree compilation for for kernels < 2.6.19 Signed-off-by: Mauro Carvalho Chehab commit e3bf20de33b016ac73424a5574177ed46c754be3 Author: Hans Verkuil Date: Thu Jul 17 13:29:49 2008 -0300 V4L/DVB (8381): ov7670: fix compile warnings Signed-off-by: Hans Verkuil Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 9edd350f51a1e81f7f01308a99800cad7770e5cd Author: Hans Verkuil Date: Thu Jul 17 13:22:51 2008 -0300 V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name. Having an _auto suffix is less ambiguous than a 'saa711x' identifier. It's also used like this in the saa7127 driver. Thanks to Jean Delvare for suggesting this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5daed07401ed27bb2684e803f3f01e3a424ea282 Author: Jean Delvare Date: Thu Jul 17 13:18:31 2008 -0300 V4L/DVB (8379): saa7127: Make device detection optional The saa7127 driver supports all of SAA7126, SAA7127, SAA7128 and SAA1729 devices. Declare all these devices, so that board drivers can tell which device is present, instead of always relying on auto-detection (which needs to write to the chip, eek!). We still need the detection for ivtv, so a special device name "saa7127_auto" can be used when the caller doesn't know exactly which device is present. Signed-off-by: Jean Delvare Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 03b52c36a38eb72548b9408c497ffabd1519eabe Author: Hans Verkuil Date: Thu Jul 17 12:33:08 2008 -0300 V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup Same issue as for cx25840: this function sets up the standard timings and has nothing to do with VBI setup. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ca130eef2ca185739a440b893e69fe36038b87c9 Author: Hans Verkuil Date: Thu Jul 17 12:26:45 2008 -0300 V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct For several MPEG controls and the volume control the default as returned by VIDIOC_QUERYCTRL was incorrect and did not match the actual initial value. This is now fixed for cx18 and ivtv. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cb5aa1c62df81ba2cdbae7f7ce469b231d43aba6 Author: Hans Verkuil Date: Thu Jul 17 11:08:40 2008 -0300 V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup cx25840_vbi_setup has nothing to do with setting up VBI, but everything with setting up the standard. Move to cx25840-core.c and rename. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5de39b2b1f68253d79f3548ef2d103fd5edae563 Author: Hans de Goede Date: Thu Jul 17 10:34:28 2008 -0300 V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver. The sn9c102 driver claims to support usb-ID 0x0c45:0x6011, which is a sn9c102 with ov6650 sensor, but the sn9c102 driver does not support the ov6650 sensor (tested). Also the sn9c102 driver claims to support usb-ID 0x0c45:0x603f, which is a sn9c102 with CISVF10 sensor, but the sn9c102 driver does not support the CISVF10 sensor (not tested). Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 12ff91264ce3e2f24013d667d44ba786f947506c Author: Hans de Goede Date: Thu Jul 17 10:30:56 2008 -0300 V4L/DVB (8373): gspca: Hue, saturation and contrast controls added for sn9c10x ovxxxx. (does not work with ov6650) Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 722103e390bb0a526f71440f44bf7f891614e1d6 Author: Hans de Goede Date: Thu Jul 17 10:24:47 2008 -0300 V4L/DVB (8372): gspca: Small ov6650 fixes. 1) Don't change the red and blue pre-gain's from their defaults 2) Actually make the powerline freq ctrl available to userspace Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c91256c27b9509624df2619271cfca9ec5436f8f Author: Jean-Francois Moine Date: Thu Jul 17 10:12:55 2008 -0300 V4L/DVB (8371): gspca: Webcam 08ca:2050 added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 100f7f2a34ded88e79ecbeaf9ed46c58fbdf339c Author: Jean-Francois Moine Date: Thu Jul 17 09:41:03 2008 -0300 V4L/DVB (8370): gspca: Webcam 0461:0821 added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 1ff1e48442188b9ae68aef82b66baef89e988cf6 Author: Jean-Francois Moine Date: Thu Jul 17 09:37:57 2008 -0300 V4L/DVB (8369): gspca: Bad initialization of sn9c102 ov7630. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d87616f5a5af028d399f2c3e14c3115c67e415cf Author: Andoni Zubimendi Date: Thu Jul 17 05:35:52 2008 -0300 V4L/DVB (8367): gspca: Light frequency filter / exposure / clean-up for sn9c103 ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a975a5279e39b5bc104cc8329d25a36a25136ad9 Author: Hans de Goede Date: Wed Jul 16 15:29:11 2008 -0300 V4L/DVB (8366): gspca: Better code for ov6650 and ov7630. sonixb: Common code between ov6650 and ov7630. Fix brightness oscillation with ov6650 sensor. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 66f358211d4f8bf1a43e3aef9565c5c1454f73b3 Author: Hans de Goede Date: Wed Jul 16 10:16:28 2008 -0300 V4L/DVB (8364): gspca: Support of powerline frequency for ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 5c6644f305650d3d533b67fc74a96e4a2ea0aa89 Author: Hans de Goede Date: Wed Jul 16 10:00:08 2008 -0300 V4L/DVB (8363): gspca: Bad image size with spca501. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c36260ee27dff9a0236ddaaee0e3524ecd389645 Author: Hans de Goede Date: Wed Jul 16 09:56:07 2008 -0300 V4L/DVB (8362): gspca: Bad offset of the brightness sum in sn9c103 packets. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit b7474cf9f693a83c9a64c8504a08823a34994a2e Author: Andoni Zubimendi Date: Wed Jul 16 08:40:30 2008 -0300 V4L/DVB (8361): gspca: Bad check of i2c write to sn9c10x. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 794af52a4ce5279c52f1467448b9e672a7db37f0 Author: Andoni Zubimendi Date: Wed Jul 16 08:33:14 2008 -0300 V4L/DVB (8360): gspca: Bad initialization of sn9c103 - ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 9a97a2abe44781a13cd2ffc95069a8fd2678da68 Author: Mauro Carvalho Chehab Date: Tue Jul 15 14:23:08 2008 -0300 V4L/DVB (8359): gspca: Adds register aliases for zc03xx registers Thanks to http://zc0302.sourceforge.net/zc0302.php, we have some hints about what each zc3xx register means. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jean-Francois Moine commit 568788a771ee88cc6b5e311a207c09731a6e47f0 Author: Jean-Francois Moine Date: Tue Jul 15 11:46:06 2008 -0300 V4L/DVB (8358): gspca: Better initialization of sn9c120 - ov7660. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit f4d520258d229f093bec6937ec3d632eb95600b4 Author: Hans de Goede Date: Tue Jul 15 09:36:42 2008 -0300 V4L/DVB (8357): gspca: Perfect exposure for sn9c10x, sensor ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 3647fea840c94c04f35215cb75b48613c0af310e Author: Hans de Goede Date: Tue Jul 15 05:36:30 2008 -0300 V4L/DVB (8356): gspca: 352x288 mode fix and source clean-up for Sonix bridges. sonixb: Bad initialization of sensor for 352x288 mode. (from Hans de Goede) sonixj: Clean-up source. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ad5ef80dd79851ea683e2d30ca4ebdc0c043a675 Author: Hans de Goede Date: Mon Jul 14 10:11:42 2008 -0300 V4L/DVB (8354): gspca: Better gain for bridge sn9c10x - sensor ov6650. sonixb: Better gain for ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 4b972d29bbccc86877221164c7f39d52694d4a81 Author: Andoni Zubimendi Date: Mon Jul 14 09:50:26 2008 -0300 V4L/DVB (8353): gspca: 640x480 for bridge sn9c103 / sensor ov7630. sonixb: 640x480 mode for sn9c103 - ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 739570bb218bb4607df1f197282561e97a98e54a Author: Jean-Francois Moine Date: Mon Jul 14 09:38:29 2008 -0300 V4L/DVB (8352): gspca: Buffers for USB exchanges cannot be in the stack. gspca: Protect dq_callback() against simultaneous USB exchanges. Temporary buffer for USB exchanges added in the device struct. (all) Use a temporary buffer for all USB exchanges. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 5b77ae7776183d733ec86727bcc34c52a336afd6 Author: Jean-Francois Moine Date: Sat Jul 12 09:28:04 2008 -0300 V4L/DVB (8350): gspca: Conform to v4l2 spec and mutex unlock fix. gspca: Empty the application queues on streamoff ioctl. streamon/off and qbuf ioctls may be done by any application. Don't handle MJPEG pixel format as JPEG. (thanks to Hans de Goede) Authorize reqbufs ioctl when streaming. Bad mutex unlock in poll() when streaming problem. (thanks to Mauro Carvalho Chehab) Don't handle 'webcam disconnected' in stream off. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 51fc8e3bc03aeddc557d3084d08425eb4cb8ed41 Author: Andoni Zubimendi Date: Thu Jul 10 11:12:24 2008 -0300 V4L/DVB (8349): gspca: SN9C103 OV7630 fixes in sonixb. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit dcef3237b652e1c02093feac0f443485a144f035 Author: Hans de Goede Date: Thu Jul 10 10:40:53 2008 -0300 V4L/DVB (8348): gspca: Add auto gain/exposure to sonixb and tas5110 / ov6650 sensors. sonixb: Do auto gain for tas5110 / ov6650 sensors. pac207: Move the auto_gain function to gspca. gspca: New function gspca_auto_gain_n_exposure(). Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d0d0e39bc5912793405d3f84ffc982fa400e6cc0 Author: Jean-Francois Moine Date: Thu Jul 10 07:06:44 2008 -0300 V4L/DVB (8346): gspca: Bad pixel format of bridge VC0321. vc032x: Light frequency was not initialized. Change the pixel format of bridge VC0321 to V4L2_PIX_FMT_YUV420 ('YU12'). Set a bridge to all webcams. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 326c986207cb2065b9819107caa31efd2bbc48db Author: Magnus Damm Date: Wed Jul 16 23:02:08 2008 -0300 V4L/DVB (8343): soc_camera_platform: Add SoC Camera Platform driver This patch adds a simple platform camera device. Useful for testing cameras with SoC camera host drivers. Only one single pixel format and resolution combination is supported. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 0d3244d6439c8c31d2a29efd587c7aca9042c8aa Author: Magnus Damm Date: Wed Jul 16 22:59:28 2008 -0300 V4L/DVB (8342): sh_mobile_ceu_camera: Add SuperH Mobile CEU driver V3 This is V3 of the SuperH Mobile CEU soc_camera driver. The CEU hardware block is configured in a transparent data fetch mode, frames are captured from the attached camera and written to physically contiguous memory buffers provided by the newly added videobuf-dma-contig queue. Tested on sh7722 and sh7723 processors. Changes since V2: - remove SUPERH Kconfig dependency - move sh_mobile_ceu.h to include/media - add board callback support with enable_camera()/disable_camera() - add support for declare_coherent_memory - rework video memory limit - more verbose error messages Changes since V1: - fixed the CEU driver to work with the newly updated patches Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 2cc45cf25a2c14da6d18b7570a23ec09fb8f439a Author: Magnus Damm Date: Wed Jul 16 21:33:39 2008 -0300 V4L/DVB (8341): videobuf: Add physically contiguous queue code V3 This is V3 of the physically contiguous videobuf queues patch. Useful for hardware such as the SuperH Mobile CEU which doesn't support scatter gatter bus mastering. Since it may be difficult to allocate large chunks of physically contiguous memory after some uptime due to fragmentation, this code allocates memory using dma_alloc_coherent(). Architectures supporting dma_declare_coherent_memory() can easily avoid fragmentation issues by using dma_declare_coherent_memory() to force dma_alloc_coherent() to allocate from a certain pre-allocated memory area. Changes since V2 - use dma_handle for physical address - use "scatter gather" instead of "scatter gatter" Changes since V1: - use dev_err() instead of pr_err() - remember size in struct videobuf_dma_contig_memory - keep struct videobuf_dma_contig_memory in .c file - let videobuf_to_dma_contig() return dma_addr_t - implement __videobuf_sync() - return statements, white space and other minor fixes Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 5d6aaf50e2986d3289d16fc2859c490c66a1be63 Author: Magnus Damm Date: Wed Jul 16 21:27:49 2008 -0300 V4L/DVB (8340): videobuf: Fix gather spelling Use "scatter gather" instead of "scatter gatter". Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit b15cf1fcceb92247051dedb502692d56adaa428d Author: Magnus Damm Date: Fri Jul 11 21:03:25 2008 -0300 V4L/DVB (8339): soc_camera: Add 16-bit bus width support The SuperH Mobile CEU hardware supports 16-bit width bus, so extend the soc_camera code with SOCAM_DATAWIDTH_16. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit a034d1b76b173b37f9a3646aa8f50a2c14a0f3ea Author: Magnus Damm Date: Fri Jul 11 20:59:34 2008 -0300 V4L/DVB (8338): soc_camera: Move spinlocks This patch moves the spinlock handling from soc_camera.c to the actual camera host driver. The spinlock_alloc/free callbacks are replaced with code in init_videobuf(). So far all camera host drivers implement their own spinlock_alloc/free methods anyway, and videobuf_queue_core_init() BUGs on a NULL spinlock argument, so, new camera host drivers will not forget to provide a spinlock when initialising their videobuf queues. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 092d3921195c4553a1818e698cee7a281ab361f4 Author: Paulius Zaleckas Date: Fri Jul 11 20:50:31 2008 -0300 V4L/DVB (8337): soc_camera: make videobuf independent Makes SoC camera videobuf independent. Includes all necessary changes for PXA camera driver (currently the only driver using soc_camera in the mainline). These changes are important for the future soc_camera based drivers. Signed-off-by: Paulius Zaleckas Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 439d0e4250b6fc9df3fc9183db38cf8a23d4ad93 Author: Oliver Endriss Date: Tue Jul 15 19:52:22 2008 -0300 V4L/DVB (8335): dvb-ttpci: Fix build with CONFIG_INPUT_EVDEV=n (Bug #11042) Fix build with CONFIG_INPUT_EVDEV=n (Bug #11042). Thanks to Toralf Förster for reporting. Thanks-to: Toralf Förster Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 4ee48c4257d842a29c032a32a19a3fcdd004b83f Author: Oliver Endriss Date: Tue Jul 15 19:36:46 2008 -0300 V4L/DVB (8334): tda10023: Fix typo in tda10023_attach dummy routine Fix compiler warning caused by a typo in the tda10023_attach dummy routine. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 02fa272fcb6edda9059d6dbaab20dfe919f4f4d2 Author: Andy Walls Date: Sun Jul 13 19:30:15 2008 -0300 V4L/DVB (8332): cx18: Suport external reset of the Z8F0811 IR controller on HVR-1600 for lirc cx18: added in cx18_ir_reset_gpio function for lirc_pvr150 like module. Also added the ability to reset the IR chip via ioctl like ivtv. This needs the mutex to protect gpio_dir and gpio_val in struct cx18 as gpio changes can come from a few different asynchronous sources now. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 8abdd00dcc6a58cab3afe6a23a0ce819dc08049a Author: Andy Walls Date: Sun Jul 13 19:05:25 2008 -0300 V4L/DVB (8331): cx18: Add locking for struct cx18 GPIO state variables cx18: Add locking for struct cx18 GPIO state variables in anticpation of adding IR microcontroller reset support for use by external IR modules. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 2c6a37bb076b9718c6362d4ffa1c7e58fdb1a0e9 Author: Michael Krufky Date: Sat Jul 12 22:58:24 2008 -0300 V4L/DVB (8326): sms1xxx: fix missing #include Fix the build error: smscoreapi.c:689: error: 'uintptr_t' undeclared Thanks to Peter Schlaf for reporting this. Cc: Peter Schlaf Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f1f74aa2cf7f109b2eaf3502b8bd13bf40bf6633 Author: Michael Krufky Date: Sat Jul 12 00:37:08 2008 -0300 V4L/DVB (8322): sms1xxx: fix improper usage of asm/foo.h Fix the following warnings generated by checkpatch.pl: WARNING: Use #include instead of 251: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:30: +#include WARNING: Use #include instead of 1566: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:29: +#include Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0b17d0edbc22eda3d0407f98ce4f16ceefb9a97f Author: Hermann Pitton Date: Sat Jul 12 12:27:59 2008 -0300 V4L/DVB (8319): saa7134: Add support for analog only ASUSTeK P7131 saa7134: add a separate entry for the ASUSTeK P7131 analog only and do some eeprom detection to escape from the TVFM7135 with the same PCI subsystem on auto detection. Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab commit cd257a6f4dd908d94e504d2431710f0fcfe62036 Author: Daniel Drake Date: Mon Jun 30 20:57:39 2008 -0300 V4L/DVB (8318): OV7670: don't reject unsupported settings For VIDIOC_G_FMT/VIDIOC_TRY_FMT, the V4L2 API spec states: "Drivers should not return an error code unless the input is ambiguous" "Very simple, inflexible devices may even ignore all input and always return the default parameters." "When the requested buffer type is not supported drivers return an EINVAL error code." i.e. returning errors for unsupported fields is bad, and it's ok to unconditionally overwrite user-requested settings This patch makes ov7670 meet that behaviour, and brings it in line with other drivers e.g. stk-webcam. It also fixes compatibility with (unpatched) gstreamer. Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 3f8d6f73da4332b4ff4150b9bae8e5f680bcbbde Author: Dean Anderson Date: Mon Jun 30 21:28:34 2008 -0300 V4L/DVB (8317): Sensoray 2255 V4l driver checkpatch fixes This patch fixes some coding style issues. It also fixes a NULL de-reference on driver unload. The permissions for the module parameters were changed to 0644. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 91a1d912f61b91e44336efe100a2bd0821777e24 Author: Jean Delvare Date: Wed Jul 2 16:01:21 2008 -0300 V4L/DVB (8316): bt819: Fix a debug message Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 203c204b39fef2c1c99e4b39e61ba292aa60142a Author: Jean Delvare Date: Wed Jul 2 15:59:29 2008 -0300 V4L/DVB (8315): zr36067: Delete dead code This has been commented out for years, it's about time to get rid of it. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 44f71c3fcefbfea3628cca52c0a177252cf83b60 Author: Michael Krufky Date: Sat Jun 28 23:55:36 2008 -0300 V4L/DVB (8313): sms1xxx: add support for Hauppauge WinTV-Nova-T-MiniStick Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a745f0a12cab631b92f9e13b31997192c7df3823 Author: Michael Krufky Date: Tue Jul 1 04:47:10 2008 -0300 V4L/DVB (8312): sms1xxx: add firmware filenames to board properties for stellar and nova Assign the following firmware filenames: sms1xxx-stellar-dvbt-01.fw sms1xxx-nova-a-dvbt-01.fw sms1xxx-nova-b-dvbt-01.fw Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1fbc3caff47785aca67b4bd5b29c04f3f20c770e Author: Michael Krufky Date: Tue Jul 1 04:35:26 2008 -0300 V4L/DVB (8311): sms1xxx: support device-specific firmware filenames on stellar usb1 sticks Add the capability to define device-specific firmware filenames for the SMS1010, with a mechanism to fall back to the generic firmware if the device-specific firmware is not present. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b1d8f9f5b8036b61a7ec562dfb86361f5b18e8f2 Author: Michael Krufky Date: Sun Jun 29 15:15:19 2008 -0300 V4L/DVB (8310): sms1xxx: remove kmutex_t typedef remove typedef struct mutex kmutex_t fix one line > 80 columns Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4411d29165d83a4a73ea351ffccfdc0fd8baeb1e Author: Michael Krufky Date: Sun Jun 29 14:45:37 2008 -0300 V4L/DVB (8309): sms1xxx: fix OOPS on 64 bit kernels due to a bad cast Fix the following build warning: smscoreapi.c: In function 'smscore_detect_mode': smscoreapi.c:689: warning: cast from pointer to integer of different size smscoreapi.c:689: warning: cast to pointer from integer of different size smscoreapi.c: In function 'smscore_set_device_mode': smscoreapi.c:820: warning: cast from pointer to integer of different size smscoreapi.c:820: warning: cast to pointer from integer of different size ...and fix the following OOPS on 64bit kernels: [ 717.263667] usb 6-4: new high speed USB device using ehci_hcd and address 2 [ 717.396386] usb 6-4: configuration #1 chosen from 1 choice [ 717.473650] Unable to handle kernel paging request at 0000000000c02000 RIP: [ 717.473657] [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.473669] PGD 3c6f7067 PUD 3d484067 PMD 0 [ 717.473674] Oops: 0002 [1] SMP [ 717.473678] CPU 0 [Modules linked in snipped] [ 717.473773] Pid: 8380, comm: modprobe Tainted: P 2.6.24-16-generic #1 [ 717.473776] RIP: 0010:[] [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.473784] RSP: 0018:ffff81003d495ba8 EFLAGS: 00010206 [ 717.473786] RAX: ffff81003d8cd8d0 RBX: ffff81003d8cd800 RCX: ffff81003d8cd8d0 [ 717.473788] RDX: 0000000000000008 RSI: ffff81003f080070 RDI: ffff81003d8cd800 [ 717.473791] RBP: 0000000000000004 R08: ffff81003ec0104b R09: ffffffffffffffff [ 717.473793] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000c02000 [ 717.473796] R13: 00000000fffffff4 R14: ffff810000c02000 R15: ffff81003d8cd878 [ 717.473799] FS: 00007f70a680f6e0(0000) GS:ffffffff805b0000(0000) knlGS:0000000000000000 [ 717.473801] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 717.473804] CR2: 0000000000c02000 CR3: 000000003c68b000 CR4: 00000000000006e0 [ 717.473806] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 717.473809] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 717.473812] Process modprobe (pid: 8380, threadinfo ffff81003d494000, task ffff81003d2fc000) [ 717.473814] Stack: ffff81003d8cd800 ffff81003d8cd800 0000000000000000 ffff81003c6d8000 [ 717.473820] ffff81003dcac800 0000000000000008 ffffc20000787bb0 ffffffff88dba16c [ 717.473825] ffff81003dcac800 000000000000000a 0000000000000000 ffffffff88dbb2fa [ 717.473829] Call Trace: [ 717.473866] [] :sms1xxx:smscore_start_device+0x1c/0xb0 [ 717.473885] [] :sms1xxx:smsusb_probe+0x29a/0x670 [ 717.473929] [] :sms1xxx:smsusb_sendrequest+0x0/0x30 [ 717.473965] [] mutex_lock+0x9/0x20 [ 717.473998] [] :usbcore:usb_autopm_do_device+0x8e/0x130 [ 717.474040] [] :usbcore:usb_probe_interface+0xda/0x160 [ 717.474067] [] driver_probe_device+0x9c/0x1b0 [ 717.474091] [] __driver_attach+0xc9/0xd0 [ 717.474107] [] __driver_attach+0x0/0xd0 [ 717.474115] [] bus_for_each_dev+0x4d/0x80 [ 717.474156] [] bus_add_driver+0xac/0x220 [ 717.474203] [] :usbcore:usb_register_driver+0xa9/0x120 [ 717.474232] [] :sms1xxx:smsusb_register+0x1b/0x70 [ 717.474243] [] :sms1xxx:smscore_module_init+0x7c/0xb0 [ 717.474253] [] sys_init_module+0x18e/0x1a90 [ 717.474426] [] system_call+0x7e/0x83 [ 717.474490] [ 717.474491] [ 717.474492] Code: 66 41 c7 04 24 9c 02 41 c6 44 24 02 00 4c 89 e6 41 c6 44 24 [ 717.474506] RIP [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.474513] RSP [ 717.474515] CR2: 0000000000c02000 [ 717.474521] ---[ end trace 52d9c6f207be106a ]--- Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 14a638cd3b6031c27b33560506244b9bf1913ad9 Author: Michael Krufky Date: Sat Jun 28 23:53:51 2008 -0300 V4L/DVB (8308): sms1xxx: Provide option to support Siano default usb ids Provide an option to enable / disable support for Siano's default usb ids. This allows the support for Siano's USB IDs to be disabled, so that Siano's external driver can be used, instead. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eb383bddc5ec52087ccfad4cccd8c6cc57c846d8 Author: Michael Krufky Date: Sun Jun 29 01:33:23 2008 -0300 V4L/DVB (8307): sms1xxx: change smsusb_driver.name to sms1xxx Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 5068b7a449293ced0ea963f3c944189d78fe1b1e Author: Michael Krufky Date: Sat Jun 28 23:27:19 2008 -0300 V4L/DVB (8306): sms1xxx: log firmware download process by default Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0f2a1ee112a4709a3b1a3c3c64b5d11752da1eef Author: Michael Krufky Date: Sat Jun 28 20:53:45 2008 -0300 V4L/DVB (8305): sms1xxx: fix warning: format '%d' expects type 'int', but argument x has type 'size_t' Fix the following 64bit build warning: make[2]: Entering directory `/usr/src/linux-headers-2.6.24-16-generic' CC [M] smscoreapi.o smscoreapi.c: In function 'smscore_load_firmware_from_file': smscoreapi.c:604: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' CC [M] smsusb.o smsusb.c: In function 'smsusb1_load_firmware': smsusb.c:216: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' smsusb.c:223: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8f37356b065206316e0b66dbee2718c82329684c Author: Michael Krufky Date: Sat Jun 28 17:09:28 2008 -0300 V4L/DVB (8303): sms1xxx: update MODULE_DESCRIPTION set MODULE_DESCRIPTION to "Driver for the Siano SMS1XXX USB dongle" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit cf1cfe1ba70952093a46bb0e21b58357f36f2e8f Author: Michael Krufky Date: Sat Jun 28 16:45:36 2008 -0300 V4L/DVB (8302): sms1xxx: fix Siano board names Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 02aea4fb640cdc4018e0a6d34e235eb63e4482d7 Author: Michael Krufky Date: Thu Jun 26 04:58:30 2008 -0300 V4L/DVB (8301): sms1xxx: add capability to define device-specific firmware filenames Add the capability to define device-specific firmware filenames for the SMS1150, with a mechanism to fall back to the generic firmware if the device-specific firmware is not present. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2708e888c57904f78649dcd91dcda9768d580ecf Author: Michael Krufky Date: Sat Jun 21 05:24:38 2008 -0300 V4L/DVB (8300): sms1xxx: simplify smsusb_init_device switch..case block Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0c071f374f66f05aded3be970f683d54fd918806 Author: Michael Krufky Date: Sat Jun 21 02:44:02 2008 -0300 V4L/DVB (8299): sms1xxx: mark functions static Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c65c7a652ff10b86d33eda36f9c4200027bd8dd4 Author: Michael Krufky Date: Thu Jun 19 22:20:49 2008 -0300 V4L/DVB (8298): sms1xxx: remove redundant __func__ in sms_err macro Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2522dc13245073f75399ada8e7f6acecde834953 Author: Michael Krufky Date: Thu Jun 19 22:15:38 2008 -0300 V4L/DVB (8297): sms1xxx: remove old printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eb250942fe3cf2a129ab55d65161bc66b7009853 Author: Michael Krufky Date: Thu Jun 19 22:07:23 2008 -0300 V4L/DVB (8296): sms1xxx: always show error messages Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f14d56a99bddb779f6f7ec028bcd9d142536589e Author: Michael Krufky Date: Thu Jun 19 20:59:08 2008 -0300 V4L/DVB (8295): sms1xxx: add debug module option, to enable debug messages All dmesg spam turned off by default, for now. Values for debug: (info=1, adv=2 (or-able) Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a0c0abcb1fdb316dee3a38cff9843d7d094c327c Author: Michael Krufky Date: Thu Jun 19 20:35:21 2008 -0300 V4L/DVB (8294): sms1xxx: move message formatting into printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 068d6c0f5d6c67d0e93f8e214897ddd64746be4e Author: Michael Krufky Date: Thu Jun 19 01:15:46 2008 -0300 V4L/DVB (8293): sms1xxx: create printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1c11d546b6c31399ac60f42d3103227cc1164d80 Author: Michael Krufky Date: Wed Jun 18 22:09:55 2008 -0300 V4L/DVB (8292): sms1xxx: add code to allow device-specific functionality Set board ID in the usb_device_id table's driver_info field. Use board name when registering the dvb adapter. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit dd5b2a5c2a6c793d855910864593ad26dd844154 Author: Michael Krufky Date: Wed Jun 18 20:25:25 2008 -0300 V4L/DVB (8291): sms1xxx: change default_mode to 4 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d3e72fe75ef7651e49e50f6a5f2c1c6453749e33 Author: Michael Krufky Date: Mon Jun 16 12:37:05 2008 -0300 V4L/DVB (8290): sms1xxx: small cleanup Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit df0462e77e9aa19d50dbfd540e78f1803e992c25 Author: Michael Krufky Date: Sun Jun 15 19:39:55 2008 -0300 V4L/DVB (8289): sms1xxx: remove #if LINUX_VERSION_CODE checks Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fbd05c8213e7cddca3041c280e5fca5eff0956f9 Author: Michael Krufky Date: Sun Jun 15 19:27:35 2008 -0300 V4L/DVB (8288): sms1xxx: more cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e080842c6c31249010adb184f9efbbc5cb40bd2b Author: Michael Krufky Date: Sun Jun 15 19:11:37 2008 -0300 V4L/DVB (8287): sms1xxx: fix WARNING: unnecessary cast may hide bugs fix the following checkpatch.pl warning: WARNING: unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html 596: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:540: + msg = (struct SmsMsgHdr_ST *) kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA); Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 18245e18eeae15e928b46c1ae0f3a19bdc50419d Author: Michael Krufky Date: Sun Jun 15 17:52:24 2008 -0300 V4L/DVB (8286): sms1xxx: remove typedefs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ca78373687bddcd436e1bf2d9b6806cfd9cad8b8 Author: Michael Krufky Date: Sun Jun 15 17:36:00 2008 -0300 V4L/DVB (8285): sms1xxx: more 80-column cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9f2113975a7898c913c668bb709e95c27e51617b Author: Michael Krufky Date: Sun Jun 15 17:26:42 2008 -0300 V4L/DVB (8284): sms1xxx: fix WARNING: printk() should include KERN_ facility level Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 59bf6b8e85209f4b875e319b42e8f13af7797826 Author: Michael Krufky Date: Sun Jun 15 16:50:11 2008 -0300 V4L/DVB (8283): sms1xxx: 80-column cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fa830e8a014a206103d06a7600ed8c661b427db3 Author: Michael Krufky Date: Sun Jun 15 15:52:43 2008 -0300 V4L/DVB (8282): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f0333e3de0e06fb9a6662a6df7d3d1cc8e5dbeca Author: Michael Krufky Date: Sun Jun 15 15:32:00 2008 -0300 V4L/DVB (8281): sms1xxx: remove INT / UINT typedefs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 822374165d6b11733467cfa2fa18234319198233 Author: Michael Krufky Date: Sun Jun 15 15:14:13 2008 -0300 V4L/DVB (8280): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 73104fb3e4e692cb1f9505b548ab073b0859b256 Author: Michael Krufky Date: Sat Jun 14 18:27:18 2008 -0300 V4L/DVB (8279): sms1xxx: #define usb vid:pid's Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 494d24c527e5ab43aecb8e77bfdc7e939466b134 Author: Michael Krufky Date: Sat Jun 14 07:40:41 2008 -0300 V4L/DVB (8278): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f17407a85db3b86526d54e65698348873a6df617 Author: Michael Krufky Date: Sat Jun 14 00:43:26 2008 -0300 V4L/DVB (8277): sms1xxx: update latest siano drop to 1.2.17 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 55ad310c2f21281f50fa040b7765a4a1151bd420 Author: Michael Krufky Date: Tue May 6 03:52:44 2008 -0300 V4L/DVB (8276): sms1xxx: codingstyle cleanup: "(foo*)" should be "(foo *)" ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a83ccdd6a952eb25d3f51dfdc175c1e9bf8f7cae Author: Michael Krufky Date: Tue May 6 03:11:51 2008 -0300 V4L/DVB (8275): sms1xxx: codingstyle cleanup: "foo* bar"/"foo * bar" should be "foo *bar" ERROR: "foo* bar" should be "foo *bar" ERROR: "foo * bar" should be "foo *bar" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3617691fb98b81850640a9b61fb932b798ad4504 Author: Michael Krufky Date: Thu May 22 18:32:40 2008 -0300 V4L/DVB (8274): sms1xxx: build cleanup after driver relocation Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 18658117ff844e8117f6b363cb7fa8c5f8ad2cb8 Author: Michael Krufky Date: Thu May 22 18:30:17 2008 -0300 V4L/DVB (8273): sms1xxx: replace __FUNCTION__ with __func__ Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 854470606070d91955f03a7dca3a8024fc2a2540 Author: Michael Krufky Date: Thu May 22 18:29:20 2008 -0300 V4L/DVB (8272): sms1xxx: move driver from media/mdtv/ to media/dvb/siano/ Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7d18d2e91b5495ed0b99c83d595a56e25521a111 Author: Steven Toth Date: Thu May 22 18:07:39 2008 -0300 V4L/DVB (8271): sms1xxx: usbvid table Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 19d703da05de6495adfc0ec9aec927d2fce99af6 Author: Steven Toth Date: Thu May 22 18:06:41 2008 -0300 V4L/DVB (8270): sms1xxx: header include cleanups and unexport symbols Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8d4f9d0e0bb8b8191b525bd41eddadaf831e47ef Author: Steven Toth Date: Thu May 22 18:05:26 2008 -0300 V4L/DVB (8269): sms1xxx: copyrights Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eae55660fc4a7f17f0f87458d8ada2b51b1833c1 Author: Steven Toth Date: Thu May 22 18:04:36 2008 -0300 V4L/DVB (8268): sms1xxx: usb cleanup Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 159ed4bbc394bb3e547eb64fdd3a59141ced131a Author: Steven Toth Date: Thu May 22 18:01:42 2008 -0300 V4L/DVB (8267): sms1xxx: Makefile cleanup Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3dd243787017e40c66ae54cf590ea513a110c51d Author: Steven Toth Date: Thu May 22 18:01:02 2008 -0300 V4L/DVB (8266): sms1xxx: merge modules Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7a19598c75660b6d4464d291f8e99a91fd7afc4a Author: Steven Toth Date: Thu May 22 16:43:04 2008 -0300 V4L/DVB (8265): sms1xxx: Kconfig / Makefile cleanups Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9e4fb5e7122ce67769719e715159baed5e5d7247 Author: Steven Toth Date: Thu May 22 15:48:54 2008 -0300 V4L/DVB (8264): sms1xxx: remove smstypes.h Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 955e9ca3cdeae62e8067ede204b5a02dcde6813e Author: Steven Toth Date: Thu May 22 15:46:32 2008 -0300 V4L/DVB (8263): sms1xxx: merge ksyms Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c6465799c38762b963bb819e033d2a56a3d3c233 Author: Steven Toth Date: Mon May 19 19:09:21 2008 -0300 V4L/DVB (8262): sms1xxx: remove smschar.o Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 464a77dd8845fc8f3beeaad24478081576c4b83a Author: Steven Toth Date: Mon May 19 19:01:25 2008 -0300 V4L/DVB (8261): sms1xxx: remove smsnet.o Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7315b082e333191f7606dbb23dbcbdba98a79c11 Author: Michael Krufky Date: Mon May 19 18:58:40 2008 -0300 V4L/DVB (8260): sms1xxx: build fixes Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9c59f968a9960bbb3402c8a8ea8004c798f4f383 Author: Michael Krufky Date: Mon May 19 18:57:12 2008 -0300 V4L/DVB (8259): sms1xxx: pass adapter_nr into dvb_register_adapter Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2e5c1ec8865abd81e24a394918c7ba315e0b7b70 Author: Michael Krufky Date: Mon May 19 18:56:13 2008 -0300 V4L/DVB (8258): add support for SMS1010 and SMS1150 based digital television devices initial driver drop, provided by Siano Mobile Silicon, Inc. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a9e285856112e5e721b6a341d15437a164128b30 Author: Laurent Pinchart Date: Fri Jul 11 19:32:15 2008 -0300 V4L/DVB (8257): uvcvideo: Fix possible AB-BA deadlock with videodev_lock and open_mutex The uvcvideo driver's uvc_v4l2_open() method is called from videodev's video_open() function, which means it is called with the videodev_lock mutex held. uvc_v4l2_open() then takes uvc_driver.open_mutex to check dev->state and avoid racing against a device disconnect, which means that open_mutex must nest inside videodev_lock. However uvc_disconnect() takes the open_mutex around setting dev->state and also around putting its device reference. However, if uvc_disconnect() ends up dropping the last reference, it will call uvc_delete(), which calls into the videodev code to unregister its device, and this will end up taking videodev_lock. This opens a (unlikely in practice) window for an AB-BA deadlock and also causes a lockdep warning because of the lock misordering. Fortunately there is no apparent reason to hold open_mutex when doing kref_put() in uvc_disconnect(): if uvc_v4l2_open() runs before the state is set to UVC_DEV_DISCONNECTED, then it will take another reference to the device and kref_put() won't call uvc_delete; if uvc_v4l2_open() runs after the state is set, it will run before uvc_delete(), see the state, and return immediately -- uvc_delete() does uvc_unregister_video() (and hence video_unregister_device(), which is synchronized with videodev_lock) as its first thing, so there is no risk of use-after-free in uvc_v4l2_open(). Bug diagnosed based on a lockdep warning reported by Romano Giannetti . Signed-off-by: Roland Dreier Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 6f80e1b4cda7e184e369c84a8b388882b0233d53 Author: Andrew Morton Date: Fri Jul 4 06:33:23 2008 -0300 V4L/DVB (8256): uvc/uvc_v4l2.c: suppress uninitialized var warning drivers/media/video/uvc/uvc_v4l2.c: In function `uvc_v4l2_mmap': drivers/media/video/uvc/uvc_v4l2.c:1035: warning: 'buffer' might be used uninitialized in this function Signed-off-by: Andrew Morton Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 25e69850d1bb315f251c91183b89da44d4f9be23 Author: Laurent Pinchart Date: Wed Jul 9 18:29:59 2008 -0300 V4L/DVB (8254): uvcvideo : Add support for Asus F9GS integrated webcam Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit a9e1113483f110723e4c0277a05d08f51da232aa Author: Mauro Carvalho Chehab Date: Wed Jul 9 05:26:26 2008 -0300 V4L/DVB (8253): gspca: fix warnings on x86_64 /home/v4l/master/v4l/gspca.c: In function 'gspca_frame_add': /home/v4l/master/v4l/gspca.c:222: warning: format '%d' expects type 'int', but argument 2 has type 'long int' /home/v4l/master/v4l/gspca.c: In function 'dev_read': /home/v4l/master/v4l/gspca.c:1568: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' /home/v4l/master/v4l/gspca.c:1618: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a47cacbd869b67ce16981ad5a0b06e4eac2efaff Author: Christophe Jaillet Date: Fri Jul 4 06:33:22 2008 -0300 V4L/DVB (8252): buf-dma-sg.c: avoid clearing memory twice 1) Remove a useless initialisation of 'i' 2) Avoid clearing the memory allocated twice (once in 'kcalloc', once in 'sg_init_table') 3) Remove a test that can never trigger. The function returns NULL in such a case, so we know that at this point 'pages[0]' != NULL Signed-off-by: Christophe Jaillet Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit a8a89b7f60f18c2517c3b950f5ecede0626363eb Author: Akinobu Mita Date: Fri Jul 4 06:33:20 2008 -0300 V4L/DVB (8251): ttusb: use simple_read_from_buffer()() Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 3fce3fb0592841857ae01334d0c6934c1ad32faf Author: David Howells Date: Tue Jul 8 16:04:38 2008 -0300 V4L/DVB (8249): Fix pointer cast warnings in the ivtv framebuffer driver Fix casts of pointers to integers of different sizes in the ivtv framebuffer driver. These were introduced in patch 38eb6ba5b8487d15b020fe391d324edd2b659b03. Signed-off-by: David Howells Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5a367dfb739831d54caf226ce0bc4c75ef264d8d Author: Jean Delvare Date: Thu Jul 10 11:23:37 2008 -0300 V4L/DVB (8246): tvaudio: Stop I2C driver ID abuse The tvaudio driver is using "official" I2C device IDs for internal purpose. There must be some historical reason behind this but anyway, it shouldn't do that. As the stored values are never used, the easiest way to fix the problem is simply to remove them altogether. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit be99af6679174e5d0e9f36fc8c18318a8ce34bca Author: Jean Delvare Date: Thu Jul 10 11:04:10 2008 -0300 V4L/DVB (8245): ovcamchip: Delete stray I2C bus ID I2C_HW_SMBUS_OVFX2 is referenced in ovcamchip_core.c, but no bus uses this driver ID, so we can remove the reference. As far as I can see, the Cypress FX2 webcam is handled by a different driver (dvb-usb). Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit e2fc00c21124d9d9a8d4f396e5498ea27ddfc8fd Author: Massimo Piccioni Date: Fri Jul 11 13:48:02 2008 -0300 V4L/DVB (8244): saa7134: add support for AVerMedia M103 The following patch updates saa7134 driver to add support for AVerMedia M103 MiniPCI DVB-T Hybrid card. Signed-off-by: Massimo Piccioni [mchehab@infradead.org: fixed merge conflicts and a small codingstyle] Signed-off-by: Mauro Carvalho Chehab commit 52b5045078b76ee86e210210601d45670eab22f1 Author: Michael Krufky Date: Wed Jul 9 02:18:49 2008 -0300 V4L/DVB (8236): cx23885: add support for new revision of FusionHDTV7 Dual Express The new revision of this board uses the same pci subsystem id as the first revision, but uses a S5H1411 demodulator instead of the S5H1409. In the case of the FusionHDTV7 Dual Express, if s5h1409_attach fails, try s5h1411_attach. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bdf2fe4a0b9d23e69c77eaec76212216c9a957ef Author: Laurent Pinchart Date: Mon Jul 7 23:41:40 2008 -0300 V4L/DVB (8235): uvcvideo : Add support for Medion Akoya Mini E1210 integrated webcam Signed-off-by: Tim Gardner Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 6833c917b4de1757febdbf946d709ece6dc7a86f Author: Laurent Pinchart Date: Mon Jul 7 23:04:29 2008 -0300 V4L/DVB (8234): uvcvideo: Make input device support optional UVC devices can report button events. The uvcvideo driver depends on CONFIG_INPUT to report events to the input layer. This patch removes the hard dependency by introducing a new CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV option. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit ac0d6df69bc72eabda944fd14a958074dc08ca0c Author: Jean-Francois Moine Date: Tue Jul 8 06:58:15 2008 -0300 V4L/DVB (8232): gspca: Change the USERPTR mechanism. main: Change the packet copy mechanism for userptr. Cannot do reqbufs ioctl when already done and count != 0. Accept count < frame size in read(). Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c41492c89a00630c7482eae25deaf9af91b73c98 Author: Jean-Francois Moine Date: Mon Jul 7 08:31:16 2008 -0300 V4L/DVB (8231): gspca: Do not declare the webcams declared by other drivers. etoms: Do not declare the webcams declared by the driver et61x251. sonixb, sonixj: Do not declare the webcams declared by the driver sn9c102. zc3xx: Do not declare the webcams declared by the driver zc0301. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit f87086e302300fdff1bd32049deb7a7f3e3de7da Author: Hans Verkuil Date: Fri Jul 18 00:50:58 2008 -0300 v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10 Also remove some blank lines that were used to split compat code at -devel tree. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e01117c81676dc9897f567e32cdc13a26e85280b Author: Laurent Pinchart Date: Fri Jul 4 00:36:21 2008 -0300 V4L/DVB (8209): uvcvideo: Don't free URB buffers on suspend. All submitted URBs must be killed at suspend time, but URB buffers don't have to be freed. Avoiding a free on suspend/reallocate on resume lowers the presure on system memory. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 291358785cde5536d98a4f3cae77efd8ca626486 Author: Laurent Pinchart Date: Fri Jul 4 00:35:26 2008 -0300 V4L/DVB (8208): uvcvideo: Use GFP_NOIO when allocating memory during resume The swap device might still be asleep, so memory allocated in the resume handler must use GFP_NOIO. Thanks to Oliver Neukum for catching and reporting this bug. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 233548a2fd934a0220db8b1521c0bc88c82e5e53 Author: Laurent Pinchart Date: Fri Jul 4 00:34:59 2008 -0300 V4L/DVB (8207): uvcvideo: Fix a buffer overflow in format descriptor parsing Thanks to Oliver Neukum for catching and reporting this bug. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 553b9fa47d67a77f6456bc969891a347bfb323dc Author: Andoni Zubimendi Date: Sun Jul 6 07:27:19 2008 -0300 V4L/DVB (8205): gspca: Size of frame header adjusted according to sn9c10x in sonixb. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 814429501f65e3482adb8e7678660ceb7a2fc2e6 Author: Jean-Francois Moine Date: Sun Jul 6 07:04:39 2008 -0300 V4L/DVB (8204): gspca: Cleanup code. spca508: Cleanup code. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 80544d3c7a7ce32084c9137c96488704053772e3 Author: Hans de Goede Date: Sun Jul 6 06:40:55 2008 -0300 V4L/DVB (8202): gspca: PAC207 frames may be not compressed. pac207: Set the sizeimage to the max value for 352x288. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c2446b3eba97243acbe2ad0939a28b5edb97eae7 Author: Jean-Francois Moine Date: Sat Jul 5 11:49:20 2008 -0300 V4L/DVB (8201): gspca: v4l2_pix_format in each subdriver. main: Parameter comp_fac removed. main, pac207: get_buff_size op removed. (all) v4l2_pix_format in each subdriver. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit efab8211db79d20032fa7d09b8a3671e68a9c5b9 Author: Harvey Harrison Date: Sat Jul 5 06:12:47 2008 -0300 V4L/DVB (8199): gspca: Compile warnings about NULL ptr. Signed-off-by: Harvey Harrison Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 46ccdafa71c1c95de002ce7a31e700cf5c8195df Author: Hans de Goede Date: Fri Jul 4 18:39:08 2008 -0300 V4L/DVB (8198): gspca: Frame decoding errors when PAC207 in full daylight. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ab8f12cf8e3d33adec382585f9f60f8686a372c3 Author: Hans de Goede Date: Fri Jul 4 18:29:32 2008 -0300 V4L/DVB (8197): gspca: pac207 frames no more decoded in the subdriver. videodev2: New pixfmt pac207: Remove the specific decoding. main: get_buff_size operation added for the subdriver. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 24c530b4abb979f9e79298f0b4c4e83781a0e4c3 Author: Hans de Goede Date: Fri Jul 4 17:55:18 2008 -0300 V4L/DVB (8196): gspca: Correct sizeimage in vidioc_s/try/g_fmt_cap Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a5ae2062252e697d38e53dbbeb91460252208914 Author: Jean-Francois Moine Date: Fri Jul 4 11:16:16 2008 -0300 V4L/DVB (8195): gspca: Input buffer overwritten in spca561 + cleanup code. spca561: Input buffer may be changed on reg write. (all sd): Cleanup code, 'const' added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 54ab92ca05550550bcec2462de2605f35d079b66 Author: Hans de Goede Date: Thu Jul 3 11:20:58 2008 -0300 V4L/DVB (8194): gspca: Fix the format of the low resolution mode of spca561. The low (half) res modes of the spca561 are not spca561 compressed, but are raw bayer, this patches fixes this and adds a PIX_FMT define for the GBRG bayer format used by the spca561 in low res mode. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit bf7f0b98426b54c29ec8100a3f1963114c2f2ef0 Author: Jean-Francois Moine Date: Thu Jul 3 11:09:12 2008 -0300 V4L/DVB (8193): gspca: Input buffer may be changed on reg write. Done for conex, etoms, pac7311, sonixj, t613 and tv8532. Code cleanup for some other subdrivers. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0d2a722ddae5e736a5c36a1b99ee4ca59a8373bc Author: Hans de Goede Date: Thu Jul 3 08:15:22 2008 -0300 V4L/DVB (8192): Try to fix a reg_w() bug Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d646e701819f994c5cb1507dc859b739b5478d32 Author: Hans de Goede Date: Thu Jul 3 06:48:22 2008 -0300 V4L/DVB (8191): gspca: Make CONFIG_VIDEO_ADV_DEBUG actually work. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0c61621412ca09bd692cef86d4c9f358d5e81b0c Author: Andy Walls Date: Mon Jul 7 10:36:16 2008 -0300 V4L/DVB (8189): cx18: Use correct GPIO pin for resetting Xceive 3028 tuner on Yuan MPC718 Change the Yuan MPC718 cards entry to use the correct GPIO pin for resetting the Xceive 3028 tuner. Thanks to Brian Hope for taking the time and figuring out which pin to use. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 53ad02efe7d5908f0ce73a7dac9530f1180f2514 Author: Andy Walls Date: Sun Jul 6 19:36:52 2008 -0300 V4L/DVB (8188): cx18: Add missing reset recovery delay in cx18-i2c.c cx18: Add a missing reset recovery delay in cx18-i2c.c after the final deassert. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit d01eb2dc7d5265ec3bee9ec1b8ab79155e1310d6 Author: Michael Krufky Date: Thu Jul 3 23:43:36 2008 -0300 V4L/DVB (8186): dib0700: add support for Hauppauge Nova-TD Stick 52009 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 69b28b110975abcfac3f7345494e74a771e9b724 Author: Douglas Schilling Landgraf Date: Fri Jul 4 04:40:28 2008 -0300 V4L/DVB (8184): spca508: Add Clone Digital Webcam 11043 Added ID vendor/product for Clone Digital Webcam 11043. Thanks to Ivan Brasil Fuzzer for testing and data collection. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 30b4d355aa02ba274279eae1187539b85bd100ed Author: Michael Krufky Date: Wed Jul 2 12:55:49 2008 -0300 V4L/DVB (8183): cxusb: select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE After adding support for AVerTVHD Volar, DVB_USB_CXUSB must select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 82643d0e90896fba965e6e43692538b2cc093d34 Author: Jean-Francois Moine Date: Wed Jul 2 09:14:56 2008 -0300 V4L/DVB (8181): gspca: read() did not work (loop in kernel, timeout...) main: Remove some vidioc_xx traces. main: read() did not work (user irq instead of mmap irq). main: Lack of v4l1 compat. main: Process loop inside kernel when no frame arriving. main: Double qbuf in read() when too many buffered frames. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 956e42d28f300f5bb928fb5850b3e3c0a8982d23 Author: Jean-Francois Moine Date: Tue Jul 1 10:03:42 2008 -0300 V4L/DVB (8180): Source cleanup - compile error with VIDEO_ADV_DEBUG. main, etoms, mars, pac207, pac7311, sonixb, sonixj, spca500, spca505: Cleanup source. sunplus: Compilation error when VIDEO_ADV_DEBUG set. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 00528d9c2e9e15625883c161867cba61725ba335 Author: Mike Isely Date: Mon Jun 30 03:35:52 2008 -0300 V4L/DVB (8176): pvrusb2: Update video_gop_size When switching video standard, ensure that video GOP size remains appropriately configured. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit ab062fe3b540c157eb66c4acedbedbc200cfd9e2 Author: Mike Isely Date: Mon Jun 30 03:32:35 2008 -0300 V4L/DVB (8175): pvrusb2: Fix misleading source code comment Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 7e87218bbfa2697c7df42ac80498a2fd17b276a4 Author: Hans Verkuil Date: Tue Jul 1 18:46:09 2008 -0300 V4L/DVB (8173): saa711x.c: remove obsolete file. saa711x.c is no longer used. Remove. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dc5e42fb20229487ef11fd6fa0cdb7b7d42170f6 Author: Hans Verkuil Date: Mon Jun 30 20:02:47 2008 -0300 V4L/DVB (8171): ivtv: put back full device name, people relied on it in udev rules. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e8b934de12989d1704e7df7ebb408a6021f08442 Author: Hans Verkuil Date: Sat Jun 28 20:57:56 2008 -0300 V4L/DVB (8169): cx18: enable TS support Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1a3932e0ed9ca46db2b76ce067e4ebaf04d91ea1 Author: Hans Verkuil Date: Sat Jun 28 20:57:30 2008 -0300 V4L/DVB (8168): cx18: Upgrade to newer firmware & update cx18 documentation. Conexant graciously gave us permission to redistribute the firmware. Update the documentation where the firmware can be downloaded. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 86d674a1324cce5708b1b84e4ae162910e201b4f Author: Hans Verkuil Date: Sat Jun 28 14:57:30 2008 -0300 V4L/DVB (8168a): cx18: Update cx18 documentation. Update the documentation, providing an updated list of supported boards. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 81cb727d29eda7692a03be035b7228b4c3f6b610 Author: Hans Verkuil Date: Sat Jun 28 12:49:20 2008 -0300 V4L/DVB (8167): cx18: set correct audio inputs for tuner and line-in 2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f313da113fe083bfb1eb43377f551db4bbe702a6 Author: Hans Verkuil Date: Sat Jun 28 08:03:02 2008 -0300 V4L/DVB (8165): cx18: fix v4l-cx23418-dig.fw firmware load. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c3cb4d95ae778dbc6a4be1e74672d645fc75c8a7 Author: Hans Verkuil Date: Fri Jun 27 23:27:25 2008 -0300 V4L/DVB (8164): cx18/ivtv: choose a better initial TV standard for cards without eeprom. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c1738904d6808a091d7d496b445d20671d513ad4 Author: Hans Verkuil Date: Fri Jun 27 15:33:02 2008 -0300 V4L/DVB (8162): cx18: fix PAL/SECAM support Reverted the 'Fix unintended auto configurations in cx18-av-core' patch, instead disable the auto config completely. Fix a bug in cx18_av_vbi_setup() where the standard tests were done in the wrong order. Tested with NTSC-M, PAL-BG, PAL-I, PAL-DK, PAL-M, PAL-Nc, SECAM-DK, SECAM-L and SECAM-BG. The last one does not work at the moment due to a tda9887.c bug. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e078770a050aa686f895a965f54222c0f201feb3 Author: Mauro Carvalho Chehab Date: Tue Jul 1 04:06:22 2008 -0300 V4L/DVB (8161): gspca: Fix compilation Some callbacks were renamed. Fix it. Signed-off-by: Mauro Carvalho Chehab commit 50a871fed9c82f01baa40100cd2d262784220953 Author: Jean-Francois Moine Date: Mon Jun 30 19:47:33 2008 -0300 V4L/DVB (8158): gspca: minor changes main: V4L2_PIX_FMT_SPCA501 is compressed (thanks to Hans de Goede) main: return 0 when no change on vidioc_s_fmt_cap (thanks to Hans de Goede) pac207: cleanup Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 6a7eba24e4f0ff725d33159f6265e3a79d53a833 Author: Jean-Francois Moine Date: Mon Jun 30 15:50:11 2008 -0300 V4L/DVB (8157): gspca: all subdrivers - remaning subdrivers added - remove the decoding helper and some specific frame decodings Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d43fa32fec442571f10f5d0c3b553413288728de Author: Jean-Francois Moine Date: Thu Jun 12 10:58:58 2008 -0300 V4L/DVB (8156): Many bug fixes, zc3xx added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 4aa0d037a6c8e6b37ecfd986a444f83190c32a21 Author: Jean-Francois Moine Date: Sun May 4 06:46:21 2008 -0300 V4L/DVB (8154): Fix protection problems in the main driver. - Protect format change when streaming active. - Protect USB exchanges on close. - Set a timeout in frame wait. - Have only one capture file and free the resources when closing this file. - Simplify the URB buffer. - Don't reset the control values at open time in pac207. - Fix compilation warnings of stk014. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit e2997a72ddfafc25bd0c8f1f52bcf41979d5a559 Author: Hans de Goede Date: Wed Apr 23 08:09:12 2008 -0300 V4L/DVB (8153): Subdriver pac207 added and minor changes. pac207 added. Check status on mutex lock. Call back on frame dequeue. Free the resources on last close only. Avoid URB and ISOC errors on close. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 63eb9546dcb5e9dc39ab88a603dede8fdd18e717 Author: Jean-Francois Moine Date: Sat Apr 12 09:58:09 2008 -0300 V4L/DVB (8152): Initial release of gspca with only one driver. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 8b53b39d6228cda41b7ddfc9d094a072afca6655 Author: Hans Verkuil Date: Fri Jun 27 21:18:15 2008 -0300 V4L/DVB (8151): saa7134-empress: fix MPEG control support The MPEG controls could not be enumerated and so could not be read or set through the v4l2-ctl utility or shown in control panels. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e5e4cd8df61e602202f588dd545364dba37b4cc7 Author: Tim Farrington Date: Sun Jun 29 11:54:08 2008 -0300 V4L/DVB (8149): Avermedia E506 composite Composite was originally mis-labelled as name_comp1, so it should be simply redone as name_comp, with its now corrected attributes. Signed-off-by: Tim Farrington Signed-off-by: Mauro Carvalho Chehab commit f5376adacc693155c24e4e7be3777bdd0eeb99f7 Author: Daniel Gimpelevich Date: Sat Jun 28 05:01:30 2008 -0300 V4L/DVB (8147): cxusb: add initial support for AVerTVHD Volar Add initial support for this device. The AGC and tracking filter settings for the mxl5003 are known to be wrong, but it generally works. Signed-off-by: Daniel Gimpelevich Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c0f4c0adfdb10747045fcc757a3e60ae1e1558f3 Author: Michael Krufky Date: Sat Jun 28 02:06:50 2008 -0300 V4L/DVB (8146): lgdt330x: add additional FEC control configuration option Allow the following configuration, by passing clock_polarity_flip = 2: Enable FEC automatic reset. Disable spectrum inversion. Enable viterbi resynchronization. Set polarity indicator high. Enable error flag insertion. Thanks to Daniel Gimpelevich, for discovering that this configuration is used on the AVerMedia AVerTVHD Volar. Signed-off-by: Michael Krufky CC: Daniel Gimpelevich Signed-off-by: Mauro Carvalho Chehab commit ecfceef742b816a5c8541a7d58fe215c38d4d859 Author: Mauro Carvalho Chehab Date: Sun Jun 29 08:41:19 2008 -0300 V4L/DVB (8143): Fix compilation for mt9v022 Signed-off-by: Mauro Carvalho Chehab commit 2d5b5a4733b7e32188baa250fbbc4ae11f5e6f69 Author: Mauro Carvalho Chehab Date: Sun Jun 29 08:29:00 2008 -0300 V4L/DVB (8142): ttpci: tda827x.h is at drivers/media/common As reported by Stephen Rothwell : drivers/media/dvb/ttpci/budget-ci.c:50:21: error: tda827x.h: No such file or directory Signed-off-by: Mauro Carvalho Chehab commit 84a9f33614e3cfcc7326629a503d4389c9d84e0f Author: Al Viro Date: Sun Jun 22 14:19:29 2008 -0300 V4L/DVB (8136): xc2028 unaligned access fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 153755a774578dcf921f8145e786ce25f72368d2 Author: Al Viro Date: Sun Jun 22 14:19:39 2008 -0300 V4L/DVB (8135): WRITE_RPS1() converts to le32 itself ... but two ancient drivers had not noticed. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 9c169df8d6877c618587bf40498f2ef378c97eb8 Author: Al Viro Date: Sun Jun 22 14:19:49 2008 -0300 V4L/DVB (8134): zoran annotations and fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 86ecc02755ea2d00925b344272b49b26d610bbe2 Author: Al Viro Date: Sun Jun 22 14:19:59 2008 -0300 V4L/DVB (8133): cx23885 endianness fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 3aa7110e1c415c38c42ef77be0ef2c7a888b9e16 Author: Al Viro Date: Sun Jun 22 14:20:09 2008 -0300 V4L/DVB (8132): bt8xx endianness annotations and fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 947a080037c6ae47cfe5072eadbd189e3da27ecd Author: Al Viro Date: Sun Jun 22 14:20:19 2008 -0300 V4L/DVB (8131): dmx_write: memcpy from user-supplied pointer ... copy to kernel memory first Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit b0ba0e3ab6f452321771325b7b5578f9a804f69e Author: Al Viro Date: Sun Jun 22 14:20:29 2008 -0300 V4L/DVB (8130): split dvb_ringbuffer dual-use functions split the suckers into kernel-memory and user-memory versions, annotate both properly. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 67778b322780200ac14e95c8089a0bd679a467d9 Author: Al Viro Date: Sun Jun 22 14:20:39 2008 -0300 V4L/DVB (8129): pluto_set_dma_addr() fix bogus cpu_to_le32() when passing dma address to hardware via writel() - writel() converts itself. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit a36ef6b1e09d06d4f1ac769eee4bd7e6cf3e0fae Author: Al Viro Date: Sun Jun 22 14:19:19 2008 -0300 V4L/DVB (8128): saa7146: ->cpu_addr and friends are little-endian Annotations + stop saa7146_i2c from playing fast and loose with reuse of ->cpu_addr for host-endian. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit f51b10ef6520f2bd725dc333e771eabd55d6c04f Author: Al Viro Date: Sun Jun 22 14:20:49 2008 -0300 V4L/DVB (8126): net endianness fix According to RFC 4326 (4.1) D-bit is MSB in net-endian 16bit. dvb_net.c did /* Set D-bit for CRC32 verification, * if it was set originally. */ ulen |= 0x0080; which works of little-endian (htons(1<<15) is 0x0080 there), but breaks on big-endian. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 38f993ad8b1fe4caf9e989caf6e2a25aff3bbaf7 Author: Dean Anderson Date: Thu Jun 26 23:15:51 2008 -0300 V4L/DVB (8125): This driver adds support for the Sensoray 2255 devices. It was primarily developed by Dean Anderson with only a little bit of guidance and cleanup by Greg. Signed-off-by: Dean Anderson Signed-off-by: Greg Kroah-Hartman [mchehab@infradead.org: fixed renamed callbacks] Signed-off-by: Mauro Carvalho Chehab commit bfda3a0b3276cda7f2da1dcd98bd060b60954cbb Author: Daniel Gimpelevich Date: Sat Jun 28 01:45:26 2008 -0300 V4L/DVB (8124): Add LifeVideo To-Go Cardbus PCI ID Signed-off-by: Daniel Gimpelevich Signed-off-by: Mauro Carvalho Chehab commit a9fc52bcbeb5245b58d23c558f3e3e8f18bebbc3 Author: Devin Heitmueller Date: Sat Jun 28 08:57:06 2008 -0300 V4L/DVB (8123): Add support for em2860 based PointNix Intra-Oral Camera em28xx-cards.c em28xx-input.c em28xx-video.c em28xx.h - Add support for the PointNix Intra-Oral Camera, which required addition of a construct for reading the "snapshot" button (provided on the em2860 and em2880 chips, but this is the first case where I have seen it actually used in a product). The button is wired to pin 56 on the em2880. http://www.pointnix.com/ENG/dental/product_02.asp Thanks to Roberto Mantovani for testing the changes Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 305519c924d8f2f2f85c390c6d456dc41dbe0284 Author: Douglas Schilling Landgraf Date: Fri Jun 27 04:15:38 2008 -0300 V4L/DVB (8120): cx23885-417: Replace cx23885_do_ioctl to use video_ioctl2 Convert cx23885-417 to use video_ioctl2 Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9c7ecaf5ace4dba94b4c75afa395440acfb2e36c Author: Dan Taylor Date: Fri Jun 27 13:29:41 2008 -0300 V4L/DVB (8117): saa7134: Avermedia A16D composite input Signed-off-by: Star Trac by Unisen, Inc. Dan Taylor Signed-off-by: Mauro Carvalho Chehab commit 6264c80661eaa2df793dd71d4956f371be955aa2 Author: Hans Verkuil Date: Wed Jun 25 06:54:05 2008 -0300 V4L/DVB (8116): videodev: allow PRIVATE_BASE controls when called through VIDIOC_G/S_CTRL. V4L2_CID_PRIVATE_BASE controls are not allowed when called from VIDIOC_S/G_EXT_CTRL as extended controls use a better mechanism for private controls. But still allow it when called from the VIDIOC_G/S_CTRL to extended control conversion in video_ioctl2() for backwards compatibility. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c5588b5c473c3d496a2f94b80ea8254110866506 Author: Andy Walls Date: Wed Jun 25 00:24:21 2008 -0300 V4L/DVB (8114): cx18: Improve Raptor card audio input routing defintions cx18: Improved Raptor card audio input routing defintions, so that muxer values matched cx18_gpio() values for tuner, line in 1, and radio and added LED indication of selected audio input. Audio line in 2 doesn't work as it uses the not yet supported 2nd I2S port. Tuner/FM Radio AF is mono until SIF support is fixed. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit adb65bc71c8fef53822870cc9018f05b11131233 Author: Hans Verkuil Date: Wed Jun 25 06:32:44 2008 -0300 V4L/DVB (8113): ivtv/cx18: remove s/g_ctrl, now all controls are handled through s/g_ext_ctrl videodev converts old-style controls to an extended control so the ivtv and cx18 drivers no longer have to handle both. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d8799b4699af008290e141804b40c5ebf3d7dc35 Author: Hans Verkuil Date: Wed Jun 25 06:29:01 2008 -0300 V4L/DVB (8112): videodev: improve extended control support in video_ioctl2() - add sanity checks for the extended controls argument. - if the driver only supports extended controls, then convert old-style controls to an extended control callback. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 36ecd4955a5ebee6135e2bcc997712fad4ac9b69 Author: Hans Verkuil Date: Wed Jun 25 06:00:17 2008 -0300 V4L/DVB (8111): ivtv/cx18: fix compile error when CONFIG_VIDEO_ADV_DEBUG is not defined. Thanks to Randy Dunlap for reporting this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1d0a436256dc1aecfad901bcd4432dac1cabe6b2 Author: Mauro Carvalho Chehab Date: Mon Jun 23 12:31:29 2008 -0300 V4L/DVB (8110): bttv: allow debug ioctl's Signed-off-by: Mauro Carvalho Chehab commit f24648e42fd4b7d3ad5af6eaefe0214426933954 Author: Hans Verkuil Date: Sun Jun 22 12:11:13 2008 -0300 V4L/DVB (8107): cx18: improve support for the Raptor board. - add radio definition - reset the audio firmware (required for this board, harmless for the others) Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 156f194b9df243b4c347a62b37258cb088f20297 Author: Hans Verkuil Date: Sun Jun 22 12:08:16 2008 -0300 V4L/DVB (8106): ivtv/cx18: improve tuner std check in card definitions. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e0e31cdb91cddc4cfbf6d5ffa8212f694723269b Author: Hans Verkuil Date: Sun Jun 22 12:03:28 2008 -0300 V4L/DVB (8105): cx2341x: add TS capability The cx18 can support transport streams with newer firmwares. Add a TS capability to the generic cx2341x module. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 37f89f9542c3945bddf46efc15a1b1e349af3f88 Author: Hans Verkuil Date: Sun Jun 22 11:57:31 2008 -0300 V4L/DVB (8104): cx18/ivtv: ioctl debugging improvements Completely rely on the video_ioctl2 debugging facilities rather than doing it ourselves. Fill in some missing fields in ivtv with VIDIOC_G_FBUF. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 21575c13125f2ef790e192e2c70e446c6cfe0d7d Author: Hans Verkuil Date: Sun Jun 22 11:55:09 2008 -0300 V4L/DVB (8103): videodev: fix/improve ioctl debugging Various ioctl debugging fixes and improvements: - use %x rather than %d for control IDs and bitmask fields - make two arrays const - show the whole control array for the ext_ctrl ioctls - print pix_fmt for V4L2_BUF_TYPE_VIDEO_OUTPUT - show full type name rather than an integer - fix CROPCAP debugging - fix G/S_TUNER debugging - show error code in case of an error - other small cleanups Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7dc1b8844eb3e0a91911f20736db87f4876e14b4 Author: Michael Krufky Date: Sat Jun 21 22:13:42 2008 -0300 V4L/DVB (8098): xc5000: add module option to load firmware during driver attach The xc5000 firmware download process can be slow on certain devices. Add a module option, "init_fw" to perform the firmware download during xc5000_attach(), which would get the firmware download over with well before any tune request is made. When this option is enabled, it will reduce the time it takes to get a signal lock during the first tune after driver load, but will add a few seconds to the driver initialization. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fa1035997cbba4c348a88f8b94eb135222aaba12 Author: Huang Weiyi Date: Sat Jun 21 14:30:33 2008 -0300 V4L/DVB (8095): zoran_driver.c: Removed duplicated include Removed duplicated include file in drivers/media/video/zoran_driver.c. Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit fdea5d69c1d335a639e39e83990de84e10fb2057 Author: Hans Verkuil Date: Sat Jun 21 13:25:36 2008 -0300 V4L/DVB (8093): cx18: fix prefix typo Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3d66c405708ee43b08788e89dbd63ebf3bbb5af1 Author: Hans Verkuil Date: Sat Jun 21 11:19:34 2008 -0300 V4L/DVB (8091): cx18: show GPIO pins when VIDIOC_LOG_STATUS is called. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 42b03fe16fe8cc2cd6575e25ed1872fd6f5da56f Author: Ian Armstrong Date: Sat Jun 21 11:09:46 2008 -0300 V4L/DVB (8090): ivtv: yuv decoder lock fix (2) The IVTV_IOC_DMA_FRAME ioctl fails to correctly 'start' the decoder. Although yuv output will be correct, some functions which should be disabled while the decoder is in use remain enabled. This can result in hardware registers being corrupted, causing problems with the mpeg decoder. This patch ensures the decoder 'start' sequence is called, disabling these functions until the device is closed. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 03c2808503b102971226007070c57410267d0b9d Author: Sri Deevi Date: Sat Jun 21 11:06:44 2008 -0300 V4L/DVB (8089): cx18: add support for Conexant Raptor PAL/SECAM card Patch provided courtesy of Conexant http://www.conexant.com. Signed-off-by: Srinivasa Deevi Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 464e9f3a0cabce9a7cf51f382f129d464483b0d0 Author: Ian Armstrong Date: Sat Jun 21 09:25:23 2008 -0300 V4L/DVB (8088): ivtv: yuv decoder lock fix write() operations to the yuv device may not always 'start' the decoder. Although yuv output will be correct, some functions which should be disabled while the decoder is in use remain enabled. This can result in hardware registers being corrupted, causing problems with the mpeg decoder. This patch simply moves the existing decoder 'start' sequence to earlier in the write() handler. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0b5a30e90ddcb0095a1bfc4b44eb3fd1e8ee9f3c Author: Hans Verkuil Date: Sat Jun 21 09:22:19 2008 -0300 V4L/DVB (8087): cx18: make sure all v4l2_format fields are filled in Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e27bf207db4fc6dd500eb82611f102da85cfe7d0 Author: Hans Verkuil Date: Sat Jun 21 09:21:23 2008 -0300 V4L/DVB (8086): ivtv/cx18: fix video_temporal_filter handling If the capture is scaled, then the video_temporal_filter is set to 0 by the cx2341x.c module since otherwise you would get ghosting. However, this was also done in the VIDIOC_S_FMT ioctl which meant that the video_temporal_filter control was reset to 0 or 8 each time S_FMT was called. This was old code that should have been removed a long time ago. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5cf2cc4803a0415f7048951a727204df414325e6 Author: Hans Verkuil Date: Sat Jun 21 09:06:59 2008 -0300 V4L/DVB (8085): ivtv: fill in all v4l2_framebuffer fields in VIDIOC_G/S_FBUF Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 79afcb10dfdd3287875666de34c23510423058b8 Author: Hans Verkuil Date: Sat Jun 21 09:02:36 2008 -0300 V4L/DVB (8084): ivtv/cx18: remove unnecessary memsets & KERNEL_VERSION tests Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8bfb9b1ce62757b8dea07c239efbbeec7bac811a Author: Hans Verkuil Date: Sat Jun 21 08:57:42 2008 -0300 V4L/DVB (8083): videodev: zero fields for ENCODER_CMD and VIDIOC_G_SLICED_VBI_CAP This avoids the need of memsets in the ivtv/cx18 drivers. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3b6fe58f0f18880200969e813d0181d1bdab0966 Author: Andy Walls Date: Sat Jun 21 08:36:31 2008 -0300 V4L/DVB (8082): cx18: convert to video_ioctl2() cx18: convert driver to use video_ioctl2(). Pushed down ioctl debug messages and priority checks as well. Still left serialization lock in place for now. #if 0'ed out sliced vbi ioctl code for now. Patch heavil